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

Merge changes I81990d63,I053a6220

Browse Source 
* changes:
  Fix settings crash if launched with null args
  Fix settings crash on noti listener screen
This commit is contained in:
TreeHugger Robot
2018-09-08 04:52:19 +00:00
committed by Android (Google) Code Review
parent 16d523b349 cbacfc5753
commit 698465c236
2 changed files with 14 additions and 11 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); mPkgInfo = findPackageInfo(mPkg, mUid);
mUserId = UserHandle.getUserId(mUid); if (mPkgInfo != null) {
mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended( mUserId = UserHandle.getUserId(mUid);
mContext, mPkg, mUserId); mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(
mContext, mPkg, mUserId);
loadChannel();
loadAppRow();
loadChannelGroup();
collectConfigActivities();
getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class)); loadChannel();
loadAppRow();
loadChannelGroup();
collectConfigActivities();
for (NotificationPreferenceController controller : mControllers) { getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class));
controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
for (NotificationPreferenceController controller : mControllers) {
controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
}
} }
} }

2
src/com/android/settings/utils/ManagedServiceSettings.java
View File

@@ -117,7 +117,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
CharSequence title = null; CharSequence title = null;
try { try {
title = mPm.getApplicationInfoAsUser( title = mPm.getApplicationInfoAsUser(
service.packageName, 0, getCurrentUser(managedProfileId)).loadLabel(mPm); service.packageName, 0, UserHandle.myUserId()).loadLabel(mPm);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// unlikely, as we are iterating over live services. // unlikely, as we are iterating over live services.
Log.e(TAG, "can't find package name", e); Log.e(TAG, "can't find package name", e);