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

Commit 89ca8b30 authored by chiachangwang's avatar chiachangwang
Browse files

Update the prefix in keystore for app exclusion 

Update the string without the underscore to prevent conflict with
the existing VPN prefix.

Settings app may get exception when the vpn exclusion list was
set since the logic is used in the Settings relying on the
prefix match. The current app exclusion prefix is also started
with "VPN_", so it will be mis-used by Settings as a VPN profile.

Bug: 237345836
Test: atest FrameworksNetTests
Change-Id: I01e773cc15eb1ae5ffaa12aef124bbbf390cc004
parent 1af24cfd

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.