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

Commit 68515252 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Fix Sysui crash on volume change." into nyc-dev 

am: 6e9151ea

* commit '6e9151ea':
  Fix Sysui crash on volume change.
parents 676e9733 6e9151ea

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ 
    <!-- TV picture-in-picture -->

    <uses-permission android:name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE" />



    <!-- DND access -->

    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS" />



    <application

        android:name=".SystemUIApplication"

        android:persistent="true"

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −8
Original line number Diff line number Diff line
@@ -1852,16 +1852,11 @@ public class NotificationManagerService extends SystemService { 
        }



        private boolean checkPolicyAccess(String pkg) {

            if (PackageManager.PERMISSION_GRANTED == getContext().checkCallingPermission(

                    android.Manifest.permission.MANAGE_NOTIFICATIONS)) {

                return true;

            }

            if (mAudioManagerInternal != null) {

                final int vcuid = mAudioManagerInternal.getVolumeControllerUid();

                if (vcuid > 0 && Binder.getCallingUid() == vcuid) {

            if (PackageManager.PERMISSION_GRANTED == ActivityManager.checkComponentPermission(

                    android.Manifest.permission.MANAGE_NOTIFICATIONS, Binder.getCallingUid(),

                    -1, true)) {

                return true;

            }

            }

            return checkPackagePolicyAccess(pkg) || mListeners.isComponentEnabledForPackage(pkg);

        }