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
This commit is contained in:
@@ -34,7 +34,6 @@ import android.net.wifi.WifiEnterpriseConfig.Phase2;
|
||||
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 @@ public class WifiConfigController implements TextWatcher,
|
||||
|
||||
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 @@ public class WifiConfigController implements TextWatcher,
|
||||
}
|
||||
}
|
||||
|
||||
@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);
|
||||
|
Reference in New Issue
Block a user