commit 5d60e0a570708bcf7c73471f843304f64bcc7afa
author Songchun Fan <schfan@google.com> Thu Sep 03 15:44:53 2020 -0700
committer Songchun Fan <schfan@google.com> Thu Sep 03 23:08:41 2020 +0000
tree 8628e53a8a07e15429b316fe46126623ff9c333a
parent 4743509c7e05eacda785bebe9f4226a39ec945be

[NetworkScorerAppManager] system_server should not call non forUser Settings.Secure.get* methods

BUG: 166312046
Test: builds
Change-Id: Ie5a38665005257684b36ee858fe81ebdb1484ce7

services/core/java/com/android/server/NetworkScorerAppManager.java

diff --git a/services/core/java/com/android/server/NetworkScorerAppManager.java b/services/core/java/com/android/server/NetworkScorerAppManager.java
index 3bcb36f..4de4075 100644
--- a/services/core/java/com/android/server/NetworkScorerAppManager.java
+++ b/services/core/java/com/android/server/NetworkScorerAppManager.java
@@ -19,6 +19,7 @@
 import android.Manifest.permission;
 import android.annotation.Nullable;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.PermissionChecker;
@@ -404,7 +405,8 @@
         }
 
         public int getSecureInt(Context context, String name, int defaultValue) {
-            return Settings.Secure.getInt(context.getContentResolver(), name, defaultValue);
+            final ContentResolver cr = context.getContentResolver();
+            return Settings.Secure.getIntForUser(cr, name, defaultValue, cr.getUserId());
         }
     }
 }