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

Commit 08e1aaf3 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

Merge "Settings: Remove usage of hidden APIs"

parents ce722294 d5df7b96

src/com/android/settings/network/AirplaneModePreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

            }