diff options
| -rw-r--r-- | api/system-current.txt | 9 | ||||
| -rw-r--r-- | config/preloaded-classes | 1 | ||||
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 8 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 8 | ||||
| -rw-r--r-- | core/java/android/os/telephony/TelephonyRegistryManager.java | 546 | ||||
| -rw-r--r-- | core/java/android/service/carrier/CarrierService.java | 21 | ||||
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 22 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 22 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl | 4 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneConstants.java | 4 |
10 files changed, 614 insertions, 31 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 7012a2001772..417059c4905e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1373,6 +1373,7 @@ package android.content { field public static final String STATS_MANAGER = "stats"; field public static final String STATUS_BAR_SERVICE = "statusbar"; field public static final String SYSTEM_UPDATE_SERVICE = "system_update"; + field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry"; field public static final String VR_SERVICE = "vrmanager"; field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager"; field public static final String WIFI_SCANNING_SERVICE = "wifiscanner"; @@ -5638,6 +5639,14 @@ package android.os.storage { } +package android.os.telephony { + + public class TelephonyRegistryManager { + method public void notifyCarrierNetworkChange(boolean); + } + +} + package android.permission { public final class PermissionControllerManager { diff --git a/config/preloaded-classes b/config/preloaded-classes index b4fd031bf5a2..1a8a8c2e7c95 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -4835,7 +4835,6 @@ com.android.internal.telephony.PhoneConstantConversions com.android.internal.telephony.PhoneConstants$DataState com.android.internal.telephony.PhoneConstants$State com.android.internal.telephony.PhoneFactory -com.android.internal.telephony.PhoneInternalInterface$DataActivityState com.android.internal.telephony.PhoneInternalInterface com.android.internal.telephony.PhoneNotifier com.android.internal.telephony.PhoneStateIntentReceiver diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index cfe2cf09ae19..77647c5aca89 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -157,6 +157,7 @@ import android.os.health.SystemHealthManager; import android.os.image.DynamicSystemManager; import android.os.image.IDynamicSystemService; import android.os.storage.StorageManager; +import android.os.telephony.TelephonyRegistryManager; import android.permission.PermissionControllerManager; import android.permission.PermissionManager; import android.print.IPrintManager; @@ -607,6 +608,13 @@ final class SystemServiceRegistry { return new TelephonyManager(ctx.getOuterContext()); }}); + registerService(Context.TELEPHONY_REGISTRY_SERVICE, TelephonyRegistryManager.class, + new CachedServiceFetcher<TelephonyRegistryManager>() { + @Override + public TelephonyRegistryManager createService(ContextImpl ctx) { + return new TelephonyRegistryManager(); + }}); + registerService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class, new CachedServiceFetcher<SubscriptionManager>() { @Override diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a6b95a95dcd8..75e751ee9de7 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4691,6 +4691,14 @@ public abstract class Context { public static final String DYNAMIC_SYSTEM_SERVICE = "dynamic_system"; /** + * Use with {@link #getSystemService(String)} to retrieve an + * {@link android.os.telephony.TelephonyRegistryManager}. + * @hide + */ + @SystemApi + public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry"; + + /** * Determine whether the given permission is allowed for a particular * process and user ID running in the system. * diff --git a/core/java/android/os/telephony/TelephonyRegistryManager.java b/core/java/android/os/telephony/TelephonyRegistryManager.java new file mode 100644 index 000000000000..459c414cdf73 --- /dev/null +++ b/core/java/android/os/telephony/TelephonyRegistryManager.java @@ -0,0 +1,546 @@ +/* + * 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.os.telephony; + +import android.annotation.SystemApi; +import android.net.LinkProperties; +import android.net.NetworkCapabilities; +import android.os.Bundle; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.telephony.CallQuality; +import android.telephony.CellInfo; +import android.telephony.DataFailCause; +import android.telephony.DisconnectCause; +import android.telephony.PhoneCapability; +import android.telephony.PreciseCallState.State; +import android.telephony.ServiceState; +import android.telephony.SignalStrength; +import android.telephony.TelephonyManager; +import android.telephony.TelephonyManager.CallState; +import android.telephony.TelephonyManager.DataActivityType; +import android.telephony.TelephonyManager.DataState; +import android.telephony.TelephonyManager.NetworkType; +import android.telephony.TelephonyManager.RadioPowerState; +import android.telephony.TelephonyManager.SimActivationState; +import android.telephony.data.ApnSetting; +import android.telephony.data.ApnSetting.ApnType; +import android.telephony.ims.ImsReasonInfo; +import com.android.internal.telephony.ITelephonyRegistry; +import java.util.List; + +/** + * A centralized place to notify telephony related status changes, e.g, {@link ServiceState} update + * or {@link PhoneCapability} changed. This might trigger callback from applications side through + * {@link android.telephony.PhoneStateListener} + * + * TODO: limit API access to only carrier apps with certain permissions or apps running on + * privileged UID. + * + * @hide + */ +@SystemApi +public class TelephonyRegistryManager { + + private static final String TAG = "TelephonyRegistryManager"; + private static ITelephonyRegistry sRegistry; + + /** @hide **/ + public TelephonyRegistryManager() { + if (sRegistry == null) { + sRegistry = ITelephonyRegistry.Stub.asInterface( + ServiceManager.getService("telephony.registry")); + } + } + + /** + * Informs the system of an intentional upcoming carrier network change by a carrier app. + * This call only used to allow the system to provide alternative UI while telephony is + * performing an action that may result in intentional, temporary network lack of connectivity. + * <p> + * Based on the active parameter passed in, this method will either show or hide the alternative + * UI. There is no timeout associated with showing this UX, so a carrier app must be sure to + * call with active set to false sometime after calling with it set to {@code true}. + * <p> + * Requires Permission: calling app has carrier privileges. + * + * @param active Whether the carrier network change is or shortly will be + * active. Set this value to true to begin showing alternative UI and false to stop. + * @see TelephonyManager#hasCarrierPrivileges + */ + public void notifyCarrierNetworkChange(boolean active) { + try { + sRegistry.notifyCarrierNetworkChange(active); + } catch (RemoteException ex) { + // system server crash + } + } + + /** + * Notify call state changed on certain subscription. + * + * @param subId for which call state changed. + * @param slotIndex for which call state changed. Can be derived from subId except when subId is + * invalid. + * @param state latest call state. e.g, offhook, ringing + * @param incomingNumer incoming phone number. + * + * @hide + */ + public void notifyCallStateChanged(int subId, int slotIndex, @CallState int state, + String incomingNumer) { + try { + sRegistry.notifyCallState(slotIndex, subId, state, incomingNumer); + } catch (RemoteException ex) { + // system server crash + } + } + + /** + * Notify {@link ServiceState} update on certain subscription. + * + * @param subId for which the service state changed. + * @param slotIndex for which the service state changed. Can be derived from subId except + * subId is invalid. + * @param state service state e.g, in service, out of service or roaming status. + * + * @hide + */ + public void notifyServiceStateChanged(int subId, int slotIndex, ServiceState state) { + try { + sRegistry.notifyServiceStateForPhoneId(slotIndex, subId, state); + } catch (RemoteException ex) { + // system server crash + } + } + + /** + * Notify {@link SignalStrength} update on certain subscription. + * + * @param subId for which the signalstrength changed. + * @param slotIndex for which the signalstrength changed. Can be derived from subId except when + * subId is invalid. + * @param signalStrength e.g, signalstrength level {@see SignalStrength#getLevel()} + * + * @hide + */ + public void notifySignalStrengthChanged(int subId, int slotIndex, + SignalStrength signalStrength) { + try { + sRegistry.notifySignalStrengthForPhoneId(slotIndex, subId, signalStrength); + } catch (RemoteException ex) { + // system server crash + } + } + + /** + * Notify changes to the message-waiting indicator on certain subscription. e.g, The status bar + * uses message waiting indicator to determine when to display the voicemail icon. + * + * @param subId for which message waiting indicator changed. + * @param slotIndex for which message waiting indicator changed. Can be derived from subId + * except when subId is invalid. + * @param msgWaitingInd {@code true} indicates there is message-waiting indicator, {@code false} + * otherwise. + * + * @hide + */ + public void notifyMessageWaitingChanged(int subId, int slotIndex, boolean msgWaitingInd) { + try { + sRegistry.notifyMessageWaitingChangedForPhoneId(slotIndex, subId, msgWaitingInd); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify changes to the call-forwarding status on certain subscription. + * + * @param subId for which call forwarding status changed. + * @param callForwardInd {@code true} indicates there is call forwarding, {@code false} + * otherwise. + * + * @hide + */ + public void notifyCallForwardingChanged(int subId, boolean callForwardInd) { + try { + sRegistry.notifyCallForwardingChangedForSubscriber(subId, callForwardInd); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify changes to activity state changes on certain subscription. + * + * @param subId for which data activity state changed. + * @param dataActivityType indicates the latest data activity type e.g, {@link + * TelephonyManager#DATA_ACTIVITY_IN} + * + * @hide + */ + public void notifyDataActivityChanged(int subId, @DataActivityType int dataActivityType) { + try { + sRegistry.notifyDataActivityForSubscriber(subId, dataActivityType); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify changes to default (Internet) data connection state on certain subscription. + * + * @param subId for which data connection state changed. + * @param slotIndex for which data connections state changed. Can be derived from subId except + * when subId is invalid. + * @param state latest data connection state, e.g, + * @param isDataConnectivityPossible indicates if data is allowed + * @param apn the APN {@link ApnSetting#getApnName()} of this data connection. + * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN. + * @param linkProperties {@link LinkProperties} associated with this data connection. + * @param networkCapabilities {@link NetworkCapabilities} associated with this data connection. + * @param networkType associated with this data connection. + * @param roaming {@code true} indicates in roaming, {@false} otherwise. + * @see TelephonyManager#DATA_DISCONNECTED + * @see TelephonyManager#isDataConnectivityPossible() + * + * @hide + */ + public void notifyDataConnectionForSubscriber(int slotIndex, int subId, @DataState int state, + boolean isDataConnectivityPossible, + @ApnType String apn, String apnType, LinkProperties linkProperties, + NetworkCapabilities networkCapabilities, int networkType, boolean roaming) { + try { + sRegistry.notifyDataConnectionForSubscriber(slotIndex, subId, state, + isDataConnectivityPossible, + apn, apnType, linkProperties, networkCapabilities, networkType, roaming); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify {@link CallQuality} change on certain subscription. + * + * @param subId for which call quality state changed. + * @param slotIndex for which call quality state changed. Can be derived from subId except when + * subId is invalid. + * @param callQuality Information about call quality e.g, call quality level + * @param networkType associated with this data connection. e.g, LTE + * + * @hide + */ + public void notifyCallQualityChanged(int subId, int slotIndex, CallQuality callQuality, + @NetworkType int networkType) { + try { + sRegistry.notifyCallQualityChanged(callQuality, slotIndex, subId, networkType); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify emergency number list changed on certain subscription. + * + * @param subId for which emergency number list changed. + * @param slotIndex for which emergency number list changed. Can be derived from subId except + * when subId is invalid. + * + * @hide + */ + public void notifyEmergencyNumberList(int subId, int slotIndex) { + try { + sRegistry.notifyEmergencyNumberList(slotIndex, subId); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify radio power state changed on certain subscription. + * + * @param subId for which radio power state changed. + * @param slotIndex for which radio power state changed. Can be derived from subId except when + * subId is invalid. + * @param radioPowerState the current modem radio state. + * + * @hide + */ + public void notifyRadioPowerStateChanged(int subId, int slotIndex, + @RadioPowerState int radioPowerState) { + try { + sRegistry.notifyRadioPowerStateChanged(slotIndex, subId, radioPowerState); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify {@link PhoneCapability} changed. + * + * @param phoneCapability the capability of the modem group. + * + * @hide + */ + public void notifyPhoneCapabilityChanged(PhoneCapability phoneCapability) { + try { + sRegistry.notifyPhoneCapabilityChanged(phoneCapability); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify data activation state changed on certain subscription. + * @see TelephonyManager#getDataActivationState() + * + * @param subId for which data activation state changed. + * @param slotIndex for which data activation state changed. Can be derived from subId except + * when subId is invalid. + * @param activationState sim activation state e.g, activated. + * + * @hide + */ + public void notifyDataActivationStateChanged(int subId, int slotIndex, + @SimActivationState int activationState) { + try { + sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId, + TelephonyManager.SIM_ACTIVATION_TYPE_DATA, activationState); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify voice activation state changed on certain subscription. + * @see TelephonyManager#getVoiceActivationState() + * + * @param subId for which voice activation state changed. + * @param slotIndex for which voice activation state changed. Can be derived from subId except + * subId is invalid. + * @param activationState sim activation state e.g, activated. + * + * @hide + */ + public void notifyVoiceActivationStateChanged(int subId, int slotIndex, + @SimActivationState int activationState) { + try { + sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId, + TelephonyManager.SIM_ACTIVATION_TYPE_VOICE, activationState); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify User mobile data state changed on certain subscription. e.g, mobile data is enabled + * or disabled. + * + * @param subId for which mobile data state has changed. + * @param slotIndex for which mobile data state has changed. Can be derived from subId except + * when subId is invalid. + * @param state {@code true} indicates mobile data is enabled/on. {@code false} otherwise. + * + * @hide + */ + public void notifyUserMobileDataStateChanged(int slotIndex, int subId, boolean state) { + try { + sRegistry.notifyUserMobileDataStateChangedForPhoneId(slotIndex, subId, state); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * TODO: this is marked as deprecated, can we move this one safely? + * + * @param subId + * @param slotIndex + * @param rawData + * + * @hide + */ + public void notifyOemHookRawEventForSubscriber(int subId, int slotIndex, byte[] rawData) { + try { + sRegistry.notifyOemHookRawEventForSubscriber(slotIndex, subId, rawData); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify IMS call disconnect causes which contains {@link android.telephony.ims.ImsReasonInfo}. + * + * @param subId for which ims call disconnect. + * @param imsReasonInfo the reason for ims call disconnect. + * + * @hide + */ + public void notifyImsDisconnectCause(int subId, ImsReasonInfo imsReasonInfo) { + try { + sRegistry.notifyImsDisconnectCause(subId, imsReasonInfo); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify precise data connection failed cause on certain subscription. + * + * @param subId for which data connection failed. + * @param slotIndex for which data conenction failed. Can be derived from subId except when + * subId is invalid. + * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN. + * @param apn the APN {@link ApnSetting#getApnName()} of this data connection. + * @param failCause data fail cause. + * + * @hide + */ + public void notifyPreciseDataConnectionFailed(int subId, int slotIndex, String apnType, + String apn, @DataFailCause.FailCause int failCause) { + try { + sRegistry.notifyPreciseDataConnectionFailed(slotIndex, subId, apnType, apn, failCause); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify single Radio Voice Call Continuity (SRVCC) state change for the currently active call + * on certain subscription. + * + * @param subId for which srvcc state changed. + * @param state srvcc state + * + * @hide + */ + public void notifySrvccStateChanged(int subId, @TelephonyManager.SrvccState int state) { + try { + sRegistry.notifySrvccStateChanged(subId, state); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify over the air sim provisioning(OTASP) mode changed on certain subscription. + * + * @param subId for which otasp mode changed. + * @param otaspMode latest mode for OTASP e.g, OTASP needed. + * + * @hide + */ + public void notifyOtaspChanged(int subId, int otaspMode) { + try { + sRegistry.notifyOtaspChanged(subId, otaspMode); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify precise call state changed on certain subscription, including foreground, background + * and ringcall states. + * + * @param subId for which precise call state changed. + * @param slotIndex for which precise call state changed. Can be derived from subId except when + * subId is invalid. + * @param ringCallPreciseState ringCall state. + * @param foregroundCallPreciseState foreground call state. + * @param backgroundCallPreciseState background call state. + * + * @hide + */ + public void notifyPreciseCallState(int subId, int slotIndex, @State int ringCallPreciseState, + @State int foregroundCallPreciseState, @State int backgroundCallPreciseState) { + try { + sRegistry.notifyPreciseCallState(slotIndex, subId, ringCallPreciseState, + foregroundCallPreciseState, backgroundCallPreciseState); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify call disconnect causes which contains {@link DisconnectCause} and {@link + * android.telephony.PreciseDisconnectCause}. + * + * @param subId for which call disconnected. + * @param slotIndex for which call disconnected. Can be derived from subId except when subId is + * invalid. + * @param cause {@link DisconnectCause} for the disconnected call. + * @param preciseCause {@link android.telephony.PreciseDisconnectCause} for the disconnected + * call. + * + * @hide + */ + public void notifyDisconnectCause(int slotIndex, int subId, int cause, int preciseCause) { + try { + sRegistry.notifyDisconnectCause(slotIndex, subId, cause, preciseCause); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify data connection failed on certain subscription. + * + * @param subId for which data connection failed. + * @param slotIndex for which data conenction faled. Can be derived from subId except when subId + * is invalid. + * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN. Note each data + * connection can support multiple anyTypes. + * + * @hide + */ + public void notifyDataConnectionFailed(int subId, int slotIndex, String apnType) { + try { + sRegistry.notifyDataConnectionFailedForSubscriber(slotIndex, subId, apnType); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * TODO change from bundle to CellLocation? + * @hide + */ + public void notifyCellLocation(int subId, Bundle cellLocation) { + try { + sRegistry.notifyCellLocationForSubscriber(subId, cellLocation); + } catch (RemoteException ex) { + // system process is dead + } + } + + /** + * Notify {@link CellInfo} changed on certain subscription. e.g, when an observed cell info has + * changed or new cells have been added or removed on the given subscription. + * + * @param subId for which cellinfo changed. + * @param cellInfo A list of cellInfo associated with the given subscription. + * + * @hide + */ + public void notifyCellInfoChanged(int subId, List<CellInfo> cellInfo) { + try { + sRegistry.notifyCellInfoForSubscriber(subId, cellInfo); + } catch (RemoteException ex) { + + } + } + +} diff --git a/core/java/android/service/carrier/CarrierService.java b/core/java/android/service/carrier/CarrierService.java index aeb186b00686..9184d6d51f44 100644 --- a/core/java/android/service/carrier/CarrierService.java +++ b/core/java/android/service/carrier/CarrierService.java @@ -16,17 +16,15 @@ package android.service.carrier; import android.annotation.CallSuper; import android.app.Service; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.IBinder; import android.os.PersistableBundle; -import android.os.RemoteException; import android.os.ResultReceiver; -import android.os.ServiceManager; +import android.os.telephony.TelephonyRegistryManager; import android.util.Log; -import com.android.internal.telephony.ITelephonyRegistry; - /** * A service that exposes carrier-specific functionality to the system. * <p> @@ -55,16 +53,10 @@ public abstract class CarrierService extends Service { public static final String CARRIER_SERVICE_INTERFACE = "android.service.carrier.CarrierService"; - private static ITelephonyRegistry sRegistry; - private final ICarrierService.Stub mStubWrapper; public CarrierService() { mStubWrapper = new ICarrierServiceWrapper(); - if (sRegistry == null) { - sRegistry = ITelephonyRegistry.Stub.asInterface( - ServiceManager.getService("telephony.registry")); - } } /** @@ -122,9 +114,12 @@ public abstract class CarrierService extends Service { * @see android.telephony.TelephonyManager#hasCarrierPrivileges */ public final void notifyCarrierNetworkChange(boolean active) { - try { - if (sRegistry != null) sRegistry.notifyCarrierNetworkChange(active); - } catch (RemoteException | NullPointerException ex) {} + TelephonyRegistryManager telephonyRegistryMgr = + (TelephonyRegistryManager) this.getSystemService( + Context.TELEPHONY_REGISTRY_SERVICE); + if (telephonyRegistryMgr != null) { + telephonyRegistryMgr.notifyCarrierNetworkChange(active); + } } /** diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 611444153791..1a9cd5b66c67 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -961,13 +961,13 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } } - public void notifyCallState(int state, String phoneNumber) { + public void notifyCallStateForAllSubs(int state, String phoneNumber) { if (!checkNotifyPermission("notifyCallState()")) { return; } if (VDBG) { - log("notifyCallState: state=" + state + " phoneNumber=" + phoneNumber); + log("notifyCallStateForAllSubs: state=" + state + " phoneNumber=" + phoneNumber); } synchronized (mRecords) { @@ -994,13 +994,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { SubscriptionManager.INVALID_SUBSCRIPTION_ID); } - public void notifyCallStateForPhoneId(int phoneId, int subId, int state, - String incomingNumber) { + public void notifyCallState(int phoneId, int subId, int state, String incomingNumber) { if (!checkNotifyPermission("notifyCallState()")) { return; } if (VDBG) { - log("notifyCallStateForPhoneId: subId=" + subId + log("notifyCallState: subId=" + subId + " state=" + state + " incomingNumber=" + incomingNumber); } synchronized (mRecords) { @@ -1094,10 +1093,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { synchronized (mRecords) { if (validatePhoneId(phoneId)) { switch (activationType) { - case PhoneConstants.SIM_ACTIVATION_TYPE_VOICE: + case TelephonyManager.SIM_ACTIVATION_TYPE_VOICE: mVoiceActivationState[phoneId] = activationState; break; - case PhoneConstants.SIM_ACTIVATION_TYPE_DATA: + case TelephonyManager.SIM_ACTIVATION_TYPE_DATA: mDataActivationState[phoneId] = activationState; break; default: @@ -1110,7 +1109,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { + " state=" + activationState); } try { - if ((activationType == PhoneConstants.SIM_ACTIVATION_TYPE_VOICE) && + if ((activationType == TelephonyManager.SIM_ACTIVATION_TYPE_VOICE) && r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE) && idMatch(r.subId, subId, phoneId)) { @@ -1121,7 +1120,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } r.callback.onVoiceActivationStateChanged(activationState); } - if ((activationType == PhoneConstants.SIM_ACTIVATION_TYPE_DATA) && + if ((activationType == TelephonyManager.SIM_ACTIVATION_TYPE_DATA) && r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_DATA_ACTIVATION_STATE) && idMatch(r.subId, subId, phoneId)) { @@ -1241,7 +1240,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } public void notifyCellInfoForSubscriber(int subId, List<CellInfo> cellInfo) { - if (!checkNotifyPermission("notifyCellInfo()")) { + if (!checkNotifyPermission("notifyCellInfoForSubscriber()")) { return; } if (VDBG) { @@ -1258,7 +1257,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { checkFineLocationAccess(r, Build.VERSION_CODES.Q)) { try { if (DBG_LOC) { - log("notifyCellInfo: mCellInfo=" + cellInfo + " r=" + r); + log("notifyCellInfoForSubscriber: mCellInfo=" + cellInfo + + " r=" + r); } r.callback.onCellInfoChanged(cellInfo); } catch (RemoteException ex) { diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 42d65e2bbce6..ed1bf9688d4a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4486,6 +4486,17 @@ public class TelephonyManager { } /** + * Sim activation type: voice + * @hide + */ + public static final int SIM_ACTIVATION_TYPE_VOICE = 0; + /** + * Sim activation type: data + * @hide + */ + public static final int SIM_ACTIVATION_TYPE_DATA = 1; + + /** * Initial SIM activation state, unknown. Not set by any carrier apps. * @hide */ @@ -5012,6 +5023,17 @@ public class TelephonyManager { */ public static final int DATA_ACTIVITY_DORMANT = 0x00000004; + /** @hide */ + @IntDef(prefix = {"DATA_"}, value = { + DATA_ACTIVITY_NONE, + DATA_ACTIVITY_IN, + DATA_ACTIVITY_OUT, + DATA_ACTIVITY_INOUT, + DATA_ACTIVITY_DORMANT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface DataActivityType{} + /** * Returns a constant indicating the type of activity on a data connection * (cellular). diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index b57ae3cf176f..c627480d85ac 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -43,8 +43,8 @@ interface ITelephonyRegistry { void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events, boolean notifyNow); @UnsupportedAppUsage - void notifyCallState(int state, String incomingNumber); - void notifyCallStateForPhoneId(in int phoneId, in int subId, int state, String incomingNumber); + void notifyCallStateForAllSubs(int state, String incomingNumber); + void notifyCallState(in int phoneId, in int subId, int state, String incomingNumber); void notifyServiceStateForPhoneId(in int phoneId, in int subId, in ServiceState state); void notifySignalStrengthForPhoneId(in int phoneId, in int subId, in SignalStrength signalStrength); diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index f8621c95d0b0..5b2f6880819a 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -74,10 +74,6 @@ public class PhoneConstants { public static final int PRESENTATION_UNKNOWN = 3; // no specified or unknown by network public static final int PRESENTATION_PAYPHONE = 4; // show pay phone info - // Sim activation type - public static final int SIM_ACTIVATION_TYPE_VOICE = 0; - public static final int SIM_ACTIVATION_TYPE_DATA = 1; - public static final String PHONE_NAME_KEY = "phoneName"; public static final String DATA_NETWORK_TYPE_KEY = "networkType"; public static final String DATA_FAILURE_CAUSE_KEY = "failCause"; |