Merge "Renamed DisplayInfo to TelephonyDisplayInfo" into rvc-dev am: 0e56c85768 (9b522632) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −14

Original line number	Diff line number	Diff line
		@@ -47459,19 +47459,6 @@ package android.telephony {
		field public static final int VSNCP_TIMEOUT = 2236; // 0x8bc
		}

		public final class DisplayInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getNetworkType();
		method public int getOverrideNetworkType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DisplayInfo> CREATOR;
		field public static final int OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO = 2; // 0x2
		field public static final int OVERRIDE_NETWORK_TYPE_LTE_CA = 1; // 0x1
		field public static final int OVERRIDE_NETWORK_TYPE_NONE = 0; // 0x0
		field public static final int OVERRIDE_NETWORK_TYPE_NR_NSA = 3; // 0x3
		field public static final int OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE = 4; // 0x4
		}

		public class IccOpenLogicalChannelResponse implements android.os.Parcelable {
		method public int describeContents();
		method public int getChannel();
		@@ -47698,7 +47685,7 @@ package android.telephony {
		method public void onDataActivity(int);
		method public void onDataConnectionStateChanged(int);
		method public void onDataConnectionStateChanged(int, int);
		method @RequiresPermission("android.permission.READ_PHONE_STATE") public void onDisplayInfoChanged(@NonNull android.telephony.DisplayInfo);
		method @RequiresPermission("android.permission.READ_PHONE_STATE") public void onDisplayInfoChanged(@NonNull android.telephony.TelephonyDisplayInfo);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);
		method public void onMessageWaitingIndicatorChanged(boolean);
		method @RequiresPermission("android.permission.MODIFY_PHONE_STATE") public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);
		@@ -48123,6 +48110,19 @@ package android.telephony {
		method public android.telephony.SubscriptionPlan.Builder setTitle(@Nullable CharSequence);
		}

		public final class TelephonyDisplayInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getNetworkType();
		method public int getOverrideNetworkType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.TelephonyDisplayInfo> CREATOR;
		field public static final int OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO = 2; // 0x2
		field public static final int OVERRIDE_NETWORK_TYPE_LTE_CA = 1; // 0x1
		field public static final int OVERRIDE_NETWORK_TYPE_NONE = 0; // 0x0
		field public static final int OVERRIDE_NETWORK_TYPE_NR_NSA = 3; // 0x3
		field public static final int OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE = 4; // 0x4
		}

		public class TelephonyManager {
		method public boolean canChangeDtmfToneLength();
		method @Nullable public android.telephony.TelephonyManager createForPhoneAccountHandle(android.telecom.PhoneAccountHandle);

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -3793,7 +3793,7 @@ package android.telephony {
		method public void notifyDataActivityChanged(int, int);
		method public void notifyDataConnectionForSubscriber(int, int, int, @Nullable android.telephony.PreciseDataConnectionState);
		method public void notifyDisconnectCause(int, int, int, int);
		method public void notifyDisplayInfoChanged(int, int, @NonNull android.telephony.DisplayInfo);
		method public void notifyDisplayInfoChanged(int, int, @NonNull android.telephony.TelephonyDisplayInfo);
		method public void notifyEmergencyNumberList(int, int);
		method public void notifyImsDisconnectCause(int, @NonNull android.telephony.ims.ImsReasonInfo);
		method public void notifyMessageWaitingChanged(int, int, boolean);

core/java/android/telephony/PhoneStateListener.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -855,16 +855,16 @@ public class PhoneStateListener {

		/**
		* Callback invoked when the display info has changed on the registered subscription.
		* <p> The {@link DisplayInfo} contains status information shown to the user based on
		* <p> The {@link TelephonyDisplayInfo} contains status information shown to the user based on
		* carrier policy.
		*
		* Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE} or that the calling
		* app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).
		*
		* @param displayInfo The display information.
		* @param telephonyDisplayInfo The display information.
		*/
		@RequiresPermission((android.Manifest.permission.READ_PHONE_STATE))
		public void onDisplayInfoChanged(@NonNull DisplayInfo displayInfo) {
		public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo telephonyDisplayInfo) {
		// default implementation empty
		}

		@@ -1247,13 +1247,13 @@ public class PhoneStateListener {
		() -> psl.onUserMobileDataStateChanged(enabled)));
		}

		public void onDisplayInfoChanged(DisplayInfo displayInfo) {
		public void onDisplayInfoChanged(TelephonyDisplayInfo telephonyDisplayInfo) {
		PhoneStateListener psl = mPhoneStateListenerWeakRef.get();
		if (psl == null) return;

		Binder.withCleanCallingIdentity(
		() -> mExecutor.execute(
		() -> psl.onDisplayInfoChanged(displayInfo)));
		() -> psl.onDisplayInfoChanged(telephonyDisplayInfo)));
		}

		public void onOemHookRawEvent(byte[] rawData) {

core/java/android/telephony/TelephonyRegistryManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -590,12 +590,12 @@ public class TelephonyRegistryManager {
		* derived from {@code subscriptionId} except when {@code subscriptionId} is invalid, such as
		* when the device is in emergency-only mode.
		* @param subscriptionId Subscription id for which display network info has changed.
		* @param displayInfo The display info.
		* @param telephonyDisplayInfo The display info.
		*/
		public void notifyDisplayInfoChanged(int slotIndex, int subscriptionId,
		@NonNull DisplayInfo displayInfo) {
		@NonNull TelephonyDisplayInfo telephonyDisplayInfo) {
		try {
		sRegistry.notifyDisplayInfoChanged(slotIndex, subscriptionId, displayInfo);
		sRegistry.notifyDisplayInfoChanged(slotIndex, subscriptionId, telephonyDisplayInfo);
		} catch (RemoteException ex) {
		// system process is dead
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.telephony.CallAttributes;
		import android.telephony.CellIdentity;
		import android.telephony.CellInfo;
		import android.telephony.DataConnectionRealTimeInfo;
		import android.telephony.DisplayInfo;
		import android.telephony.TelephonyDisplayInfo;
		import android.telephony.PhoneCapability;
		import android.telephony.PreciseCallState;
		import android.telephony.PreciseDataConnectionState;
		@@ -55,7 +55,7 @@ oneway interface IPhoneStateListener {
		void onOemHookRawEvent(in byte[] rawData);
		void onCarrierNetworkChange(in boolean active);
		void onUserMobileDataStateChanged(in boolean enabled);
		void onDisplayInfoChanged(in DisplayInfo displayInfo);
		void onDisplayInfoChanged(in TelephonyDisplayInfo telephonyDisplayInfo);
		void onPhoneCapabilityChanged(in PhoneCapability capability);
		void onActiveDataSubIdChanged(in int subId);
		void onRadioPowerStateChanged(in int state);