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

Commit 130ff1d8 authored by chiachangwang's avatar chiachangwang Committed by Automerger Merge Worker
Browse files

Update the prefix in keystore for app exclusion am: 89ca8b30 am: 187347f0... 

Update the prefix in keystore for app exclusion am: 89ca8b30 am: 187347f0 am: 06ca3b21 am: 906b5515

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



Change-Id: I9dc5d2f212bc8e4ebc17f346265ca5866dc62709
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24cfeffc 906b5515

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

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public class Vpn { 
    private static final boolean LOGD = true;

    private static final String ANDROID_KEYSTORE_PROVIDER = "AndroidKeyStore";

    /** Key containing prefix of vpn app excluded list */

    @VisibleForTesting static final String VPN_APP_EXCLUDED = "VPN_APP_EXCLUDED_";

    @VisibleForTesting static final String VPN_APP_EXCLUDED = "VPNAPPEXCLUDED_";



    // Length of time (in milliseconds) that an app hosting an always-on VPN is placed on

    // the device idle allowlist during service launch and VPN bootstrap.