Merge "expose APIs for mainline telephony-sdk" (0bc81e1d) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -44668,6 +44668,12 @@ package android.telephony {
		field public static final int SCAN_TYPE_PERIODIC = 1; // 0x1
		}

		public final class PhoneCapability implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhoneCapability> CREATOR;
		}

		public class PhoneNumberFormattingTextWatcher implements android.text.TextWatcher {
		ctor public PhoneNumberFormattingTextWatcher();
		ctor public PhoneNumberFormattingTextWatcher(String);

core/java/android/telephony/PhoneStateListener.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -285,14 +285,6 @@ public class PhoneStateListener {
		*/
		public static final int LISTEN_USER_MOBILE_DATA_STATE = 0x00080000;

		/**
		* Listen for changes to the physical channel configuration.
		*
		* @see #onPhysicalChannelConfigurationChanged
		* @hide
		*/
		public static final int LISTEN_PHYSICAL_CHANNEL_CONFIGURATION = 0x00100000;

		/**
		* Listen for changes to the phone capability.
		*
		@@ -830,24 +822,6 @@ public class PhoneStateListener {
		// default implementation empty
		}

		/**
		* Callback invoked when the current physical channel configuration has changed on the
		* registered subscription.
		* Note, the registration subId comes from {@link TelephonyManager} object which registers
		* PhoneStateListener by {@link TelephonyManager#listen(PhoneStateListener, int)}.
		* If this TelephonyManager object was created with
		* {@link TelephonyManager#createForSubscriptionId(int)}, then the callback applies to the
		* subId. Otherwise, this callback applies to
		* {@link SubscriptionManager#getDefaultSubscriptionId()}.
		*
		* @param configs List of the current {@link PhysicalChannelConfig}s
		* @hide
		*/
		public void onPhysicalChannelConfigurationChanged(
		@NonNull List<PhysicalChannelConfig> configs) {
		// default implementation empty
		}

		/**
		* Callback invoked when the current emergency number list has changed on the registered
		* subscription.
		@@ -1194,15 +1168,6 @@ public class PhoneStateListener {
		() -> mExecutor.execute(() -> psl.onCarrierNetworkChange(active)));
		}

		public void onPhysicalChannelConfigurationChanged(List<PhysicalChannelConfig> configs) {
		PhoneStateListener psl = mPhoneStateListenerWeakRef.get();
		if (psl == null) return;

		Binder.withCleanCallingIdentity(
		() -> mExecutor.execute(
		() -> psl.onPhysicalChannelConfigurationChanged(configs)));
		}

		public void onEmergencyNumberListChanged(Map emergencyNumberList) {
		PhoneStateListener psl = mPhoneStateListenerWeakRef.get();
		if (psl == null) return;

core/java/com/android/internal/telephony/IPhoneStateListener.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.telephony.CallAttributes;
		import android.telephony.CellInfo;
		import android.telephony.DataConnectionRealTimeInfo;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseCallState;
		import android.telephony.PreciseDataConnectionState;
		import android.telephony.ServiceState;
		@@ -44,7 +43,6 @@ oneway interface IPhoneStateListener {
		void onDataConnectionStateChanged(int state, int networkType);
		void onDataActivity(int direction);
		void onSignalStrengthsChanged(in SignalStrength signalStrength);
		void onPhysicalChannelConfigurationChanged(in List<PhysicalChannelConfig> configs);
		void onOtaspChanged(in int otaspMode);
		void onCellInfoChanged(in List<CellInfo> cellInfo);
		void onPreciseCallStateChanged(in PreciseCallState callState);

core/java/com/android/internal/telephony/ITelephonyRegistry.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.telephony.CallQuality;
		import android.telephony.CellInfo;
		import android.telephony.ims.ImsReasonInfo;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.emergency.EmergencyNumber;
		@@ -72,8 +71,6 @@ interface ITelephonyRegistry {
		void notifyOtaspChanged(in int subId, in int otaspMode);
		@UnsupportedAppUsage
		void notifyCellInfo(in List<CellInfo> cellInfo);
		void notifyPhysicalChannelConfigurationForSubscriber(in int phoneId, in int subId,
		in List<PhysicalChannelConfig> configs);
		void notifyPreciseCallState(int phoneId, int subId, int ringingCallState,
		int foregroundCallState, int backgroundCallState);
		void notifyDisconnectCause(int phoneId, int subId, int disconnectCause,

services/core/java/com/android/server/TelephonyRegistry.java

+0 −52

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import android.telephony.DisconnectCause;
		import android.telephony.LocationAccessPolicy;
		import android.telephony.PhoneCapability;
		import android.telephony.PhoneStateListener;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseCallState;
		import android.telephony.PreciseDataConnectionState;
		import android.telephony.PreciseDisconnectCause;
		@@ -213,8 +212,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {

		private ArrayList<List<CellInfo>> mCellInfo = null;

		private ArrayList<List<PhysicalChannelConfig>> mPhysicalChannelConfigs;

		private Map<Integer, List<EmergencyNumber>> mEmergencyNumberList;

		private EmergencyNumber[] mOutgoingSmsEmergencyNumber;
		@@ -424,7 +421,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		if (mNumPhones < oldNumPhones) {
		cutListToSize(mCellInfo, mNumPhones);
		cutListToSize(mImsReasonInfo, mNumPhones);
		cutListToSize(mPhysicalChannelConfigs, mNumPhones);
		return;
		}

		@@ -445,7 +441,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mCellInfo.add(i, null);
		mImsReasonInfo.add(i, null);
		mSrvccState[i] = TelephonyManager.SRVCC_STATE_HANDOVER_NONE;
		mPhysicalChannelConfigs.add(i, new ArrayList<>());
		mOtaspMode[i] = TelephonyManager.OTASP_UNKNOWN;
		mCallDisconnectCause[i] = DisconnectCause.NOT_VALID;
		mCallPreciseDisconnectCause[i] = PreciseDisconnectCause.NOT_VALID;
		@@ -522,7 +517,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mPreciseDataConnectionState = new PreciseDataConnectionState[numPhones];
		mCellInfo = new ArrayList<>();
		mImsReasonInfo = new ArrayList<>();
		mPhysicalChannelConfigs = new ArrayList<>();
		mEmergencyNumberList = new HashMap<>();
		mOutgoingCallEmergencyNumber = new EmergencyNumber[numPhones];
		mOutgoingSmsEmergencyNumber = new EmergencyNumber[numPhones];
		@@ -542,7 +536,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mCellInfo.add(i, null);
		mImsReasonInfo.add(i, null);
		mSrvccState[i] = TelephonyManager.SRVCC_STATE_HANDOVER_NONE;
		mPhysicalChannelConfigs.add(i, new ArrayList<>());
		mOtaspMode[i] = TelephonyManager.OTASP_UNKNOWN;
		mCallDisconnectCause[i] = DisconnectCause.NOT_VALID;
		mCallPreciseDisconnectCause[i] = PreciseDisconnectCause.NOT_VALID;
		@@ -950,14 +943,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		remove(r.binder);
		}
		}
		if ((events & PhoneStateListener.LISTEN_PHYSICAL_CHANNEL_CONFIGURATION) != 0) {
		try {
		r.callback.onPhysicalChannelConfigurationChanged(
		mPhysicalChannelConfigs.get(phoneId));
		} catch (RemoteException ex) {
		remove(r.binder);
		}
		}
		if ((events & PhoneStateListener.LISTEN_EMERGENCY_NUMBER_LIST) != 0) {
		try {
		r.callback.onEmergencyNumberListChanged(mEmergencyNumberList);
		@@ -1382,43 +1367,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		}

		/**
		* Notify physical channel configuration according to subscripton ID and phone ID
		*/
		public void notifyPhysicalChannelConfigurationForSubscriber(int phoneId, int subId,
		List<PhysicalChannelConfig> configs) {
		if (!checkNotifyPermission("notifyPhysicalChannelConfiguration()")) {
		return;
		}

		if (VDBG) {
		log("notifyPhysicalChannelConfiguration: subId=" + subId + " phoneId=" + phoneId
		+ " configs=" + configs);
		}

		synchronized (mRecords) {
		if (validatePhoneId(phoneId)) {
		mPhysicalChannelConfigs.set(phoneId, configs);
		for (Record r : mRecords) {
		if (r.matchPhoneStateListenerEvent(
		PhoneStateListener.LISTEN_PHYSICAL_CHANNEL_CONFIGURATION)
		&& idMatch(r.subId, subId, phoneId)) {
		try {
		if (DBG_LOC) {
		log("notifyPhysicalChannelConfiguration: mPhysicalChannelConfigs="
		+ configs + " r=" + r);
		}
		r.callback.onPhysicalChannelConfigurationChanged(configs);
		} catch (RemoteException ex) {
		mRemoveList.add(r.binder);
		}
		}
		}
		}
		handleRemoveListLocked();
		}
		}

		@Override
		public void notifyMessageWaitingChangedForPhoneId(int phoneId, int subId, boolean mwi) {
		if (!checkNotifyPermission("notifyMessageWaitingChanged()")) {