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

Commit 3a0ee8f9 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Revert "Allow signature apps to modify notification policies." 

This reverts commit 39a8c353.

Change-Id: I9a9a5fcc76202f5d2b3b175e5d5b9361604285d8
parent 39a8c353

core/res/AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -2530,12 +2530,6 @@ 
        android:label="@string/permlab_access_notification_policy"

        android:protectionLevel="normal" />



    <!-- Allows modification of do not disturb rules and policies. Only allowed for system

        processes.

        @hide -->

    <permission android:name="android.permission.MANAGE_NOTIFICATIONS"

                android:protectionLevel="signature" />



    <!-- Allows access to keyguard secure storage.  Only allowed for system processes.

        @hide -->

    <permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE"

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

+0 −4
Original line number Diff line number Diff line
@@ -1642,10 +1642,6 @@ public class NotificationManagerService extends SystemService { 
        }



        private void enforcePolicyAccess(String pkg, String method) {

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

                    android.Manifest.permission.MANAGE_NOTIFICATION_RULES)) {

                return;

            }

            if (!checkPolicyAccess(pkg)) {

                Slog.w(TAG, "Notification policy access denied calling " + method);

                throw new SecurityException("Notification policy access denied");

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

+2 −3
Original line number Diff line number Diff line
@@ -248,9 +248,8 @@ public class ZenModeHelper { 
        }

        pw.printf("allow(calls=%s,callsFrom=%s,repeatCallers=%s,messages=%s,messagesFrom=%s,"

                + "events=%s,reminders=%s)\n",

                config.allowCalls, ZenModeConfig.sourceToString(config.allowCallsFrom),

                config.allowRepeatCallers, config.allowMessages,

                ZenModeConfig.sourceToString(config.allowMessagesFrom),

                config.allowCalls, config.allowCallsFrom, config.allowRepeatCallers,

                config.allowMessages, config.allowMessagesFrom,

                config.allowEvents, config.allowReminders);

        pw.print(prefix); pw.print("  manualRule="); pw.println(config.manualRule);

        if (config.automaticRules.isEmpty()) return;