From 5d60e0a570708bcf7c73471f843304f64bcc7afa Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Thu, 3 Sep 2020 15:44:53 -0700
Subject: [PATCH] [NetworkScorerAppManager] system_server should not call non
 forUser Settings.Secure.get* methods

BUG: 166312046
Test: builds
Change-Id: Ie5a38665005257684b36ee858fe81ebdb1484ce7
---
 .../core/java/com/android/server/NetworkScorerAppManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/NetworkScorerAppManager.java b/services/core/java/com/android/server/NetworkScorerAppManager.java
index 3bcb36fd0e00d..4de40755419fb 100644
--- a/services/core/java/com/android/server/NetworkScorerAppManager.java
+++ b/services/core/java/com/android/server/NetworkScorerAppManager.java
@@ -19,6 +19,7 @@ package com.android.server;
 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 class NetworkScorerAppManager {
         }
 
         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());
         }
     }
 }