Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1d602b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix few crashes in Sim Settings."

parents f62e83b4 392d2f44

AndroidManifest.xml

+24 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,30 @@ 
            </intent-filter>

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.SimStatus"

                android:label="@string/sim_status_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.ImeiInformation"

                android:label="@string/imei_information_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity

            android:name=".deviceinfo.MSimStatus"

src/com/android/settings/IccLockSettings.java

100644 → 100755
+2 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.preference.CheckBoxPreference; 
import android.preference.Preference;

import android.preference.PreferenceActivity;

import android.preference.PreferenceScreen;

import android.preference.SwitchPreference;

import android.telephony.SubscriptionManager;

import android.util.Log;

import android.widget.Toast;
@@ -94,7 +93,7 @@ public class IccLockSettings extends PreferenceActivity 
    private Phone mPhone;



    private EditPinPreference mPinDialog;

    private SwitchPreference mPinToggle;

    private CheckBoxPreference mPinToggle;



    private Resources mRes;
@@ -170,7 +169,7 @@ public class IccLockSettings extends PreferenceActivity 
        addPreferencesFromResource(R.xml.sim_lock_settings);



        mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);

        mPinToggle = (SwitchPreference) findPreference(PIN_TOGGLE);

        mPinToggle = (CheckBoxPreference) findPreference(PIN_TOGGLE);

        if (savedInstanceState != null &&

               savedInstanceState.containsKey(DIALOG_STATE)) {

            mDialogState = savedInstanceState.getInt(DIALOG_STATE);