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

Remove some factory methods (7/n)

Browse Source 
Address the comment:
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10058522/5/services/core/java/com/android/server/rollback/RollbackStore.java#226

Bug: 147400979
Test: atest RollbackStoreTest
Change-Id: Ibc6a855f252e1f4226f5c121dd763c7b4baef5f1
This commit is contained in:
JW Wang
2020-02-03 09:32:52 +08:00
parent c0d627749a
commit 1aba59bbae
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/rollback/RollbackStore.java
View File

@@ -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));
@@ -215,16 +210,6 @@ class RollbackStore {
* Creates a new Rollback instance for a staged rollback with
* 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));

10
services/tests/servicestests/src/com/android/server/rollback/RollbackStoreTest.java
View File

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