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

Merge "[policy] system_server should not call non forUser Settings.Secure.get* methods"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-04 00:34:33 +00:00
committed by Android (Google) Code Review
parent 9ad845bfb4 e447e11083
commit a530f8ef06
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -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
}