commit c1faf5b1e4a62fecf7b8425e540380f3f1ffa62b
author Meng Wang <mewan@google.com> Tue Nov 05 18:12:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 05 18:12:37 2019 +0000
tree 92e324927bcb4cc956b7d574afed2ba4e983bc8d
parent 2ac07839d1bc26e46724cef031bdc9780a0eb906
parent 6c08ecd71cd03815469da44a5abefc190f1ed376

Merge "Do not use hidden API ParcelableException"

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);