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

Fix settings crash if launched with null args

Browse Source 
Test: manual
Change-Id: I81990d63606074fc670cc39471c91ee61a73f1fc
Fixes: 73666426
This commit is contained in:
Julia Reynolds
2018-09-07 14:14:47 -04:00
parent e4fe56e161
commit cbacfc5753
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,19 +112,22 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
mPkgInfo = findPackageInfo(mPkg, mUid);
mUserId = UserHandle.getUserId(mUid);
mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(
mContext, mPkg, mUserId);
if (mPkgInfo != null) {
mUserId = UserHandle.getUserId(mUid);
mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(
mContext, mPkg, mUserId);
loadChannel();
loadAppRow();
loadChannelGroup();
collectConfigActivities();
getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class));
loadChannel();
loadAppRow();
loadChannelGroup();
collectConfigActivities();
for (NotificationPreferenceController controller : mControllers) {
controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class));
for (NotificationPreferenceController controller : mControllers) {
controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
}
}
}