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

Commit ee75f546 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master 

Bug: 151763422
Change-Id: Ie99b0fb88c440f1e40a412da74905adf3f0725df
parents 1dcc1037 ee2b1d15

src/com/android/settings/development/MockLocationAppPreferenceController.java

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ public class MockLocationAppPreferenceController extends DeveloperOptionsPrefere 
        return true;

    }



    @Override

    public void onDeveloperOptionsDisabled() {

        super.onDeveloperOptionsDisabled();

        removeAllMockLocations();

    }



    private void updateMockLocation() {

        final String mockLocationApp = getCurrentMockLocationApp();

src/com/android/settings/slices/SettingsSliceProvider.java

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import androidx.slice.Slice; 
import androidx.slice.SliceProvider;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.bluetooth.BluetoothSliceBuilder;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.notification.ZenModeSliceBuilder;
@@ -303,7 +304,8 @@ public class SettingsSliceProvider extends SliceProvider { 
    @Override

    public PendingIntent onCreatePermissionRequest(@NonNull Uri sliceUri,

            @NonNull String callingPackage) {

        final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS);

        final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS)

                .setPackage(Utils.SETTINGS_PACKAGE_NAME);

        final PendingIntent noOpIntent = PendingIntent.getActivity(getContext(),

                0 /* requestCode */, settingsIntent, 0 /* flags */);

        return noOpIntent;

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import androidx.slice.SliceProvider; 
import androidx.slice.widget.SliceLiveData;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.testutils.DatabaseTestUtils;

import com.android.settings.testutils.FakeToggleController;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -450,8 +451,10 @@ public class SettingsSliceProviderTest { 
    public void onCreatePermissionRequest_returnsSettingIntent() {

        final PendingIntent pendingIntent = mProvider.onCreatePermissionRequest(

                CustomSliceRegistry.FLASHLIGHT_SLICE_URI, "com.android.whaaaat");

        final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS)

                .setPackage(Utils.SETTINGS_PACKAGE_NAME);

        PendingIntent settingsPendingIntent =

                PendingIntent.getActivity(mContext, 0, new Intent(Settings.ACTION_SETTINGS), 0);

                PendingIntent.getActivity(mContext, 0, settingsIntent, 0);



        assertThat(pendingIntent).isEqualTo(settingsPendingIntent);

    }