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

Commit 0cd153c2 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Make sure to udpate enterprise id" am: 724e9d6a 

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

Change-Id: I197e3ffcb876739c724942915c08a323565c7a35
parents d4b635fa 724e9d6a

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; 
import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;

import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_DEFAULT;

import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_ENTERPRISE;

import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1;

import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK;

import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;

import static android.provider.Settings.Secure.USER_SETUP_COMPLETE;
@@ -17541,7 +17542,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                ? PROFILE_NETWORK_PREFERENCE_ENTERPRISE : PROFILE_NETWORK_PREFERENCE_DEFAULT;

        ProfileNetworkPreference.Builder preferenceBuilder =

                new ProfileNetworkPreference.Builder();

        preferenceBuilder.setPreference(networkPreference);

        if (preferentialNetworkServiceEnabled) {

            preferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);

            preferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);

        } else {

            preferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_DEFAULT);

        }

        List<ProfileNetworkPreference> preferences = new ArrayList<>();

        preferences.add(preferenceBuilder.build());

        mInjector.binderWithCleanCallingIdentity(() ->

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE; 
import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_DEFAULT;

import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_ENTERPRISE;

import static android.net.InetAddresses.parseNumericAddress;

import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1;



import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE;

import static com.android.internal.widget.LockPatternUtils.EscrowTokenStateChangeCallback;
@@ -4109,6 +4110,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        ProfileNetworkPreference preferenceDetails2 =

                new ProfileNetworkPreference.Builder()

                        .setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE)

                        .setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1)

                        .build();

        List<ProfileNetworkPreference> preferences2 = new ArrayList<>();

        preferences2.add(preferenceDetails);