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

Commit 5785f0cf authored Sep 09, 2020 by Alex Stetson Committed by Android (Google) Code Review Sep 09, 2020

Merge "Add CATEGORY_CAR notification restrictions"

parents 0ba5bf6d 4a13e88b

api/system-current.txt

+1 −0

Original line number	Original line	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 REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";
	field public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";		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 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_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_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";		field public static final String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";

core/res/AndroidManifest.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4691,6 +4691,12 @@
	<permission android:name="android.permission.HANDLE_CAR_MODE_CHANGES"		<permission android:name="android.permission.HANDLE_CAR_MODE_CHANGES"
	android:protectionLevel="signature\|privileged" />		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		<!-- The system process is explicitly the only one allowed to launch the
	confirmation UI for full backup/restore -->		confirmation UI for full backup/restore -->
	<uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/>		<uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/>

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@
	<permission name="android.permission.REAL_GET_TASKS"/>		<permission name="android.permission.REAL_GET_TASKS"/>
	<permission name="android.permission.READ_LOGS"/>		<permission name="android.permission.READ_LOGS"/>
	<permission name="android.permission.REBOOT"/>		<permission name="android.permission.REBOOT"/>
			<permission name="android.permission.SEND_CATEGORY_CAR_NOTIFICATIONS"/>
	<!-- use for CarServiceTest -->		<!-- use for CarServiceTest -->
	<permission name="android.permission.SET_ACTIVITY_WATCHER"/>		<permission name="android.permission.SET_ACTIVITY_WATCHER"/>
	<permission name="android.permission.WRITE_SECURE_SETTINGS"/>		<permission name="android.permission.WRITE_SECURE_SETTINGS"/>

non-updatable-api/system-current.txt

+1 −0

Original line number	Original line	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 REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";
	field public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";		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 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_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_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";		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	Original line	Diff line number	Diff line
	@@ -8465,7 +8465,10 @@ public class NotificationManagerService extends SystemService {
	if (Notification.CATEGORY_CAR_EMERGENCY.equals(notification.category)		if (Notification.CATEGORY_CAR_EMERGENCY.equals(notification.category)
	\|\| Notification.CATEGORY_CAR_WARNING.equals(notification.category)		\|\| Notification.CATEGORY_CAR_WARNING.equals(notification.category)
	\|\| Notification.CATEGORY_CAR_INFORMATION.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));
	}		}
	}		}