1 files changed, 8 insertions, 1 deletions
diff --git a/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java b/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
index 08c9bd441..9e3edabda 100644
--- a/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -28,6 +29,9 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.latin.utils.PreferenceUtils;
+
 /**
  * A base abstract class for a {@link PreferenceFragment} that implements a nested
  * {@link PreferenceScreen} of the main preference screen.
@@ -77,7 +81,7 @@ public abstract class SubScreenFragment extends PreferenceFragment
     }
 
     final SharedPreferences getSharedPreferences() {
-        return getPreferenceManager().getSharedPreferences();
+        return PreferenceUtils.getDefaultSharedPreferences(getActivity());
     }
 
     /**
@@ -100,6 +104,9 @@ public abstract class SubScreenFragment extends PreferenceFragment
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (BuildCompatUtils.EFFECTIVE_SDK_INT >= Build.VERSION_CODES.N) {
+            super.getPreferenceManager().setStorageDeviceProtected();
+        }
         mSharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {