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

Merge "Settings: Remove usage of hidden APIs"

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-12-19 18:38:08 +00:00
committed by Android (Google) Code Review
parent ce72229449 d5df7b9655
commit 08e1aaf3f2
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -23,13 +23,13 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.provider.SettingsSlicesContract; import android.provider.SettingsSlicesContract;
import android.telephony.TelephonyManager;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.AirplaneModeEnabler; import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
@@ -77,7 +77,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
// In ECM mode launch ECM app dialog // In ECM mode launch ECM app dialog
if (mFragment != null) { if (mFragment != null) {
mFragment.startActivityForResult( 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); REQUEST_CODE_EXIT_ECM);
} }
return true; return true;

3
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -34,7 +34,6 @@ import android.view.MenuItem;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.datausage.BillingCyclePreferenceController; import com.android.settings.datausage.BillingCyclePreferenceController;
@@ -98,7 +97,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
|| TextUtils.equals(key, BUTTON_CDMA_SUBSCRIPTION_KEY)) { || TextUtils.equals(key, BUTTON_CDMA_SUBSCRIPTION_KEY)) {
if (mTelephonyManager.getEmergencyCallbackMode()) { if (mTelephonyManager.getEmergencyCallbackMode()) {
startActivityForResult( 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); REQUEST_CODE_EXIT_ECM);
mClickedPrefKey = key; mClickedPrefKey = key;
} }