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

Commit 4a13e88b authored by Alex Stetson's avatar Alex Stetson
Browse files

Add CATEGORY_CAR notification restrictions 

Add permission for restricting the use of CATEGORY_CAR notifications
rather than restricting to system calls.

Bug: 159459663
Test: manual, atest
NotificationManagerServiceTest#testEnqueuedRestrictedNotifications*

Change-Id: I6e8a32fec1469f5e0cbc8aa0cb765e5c04069546
parent ac85c998

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ package android { 
    field public static final String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";

    field public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";

    field public static final String SECURE_ELEMENT_PRIVILEGED_OPERATION = "android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION";

    field public static final String SEND_CATEGORY_CAR_NOTIFICATIONS = "android.permission.SEND_CATEGORY_CAR_NOTIFICATIONS";

    field public static final String SEND_DEVICE_CUSTOMIZATION_READY = "android.permission.SEND_DEVICE_CUSTOMIZATION_READY";

    field public static final String SEND_SHOW_SUSPENDED_APP_DETAILS = "android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS";

    field public static final String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -4690,6 +4690,12 @@ 
    <permission android:name="android.permission.HANDLE_CAR_MODE_CHANGES"

                android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows the holder to send category_car notifications.

        @hide -->

    <permission

        android:name="android.permission.SEND_CATEGORY_CAR_NOTIFICATIONS"

        android:protectionLevel="signature|privileged" />



    <!-- The system process is explicitly the only one allowed to launch the

         confirmation UI for full backup/restore -->

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

data/etc/car/com.google.android.car.kitchensink.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
        <permission name="android.permission.REAL_GET_TASKS"/>

        <permission name="android.permission.READ_LOGS"/>

        <permission name="android.permission.REBOOT"/>

        <permission name="android.permission.SEND_CATEGORY_CAR_NOTIFICATIONS"/>

        <!-- use for CarServiceTest -->

        <permission name="android.permission.SET_ACTIVITY_WATCHER"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ package android { 
    field public static final String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";

    field public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";

    field public static final String SECURE_ELEMENT_PRIVILEGED_OPERATION = "android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION";

    field public static final String SEND_CATEGORY_CAR_NOTIFICATIONS = "android.permission.SEND_CATEGORY_CAR_NOTIFICATIONS";

    field public static final String SEND_DEVICE_CUSTOMIZATION_READY = "android.permission.SEND_DEVICE_CUSTOMIZATION_READY";

    field public static final String SEND_SHOW_SUSPENDED_APP_DETAILS = "android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS";

    field public static final String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";

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

+4 −1
Original line number Diff line number Diff line
@@ -8462,7 +8462,10 @@ public class NotificationManagerService extends SystemService { 
        if (Notification.CATEGORY_CAR_EMERGENCY.equals(notification.category)

                || Notification.CATEGORY_CAR_WARNING.equals(notification.category)

                || Notification.CATEGORY_CAR_INFORMATION.equals(notification.category)) {

                    checkCallerIsSystem();

            getContext().enforceCallingPermission(

                    android.Manifest.permission.SEND_CATEGORY_CAR_NOTIFICATIONS,

                    String.format("Notification category %s restricted",

                            notification.category));

        }

    }