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

Commit 7458bf88 authored by Cody Kesting's avatar Cody Kesting
Browse files

Notify VcnStatusCallback#onVcnStatusChanged for Safe Mode. 

This CL updates VcnManagementService to notify callbacks when VCNs enter
Safe Mode via #onVcnStatusChanged. Callbacks were previously notified
via #onEnteredSafeMode - however, VcnStatusCallbacks were changed to
provide more status information by defining onVcnStatusChanged(int) per
API Council feedback.

Bug: 1597023
Test: atest FrameworksVcnTests
Change-Id: I34ef76ec29f4369390449b70b37bc3cf99c09c77
parent fb657c52

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

+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server;



import static android.net.vcn.VcnManager.VCN_STATUS_CODE_SAFE_MODE;



import static com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot;

import static com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionTrackerCallback;
@@ -837,7 +839,10 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
                // Notify all registered StatusCallbacks for this subGroup

                for (VcnStatusCallbackInfo cbInfo : mRegisteredStatusCallbacks.values()) {

                    if (isCallbackPermissioned(cbInfo)) {

                        Binder.withCleanCallingIdentity(() -> cbInfo.mCallback.onEnteredSafeMode());

                        Binder.withCleanCallingIdentity(

                                () ->

                                        cbInfo.mCallback.onVcnStatusChanged(

                                                VCN_STATUS_CODE_SAFE_MODE));

                    }

                }

            }

tests/vcn/java/com/android/server/VcnManagementServiceTest.java

+6 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import static org.mockito.Mockito.doThrow; 
import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -59,6 +58,7 @@ import android.net.vcn.IVcnStatusCallback; 
import android.net.vcn.IVcnUnderlyingNetworkPolicyListener;

import android.net.vcn.VcnConfig;

import android.net.vcn.VcnConfigTest;

import android.net.vcn.VcnManager;

import android.net.vcn.VcnUnderlyingNetworkPolicy;

import android.net.wifi.WifiInfo;

import android.os.IBinder;
@@ -783,7 +783,7 @@ public class VcnManagementServiceTest { 
                true /* hasPermissionsforSubGroup */,

                true /* hasLocationPermission */);



        verify(mMockStatusCallback, times(1)).onEnteredSafeMode();

        verify(mMockStatusCallback).onVcnStatusChanged(VcnManager.VCN_STATUS_CODE_SAFE_MODE);

    }



    @Test
@@ -795,7 +795,8 @@ public class VcnManagementServiceTest { 
                false /* hasPermissionsforSubGroup */,

                true /* hasLocationPermission */);



        verify(mMockStatusCallback, never()).onEnteredSafeMode();

        verify(mMockStatusCallback, never())

                .onVcnStatusChanged(VcnManager.VCN_STATUS_CODE_SAFE_MODE);

    }



    @Test
@@ -807,7 +808,8 @@ public class VcnManagementServiceTest { 
                true /* hasPermissionsforSubGroup */,

                false /* hasLocationPermission */);



        verify(mMockStatusCallback, never()).onEnteredSafeMode();

        verify(mMockStatusCallback, never())

                .onVcnStatusChanged(VcnManager.VCN_STATUS_CODE_SAFE_MODE);

    }



    @Test