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

Commit 2e89641c authored by Matías Hernández's avatar Matías Hernández Committed by Automerger Merge Worker
Browse files

Merge "Resolve message/conversation image Uris with the correct user id" into tm-dev am: 0857f7e9 

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



Change-Id: I0afe71d2716d0026890b2bb43964bb16207685e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43e1d0b9 0857f7e9

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+11 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.Bundle; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.Trace;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.util.ArraySet;

import android.util.AttributeSet;
@@ -1523,8 +1524,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 


    public ExpandableNotificationRow(Context context, AttributeSet attrs) {

        super(context, attrs);

        mImageResolver = new NotificationInlineImageResolver(context,

                new NotificationInlineImageCache());

        initDimens();

    }
@@ -1557,6 +1556,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            SmartReplyController smartReplyController,

            IStatusBarService statusBarService) {

        mEntry = entry;

        mImageResolver = new NotificationInlineImageResolver(userContextForEntry(mContext, entry),

                new NotificationInlineImageCache());

        mAppName = appName;

        if (mMenuRow == null) {

            mMenuRow = new NotificationMenuRow(mContext, peopleNotificationIdentifier);
@@ -1593,6 +1594,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        mMetricsLogger = metricsLogger;

    }



    private static Context userContextForEntry(Context base, NotificationEntry entry) {

        if (base.getUserId() == entry.getSbn().getNormalizedUserId()) {

            return base;

        }

        return base.createContextAsUser(

                UserHandle.of(entry.getSbn().getNormalizedUserId()), /* flags= */ 0);

    }



    private void initDimens() {

        mMaxSmallHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_min_height_legacy);

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java

+6 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class NotificationInlineImageResolver implements ImageResolver { 
     * @param imageCache The implementation of internal cache.

     */

    public NotificationInlineImageResolver(Context context, ImageCache imageCache) {

        mContext = context.getApplicationContext();

        mContext = context;

        mImageCache = imageCache;



        if (mImageCache != null) {
@@ -76,6 +76,11 @@ public class NotificationInlineImageResolver implements ImageResolver { 
        updateMaxImageSizes();

    }



    @VisibleForTesting

    public Context getContext() {

        return mContext;

    }



    /**

     * Check if this resolver has its internal cache implementation.

     * @return True if has its internal cache, false otherwise.

packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java

+22 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


package com.android.systemui;



import android.annotation.NonNull;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -28,12 +29,15 @@ import android.view.Display; 


import com.android.internal.annotations.GuardedBy;



import java.util.HashMap;

import java.util.Map;

import java.util.Set;



public class SysuiTestableContext extends TestableContext {



    @GuardedBy("mRegisteredReceivers")

    private final Set<BroadcastReceiver> mRegisteredReceivers = new ArraySet<>();

    private final Map<UserHandle, Context> mContextForUser = new HashMap<>();



    public SysuiTestableContext(Context base) {

        super(base);
@@ -146,4 +150,22 @@ public class SysuiTestableContext extends TestableContext { 
        }

        super.unregisterReceiver(receiver);

    }



    /**

     * Sets a Context object that will be returned as the result of {@link #createContextAsUser}

     * for a specific {@code user}.

     */

    public void prepareCreateContextAsUser(UserHandle user, Context context) {

        mContextForUser.put(user, context);

    }



    @Override

    @NonNull

    public Context createContextAsUser(UserHandle user, int flags) {

        Context userContext = mContextForUser.get(user);

        if (userContext != null) {

            return userContext;

        }

        return super.createContextAsUser(user, flags);

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+25 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; 
import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking;

import static com.android.systemui.statusbar.NotificationEntryHelper.modifySbn;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL;

import static com.android.systemui.statusbar.notification.row.NotificationTestHelper.PKG;

import static com.android.systemui.statusbar.notification.row.NotificationTestHelper.USER_HANDLE;



import static com.google.common.truth.Truth.assertThat;
@@ -43,6 +45,8 @@ import static org.mockito.Mockito.when; 


import android.app.Notification;

import android.app.NotificationChannel;

import android.content.Context;

import android.os.UserHandle;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -53,6 +57,7 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestableContext;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.notification.AboveShelfChangedListener;
@@ -449,4 +454,24 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        verify(mNotificationTestHelper.mOnUserInteractionCallback, never())

                .registerFutureDismissal(any(), anyInt());

    }



    @Test

    public void imageResolver_sameNotificationUser_usesContext() throws Exception {

        ExpandableNotificationRow row = mNotificationTestHelper.createRow(PKG,

                USER_HANDLE.getUid(1234), USER_HANDLE);



        assertThat(row.getImageResolver().getContext()).isSameInstanceAs(mContext);

    }



    @Test

    public void imageResolver_differentNotificationUser_createsUserContext() throws Exception {

        UserHandle user = new UserHandle(33);

        Context userContext = new SysuiTestableContext(mContext);

        mContext.prepareCreateContextAsUser(user, userContext);



        ExpandableNotificationRow row = mNotificationTestHelper.createRow(PKG,

                user.getUid(1234), user);



        assertThat(row.getImageResolver().getContext()).isSameInstanceAs(userContext);

    }

}