Merge "Revert "[Telephony] PhoneStateListener redesign for new event"" (a9eb7e88) · Commits · e / os / android_frameworks_base

core/api/current.txt

+24 −140

Original line number	Diff line number	Diff line
		@@ -46192,12 +46192,6 @@ 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);
		@@ -46266,10 +46260,10 @@ package android.telephony {

		public class PhoneStateListener {
		ctor public PhoneStateListener();
		ctor @Deprecated public PhoneStateListener(@NonNull java.util.concurrent.Executor);
		ctor public PhoneStateListener(@NonNull java.util.concurrent.Executor);
		method public void onActiveDataSubscriptionIdChanged(int);
		method public void onBarringInfoChanged(@NonNull android.telephony.BarringInfo);
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onCallDisconnectCauseChanged(int, int);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onCallDisconnectCauseChanged(int, int);
		method public void onCallForwardingIndicatorChanged(boolean);
		method public void onCallStateChanged(int, String);
		method public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);
		@@ -46277,144 +46271,36 @@ package android.telephony {
		method public void onDataActivity(int);
		method public void onDataConnectionStateChanged(int);
		method public void onDataConnectionStateChanged(int, int);
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onDisplayInfoChanged(@NonNull android.telephony.TelephonyDisplayInfo);
		method @RequiresPermission("android.permission.READ_PHONE_STATE") public void onDisplayInfoChanged(@NonNull android.telephony.TelephonyDisplayInfo);
		method public void onEmergencyNumberListChanged(@NonNull java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>>);
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);
		method public void onMessageWaitingIndicatorChanged(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);
		method @RequiresPermission("android.permission.MODIFY_PHONE_STATE") public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);
		method public void onRegistrationFailed(@NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);
		method public void onServiceStateChanged(android.telephony.ServiceState);
		method @Deprecated public void onSignalStrengthChanged(int);
		method public void onSignalStrengthsChanged(android.telephony.SignalStrength);
		method public void onUserMobileDataStateChanged(boolean);
		field @Deprecated public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 4194304; // 0x400000
		field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_BARRING_INFO = -2147483648; // 0x80000000
		field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000
		field @Deprecated public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8
		field @Deprecated public static final int LISTEN_CALL_STATE = 32; // 0x20
		field @Deprecated public static final int LISTEN_CELL_INFO = 1024; // 0x400
		field @Deprecated public static final int LISTEN_CELL_LOCATION = 16; // 0x10
		field @Deprecated public static final int LISTEN_DATA_ACTIVITY = 128; // 0x80
		field @Deprecated public static final int LISTEN_DATA_CONNECTION_STATE = 64; // 0x40
		field @Deprecated public static final int LISTEN_DISPLAY_INFO_CHANGED = 1048576; // 0x100000
		field @Deprecated public static final int LISTEN_EMERGENCY_NUMBER_LIST = 16777216; // 0x1000000
		field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 134217728; // 0x8000000
		field @Deprecated public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4
		field public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 4194304; // 0x400000
		field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_BARRING_INFO = -2147483648; // 0x80000000
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000
		field public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8
		field public static final int LISTEN_CALL_STATE = 32; // 0x20
		field public static final int LISTEN_CELL_INFO = 1024; // 0x400
		field public static final int LISTEN_CELL_LOCATION = 16; // 0x10
		field public static final int LISTEN_DATA_ACTIVITY = 128; // 0x80
		field public static final int LISTEN_DATA_CONNECTION_STATE = 64; // 0x40
		field public static final int LISTEN_DISPLAY_INFO_CHANGED = 1048576; // 0x100000
		field public static final int LISTEN_EMERGENCY_NUMBER_LIST = 16777216; // 0x1000000
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 134217728; // 0x8000000
		field public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4
		field public static final int LISTEN_NONE = 0; // 0x0
		field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000
		field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000
		field @Deprecated public static final int LISTEN_SERVICE_STATE = 1; // 0x1
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000
		field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000
		field public static final int LISTEN_SERVICE_STATE = 1; // 0x1
		field @Deprecated public static final int LISTEN_SIGNAL_STRENGTH = 2; // 0x2
		field @Deprecated public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100
		field @Deprecated public static final int LISTEN_USER_MOBILE_DATA_STATE = 524288; // 0x80000
		}

		public static interface PhoneStateListener.ActiveDataSubscriptionIdChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onActiveDataSubscriptionIdChanged(int);
		}

		public static interface PhoneStateListener.AlwaysReportedSignalStrengthsChangedListener {
		method @RequiresPermission("android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH") public void onSignalStrengthsChanged(@NonNull android.telephony.SignalStrength);
		}

		public static interface PhoneStateListener.BarringInfoChangedListener {
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onBarringInfoChanged(@NonNull android.telephony.BarringInfo);
		}

		public static interface PhoneStateListener.CallDisconnectCauseChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onCallDisconnectCauseChanged(int, int);
		}

		public static interface PhoneStateListener.CallForwardingIndicatorChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onCallForwardingIndicatorChanged(boolean);
		}

		public static interface PhoneStateListener.CallStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_CALL_LOG) public void onCallStateChanged(int, @Nullable String);
		}

		public static interface PhoneStateListener.CarrierNetworkChangeListener {
		method public void onCarrierNetworkChange(boolean);
		}

		public static interface PhoneStateListener.CellInfoChangedListener {
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void onCellInfoChanged(@NonNull java.util.List<android.telephony.CellInfo>);
		}

		public static interface PhoneStateListener.CellLocationChangedListener {
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void onCellLocationChanged(@NonNull android.telephony.CellLocation);
		}

		public static interface PhoneStateListener.DataActivationStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onDataActivationStateChanged(int);
		}

		public static interface PhoneStateListener.DataActivityListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onDataActivity(int);
		}

		public static interface PhoneStateListener.DataConnectionStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onDataConnectionStateChanged(int, int);
		}

		public static interface PhoneStateListener.DisplayInfoChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onDisplayInfoChanged(@NonNull android.telephony.TelephonyDisplayInfo);
		}

		public static interface PhoneStateListener.EmergencyNumberListChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onEmergencyNumberListChanged(@NonNull java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>>);
		}

		public static interface PhoneStateListener.ImsCallDisconnectCauseChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);
		}

		public static interface PhoneStateListener.MessageWaitingIndicatorChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onMessageWaitingIndicatorChanged(boolean);
		}

		public static interface PhoneStateListener.PhoneCapabilityChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability);
		}

		public static interface PhoneStateListener.PhysicalChannelConfigChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPhysicalChannelConfigChanged(@NonNull java.util.List<android.telephony.PhysicalChannelConfig>);
		}

		public static interface PhoneStateListener.PreciseDataConnectionStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);
		}

		public static interface PhoneStateListener.RegistrationFailedListener {
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onRegistrationFailed(@NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);
		}

		public static interface PhoneStateListener.ServiceStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onServiceStateChanged(@NonNull android.telephony.ServiceState);
		}

		public static interface PhoneStateListener.SignalStrengthsChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onSignalStrengthsChanged(@NonNull android.telephony.SignalStrength);
		}

		public static interface PhoneStateListener.UserMobileDataStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onUserMobileDataStateChanged(boolean);
		}

		public final class PhysicalChannelConfig implements android.os.Parcelable {
		method public int describeContents();
		method public int getCellBandwidthDownlink();
		method public int getChannelNumber();
		method public int getConnectionStatus();
		method public int getNetworkType();
		method @IntRange(from=0, to=1007) public int getPhysicalCellId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int CHANNEL_NUMBER_UNKNOWN = -1; // 0xffffffff
		field public static final int CONNECTION_PRIMARY_SERVING = 1; // 0x1
		field public static final int CONNECTION_SECONDARY_SERVING = 2; // 0x2
		field public static final int CONNECTION_UNKNOWN = -1; // 0xffffffff
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhysicalChannelConfig> CREATOR;
		field public static final int PHYSICAL_CELL_ID_UNKNOWN = -1; // 0xffffffff
		field public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100
		field public static final int LISTEN_USER_MOBILE_DATA_STATE = 524288; // 0x80000
		}

		public final class PreciseDataConnectionState implements android.os.Parcelable {
		@@ -46926,8 +46812,7 @@ package android.telephony {
		method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
		method public boolean isWorldPhone();
		method @Deprecated public void listen(android.telephony.PhoneStateListener, int);
		method @Deprecated public void listen(long, @NonNull android.telephony.PhoneStateListener);
		method public void registerPhoneStateListener(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.PhoneStateListener);
		method public void listen(long, @NonNull android.telephony.PhoneStateListener);
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method public void sendDialerSpecialCode(String);
		@@ -46949,7 +46834,6 @@ package android.telephony {
		method @Deprecated public void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);
		method @Deprecated public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void switchMultiSimConfig(int);
		method public void unregisterPhoneStateListener(@NonNull android.telephony.PhoneStateListener);
		method public void updateAvailableNetworks(@NonNull java.util.List<android.telephony.AvailableNetworkInfo>, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);
		field public static final String ACTION_CARRIER_MESSAGING_CLIENT_SERVICE = "android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE";
		field public static final String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";

core/api/system-current.txt

+26 −74

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/telephony/PhoneStateListener.java

+108 −1374

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/telephony/TelephonyRegistryManager.java

+8 −350

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,6 +69,6 @@ oneway interface IPhoneStateListener {
		void onRegistrationFailed(in CellIdentity cellIdentity,
		String chosenPlmn, int domain, int causeCode, int additionalCauseCode);
		void onBarringInfoChanged(in BarringInfo barringInfo);
		void onPhysicalChannelConfigChanged(in List<PhysicalChannelConfig> configs);
		void onDataEnabledChanged(boolean enabled, int reason);
		void onPhysicalChannelConfigurationChanged(in List<PhysicalChannelConfig> configs);

		}