Merge "Highlight row (instead of ripple) when come from search."

2018-02-02 01:15:36 +00:00
parent abf3b8ad88 3d516e7607
commit 7262d37c53
8 changed files with 273 additions and 177 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -309,7 +309,7 @@ public class UserSettings extends SettingsPreferenceFragment
    public void onDestroy() {
        super.onDestroy();

-        if (!mUserCaps.mEnabled) {
+        if (mUserCaps == null || !mUserCaps.mEnabled) {
            return;
        }