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

Guard against NPE

Browse Source 
Test: manual, launching screen from locked lock screen
Fixes: 153569405
Change-Id: Idb546f58623792d94a43ca6659f7498de3beec94
This commit is contained in:
Julia Reynolds
2020-05-19 12:29:24 -04:00
parent a1c0269027
commit 663cc934d9
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
View File

@@ -31,6 +31,7 @@ import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.IconDrawableFactory; import android.util.IconDrawableFactory;
import android.util.Slog;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -294,15 +295,19 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC
List<NotifyingApp> displayableApps = new ArrayList<>(SHOW_RECENT_APP_COUNT); List<NotifyingApp> displayableApps = new ArrayList<>(SHOW_RECENT_APP_COUNT);
int count = 0; int count = 0;
for (NotifyingApp app : mApps) { for (NotifyingApp app : mApps) {
final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry( try {
app.getPackage(), app.getUserId()); final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(
if (appEntry == null) { app.getPackage(), app.getUserId());
continue; if (appEntry == null) {
} continue;
displayableApps.add(app); }
count++; displayableApps.add(app);
if (count >= SHOW_RECENT_APP_COUNT) { count++;
break; if (count >= SHOW_RECENT_APP_COUNT) {
break;
}
} catch (Exception e) {
Slog.e(TAG, "Failed to find app " + app.getPackage() + "/" + app.getUserId(), e);
} }
} }
return displayableApps; return displayableApps;