commit acbc6ca216f87975dcd585839341c4d573550891
author Oliver Scott <olivercscott@gmail.com> Mon Jan 10 20:18:08 2022 +0100
committer Jackeagle <jackeagle102@gmail.com> Wed Aug 30 00:57:08 2023 -0400
tree 0a35a2c6e951ab15b1337914a1eead82f34d23f9
parent 6e52a0dbcc96e787d6a6e9128df6abdaf92ffc7a

setUidsAllowedOnRestrictedNetworks: Modify UID enforcement to check app id

Binder's calling UID seems to return the full UID on occasion which fails when commpared to Process.SYSTEM_UID. Return the app id instead.

Issue: calyxos#823
Change-Id: Ieb84d389b4f160370be2c890db4705d920aba4ee
Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>

framework/src/android/net/ConnectivitySettingsManager.java

diff --git a/framework/src/android/net/ConnectivitySettingsManager.java b/framework/src/android/net/ConnectivitySettingsManager.java
index 822e67d..32f8319 100644
--- a/framework/src/android/net/ConnectivitySettingsManager.java
+++ b/framework/src/android/net/ConnectivitySettingsManager.java
@@ -1050,7 +1050,7 @@
     }
 
     private static boolean isCallingFromSystem() {
-        final int uid = Binder.getCallingUid();
+        final int uid = UserHandle.getAppId(Binder.getCallingUid());
         final int pid = Binder.getCallingPid();
         if (uid == Process.SYSTEM_UID && pid == Process.myPid()) {
             return true;