Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions" (6af905e0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ package android {
		field public static final String BACKUP = "android.permission.BACKUP";
		field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";
		field public static final String BIND_AUGMENTED_AUTOFILL_SERVICE = "android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE";
		field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";
		field @Deprecated public static final String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";
		field public static final String BIND_CONTENT_CAPTURE_SERVICE = "android.permission.BIND_CONTENT_CAPTURE_SERVICE";
		field public static final String BIND_CONTENT_SUGGESTIONS_SERVICE = "android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE";
		@@ -7233,6 +7234,14 @@ package android.telephony {
		method @NonNull public android.telephony.CarrierRestrictionRules.Builder setMultiSimPolicy(int);
		}

		public abstract class CellBroadcastService extends android.app.Service {
		ctor public CellBroadcastService();
		method @CallSuper public android.os.IBinder onBind(android.content.Intent);
		method public abstract void onCdmaCellBroadcastSms(int, byte[]);
		method public abstract void onGsmCellBroadcastSms(int, byte[]);
		field public static final String CELL_BROADCAST_SERVICE_INTERFACE = "android.telephony.CellBroadcastService";
		}

		public final class DataFailCause {
		field public static final int ACCESS_ATTEMPT_ALREADY_IN_PROGRESS = 2219; // 0x8ab
		field public static final int ACCESS_BLOCK = 2087; // 0x827

api/system-lint-baseline.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,14 @@ MissingNullability: android.service.notification.NotificationAssistantService#at

		MissingNullability: android.telecom.CallScreeningService.CallResponse.Builder#setShouldScreenCallFurther(boolean):

		MissingNullability: android.telephony.CellBroadcastService#onBind(android.content.Intent):
		Missing nullability on method `onBind` return
		MissingNullability: android.telephony.CellBroadcastService#onBind(android.content.Intent) parameter #0:
		Missing nullability on parameter `intent` in method `onBind`
		MissingNullability: android.telephony.CellBroadcastService#onCdmaCellBroadcastSms(int, byte[]) parameter #1:
		Missing nullability on parameter `message` in method `onCdmaCellBroadcastSms`
		MissingNullability: android.telephony.CellBroadcastService#onGsmCellBroadcastSms(int, byte[]) parameter #1:
		Missing nullability on parameter `message` in method `onGsmCellBroadcastSms`
		MissingNullability: android.telephony.NetworkService#onUnbind(android.content.Intent) parameter #0:

		MissingNullability: android.telephony.SmsCbCmasInfo#toString():
		@@ -317,6 +325,8 @@ ServiceName: android.Manifest.permission#BIND_ATTENTION_SERVICE:

		ServiceName: android.Manifest.permission#BIND_AUGMENTED_AUTOFILL_SERVICE:

		ServiceName: android.Manifest.permission#BIND_CELL_BROADCAST_SERVICE:
		Inconsistent service value; expected `BIND_CELL_BROADCAST`, was `android.permission.BIND_CELL_BROADCAST_SERVICE`
		ServiceName: android.Manifest.permission#BIND_CONTENT_CAPTURE_SERVICE:

		ServiceName: android.Manifest.permission#BIND_CONTENT_SUGGESTIONS_SERVICE:

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ package android {
		field public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
		field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";
		field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";
		field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";
		field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";
		field public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";
		field public static final String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";

core/res/AndroidManifest.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -772,6 +772,18 @@
		android:permissionFlags="hardRestricted"
		android:protectionLevel="dangerous" />

		<!-- @SystemApi @TestApi Allows an application to forward cell broadcast messages to the cell
		broadcast module. This is required in order to bind to the cell broadcast service, and
		ensures that only the system can forward messages to it.

		<p>Protection level: signature

		@hide -->
		<permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE"
		android:label="@string/permlab_bindCellBroadcastService"
		android:description="@string/permdesc_bindCellBroadcastService"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi Allows an application to read previously received cell broadcast
		messages and to register a content observer to get notifications when
		a cell broadcast has been received and added to the database. For

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -447,6 +447,10 @@
		-->
		</string-array>

		<!-- Package name for the default CellBroadcastService module [DO NOT TRANSLATE] -->
		<string name="cellbroadcast_default_package" translatable="false">com.android.cellbroadcastreceiver
		</string>

		<!-- If the mobile hotspot feature requires provisioning, a package name and class name
		can be provided to launch a supported application that provisions the devices.