Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to throw e.rethrowFromSystemServer()." into rvc-dev am: cb0230adb6

Browse Source 
Change-Id: Ia9f58d4c603d5bc0e7a28e177f49d42cbb176e8b
This commit is contained in:
Automerger Merge Worker
2020-03-04 18:46:45 +00:00
parent 9998d67d79 cb0230adb6
commit cf4c2e5a5a
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java
View File

@@ -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();
}
}
}

12
apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java
View File

@@ -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();
}
}
@@ -156,7 +153,7 @@ public class PowerWhitelistManager {
mService.addPowerSaveTempWhitelistApp(packageName, durationMs, mContext.getUserId(),
reason);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
throw e.rethrowFromSystemServer();
}
}
@@ -186,8 +183,7 @@ public class PowerWhitelistManager {
packageName, mContext.getUserId(), reason);
}
} catch (RemoteException e) {
e.rethrowFromSystemServer();
return 0;
throw e.rethrowFromSystemServer();
}
}
}