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

Commit 36875d13 authored by Patrick Kaufmann's avatar Patrick Kaufmann Committed by Automerger Merge Worker
Browse files

Merge "Call getEntryData with correct user context." into udc-qpr-dev am: 7cc06991 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24433089



Change-Id: I97fb624f5e0cebe4dc15f49e0cdaa2ba46f7a9e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5908a6e 7cc06991

packages/SettingsLib/Tile/src/com/android/settingslib/drawer/TileUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -344,7 +344,9 @@ public class TileUtils { 
                continue;

            }

            final ProviderInfo providerInfo = resolved.providerInfo;

            final List<Bundle> entryData = getEntryDataFromProvider(context,

            final List<Bundle> entryData = getEntryDataFromProvider(

                    // Build new context so the entry data is retrieved for the queried user.

                    context.createContextAsUser(user, 0 /* flags */),

                    providerInfo.authority);

            if (entryData == null || entryData.isEmpty()) {

                continue;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java

+43 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import static org.mockito.ArgumentMatchers.anyString; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -52,6 +53,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.ProviderInfo;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.net.Uri;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;
@@ -69,6 +71,8 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.annotation.Config;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.util.ReflectionHelpers;



import java.util.ArrayList;

import java.util.Arrays;
@@ -88,6 +92,10 @@ public class TileUtilsTest { 
    private UserManager mUserManager;

    @Mock

    private ContentResolver mContentResolver;

    @Mock

    private Context mUserContext;

    @Mock

    private ContentResolver mUserContentResolver;



    private static final String URI_GET_SUMMARY = "content://authority/text/summary";

    private static final String URI_GET_ICON = "content://authority/icon/my_icon";
@@ -104,6 +112,8 @@ public class TileUtilsTest { 
        mContentResolver = spy(application.getContentResolver());

        when(mContext.getContentResolver()).thenReturn(mContentResolver);

        when(mContext.getPackageName()).thenReturn("com.android.settings");

        when(mUserContext.getContentResolver()).thenReturn(mUserContentResolver);

        ShadowTileUtils.sCallRealEntryDataFromProvider = false;

    }



    @Test
@@ -374,6 +384,30 @@ public class TileUtilsTest { 
                .containsExactly(UserHandle.CURRENT, new UserHandle(10));

    }



    @Test

    public void loadTilesForAction_forUserProvider_getEntryDataFromProvider_inContextOfGivenUser() {

        ShadowTileUtils.sCallRealEntryDataFromProvider = true;

        UserHandle userHandle = new UserHandle(10);



        doReturn(mUserContext).when(mContext).createContextAsUser(eq(userHandle), anyInt());



        Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();

        List<Tile> outTiles = new ArrayList<>();

        List<ResolveInfo> info = new ArrayList<>();

        ResolveInfo resolveInfo = newInfo(true, null /* category */, null, URI_GET_ICON,

                URI_GET_SUMMARY, null, 123, PROFILE_ALL);

        info.add(resolveInfo);



        when(mPackageManager.queryIntentContentProvidersAsUser(any(Intent.class), anyInt(),

            anyInt())).thenReturn(info);



        TileUtils.loadTilesForAction(mContext, userHandle, IA_SETTINGS_ACTION,

                addedCache, null /* defaultCategory */, outTiles, false /* requiresSettings */);



        verify(mUserContentResolver, atLeastOnce())

            .acquireUnstableProvider(any(Uri.class));

    }



    @Test

    public void loadTilesForAction_withPendingIntent_updatesPendingIntentMap() {

        Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
@@ -472,8 +506,17 @@ public class TileUtilsTest { 


        private static Bundle sMetaData;



        private static boolean sCallRealEntryDataFromProvider;



        @Implementation

        protected static List<Bundle> getEntryDataFromProvider(Context context, String authority) {

            if (sCallRealEntryDataFromProvider) {

                return Shadow.directlyOn(

                    TileUtils.class,

                    "getEntryDataFromProvider",

                    ReflectionHelpers.ClassParameter.from(Context.class, context),

                    ReflectionHelpers.ClassParameter.from(String.class, authority));

            }

            return Arrays.asList(sMetaData);

        }