diff options
| author | BadDaemon <baddaemon87@gmail.com> | 2015-10-03 17:09:47 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-01-03 14:48:01 -0800 |
| commit | ea1ea586b8a0e080b4d7dc394c36c14123d7897c (patch) | |
| tree | 5da92f03d9fdc3c70a1462213424bce7333ea73c | |
| parent | e46f635ef5ac3e917a6775db96e3576d9333f965 (diff) | |
| download | packages_apps_Settings-ea1ea586b8a0e080b4d7dc394c36c14123d7897c.zip packages_apps_Settings-ea1ea586b8a0e080b4d7dc394c36c14123d7897c.tar.gz packages_apps_Settings-ea1ea586b8a0e080b4d7dc394c36c14123d7897c.tar.bz2 | |
Settings: Fix NPE in PowerMenuActions
Reproduction:
Open Settings->Keys->Power Key
Lock Device
Unlock device
-> NPE
Happens because UsersPref has already been removed
Change-Id: I8d8cbda14d7373dca46671acb16a8abb68e9ee4a
| -rw-r--r-- | src/com/android/settings/cyanogenmod/PowerMenuActions.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/cyanogenmod/PowerMenuActions.java b/src/com/android/settings/cyanogenmod/PowerMenuActions.java index 50f98cc..d73c82a 100644 --- a/src/com/android/settings/cyanogenmod/PowerMenuActions.java +++ b/src/com/android/settings/cyanogenmod/PowerMenuActions.java @@ -131,6 +131,7 @@ public class PowerMenuActions extends SettingsPreferenceFragment { if (mUsersPref != null) { if (!UserHandle.MU_ENABLED || !UserManager.supportsMultipleUsers()) { getPreferenceScreen().removePreference(findPreference(GLOBAL_ACTION_KEY_USERS)); + mUsersPref = null; } else { List<UserInfo> users = ((UserManager) mContext.getSystemService( Context.USER_SERVICE)).getUsers(); |