From ea1ea586b8a0e080b4d7dc394c36c14123d7897c Mon Sep 17 00:00:00 2001 From: BadDaemon Date: Sat, 3 Oct 2015 17:09:47 +0200 Subject: 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 --- src/com/android/settings/cyanogenmod/PowerMenuActions.java | 1 + 1 file changed, 1 insertion(+) 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 users = ((UserManager) mContext.getSystemService( Context.USER_SERVICE)).getUsers(); -- cgit v1.1