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

Merge "Fix Settings Crash" into main

Browse Source
This commit is contained in:
Edgar Wang
2024-04-24 04:00:18 +00:00
committed by Android (Google) Code Review
parent a968e2dea8 59cb0e1b30
commit 16ac28580a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/development/OemUnlockPreferenceController.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.development.DevelopmentOptionsActivityRequest
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
@@ -176,6 +177,13 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
/** Returns {@code true} if the device is SIM-locked. Otherwise, returns {@code false}. */ /** Returns {@code true} if the device is SIM-locked. Otherwise, returns {@code false}. */
private boolean isSimLockedDevice() { private boolean isSimLockedDevice() {
if (!mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_TELEPHONY_CARRIERLOCK)) {
Log.w(TAG,
"getAllowedCarriers is unsupported without "
+ "PackageManager#FEATURE_TELEPHONY_CARRIERLOCK");
return false;
}
int phoneCount = mTelephonyManager.getPhoneCount(); int phoneCount = mTelephonyManager.getPhoneCount();
for (int i = 0; i < phoneCount; i++) { for (int i = 0; i < phoneCount; i++) {
if (mTelephonyManager.getAllowedCarriers(i).size() > 0) { if (mTelephonyManager.getAllowedCarriers(i).size() > 0) {