From 656502be63a4cbb3e79e65f4f1ce09a8ff2f2db8 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Wed, 9 Oct 2019 20:26:14 +0000 Subject: [DO NOT MERGE] Revert "Add CellBroadcastService and related permissions" This reverts commit b59c74f3026ce1b7f978cb15275ee01dd001cf3b. Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383) Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389 --- api/system-current.txt | 9 -- api/test-current.txt | 1 - core/res/AndroidManifest.xml | 12 --- core/res/res/values/config.xml | 4 - core/res/res/values/strings.xml | 10 -- core/res/res/values/symbols.xml | 1 - data/etc/privapp-permissions-platform.xml | 1 - .../android/telephony/CellBroadcastService.java | 112 --------------------- .../android/telephony/ICellBroadcastService.aidl | 32 ------ .../internal/telephony/gsm/GsmSmsCbMessage.java | 11 +- .../internal/telephony/gsm/SmsCbHeader.java | 26 ++--- 11 files changed, 14 insertions(+), 205 deletions(-) delete mode 100644 telephony/java/android/telephony/CellBroadcastService.java delete mode 100644 telephony/java/android/telephony/ICellBroadcastService.aidl diff --git a/api/system-current.txt b/api/system-current.txt index 3a65dfbfc729..5bac2b733380 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index f1b00b2b4fc9..23d7eca05d7b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index dee53db1fb9b..6b4c75715406 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -772,18 +772,6 @@ android:permissionFlags="hardRestricted" android:protectionLevel="dangerous" /> - - - - - com.android.cellbroadcastreceiver - - - Forward cell broadcast messages - - 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. - read cell broadcast messages diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 94b91272a062..0bd5e4377c05 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -744,7 +744,6 @@ - diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 3d47f428286a..ff4e1005c9d9 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -125,7 +125,6 @@ applications that come with the platform - diff --git a/telephony/java/android/telephony/CellBroadcastService.java b/telephony/java/android/telephony/CellBroadcastService.java deleted file mode 100644 index d5e447e6c73d..000000000000 --- a/telephony/java/android/telephony/CellBroadcastService.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.telephony; - -import android.annotation.CallSuper; -import android.annotation.SystemApi; -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; - -/** - * A service which exposes the cell broadcast handling module to the system. - *

- * To extend this class, you must declare the service in your manifest file to require the - * {@link android.Manifest.permission#BIND_CELL_BROADCAST_SERVICE} permission and include an intent - * filter with the {@link #CELL_BROADCAST_SERVICE_INTERFACE}. - * Implementations of this service should run in the phone process and with its UID. - *

- * For example: - * 

{@code
- * 
- *   
- *     
- *           
- *     
- *   
- * 
- * }
- * @hide - */ -@SystemApi -public abstract class CellBroadcastService extends Service { - - public static final String CELL_BROADCAST_SERVICE_INTERFACE = - "android.telephony.CellBroadcastService"; - - private final ICellBroadcastService.Stub mStubWrapper; - - public CellBroadcastService() { - mStubWrapper = new ICellBroadcastServiceWrapper(); - } - - /** - * Handle a GSM cell broadcast SMS message forwarded from the system. - * @param slotIndex the index of the slot which received the message - * @param message the SMS PDU - */ - public abstract void onGsmCellBroadcastSms(int slotIndex, byte[] message); - - /** - * Handle a CDMA cell broadcast SMS message forwarded from the system. - * @param slotIndex the index of the slot which received the message - * @param message the SMS PDU - */ - public abstract void onCdmaCellBroadcastSms(int slotIndex, byte[] message); - - /** - * If overriding this method, call through to the super method for any unknown actions. - * {@inheritDoc} - */ - @Override - @CallSuper - public IBinder onBind(Intent intent) { - return mStubWrapper; - } - - /** - * A wrapper around ICellBroadcastService that forwards calls to implementations of - * {@link CellBroadcastService}. - * @hide - */ - public class ICellBroadcastServiceWrapper extends ICellBroadcastService.Stub { - /** - * Handle a GSM cell broadcast SMS. - * @param slotIndex the index of the slot which received the broadcast - * @param message the SMS message PDU - */ - @Override - public void handleGsmCellBroadcastSms(int slotIndex, byte[] message) { - CellBroadcastService.this.onGsmCellBroadcastSms(slotIndex, message); - } - - /** - * Handle a CDMA cell broadcast SMS. - * @param slotIndex the index of the slot which received the broadcast - * @param message the SMS message PDU - */ - @Override - public void handleCdmaCellBroadcastSms(int slotIndex, byte[] message) { - CellBroadcastService.this.onCdmaCellBroadcastSms(slotIndex, message); - } - } -} diff --git a/telephony/java/android/telephony/ICellBroadcastService.aidl b/telephony/java/android/telephony/ICellBroadcastService.aidl deleted file mode 100644 index eff64a2e35ba..000000000000 --- a/telephony/java/android/telephony/ICellBroadcastService.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2019, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.telephony; - -/** - * Service bound to by the system to allow custom handling of cell broadcast messages. - *

- * @see android.telephony.CellBroadcastService - * @hide - */ -interface ICellBroadcastService { - - /** @see android.telephony.CellBroadcastService#onGsmCellBroadcastSms */ - oneway void handleGsmCellBroadcastSms(int slotId, in byte[] message); - - /** @see android.telephony.CellBroadcastService#onCdmaCellBroadcastSms */ - oneway void handleCdmaCellBroadcastSms(int slotId, in byte[] message); -} diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java index c65c45fa015b..6eea118787a7 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java @@ -461,11 +461,7 @@ public class GsmSmsCbMessage { } } - /** - * Part of a GSM SMS cell broadcast message which may trigger geo-fencing logic. - * @hide - */ - public static final class GeoFencingTriggerMessage { + static final class GeoFencingTriggerMessage { /** * Indicate the list of active alerts share their warning area coordinates which means the * broadcast area is the union of the broadcast areas of the active alerts in this list. @@ -480,11 +476,6 @@ public class GsmSmsCbMessage { this.cbIdentifiers = cbIdentifiers; } - /** - * Whether the trigger message indicates that the broadcast areas are shared between all - * active alerts. - * @return true if broadcast areas are to be shared - */ boolean shouldShareBroadcastArea() { return type == TYPE_ACTIVE_ALERT_SHARE_WAC; } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java index 465840f3bc7f..acdc83867d2f 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java @@ -72,22 +72,22 @@ public class SmsCbHeader { /** * Length of SMS-CB header */ - public static final int PDU_HEADER_LENGTH = 6; + static final int PDU_HEADER_LENGTH = 6; /** * GSM pdu format, as defined in 3gpp TS 23.041, section 9.4.1 */ - public static final int FORMAT_GSM = 1; + static final int FORMAT_GSM = 1; /** * UMTS pdu format, as defined in 3gpp TS 23.041, section 9.4.2 */ - public static final int FORMAT_UMTS = 2; + static final int FORMAT_UMTS = 2; /** - * ETWS pdu format, as defined in 3gpp TS 23.041, section 9.4.1.3 + * GSM pdu format, as defined in 3gpp TS 23.041, section 9.4.1.3 */ - public static final int FORMAT_ETWS_PRIMARY = 3; + static final int FORMAT_ETWS_PRIMARY = 3; /** * Message type value as defined in 3gpp TS 25.324, section 11.1. @@ -237,11 +237,11 @@ public class SmsCbHeader { return mMessageIdentifier; } - public int getDataCodingScheme() { + int getDataCodingScheme() { return mDataCodingScheme; } - public DataCodingScheme getDataCodingSchemeStructedData() { + DataCodingScheme getDataCodingSchemeStructedData() { return mDataCodingSchemeStructedData; } @@ -253,11 +253,11 @@ public class SmsCbHeader { return mNrOfPages; } - public SmsCbEtwsInfo getEtwsInfo() { + SmsCbEtwsInfo getEtwsInfo() { return mEtwsInfo; } - public SmsCbCmasInfo getCmasInfo() { + SmsCbCmasInfo getCmasInfo() { return mCmasInfo; } @@ -265,7 +265,7 @@ public class SmsCbHeader { * Return whether this broadcast is an emergency (PWS) message type. * @return true if this message is emergency type; false otherwise */ - public boolean isEmergencyMessage() { + boolean isEmergencyMessage() { return mMessageIdentifier >= SmsCbConstants.MESSAGE_ID_PWS_FIRST_IDENTIFIER && mMessageIdentifier <= SmsCbConstants.MESSAGE_ID_PWS_LAST_IDENTIFIER; } @@ -283,7 +283,7 @@ public class SmsCbHeader { * Return whether this broadcast is an ETWS primary notification. * @return true if this message is an ETWS primary notification; false otherwise */ - public boolean isEtwsPrimaryNotification() { + boolean isEtwsPrimaryNotification() { return mFormat == FORMAT_ETWS_PRIMARY; } @@ -291,7 +291,7 @@ public class SmsCbHeader { * Return whether this broadcast is in UMTS format. * @return true if this message is in UMTS format; false otherwise */ - public boolean isUmtsFormat() { + boolean isUmtsFormat() { return mFormat == FORMAT_UMTS; } @@ -583,4 +583,4 @@ public class SmsCbHeader { this.hasLanguageIndicator = hasLanguageIndicator; } } -} +} \ No newline at end of file -- cgit v1.2.3-59-g8ed1b