PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I91a72f38cc22583202c9c707463735d3f436aac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2022-11-22 14:08:29 +00:00
committed by Automerger Merge Worker
parent a4c9dbd3db ead8a35720
commit 2decf2ae45
4 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/IccLockSettings.java
View File

@@ -174,9 +174,8 @@ public class IccLockSettings extends SettingsPreferenceFragment
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (Utils.isMonkeyRunning() ||
!SubscriptionUtil.isSimHardwareVisible(getContext())) {
finishFragment();
if (Utils.isMonkeyRunning()) {
finish();
return;
}

5
src/com/android/settings/security/SimLockPreferenceController.java
View File

@@ -28,7 +28,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.SubscriptionUtil;
import java.util.List;
@@ -51,10 +50,6 @@ public class SimLockPreferenceController extends BasePreferenceController {
@Override
public int getAvailabilityStatus() {
if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
final List<SubscriptionInfo> subInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();