- * 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 eff64a2e35baa..0000000000000
--- 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 c65c45fa015b1..6eea118787a7d 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 465840f3bc7f4..acdc83867d2fd 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