commit 95da4898b8ef6cbc55b672939f1b9be521a1ae40
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Jan 27 06:33:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jan 27 06:33:24 2019 +0000
tree 531b85798b90097ad0f1aac1cd2d8188b46eb829
parent 8bcdea718259459ab32f325ed13b09c23ffbbd27
parent 2c5f04bf360a0d1d9a92f6842b0db7ead819888e

Merge "Check if Test Harness Mode is enabling on boot"

services/core/java/com/android/server/testharness/TestHarnessModeService.java

diff --git a/services/core/java/com/android/server/testharness/TestHarnessModeService.java b/services/core/java/com/android/server/testharness/TestHarnessModeService.java
index 23c042a5..4adce58 100644
--- a/services/core/java/com/android/server/testharness/TestHarnessModeService.java
+++ b/services/core/java/com/android/server/testharness/TestHarnessModeService.java
@@ -66,6 +66,7 @@
     private static final String TEST_HARNESS_MODE_PROPERTY = "persist.sys.test_harness";
 
     private PersistentDataBlockManagerInternal mPersistentDataBlockManagerInternal;
+    private boolean mShouldSetUpTestHarnessMode;
 
     public TestHarnessModeService(Context context) {
         super(context);
@@ -96,6 +97,7 @@
             // There's no data to apply, so leave it as-is.
             return;
         }
+        mShouldSetUpTestHarnessMode = true;
         PersistentData persistentData = PersistentData.fromBytes(testHarnessModeData);
 
         SystemProperties.set(TEST_HARNESS_MODE_PROPERTY, persistentData.mEnabled ? "1" : "0");
@@ -124,6 +126,9 @@
     }
 
     private void disableAutoSync() {
+        if (!mShouldSetUpTestHarnessMode) {
+            return;
+        }
         UserInfo primaryUser = UserManager.get(getContext()).getPrimaryUser();
         ContentResolver
             .setMasterSyncAutomaticallyAsUser(false, primaryUser.getUserHandle().getIdentifier());