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

Commit 82d0c27d authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Add check to prevent resetting VPN always-on setting in safe mode am: 46014fcd am: e36d8a16 

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



Change-Id: I7db1c9b94cc6040ef80a605b3c8c9580f77ec0c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53fc5b1d e36d8a16

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

+5 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,11 @@ public class Vpn { 
            }

            // Remove always-on VPN if it's not supported.

            if (!isAlwaysOnPackageSupported(alwaysOnPackage)) {

                // Do not remove the always-on setting due to the restricted ability in safe mode.

                // The always-on VPN can then start after the device reboots to normal mode.

                if (!mContext.getPackageManager().isSafeMode()) {

                    setAlwaysOnPackage(null, false, null);

                }

                return false;

            }

            // Skip if the service is already established. This isn't bulletproof: it's not bound