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

Commit 656502be authored by Jordan Liu's avatar Jordan Liu
Browse files

[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions" 

This reverts commit b59c74f3.

Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383)

Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389
parent 25843c76

api/system-current.txt

+0 −9
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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";
@@ -7215,14 +7214,6 @@ 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/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -5,7 +5,6 @@ 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



+0
−12




























Original line number
Diff line number
Diff line








@@ -772,18 +772,6 @@













        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



+0
−4




























Original line number
Diff line number
Diff line








@@ -441,10 +441,6 @@













        -->















    </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.

















































core/res/res/values/strings.xml



+0
−10




























Original line number
Diff line number
Diff line








@@ -884,16 +884,6 @@













      messages. This means the app could monitor or delete messages sent to your















      device without showing them to you.</string>





























    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this.[CHAR LIMIT=NONE] -->













    <string name="permlab_bindCellBroadcastService">Forward cell broadcast messages</string>













    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] -->













    <string name="permdesc_bindCellBroadcastService">Allows the app to bind to the













        cell broadcast module in order to forward cell broadcast messages













        as they are received. Cell broadcast alerts are delivered in some













        locations to warn you of emergency situations. Malicious apps may













        interfere with the performance or operation of your device when an













        emergency cell broadcast is received.</string>





























    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->















    <string name="permlab_readCellBroadcasts">read cell broadcast messages</string>















    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->