Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a null pointer check to the VcnConfig" am: c80d564f74

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

Change-Id: Ifb0c0f46f79c6825f7ee89f30687f91765f8ecca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yan Yan
2023-06-09 00:22:03 +00:00
committed by Automerger Merge Worker
parent 739ecc6c62 c80d564f74
commit 186bbf0e20
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/VcnManagementService.java
View File

@@ -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