From de8be88614bd9a1fc1acd0848042b8d8e8cc5f97 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Tue, 9 Jun 2020 13:59:04 +0800 Subject: [PATCH] Some RollbackManagerInternal cleanup (7/n) As of ag/10689533, RollbackManagerInternal is a local service which will not throw runtime exceptions. Let's remove unused try/catch blocks. Bug: 150347230 Test: atest RollbackTest StagedRollbackTest Change-Id: Ifde3e7dd2bd97abde27854a57b55b42b3e30799b --- .../server/pm/PackageManagerService.java | 9 ++------- .../com/android/server/pm/StagingManager.java | 18 +++++------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 55a29b65563b5..40cca0e3ef33b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -14464,13 +14464,8 @@ public class PackageManagerService extends IPackageManager.Stub if (ps != null && doSnapshotOrRestore) { final String seInfo = AndroidPackageUtils.getSeInfo(res.pkg, ps); - try { - rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers), - appId, ceDataInode, seInfo, token); - } catch (RuntimeException re) { - Log.e(TAG, "Error snapshotting/restoring user data: " + re); - return false; - } + rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers), + appId, ceDataInode, seInfo, token); return true; } return false; diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 200a15e45ed36..5862c5cf837dd 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -521,13 +521,9 @@ public class StagingManager { private void snapshotAndRestoreApexUserData( String packageName, int[] allUsers, RollbackManagerInternal rm) { - try { - // appId, ceDataInode, and seInfo are not needed for APEXes - rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(allUsers), 0, 0, - null, 0 /*token*/); - } catch (RuntimeException re) { - Slog.e(TAG, "Error snapshotting/restoring user data: " + re); - } + // appId, ceDataInode, and seInfo are not needed for APEXes + rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(allUsers), 0, 0, + null, 0 /*token*/); } private void snapshotAndRestoreApkInApexUserData( @@ -551,12 +547,8 @@ public class StagingManager { final int[] installedUsers = ps.queryInstalledUsers(allUsers, true); final String seInfo = AndroidPackageUtils.getSeInfo(pkg, ps); - try { - rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers), - appId, ceDataInode, seInfo, 0 /*token*/); - } catch (RuntimeException re) { - Slog.e(TAG, "Error snapshotting/restoring user data: " + re); - } + rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers), + appId, ceDataInode, seInfo, 0 /*token*/); } }