From d5df7b9655c23c300203f056ddce9e0233f2295b Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Mon, 16 Dec 2019 16:52:25 -0800 Subject: [PATCH] Settings: Remove usage of hidden APIs This CL uses TelephonyManager instead of TelephonyIntent for ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS Bug: 146240041 Change-Id: I45bf3295badb49a571ab13fea2c6218768533835 --- .../settings/network/AirplaneModePreferenceController.java | 4 ++-- .../settings/network/telephony/MobileNetworkSettings.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 3c79be34d1c..f5fff1c25bc 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -23,13 +23,13 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.provider.SettingsSlicesContract; +import android.telephony.TelephonyManager; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.telephony.TelephonyIntents; import com.android.settings.AirplaneModeEnabler; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -77,7 +77,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController // In ECM mode launch ECM app dialog if (mFragment != null) { mFragment.startActivityForResult( - new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null), + new Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null), REQUEST_CODE_EXIT_ECM); } return true; diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 2c3cd3aa514..90d8d4e7d93 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -34,7 +34,6 @@ import android.view.MenuItem; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import com.android.internal.telephony.TelephonyIntents; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.datausage.BillingCyclePreferenceController; @@ -98,7 +97,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { || TextUtils.equals(key, BUTTON_CDMA_SUBSCRIPTION_KEY)) { if (mTelephonyManager.getEmergencyCallbackMode()) { startActivityForResult( - new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null), + new Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null), REQUEST_CODE_EXIT_ECM); mClickedPrefKey = key; }