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

Fix confusion of userId vs. uid

Browse Source 
There function was trying to get the UserHandle of a userId,
but was instead treating the userId as a uid, and thereby
getting the wrong UserHandle.

Bug: 162543841
Test: com.android.frameworks.telephonytests (i.e. FrameworksTelephonyTests)

Change-Id: I2b6f9c92f1d101fe18a5fdf54b85aa5acf9c94b0
This commit is contained in:
Adam Bookatz
2020-07-30 16:03:40 -07:00
parent 75301c4bc6
commit 1599e0207c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.internal.telephony;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -74,7 +75,7 @@ public final class CarrierAppUtils {
* privileged apps may have changed.
*/
public static synchronized void disableCarrierAppsUntilPrivileged(String callingPackage,
TelephonyManager telephonyManager, int userId, Context context) {
TelephonyManager telephonyManager, @UserIdInt int userId, Context context) {
if (DEBUG) {
Log.d(TAG, "disableCarrierAppsUntilPrivileged");
}
@@ -101,7 +102,7 @@ public final class CarrierAppUtils {
* Manager can kill it, and this can lead to crashes as the app is in an unexpected state.
*/
public static synchronized void disableCarrierAppsUntilPrivileged(String callingPackage,
int userId, Context context) {
@UserIdInt int userId, Context context) {
if (DEBUG) {
Log.d(TAG, "disableCarrierAppsUntilPrivileged");
}
@@ -117,9 +118,9 @@ public final class CarrierAppUtils {
systemCarrierAssociatedAppsDisabledUntilUsed, context);
}
private static ContentResolver getContentResolverForUser(Context context, int userId) {
Context userContext = context.createContextAsUser(UserHandle.getUserHandleForUid(userId),
0);
private static ContentResolver getContentResolverForUser(Context context,
@UserIdInt int userId) {
Context userContext = context.createContextAsUser(UserHandle.of(userId), 0);
return userContext.getContentResolver();
}