commit 6c08ecd71cd03815469da44a5abefc190f1ed376
author Meng Wang <mewan@google.com> Mon Sep 30 17:13:54 2019 -0700
committer Meng Wang <mewan@google.com> Mon Nov 04 22:15:52 2019 -0800
tree afabadf69f522a73c9086d246cc93c4b944da0a3
parent 622cf3787d612cb821672b7622f060e0efd456ce

Do not use hidden API ParcelableException

ParcelableException, when written into Parcel, just keeps the
excaption class name and its string representation. So we
pass the same across AIDL and compose the Exception class
on the other side, following how a ParcelableException
is read from Parcel.

Bug: 141315988
Test: make
Change-Id: Ic022b8ae2109086ada88851a46fab3c23b7e7379
Merged-In: I549f1316824857cdb6f4bbd47e6789eda0dcadd7

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index cfbcafb..f32f7e6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1077,11 +1077,13 @@
                     try {
                         if (ar.exception != null) {
                             Log.e(LOG_TAG, "Exception retrieving CellInfo=" + ar.exception);
-                            cb.onError(TelephonyManager.CellInfoCallback.ERROR_MODEM_ERROR,
-                                    new android.os.ParcelableException(ar.exception));
+                            cb.onError(
+                                    TelephonyManager.CellInfoCallback.ERROR_MODEM_ERROR,
+                                    ar.exception.getClass().getName(),
+                                    ar.exception.toString());
                         } else if (ar.result == null) {
                             Log.w(LOG_TAG, "Timeout Waiting for CellInfo!");
-                            cb.onError(TelephonyManager.CellInfoCallback.ERROR_TIMEOUT, null);
+                            cb.onError(TelephonyManager.CellInfoCallback.ERROR_TIMEOUT, null, null);
                         } else {
                             // use the result as returned
                             cb.onCellInfo((List<CellInfo>) ar.result);