summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-03-21 15:52:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-21 15:52:22 +0000
commit1af362e233ae02ca2ff7ca2eb2222bd30388c0da (patch)
tree5ba3400a1a8cd3c3d82405a380f8e025447e14d1
parentf4d0aa27071cce27f09797452c2fd4948edecc94 (diff)
parentfbac4ca9adc243385ce9d57aef7781c73b2c45db (diff)
Merge "Fix issues with RollbackTest"
-rw-r--r--tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
index 52919df1cf0a..834743d7ffed 100644
--- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
+++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
@@ -39,7 +39,6 @@ import android.util.Log;
import androidx.test.InstrumentationRegistry;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -531,7 +530,6 @@ public class RollbackTest {
/**
* Test rollback of apks involving splits.
*/
- @Ignore("b/127520966 build issues with splits need to be sorted out")
@Test
public void testRollbackWithSplits() throws Exception {
try {
@@ -827,6 +825,7 @@ public class RollbackTest {
RollbackTestUtils.adoptShellPermissionIdentity(
Manifest.permission.INSTALL_PACKAGES,
Manifest.permission.DELETE_PACKAGES,
+ Manifest.permission.MANAGE_ROLLBACKS,
Manifest.permission.TEST_MANAGE_ROLLBACKS,
Manifest.permission.KILL_BACKGROUND_PROCESSES,
Manifest.permission.RESTART_PACKAGES);