summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/policy/PermissionPolicyService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java
index ae2b040d0a89..e1cd9e334f4c 100644
--- a/services/core/java/com/android/server/policy/PermissionPolicyService.java
+++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java
@@ -31,6 +31,7 @@ import android.annotation.UserIdInt;
import android.app.AppOpsManager;
import android.app.AppOpsManagerInternal;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -242,8 +243,9 @@ public final class PermissionPolicyService extends SystemService {
public void onReceive(Context context, Intent intent) {
boolean hasSetupRun = true;
try {
- hasSetupRun = Settings.Secure.getInt(getContext().getContentResolver(),
- Settings.Secure.USER_SETUP_COMPLETE) != 0;
+ final ContentResolver cr = getContext().getContentResolver();
+ hasSetupRun = Settings.Secure.getIntForUser(cr,
+ Settings.Secure.USER_SETUP_COMPLETE, cr.getUserId()) != 0;
} catch (Settings.SettingNotFoundException e) {
// Ignore error, assume setup has run
}