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

Commit 6a9ed4aa authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 6b21f4e6: Allow System UI access to VPN. 

* commit '6b21f4e67d482cf765aac8c1d9dda38e1541b8ad':
  Allow System UI access to VPN.
parents 9226f8a3 e47df846

services/core/java/com/android/server/connectivity/Vpn.java

+5 −0
Original line number Diff line number Diff line
@@ -684,6 +684,11 @@ public class Vpn { 
            if (((app.flags & ApplicationInfo.FLAG_SYSTEM) != 0) && (appId == app.uid)) {

                return;

            }

            // SystemUI dialogs are also allowed to control VPN.

            ApplicationInfo sysUiApp = pm.getApplicationInfo("com.android.systemui", 0);

            if (((sysUiApp.flags & ApplicationInfo.FLAG_SYSTEM) != 0) && (appId == sysUiApp.uid)) {

                return;

            }

        } catch (Exception e) {

            // ignore

        } finally {