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

Commit 0b61e934 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "[Safer intents] Connectivity" into main

parents 2ddc771d c53a73ef

res/xml/network_provider_sims_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
        android:title="@string/mobile_network_list_add_more"

        android:icon="@drawable/ic_menu_add_activated_tint"

        android:order="100">

        <intent android:action="android.telephony.euicc.action.PROVISION_EMBEDDED_SUBSCRIPTION">

        <intent android:action="android.telephony.euicc.action.PROVISION_EMBEDDED_SUBSCRIPTION"

                android:targetPackage="com.android.phone">

            <extra android:name="android.telephony.euicc.extra.FORCE_PROVISION"

                   android:value="true"/>

        </intent>

src/com/android/settings/Utils.java

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ public final class Utils extends com.android.settingslib.Utils { 


    public static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";



    public static final String PHONE_PACKAGE_NAME = "com.android.phone";



    public static final String OS_PKG = "os";



    /**

src/com/android/settings/bluetooth/RequestPermissionHelper.kt

+4 −1
Original line number Diff line number Diff line
@@ -70,7 +70,10 @@ object RequestPermissionHelper { 
private fun Context.isDisallowBluetooth() =

    if (userManager.hasUserRestriction(UserManager.DISALLOW_BLUETOOTH)) {

        devicePolicyManager.createAdminSupportIntent(UserManager.DISALLOW_BLUETOOTH)

            ?.let { startActivity(it) }

            ?.let {

                it.setPackage(packageName)

                startActivity(it)

            }

        true

    } else false

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

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.preference.TwoStatePreference; 


import com.android.settings.AirplaneModeEnabler;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnDestroy;
@@ -84,7 +85,8 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 
            // In ECM mode launch ECM app dialog

            if (mFragment != null) {

                mFragment.startActivityForResult(

                        new Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null),

                        new Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null)

                                .setPackage(Utils.PHONE_PACKAGE_NAME),

                        REQUEST_CODE_EXIT_ECM);

            }

            return true;

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

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 


    private void startAddSimFlow() {

        final Intent intent = new Intent(EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION);

        intent.setPackage(com.android.settings.Utils.PHONE_PACKAGE_NAME);

        intent.putExtra(EuiccManager.EXTRA_FORCE_PROVISION, true);

        mContext.startActivity(intent);

    }