Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: ff7dc60895 am: 8f9c9e6402

Change-Id: I29886624ce72c8cb3ca6c297ccb7ff1d63e435c2
2020-03-25 05:15:23 +00:00
parent 00f2672399 8f9c9e6402
commit e1c699c7af
2 changed files with 32 additions and 12 deletions
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
@@ -111,9 +111,16 @@ public class MobileNetworkActivityTest {

        private SubscriptionInfo mSubscriptionInFragment;

+        @Override
+        ProxySubscriptionManager getProxySubscriptionManager() {
+            if (mProxySubscriptionMgr == null) {
+                mProxySubscriptionMgr = mock(ProxySubscriptionManager.class);
+            }
+            return mProxySubscriptionMgr;
+        }
+
        @Override
        void registerActiveSubscriptionsListener() {
-            mProxySubscriptionMgr = mock(ProxySubscriptionManager.class);
            onChanged();
        }