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

Commit 6e9151ea authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

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

parents e9b5fc29 a014e20b

packages/SystemUI/AndroidManifest.xml

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

    <!-- TV picture-in-picture -->

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

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





    <!-- DND access -->

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



    <application

    <application

        android:name=".SystemUIApplication"

        android:name=".SystemUIApplication"

        android:persistent="true"

        android:persistent="true"

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

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

        }





        private boolean checkPolicyAccess(String pkg) {

        private boolean checkPolicyAccess(String pkg) {

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

            if (PackageManager.PERMISSION_GRANTED == ActivityManager.checkComponentPermission(

                    android.Manifest.permission.MANAGE_NOTIFICATIONS)) {

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

                return true;

                    -1, true)) {

            }

            if (mAudioManagerInternal != null) {

                final int vcuid = mAudioManagerInternal.getVolumeControllerUid();

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

                return true;

                return true;

            }

            }

            }

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

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

        }

        }