PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev

Browse Source
This commit is contained in:
Maggie Benthall
2013-08-28 00:00:00 +00:00
committed by Android (Google) Code Review
parent cb6ba728c5 f48206e37e
commit 9506d857cb
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/SecuritySettings.java
View File

@@ -85,7 +85,7 @@ public class SecuritySettings extends RestrictedSettingsFragment
private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive"; private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
private PackageManager mPM; private PackageManager mPM;
DevicePolicyManager mDPM; private DevicePolicyManager mDPM;
private ChooseLockSettingsHelper mChooseLockSettingsHelper; private ChooseLockSettingsHelper mChooseLockSettingsHelper;
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
@@ -168,9 +168,6 @@ public class SecuritySettings extends RestrictedSettingsFragment
// Add options for device encryption // Add options for device encryption
DevicePolicyManager dpm =
(DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER; mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
if (!mIsPrimary) { if (!mIsPrimary) {
@@ -186,7 +183,7 @@ public class SecuritySettings extends RestrictedSettingsFragment
} }
if (mIsPrimary) { if (mIsPrimary) {
switch (dpm.getStorageEncryptionStatus()) { switch (mDPM.getStorageEncryptionStatus()) {
case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE: case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
// The device is currently encrypted. // The device is currently encrypted.
addPreferencesFromResource(R.xml.security_settings_encrypted); addPreferencesFromResource(R.xml.security_settings_encrypted);
@@ -264,8 +261,8 @@ public class SecuritySettings extends RestrictedSettingsFragment
// Credential storage // Credential storage
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); 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)) { if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
mKeyStore = KeyStore.getInstance();
Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE); Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
final int storageSummaryRes = final int storageSummaryRes =