Merge "Clean up split system user code in packages/apps/Settings/"

2021-01-15 04:18:25 +00:00
parent fd401c0167 460c2cbc0f
commit 11cbb5f6f9
6 changed files with 3 additions and 43 deletions
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -430,11 +430,6 @@ public class WifiConfigController2Test {
            super(parent, view, wifiEntry, mode, wifiManager);
        }

-        @Override
-        boolean isSplitSystemUser() {
-            return false;
-        }
-
        @Override
        KeyStore getKeyStore() {
            return mKeyStore;
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -411,11 +411,6 @@ public class WifiConfigControllerTest {
            super(parent, view, accessPoint, mode, wifiManager);
        }

-        @Override
-        boolean isSplitSystemUser() {
-            return false;
-        }
-
        @Override
        KeyStore getKeyStore() { return mKeyStore; }
    }