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

Merge "Replace hidden UserHandle.isApp() usage for mainline" am: c095d60582

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I233ae9cad18efe02e57b424fb5ab9ff7e9d528b5
This commit is contained in:
Chiachang Wang
2021-01-13 08:12:23 +00:00
committed by Automerger Merge Worker
parent 318dd035a6 c095d60582
commit 409d84773e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkPolicyManager.java
View File

@@ -32,8 +32,8 @@ import android.content.pm.Signature;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.os.Build; import android.os.Build;
import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.telephony.SubscriptionPlan; import android.telephony.SubscriptionPlan;
import android.util.DebugUtils; import android.util.DebugUtils;
import android.util.Pair; import android.util.Pair;
@@ -500,7 +500,7 @@ public class NetworkPolicyManager {
@Deprecated @Deprecated
public static boolean isUidValidForPolicy(Context context, int uid) { public static boolean isUidValidForPolicy(Context context, int uid) {
// first, quick-reject non-applications // first, quick-reject non-applications
if (!UserHandle.isApp(uid)) { if (!Process.isApplicationUid(uid)) {
return false; return false;
} }