commit 8ad9479799b47fd5db6dd342fb85c4a8f4255c09
author Sooraj Sasindran <sasindran@google.com> Wed Sep 18 10:06:53 2019 -0700
committer Sooraj Sasindran <sasindran@google.com> Wed Sep 18 10:10:51 2019 -0700
tree 83f2d59a408f06e0c8755955454a3a066e0ae98e
parent 2e84d8f657ca9f088e9935ce7b2b8dca19ae1d76

Do not use hidden rethrowAsRuntimeException API

Do not use hidden rethrowAsRuntimeException API from
RemoteException.

Bug: 137202333
Test: Make
Change-Id: Idcb007465096f5b139585c7eb0f307fd40edac7f

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java b/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java
index 64ce9de..8d7e4a5 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java
@@ -53,6 +53,7 @@
 import android.text.TextUtils;
 
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.util.TelephonyUtils;
 
 import java.util.HashSet;
 import java.util.List;
@@ -136,7 +137,7 @@
                 UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);
         } catch (RemoteException e) {
             loge("Binder to package manager died, permission grant for DataService failed.");
-            throw e.rethrowAsRuntimeException();
+            throw TelephonyUtils.rethrowAsRuntimeException(e);
         }
     }
 
@@ -162,7 +163,7 @@
             }
         } catch (RemoteException e) {
             loge("Binder to package manager died; failed to revoke DataService permissions.");
-            throw e.rethrowAsRuntimeException();
+            throw TelephonyUtils.rethrowAsRuntimeException(e);
         }
     }
 

src/java/com/android/internal/telephony/util/TelephonyUtils.java

diff --git a/src/java/com/android/internal/telephony/util/TelephonyUtils.java b/src/java/com/android/internal/telephony/util/TelephonyUtils.java
index da01594..32f1691 100644
--- a/src/java/com/android/internal/telephony/util/TelephonyUtils.java
+++ b/src/java/com/android/internal/telephony/util/TelephonyUtils.java
@@ -16,13 +16,19 @@
 package com.android.internal.telephony.util;
 
 import android.annotation.Nullable;
+import android.os.RemoteException;
 
 /**
  * This class provides various util functions
  */
 public final class TelephonyUtils {
-  /** {@hide} */
-  public static String emptyIfNull(@Nullable String str) {
-    return str == null ? "" : str;
+    /** {@hide} */
+    public static String emptyIfNull(@Nullable String str) {
+        return str == null ? "" : str;
+    }
+
+    /** {@hide} */
+    public static RuntimeException rethrowAsRuntimeException(RemoteException remoteException) {
+        throw new RuntimeException(remoteException);
+    }
   }
-}