commit 1e5d0e731ededfb5ebf8e3d8073c292d26b17ce9
author Julia Reynolds <juliacr@google.com> Tue Apr 26 15:28:19 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 26 15:28:20 2016 +0000
tree 14ed8f14c7b1b344dd7e18f8d085743772191571
parent e39066c30912bd027cd156c10ff4c9079144ea3d
parent 175bba9ed9390466f8cc7bae48eae50ac051d408

Merge "Don't crash on apps only installed for other users." into nyc-dev

src/com/android/settings/notification/AppNotificationSettings.java

diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 5113dc6..b8270e1 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -80,21 +80,23 @@
         mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
         mSilent = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_SILENT);
 
-        mAppRow = mBackend.loadAppRow(mContext, mPm, mPkgInfo);
+        if (mPkgInfo != null) {
+            mAppRow = mBackend.loadAppRow(mContext, mPm, mPkgInfo);
 
-        NotificationManager.Policy policy =
-                NotificationManager.from(mContext).getNotificationPolicy();
-        mDndVisualEffectsSuppressed = policy == null ? false : policy.suppressedVisualEffects != 0;
+            NotificationManager.Policy policy =
+                    NotificationManager.from(mContext).getNotificationPolicy();
+            mDndVisualEffectsSuppressed = policy == null ? false : policy.suppressedVisualEffects != 0;
 
-        // load settings intent
-        ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
-        rows.put(mAppRow.pkg, mAppRow);
-        collectConfigActivities(rows);
+            // load settings intent
+            ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
+            rows.put(mAppRow.pkg, mAppRow);
+            collectConfigActivities(rows);
 
-        setupImportancePrefs(mAppRow.systemApp, mAppRow.appImportance, mAppRow.banned);
-        setupPriorityPref(mAppRow.appBypassDnd);
-        setupVisOverridePref(mAppRow.appVisOverride);
-        updateDependents(mAppRow.appImportance);
+            setupImportancePrefs(mAppRow.systemApp, mAppRow.appImportance, mAppRow.banned);
+            setupPriorityPref(mAppRow.appBypassDnd);
+            setupVisOverridePref(mAppRow.appVisOverride);
+            updateDependents(mAppRow.appImportance);
+        }
     }
 
     @Override