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

Commit 48347e02 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Add a null pointer check to the VcnConfig" into udc-dev am: e7f818af 

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



Change-Id: I1b69896bd66dfd11f71ec6dc32b62e1fc51ccec8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04d47245 e7f818af

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -1065,13 +1065,20 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
            boolean isRestricted = false;

            boolean isRestricted = false;

            synchronized (mLock) {

            synchronized (mLock) {

                final Vcn vcn = mVcns.get(subGrp);

                final Vcn vcn = mVcns.get(subGrp);

                final VcnConfig vcnConfig = mConfigs.get(subGrp);

                if (vcn != null) {

                if (vcn != null) {

                    if (vcnConfig == null) {

                        // TODO: b/284381334 Investigate for the root cause of this issue

                        // and handle it properly

                        logWtf("Vcn instance exists but VcnConfig does not for " + subGrp);

                    }



                    if (vcn.getStatus() == VCN_STATUS_CODE_ACTIVE) {

                    if (vcn.getStatus() == VCN_STATUS_CODE_ACTIVE) {

                        isVcnManagedNetwork = true;

                        isVcnManagedNetwork = true;

                    }

                    }





                    final Set<Integer> restrictedTransports = mDeps.getRestrictedTransports(

                    final Set<Integer> restrictedTransports = mDeps.getRestrictedTransports(

                            subGrp, mLastSnapshot, mConfigs.get(subGrp));

                            subGrp, mLastSnapshot, vcnConfig);

                    for (int restrictedTransport : restrictedTransports) {

                    for (int restrictedTransport : restrictedTransports) {

                        if (ncCopy.hasTransport(restrictedTransport)) {

                        if (ncCopy.hasTransport(restrictedTransport)) {

                            if (restrictedTransport == TRANSPORT_CELLULAR

                            if (restrictedTransport == TRANSPORT_CELLULAR