Merge "Revert "Device do network scan after user rotates NetworkSelection page""

2021-11-17 06:24:53 +00:00
parent f9c230bdc8 3c9580d573
commit f5e2d52f43
8 changed files with 44 additions and 59 deletions
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -122,6 +122,10 @@ public class NetworkSelectSettingsTest {

        public TargetClass(NetworkSelectSettingsTest env) {
            mTestEnv = env;
+
+            Bundle bundle = new Bundle();
+            bundle.putInt(Settings.EXTRA_SUB_ID, SUB_ID);
+            setArguments(bundle);
        }

        @Override
@@ -180,11 +184,6 @@ public class NetworkSelectSettingsTest {
        protected boolean enableAggregation(Context context) {
            return mTestEnv.mIsAggregationEnabled;
        }
-
-        @Override
-        protected int getSubId() {
-            return SUB_ID;
-        }
    }

    @Test