summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2021-01-13 10:45:37 +0800
committerChiachang Wang <chiachangwang@google.com>2021-01-13 03:23:58 +0000
commit6548e1d84fb592c8a95a8aac63303ced44335cef (patch)
tree60e330a9761345dc790244ec17345057657e72ef /core/java/android
parentf0341dc38b9d2a7b055c29e9dbb834cfc0434c61 (diff)
Replace hidden UserHandle.isApp() usage for mainline
ConnectivityService is going to become a mainline module which is not able to access hidden APIs. NetworkPolicyManager will be part of connectivity framework sources which should also not access hidden APIs. Thus, replace usage of UserHandle.isApp() by public Process.isApplicationUid() instead. Bug: 170598012 Test: m Change-Id: I6eecc618d574352b924cb5f33f364e2dca9d730f
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/NetworkPolicyManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index ce16a7835179..4b2b1edb3848 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -32,8 +32,8 @@ import android.content.pm.Signature;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.os.Build;
+import android.os.Process;
import android.os.RemoteException;
-import android.os.UserHandle;
import android.telephony.SubscriptionPlan;
import android.util.DebugUtils;
import android.util.Pair;
@@ -473,7 +473,7 @@ public class NetworkPolicyManager {
@Deprecated
public static boolean isUidValidForPolicy(Context context, int uid) {
// first, quick-reject non-applications
- if (!UserHandle.isApp(uid)) {
+ if (!Process.isApplicationUid(uid)) {
return false;
}