From 721467c679ace081791bf0892290acf6398a1d54 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Wed, 22 Jan 2020 12:49:24 -0800 Subject: [PATCH] Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED Bug: 148160428 Test: make, flash Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58 --- src/com/android/settings/IccLockSettings.java | 5 ++--- .../settings/TestingSettingsBroadcastReceiver.java | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 2dbfd6273b6..de89e3c60e6 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -51,7 +51,6 @@ import android.widget.Toast; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.telephony.TelephonyIntents; import com.android.settings.network.ProxySubscriptionManager; import java.util.List; @@ -143,7 +142,7 @@ public class IccLockSettings extends SettingsPreferenceFragment private final BroadcastReceiver mSimStateReceiver = new BroadcastReceiver() { public void onReceive(Context context, Intent intent) { 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)); } } @@ -293,7 +292,7 @@ public class IccLockSettings extends SettingsPreferenceFragment // ACTION_SIM_STATE_CHANGED is sticky, so we'll receive current state after this call, // 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); if (mDialogState != OFF_MODE) { diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java index 2172cd07d60..0e1296ba578 100644 --- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java +++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java @@ -1,22 +1,21 @@ package com.android.settings; -import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.telephony.TelephonyManager; import com.android.settings.Settings.TestingSettingsActivity; public class TestingSettingsBroadcastReceiver extends BroadcastReceiver { - + public TestingSettingsBroadcastReceiver() { } - + @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(SECRET_CODE_ACTION)) { + if (intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)) { Intent i = new Intent(Intent.ACTION_MAIN); i.setClass(context, TestingSettingsActivity.class); i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);