From e904f46ee36d43a94b91be3bca0d2e6921024e52 Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Fri, 28 Feb 2020 13:56:03 -0800
Subject: [PATCH] Switch to throw e.rethrowFromSystemServer().

The official guidance is to explicitly throw
RemoteException.rethrowFromSystemServer() instead of just calling the
method.

Bug: 141645789
Test: Android builds
Change-Id: I37c29eb3740141e91cae5e604b58fd419d837b33
---
 .../framework/java/android/os/DeviceIdleManager.java |  6 ++----
 .../java/android/os/PowerWhitelistManager.java       | 12 ++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java b/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java
index 4c443349ea584..813f0604aec4c 100644
--- a/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java
+++ b/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java
@@ -53,8 +53,7 @@ public class DeviceIdleManager {
         try {
             return mService.getSystemPowerWhitelistExceptIdle();
         } catch (RemoteException e) {
-            e.rethrowFromSystemServer();
-            return new String[0];
+            throw e.rethrowFromSystemServer();
         }
     }
 
@@ -66,8 +65,7 @@ public class DeviceIdleManager {
         try {
             return mService.getSystemPowerWhitelist();
         } catch (RemoteException e) {
-            e.rethrowFromSystemServer();
-            return new String[0];
+            throw e.rethrowFromSystemServer();
         }
     }
 
diff --git a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java
index 0585825cc98b1..df9f5bd2f0fb0 100644
--- a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java
+++ b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java
@@ -24,8 +24,6 @@ import android.annotation.SystemService;
 import android.annotation.TestApi;
 import android.content.Context;
 
-import libcore.util.EmptyArray;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -97,7 +95,7 @@ public class PowerWhitelistManager {
         try {
             mService.addPowerSaveWhitelistApps(packageNames);
         } catch (RemoteException e) {
-            e.rethrowFromSystemServer();
+            throw e.rethrowFromSystemServer();
         }
     }
 
@@ -118,8 +116,7 @@ public class PowerWhitelistManager {
                 return mService.getAppIdWhitelistExceptIdle();
             }
         } catch (RemoteException e) {
-            e.rethrowFromSystemServer();
-            return EmptyArray.INT;
+            throw e.rethrowFromSystemServer();
         }
     }
 
@@ -136,7 +133,7 @@ public class PowerWhitelistManager {
             mService.addPowerSaveTempWhitelistApp(packageName, durationMs, mContext.getUserId(),
                     reason);
         } catch (RemoteException e) {
-            e.rethrowFromSystemServer();
+            throw e.rethrowFromSystemServer();
         }
     }
 
@@ -166,8 +163,7 @@ public class PowerWhitelistManager {
                             packageName, mContext.getUserId(), reason);
             }
         } catch (RemoteException e) {
-            e.rethrowFromSystemServer();
-            return 0;
+            throw e.rethrowFromSystemServer();
         }
     }
 }