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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-17 00:08:44 +00:00
committed by Android (Google) Code Review
parent 57c3895451 937eb58169
commit 40388abe3c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/common/com/android/internal/telephony/CarrierAppUtils.java
View File

@@ -157,7 +157,8 @@ public final class CarrierAppUtils {
List<String> enabledCarrierPackages = new ArrayList<>();
int carrierAppsHandledSdk =
Settings.Secure.getInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 0);
Settings.Secure.getIntForUser(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED,
0, contentResolver.getUserId());
if (DEBUG) {
Log.i(TAG, "Last execution SDK: " + carrierAppsHandledSdk);
}
@@ -309,8 +310,8 @@ public final class CarrierAppUtils {
// Mark the execution so we do not disable apps again on this SDK version.
if (!hasRunEver || !hasRunForSdk) {
Settings.Secure.putInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED,
Build.VERSION.SDK_INT);
Settings.Secure.putIntForUser(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED,
Build.VERSION.SDK_INT, contentResolver.getUserId());
}
if (!enabledCarrierPackages.isEmpty()) {