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

Commit 5b021003 authored by Cody Kesting's avatar Cody Kesting
Browse files

Set NOT_VCN_MANAGED capability for Networks in VcnMgmtSvc. 

This CL updates VcnManagementService to set the NOT_VCN_MANAGED bit for
Networks that are not VCN-managed. This ensures that Networks correctly
regain the NOT_VCN_MANAGED bit after leaving a VCN.

Bug:
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I01ffdde246e602296673675add58c47c92b15994
parent 2225648d

services/core/java/com/android/server/VcnManagementService.java

+2 −0
Original line number Diff line number Diff line
@@ -835,6 +835,8 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
            if (isVcnManagedNetwork) {

                ncBuilder.removeCapability(

                        NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);

            } else {

                ncBuilder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);

            }



            if (isRestrictedCarrierWifi) {