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

Commit 3a954347 authored by Doris Ling's avatar Doris Ling
Browse files

Add user id as param when constructing DefaultAppInfo. 

- DefaultAppInfo has 2 versions of the constructor, one takes the
PackageItemInfo and one takes ComponentInfo. The one with
PackageItemInfo didn't take user id as parameter but use the current
user id to retrieve app info. This is incorrect for managed profile.
Change it to take the correct user id like the other constructor does.

Change-Id: I06569523a3666bb294153b065883412350447444
Fixes: 117222623
Test: make RunSettingsLibRoboTests
parent 1e7b9347

packages/SettingsLib/src/com/android/settingslib/applications/DefaultAppInfo.java

+4 −5
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.pm.PackageItemInfo; 
import android.content.pm.PackageManager;

import android.graphics.drawable.Drawable;

import android.os.RemoteException;

import android.os.UserHandle;

import android.util.IconDrawableFactory;



import com.android.settingslib.widget.CandidateInfo;
@@ -46,8 +45,8 @@ public class DefaultAppInfo extends CandidateInfo { 
        this(context, pm, uid, cn, null /* summary */, true /* enabled */);

    }



    public DefaultAppInfo(Context context, PackageManager pm, PackageItemInfo info) {

        this(context, pm, info, null /* summary */, true /* enabled */);

    public DefaultAppInfo(Context context, PackageManager pm, int uid, PackageItemInfo info) {

        this(context, pm, uid, info, null /* summary */, true /* enabled */);

    }



    public DefaultAppInfo(Context context, PackageManager pm, int uid, ComponentName cn,
@@ -61,12 +60,12 @@ public class DefaultAppInfo extends CandidateInfo { 
        this.summary = summary;

    }



    public DefaultAppInfo(Context context, PackageManager pm, PackageItemInfo info,

    public DefaultAppInfo(Context context, PackageManager pm, int uid, PackageItemInfo info,

                          String summary, boolean enabled) {

        super(enabled);

        mContext = context;

        mPm = pm;

        userId = UserHandle.myUserId();

        userId = uid;

        packageItemInfo = info;

        componentName = null;

        this.summary = summary;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.settingslib.applications; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -72,7 +72,7 @@ public class DefaultAppInfoTest { 
    @Test

    public void initInfoWithActivityInfo_shouldLoadInfo() {

        mPackageItemInfo.packageName = "test";

        mInfo = new DefaultAppInfo(mContext, mPackageManager, mPackageItemInfo);

        mInfo = new DefaultAppInfo(mContext, mPackageManager, 0 /* uid */, mPackageItemInfo);

        mInfo.loadLabel();

        Drawable icon = mInfo.loadIcon();