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

Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2

Browse Source 
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
This commit is contained in:
Automerger Merge Worker
2020-03-11 05:51:49 +00:00
parent d0d3fd6457 7ef5614ee2
commit 382ac6e42e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ import android.widget.Toast;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.network.ProxySubscriptionManager; import com.android.settings.network.ProxySubscriptionManager;
import java.util.List; import java.util.List;
@@ -142,7 +141,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
private final BroadcastReceiver mSimStateReceiver = new BroadcastReceiver() { private final BroadcastReceiver mSimStateReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final String action = intent.getAction(); final String action = intent.getAction();
if (TelephonyIntents.ACTION_SIM_STATE_CHANGED.equals(action)) { if (Intent.ACTION_SIM_STATE_CHANGED.equals(action)) {
mHandler.sendMessage(mHandler.obtainMessage(MSG_SIM_STATE_CHANGED)); mHandler.sendMessage(mHandler.obtainMessage(MSG_SIM_STATE_CHANGED));
} }
} }
@@ -292,7 +291,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
// ACTION_SIM_STATE_CHANGED is sticky, so we'll receive current state after this call, // ACTION_SIM_STATE_CHANGED is sticky, so we'll receive current state after this call,
// which will call updatePreferences(). // which will call updatePreferences().
final IntentFilter filter = new IntentFilter(TelephonyIntents.ACTION_SIM_STATE_CHANGED); final IntentFilter filter = new IntentFilter(Intent.ACTION_SIM_STATE_CHANGED);
getContext().registerReceiver(mSimStateReceiver, filter); getContext().registerReceiver(mSimStateReceiver, filter);
if (mDialogState != OFF_MODE) { if (mDialogState != OFF_MODE) {