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

Merge "Fix bug #12893337 Crash while set up SIM card lock"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-02-04 23:59:10 +00:00
committed by Android (Google) Code Review
parent 90e9e6cd30 74abdfd3e6
commit 0cff0e4a51
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/security_settings_misc.xml
View File

@@ -21,10 +21,8 @@
android:persistent="false"> android:persistent="false">
<Preference android:title="@string/sim_lock_settings_category" <Preference android:title="@string/sim_lock_settings_category"
android:persistent="false"> android:persistent="false"
<intent android:action="android.intent.action.MAIN" android:fragment="com.android.settings.IccLockSettings">
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.IccLockSettings"/>
</Preference> </Preference>
</PreferenceCategory> </PreferenceCategory>

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

@@ -127,11 +127,11 @@ public class IccLockSettings extends SettingsPreferenceFragment
}; };
// For top-level settings screen to query // For top-level settings screen to query
static boolean isIccLockEnabled() { boolean isIccLockEnabled() {
return PhoneFactory.getDefaultPhone().getIccCard().getIccLockEnabled(); return mPhone.getIccCard().getIccLockEnabled();
} }
static String getSummary(Context context) { String getSummary(Context context) {
Resources res = context.getResources(); Resources res = context.getResources();
String summary = isIccLockEnabled() String summary = isIccLockEnabled()
? res.getString(R.string.sim_lock_on) ? res.getString(R.string.sim_lock_on)
@@ -181,7 +181,9 @@ public class IccLockSettings extends SettingsPreferenceFragment
// Don't need any changes to be remembered // Don't need any changes to be remembered
getPreferenceScreen().setPersistent(false); getPreferenceScreen().setPersistent(false);
PhoneFactory.makeDefaultPhone(getActivity());
mPhone = PhoneFactory.getDefaultPhone(); mPhone = PhoneFactory.getDefaultPhone();
mRes = getResources(); mRes = getResources();
updatePreferences(); updatePreferences();
} }