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

Don't throw runtime exceptions in ResumeOnRebootServiceProvider

Browse Source 
In the current code, these IllegalStateExceptions from
the ResumeOnRebootService will crash the system server. Since RoR
failures are not fatal, rethrow the runtime exceptions as
RemoteExceptions instead.

Bug: 172780686
Test: atest FrameworksServicesTests:RebootEscrowManagerTests
Change-Id: I3a9d78fc75212b0ea85d5be8e431b946abb1b4cc
This commit is contained in:
Tianjie
2021-03-02 18:01:29 -08:00
parent 1d0752ee9e
commit 86943a3de5
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
View File

@@ -136,7 +136,7 @@ public class ResumeOnRebootServiceProvider {
}
/** Bind to the service */
public void bindToService(long timeOut) throws TimeoutException {
public void bindToService(long timeOut) throws RemoteException, TimeoutException {
if (mBinder == null || !mBinder.asBinder().isBinderAlive()) {
CountDownLatch connectionLatch = new CountDownLatch(1);
Intent intent = new Intent();
@@ -210,27 +210,25 @@ public class ResumeOnRebootServiceProvider {
private void throwTypedException(
ParcelableException exception)
throws IOException {
if (exception.getCause() instanceof IOException) {
throws IOException, RemoteException {
if (exception != null && exception.getCause() instanceof IOException) {
exception.maybeRethrow(IOException.class);
} else if (exception.getCause() instanceof IllegalStateException) {
exception.maybeRethrow(IllegalStateException.class);
} else {
// This should not happen. Wrap the cause in IllegalStateException so that it
// doesn't disrupt the exception handling
throw new IllegalStateException(exception.getCause());
// Wrap the exception and throw it as a RemoteException.
throw new RemoteException(TAG + " wrap/unwrap failed", exception,
true /* enableSuppression */, true /* writableStackTrace */);
}
}
private void waitForLatch(CountDownLatch latch, String reason, long timeOut)
throws TimeoutException {
throws RemoteException, TimeoutException {
try {
if (!latch.await(timeOut, TimeUnit.SECONDS)) {
throw new TimeoutException("Latch wait for " + reason + " elapsed");
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IllegalStateException("Latch wait for " + reason + " interrupted");
throw new RemoteException("Latch wait for " + reason + " interrupted");
}
}
}