Clean up split system user code in packages/apps/Settings/
Remove legacy code belonged to Andrometa project. Split system user
feature is always turned off now.
Bug: 137101239
Test: build, sync and reboot
Change-Id: Ieb84a6e131383dcd263a5d9b29a49dc64d905fe0
diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java
index e3944a6..40867aa 100644
--- a/src/com/android/settings/FallbackHome.java
+++ b/src/com/android/settings/FallbackHome.java
@@ -31,7 +31,6 @@
import android.os.Message;
import android.os.PowerManager;
import android.os.SystemClock;
-import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.util.Log;
@@ -166,12 +165,6 @@
.addCategory(Intent.CATEGORY_HOME);
final ResolveInfo homeInfo = getPackageManager().resolveActivity(homeIntent, 0);
if (Objects.equals(getPackageName(), homeInfo.activityInfo.packageName)) {
- if (UserManager.isSplitSystemUser()
- && UserHandle.myUserId() == UserHandle.USER_SYSTEM) {
- // This avoids the situation where the system user has no home activity after
- // SUW and this activity continues to throw out warnings. See b/28870689.
- return;
- }
Log.d(TAG, "User unlocked but no home; let's hope someone enables one soon?");
mHandler.sendEmptyMessageDelayed(0, 500);
} else {
diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
index 36ad2ce..c3031ef 100644
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -613,8 +613,7 @@
/** Returns whether there is only one user on this device, not including the system-only user */
private boolean isSingleUser() {
final int userCount = mUserManager.getUserCount();
- return userCount == 1
- || (mUserManager.isSplitSystemUser() && userCount == 2);
+ return userCount == 1;
}
private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 59de675..4602bb4 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -34,7 +34,6 @@
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.IBinder;
-import android.os.UserManager;
import android.security.Credentials;
import android.security.KeyStore;
import android.telephony.SubscriptionInfo;
@@ -443,10 +442,7 @@
mSsidScanButton.setVisibility(View.GONE);
}
-
- if (!isSplitSystemUser()) {
- mSharedCheckBox.setVisibility(View.GONE);
- }
+ mSharedCheckBox.setVisibility(View.GONE);
mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
if (mConfigUi.getSubmitButton() != null) {
@@ -459,13 +455,6 @@
}
}
- @VisibleForTesting
- boolean isSplitSystemUser() {
- final UserManager userManager =
- (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- return userManager.isSplitSystemUser();
- }
-
private void addRow(ViewGroup group, int name, String value) {
View row = mConfigUi.getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
((TextView) row.findViewById(R.id.name)).setText(name);
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 37013f2..f398f26 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -32,7 +32,6 @@
import android.net.wifi.WifiEnterpriseConfig.Phase2;
import android.net.wifi.WifiManager;
import android.os.IBinder;
-import android.os.UserManager;
import android.security.Credentials;
import android.security.KeyStore;
import android.telephony.SubscriptionInfo;
@@ -408,10 +407,7 @@
mSsidScanButton.setVisibility(View.GONE);
}
-
- if (!isSplitSystemUser()) {
- mSharedCheckBox.setVisibility(View.GONE);
- }
+ mSharedCheckBox.setVisibility(View.GONE);
mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
if (mConfigUi.getSubmitButton() != null) {
@@ -422,13 +418,6 @@
mView.findViewById(R.id.l_wifidialog).requestFocus();
}
- @VisibleForTesting
- boolean isSplitSystemUser() {
- final UserManager userManager =
- (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- return userManager.isSplitSystemUser();
- }
-
private void addRow(ViewGroup group, int name, String value) {
View row = mConfigUi.getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
((TextView) row.findViewById(R.id.name)).setText(name);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 93663bd..5689b9f 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -431,11 +431,6 @@
}
@Override
- boolean isSplitSystemUser() {
- return false;
- }
-
- @Override
KeyStore getKeyStore() {
return mKeyStore;
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 8f73bc3..e5017bd 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -412,11 +412,6 @@
}
@Override
- boolean isSplitSystemUser() {
- return false;
- }
-
- @Override
KeyStore getKeyStore() { return mKeyStore; }
}