diff options
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackStore.java | 15 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java | 10 |
2 files changed, 5 insertions, 20 deletions
diff --git a/services/core/java/com/android/server/rollback/RollbackStore.java b/services/core/java/com/android/server/rollback/RollbackStore.java index 4f894821db27..7b046c1aa3a6 100644 --- a/services/core/java/com/android/server/rollback/RollbackStore.java +++ b/services/core/java/com/android/server/rollback/RollbackStore.java @@ -199,11 +199,6 @@ class RollbackStore { * Creates a new Rollback instance for a non-staged rollback with * backupDir assigned. */ - Rollback createNonStagedRollback(int rollbackId, int userId, String installerPackageName) { - File backupDir = new File(mRollbackDataDir, Integer.toString(rollbackId)); - return new Rollback(rollbackId, backupDir, -1, userId, installerPackageName); - } - Rollback createNonStagedRollback(int rollbackId, int userId, String installerPackageName, int[] packageSessionIds) { File backupDir = new File(mRollbackDataDir, Integer.toString(rollbackId)); @@ -216,16 +211,6 @@ class RollbackStore { * backupDir assigned. */ Rollback createStagedRollback(int rollbackId, int stagedSessionId, int userId, - String installerPackageName) { - File backupDir = new File(mRollbackDataDir, Integer.toString(rollbackId)); - return new Rollback(rollbackId, backupDir, stagedSessionId, userId, installerPackageName); - } - - /** - * TODO: Now we have 4 factory methods for creating Rollback objects which is verbose and - * cumbersome. Need to merge them for simplicity. - */ - Rollback createStagedRollback(int rollbackId, int stagedSessionId, int userId, String installerPackageName, int[] packageSessionIds) { File backupDir = new File(mRollbackDataDir, Integer.toString(rollbackId)); return new Rollback(rollbackId, backupDir, stagedSessionId, userId, installerPackageName, diff --git a/services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java b/services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java index d0d2edc59861..64d05f07e64e 100644 --- a/services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java @@ -119,7 +119,7 @@ public class RollbackStoreTest { @Test public void createNonStaged() { - Rollback rollback = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER); + Rollback rollback = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER, null); assertThat(rollback.getBackupDir().getAbsolutePath()) .isEqualTo(mFolder.getRoot().getAbsolutePath() + "/" + ID); @@ -132,7 +132,7 @@ public class RollbackStoreTest { @Test public void createStaged() { - Rollback rollback = mRollbackStore.createStagedRollback(ID, 897, USER, INSTALLER); + Rollback rollback = mRollbackStore.createStagedRollback(ID, 897, USER, INSTALLER, null); assertThat(rollback.getBackupDir().getAbsolutePath()) .isEqualTo(mFolder.getRoot().getAbsolutePath() + "/" + ID); @@ -147,7 +147,7 @@ public class RollbackStoreTest { @Test public void saveAndLoadRollback() { - Rollback origRb = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER); + Rollback origRb = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER, null); origRb.setRestoreUserDataInProgress(true); origRb.info.getCausePackages().add(new VersionedPackage("com.made.up", 2)); @@ -197,7 +197,7 @@ public class RollbackStoreTest { @Test public void loadFromJson() throws Exception { - Rollback expectedRb = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER); + Rollback expectedRb = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER, null); expectedRb.setTimestamp(Instant.parse("2019-10-01T12:29:08.855Z")); expectedRb.setRestoreUserDataInProgress(true); @@ -246,7 +246,7 @@ public class RollbackStoreTest { @Test public void saveAndDelete() { - Rollback rollback = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER); + Rollback rollback = mRollbackStore.createNonStagedRollback(ID, USER, INSTALLER, null); RollbackStore.saveRollback(rollback); |