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

Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev

Browse Source
This commit is contained in:
Martijn Coenen
2019-04-15 17:38:08 +00:00
committed by Android (Google) Code Review
parent c6a1bf1ac1 0a8217f519
commit ad6195dc40
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -261,13 +261,13 @@ public class StagingManager {
if (storageManager.supportsCheckpoint()) { if (storageManager.supportsCheckpoint()) {
storageManager.startCheckpoint(1 /* numRetries */); storageManager.startCheckpoint(1 /* numRetries */);
} }
} catch (RemoteException e) { } catch (Exception e) { // TODO(b/130190815) make a RemoteException again
// While StorageManager lives in the same process, the native implementation // While StorageManager lives in the same process, the native implementation
// it calls through lives in 'vold'; so, this call can fail if 'vold' isn't // it calls through lives in 'vold'; so, this call can fail if 'vold' isn't
// reachable. // reachable.
// Since we can live without filesystem checkpointing, just warn in this case // Since we can live without filesystem checkpointing, just warn in this case
// and continue. // and continue.
Slog.w(TAG, "Could not start filesystem checkpoint."); Slog.w(TAG, "Could not start filesystem checkpoint:", e);
} }
session.setStagedSessionReady(); session.setStagedSessionReady();