diff options
| author | Maggie Benthall <mbenthall@google.com> | 2013-08-28 00:00:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-28 00:00:01 +0000 |
| commit | 9506d857cbc87a3dcedc8c3599f1d45ac6fe995e (patch) | |
| tree | 975244d7ef83838be0ce9c72b9160aa67fd7c5af /src/com | |
| parent | cb6ba728c5f872bc66e3b8ac3682b350cb7501f0 (diff) | |
| parent | f48206e37e8a88a2f5f9b019995488696f8bf964 (diff) | |
| download | packages_apps_Settings-9506d857cbc87a3dcedc8c3599f1d45ac6fe995e.zip packages_apps_Settings-9506d857cbc87a3dcedc8c3599f1d45ac6fe995e.tar.gz packages_apps_Settings-9506d857cbc87a3dcedc8c3599f1d45ac6fe995e.tar.bz2 | |
Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index df49cec..f365403 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -85,7 +85,7 @@ public class SecuritySettings extends RestrictedSettingsFragment private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive"; private PackageManager mPM; - DevicePolicyManager mDPM; + private DevicePolicyManager mDPM; private ChooseLockSettingsHelper mChooseLockSettingsHelper; private LockPatternUtils mLockPatternUtils; @@ -168,9 +168,6 @@ public class SecuritySettings extends RestrictedSettingsFragment // Add options for device encryption - DevicePolicyManager dpm = - (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE); - mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER; if (!mIsPrimary) { @@ -186,7 +183,7 @@ public class SecuritySettings extends RestrictedSettingsFragment } if (mIsPrimary) { - switch (dpm.getStorageEncryptionStatus()) { + switch (mDPM.getStorageEncryptionStatus()) { case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE: // The device is currently encrypted. addPreferencesFromResource(R.xml.security_settings_encrypted); @@ -264,8 +261,8 @@ public class SecuritySettings extends RestrictedSettingsFragment // Credential storage final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); + mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume() if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) { - mKeyStore = KeyStore.getInstance(); Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE); final int storageSummaryRes = |