commit b7d4b51edc430d1c9c31bb9145aa4aab4ec00ab9
author rambowang <rambowang@google.com> Tue Jul 09 20:12:29 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 09 20:12:29 2024 +0000
tree e212bba1974f684ac664a49aa6b7bcfe48eb7c28
parent 230bf7b5c41eb82861c6405098484ca722eb4818
parent 1879bc303304f260543ff7d261100be30e17400e

Check system and phone UID in multiple-user-aware way am: 1879bc3033

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3163003

Change-Id: I94ebe456df45a8c12d75fa39da4d2df71034000a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/server/connectivity/ConnectivityNativeService.java

diff --git a/service/src/com/android/server/connectivity/ConnectivityNativeService.java b/service/src/com/android/server/connectivity/ConnectivityNativeService.java
index cf6127f..917ad4d 100644
--- a/service/src/com/android/server/connectivity/ConnectivityNativeService.java
+++ b/service/src/com/android/server/connectivity/ConnectivityNativeService.java
@@ -23,6 +23,7 @@
 import android.os.Binder;
 import android.os.Process;
 import android.os.ServiceSpecificException;
+import android.os.UserHandle;
 import android.system.ErrnoException;
 import android.util.Log;
 
@@ -67,8 +68,8 @@
     }
 
     private void enforceBlockPortPermission() {
-        final int uid = Binder.getCallingUid();
-        if (uid == Process.ROOT_UID || uid == Process.PHONE_UID) return;
+        final int appId = UserHandle.getAppId(Binder.getCallingUid());
+        if (appId == Process.ROOT_UID || appId == Process.PHONE_UID) return;
         PermissionUtils.enforceNetworkStackPermission(mContext);
     }