From 5d623992e93fdf22fb1c68cfecd82ad2abaa9e74 Mon Sep 17 00:00:00 2001
From: Cody Kesting <ckesting@google.com>
Date: Fri, 19 Feb 2021 17:36:32 -0800
Subject: [PATCH] Remove VcnStatusCallback#onEnteredSafemode().

This CL removes VcnStatusCallback#onEnteredSafeMode(). This method was
previously used to notify callbacks when their VCN entered Safe Mode.
However, this is not needed now that
VcnStatusCallback#onVcnStatusChanged(int) is defined.

Bug: 1597023
Test: atest FrameworksVcnTests
Change-Id: I8e47de9bf6763cd38025a552bee710673dddf843
---
 .../android/net/vcn/IVcnStatusCallback.aidl   |  1 -
 core/java/android/net/vcn/VcnManager.java     | 20 -------------------
 .../java/android/net/vcn/VcnManagerTest.java  |  3 ---
 3 files changed, 24 deletions(-)

diff --git a/core/java/android/net/vcn/IVcnStatusCallback.aidl b/core/java/android/net/vcn/IVcnStatusCallback.aidl
index d91cef592d10c..236ae8bb11b2b 100644
--- a/core/java/android/net/vcn/IVcnStatusCallback.aidl
+++ b/core/java/android/net/vcn/IVcnStatusCallback.aidl
@@ -18,7 +18,6 @@ package android.net.vcn;
 
 /** @hide */
 oneway interface IVcnStatusCallback {
-    void onEnteredSafeMode();
     void onVcnStatusChanged(int statusCode);
     void onGatewayConnectionError(
             in int[] gatewayNetworkCapabilities,
diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java
index c1d6edf898bd2..8ebf757760c34 100644
--- a/core/java/android/net/vcn/VcnManager.java
+++ b/core/java/android/net/vcn/VcnManager.java
@@ -427,20 +427,6 @@ public class VcnManager {
     public abstract static class VcnStatusCallback {
         private VcnStatusCallbackBinder mCbBinder;
 
-        /**
-         * Invoked when the VCN for this Callback's subscription group enters safe mode.
-         *
-         * <p>A VCN will be put into safe mode if any of the gateway connections were unable to
-         * establish a connection within a system-determined timeout (while underlying networks were
-         * available).
-         *
-         * @deprecated Removed in favor of {@link #onVcnStatusChanged(int)}. To be removed in a
-         *     followup patch.
-         * @hide
-         */
-        @Deprecated
-        public void onEnteredSafeMode() {}
-
         /**
          * Invoked when status of the VCN for this callback's subscription group changes.
          *
@@ -584,12 +570,6 @@ public class VcnManager {
             mCallback = callback;
         }
 
-        @Override
-        public void onEnteredSafeMode() {
-            Binder.withCleanCallingIdentity(
-                    () -> mExecutor.execute(() -> mCallback.onEnteredSafeMode()));
-        }
-
         @Override
         public void onVcnStatusChanged(@VcnStatusCode int statusCode) {
             Binder.withCleanCallingIdentity(
diff --git a/tests/vcn/java/android/net/vcn/VcnManagerTest.java b/tests/vcn/java/android/net/vcn/VcnManagerTest.java
index 66590c92579b2..7515971b8307a 100644
--- a/tests/vcn/java/android/net/vcn/VcnManagerTest.java
+++ b/tests/vcn/java/android/net/vcn/VcnManagerTest.java
@@ -203,9 +203,6 @@ public class VcnManagerTest {
         IVcnStatusCallback cbBinder =
                 new VcnStatusCallbackBinder(INLINE_EXECUTOR, mMockStatusCallback);
 
-        cbBinder.onEnteredSafeMode();
-        verify(mMockStatusCallback).onEnteredSafeMode();
-
         cbBinder.onVcnStatusChanged(VCN_STATUS_CODE_ACTIVE);
         verify(mMockStatusCallback).onVcnStatusChanged(VCN_STATUS_CODE_ACTIVE);