Merge "Do not use hidden API ParcelableException" am: e777c27788 (6b4a5300) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ICellInfoCallback.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.telephony;

		import android.os.ParcelableException;
		import android.telephony.CellInfo;

		import java.util.List;
		@@ -28,5 +27,5 @@ import java.util.List;
		oneway interface ICellInfoCallback
		{
		void onCellInfo(in List<CellInfo> state);
		void onError(in int errorCode, in ParcelableException detail);
		void onError(in int errorCode, in String exceptionName, in String message);
		}

telephony/java/android/telephony/TelephonyManager.java

+20 −6

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ import android.telephony.Annotation.NetworkType;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.Annotation.SimActivationState;
		import android.telephony.VisualVoicemailService.VisualVoicemailTask;
		import android.telephony.data.ApnSetting;
		import android.telephony.emergency.EmergencyNumber;
		import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;
		import android.telephony.ims.ImsMmTelManager;
		@@ -5494,19 +5493,20 @@ public class TelephonyManager {
		telephony.requestCellInfoUpdate(
		getSubId(),
		new ICellInfoCallback.Stub() {
		@Override
		public void onCellInfo(List<CellInfo> cellInfo) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() -> callback.onCellInfo(cellInfo)));
		}

		public void onError(int errorCode, android.os.ParcelableException detail) {
		@Override
		public void onError(int errorCode, String exceptionName, String message) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() -> callback.onError(
		errorCode,
		detail == null ? null : detail.getCause())));
		createThrowableByClassName(exceptionName, message))));
		}
		}, getOpPackageName());

		} catch (RemoteException ex) {
		}
		}
		@@ -5535,22 +5535,36 @@ public class TelephonyManager {
		telephony.requestCellInfoUpdateWithWorkSource(
		getSubId(),
		new ICellInfoCallback.Stub() {
		@Override
		public void onCellInfo(List<CellInfo> cellInfo) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() -> callback.onCellInfo(cellInfo)));
		}

		public void onError(int errorCode, android.os.ParcelableException detail) {
		@Override
		public void onError(int errorCode, String exceptionName, String message) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() -> callback.onError(
		errorCode,
		detail == null ? null : detail.getCause())));
		createThrowableByClassName(exceptionName, message))));
		}
		}, getOpPackageName(), workSource);
		} catch (RemoteException ex) {
		}
		}

		private static Throwable createThrowableByClassName(String className, String message) {
		if (className == null) {
		return null;
		}
		try {
		Class<?> c = Class.forName(className);
		return (Throwable) c.getConstructor(String.class).newInstance(message);
		} catch (ReflectiveOperationException \| ClassCastException e) {
		}
		return new RuntimeException(className + ": " + message);
		}

		/**
		* Sets the minimum time in milli-seconds between {@link PhoneStateListener#onCellInfoChanged
		* PhoneStateListener.onCellInfoChanged} will be invoked.