Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96421147 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

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

Merge "Replace hidden UserHandle.isApp() usage for mainline" am: c095d605 am: 409d8477 am: ceb1e912

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bd4ca074fc70b58194b8bd27e0e33d22cbaa1b8
parents fcfb4c19 ceb1e912

core/java/android/net/NetworkPolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -500,7 +500,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;

        }