Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 698465c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I81990d63,I053a6220 

* changes:
  Fix settings crash if launched with null args
  Fix settings crash on noti listener screen
parents 16d523b3 cbacfc57

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

+13 −10
Original line number Diff line number Diff line
@@ -112,10 +112,12 @@ abstract public class NotificationSettingsBase extends DashboardFragment { 


        mPkgInfo = findPackageInfo(mPkg, mUid);



        if (mPkgInfo != null) {

            mUserId = UserHandle.getUserId(mUid);

            mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(

                    mContext, mPkg, mUserId);





            loadChannel();

            loadAppRow();

            loadChannelGroup();
@@ -127,6 +129,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment { 
                controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);

            }

        }

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

src/com/android/settings/utils/ManagedServiceSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings { 
            CharSequence title = null;

            try {

                title = mPm.getApplicationInfoAsUser(

                        service.packageName, 0, getCurrentUser(managedProfileId)).loadLabel(mPm);

                        service.packageName, 0, UserHandle.myUserId()).loadLabel(mPm);

            } catch (PackageManager.NameNotFoundException e) {

                // unlikely, as we are iterating over live services.

                Log.e(TAG, "can't find package name", e);