commit 6384812b27911140d93e5398ea82e49e7cb79143
author Adam He <adamhe@google.com> Tue Jul 09 14:19:47 2019 -0700
committer Adam He <adamhe@google.com> Wed Jul 10 13:28:19 2019 -0700
tree 4235125d1e53ee2c6602cb2c7bc058eccd892500
parent 66c02ffd6d954673c4412a7e7349b491595d82b5

Check mSetupComplete on initialization to avoid service being disabled.

Fixes: 135297073
Test: manual verification && atest CtsContentCaptureServiceTestCases
Change-Id: Ida283990c7800ac6946f7e5905e67ca1b21d8bbc

services/core/java/com/android/server/infra/AbstractPerUserSystemService.java

diff --git a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
index c52921e..16cf7ee 100644
--- a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
@@ -75,6 +75,14 @@
         mMaster = master;
         mLock = lock;
         mUserId = userId;
+        updateIsSetupComplete(userId);
+    }
+
+    /** Updates whether setup is complete for current user */
+    private void updateIsSetupComplete(@UserIdInt int userId) {
+        final String setupComplete = Settings.Secure.getStringForUser(
+                getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, userId);
+        mSetupComplete = "1".equals(setupComplete);
     }
 
     /**
@@ -143,9 +151,7 @@
                     + ", disabled=" + disabled + ", mDisabled=" + mDisabled);
         }
 
-        final String setupComplete = Settings.Secure.getStringForUser(
-                getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, mUserId);
-        mSetupComplete = "1".equals(setupComplete);
+        updateIsSetupComplete(mUserId);
         mDisabled = disabled;
 
         updateServiceInfoLocked();