commit d8921f4ad2a1f63b602b74101338d984702232f8
author Meng Wang <mewan@google.com> Mon Sep 30 17:13:54 2019 -0700
committer Meng Wang <mewan@google.com> Wed Oct 02 11:51:21 2019 -0700
tree 6efbe1587a0ec4d3a51069daa8053c71ced435ca
parent 1f5858376280b8ff7e2f7265cc86095261f7843e

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: I549f1316824857cdb6f4bbd47e6789eda0dcadd7

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ae45936..d149f7b 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1072,11 +1072,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);