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

Commit 544b3a5f 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... 

Merge "Resolve message/conversation image Uris with the correct user id" into udc-dev am: e8cc6f06

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



Change-Id: Ic78ab9d493cda100cb3899c345f6f61d0f2dbb15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c9d92dd e8cc6f06

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

+34 −5
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.graphics.drawable.Drawable; 
import android.os.Build;

import android.os.Bundle;

import android.os.Trace;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.util.ArraySet;

import android.util.AttributeSet;
@@ -371,7 +372,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private boolean mUseIncreasedHeadsUpHeight;

    private float mTranslationWhenRemoved;

    private boolean mWasChildInGroupWhenRemoved;

    private NotificationInlineImageResolver mImageResolver;

    private final NotificationInlineImageResolver mImageResolver;

    @Nullable

    private OnExpansionChangedListener mExpansionChangedListener;

    @Nullable
@@ -1630,13 +1631,41 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    }



    /**

     * Constructs an ExpandableNotificationRow.

     * @param context context passed to image resolver

     * Constructs an ExpandableNotificationRow. Used by layout inflation.

     *

     * @param context passed to image resolver

     * @param attrs attributes used to initialize parent view

     */

    public ExpandableNotificationRow(Context context, AttributeSet attrs) {

        super(context, attrs);

        mImageResolver = new NotificationInlineImageResolver(context,

        this(context, attrs, context);

        Log.wtf(TAG, "This constructor shouldn't be called");

    }



    /**

     * Constructs an ExpandableNotificationRow. Used by layout inflation (with a custom {@code

     * AsyncLayoutFactory} in {@link RowInflaterTask}.

     *

     * @param context context context of the view

     * @param attrs attributes used to initialize parent view

     * @param entry notification that the row will be associated to (determines the user for the

     *              ImageResolver)

     */

    public ExpandableNotificationRow(Context context, AttributeSet attrs, NotificationEntry entry) {

        this(context, attrs, userContextForEntry(context, entry));

    }



    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 ExpandableNotificationRow(Context sysUiContext, AttributeSet attrs,

            Context userContext) {

        super(sysUiContext, attrs);

        mImageResolver = new NotificationInlineImageResolver(userContext,

                new NotificationInlineImageCache());

        float radius = getResources().getDimension(R.dimen.notification_corner_radius_small);

        mSmallRoundness = radius / getMaxRadius();

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/src/com/android/systemui/statusbar/notification/row/RowInflaterTask.java

+33 −1
Original line number Diff line number Diff line
@@ -17,10 +17,15 @@ 
package com.android.systemui.statusbar.notification.row;



import android.content.Context;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.asynclayoutinflater.view.AsyncLayoutFactory;

import androidx.asynclayoutinflater.view.AsyncLayoutInflater;



import com.android.systemui.R;
@@ -55,12 +60,39 @@ public class RowInflaterTask implements InflationTask, AsyncLayoutInflater.OnInf 
            mInflateOrigin = new Throwable("inflate requested here");

        }

        mListener = listener;

        AsyncLayoutInflater inflater = new AsyncLayoutInflater(context);

        AsyncLayoutInflater inflater = new AsyncLayoutInflater(context,

                new RowAsyncLayoutInflater(entry));

        mEntry = entry;

        entry.setInflationTask(this);

        inflater.inflate(R.layout.status_bar_notification_row, parent, this);

    }



    @VisibleForTesting

    static class RowAsyncLayoutInflater implements AsyncLayoutFactory {

        private final NotificationEntry mEntry;



        RowAsyncLayoutInflater(NotificationEntry entry) {

            mEntry = entry;

        }



        @Nullable

        @Override

        public View onCreateView(@Nullable View parent, @NonNull String name,

                @NonNull Context context, @NonNull AttributeSet attrs) {

            if (name.equals(ExpandableNotificationRow.class.getName())) {

                return new ExpandableNotificationRow(context, attrs, mEntry);

            }

            return null;

        }



        @Nullable

        @Override

        public View onCreateView(@NonNull String name, @NonNull Context context,

                @NonNull AttributeSet attrs) {

            return null;

        }

    }



    @Override

    public void abort() {

        mCancelled = true;

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

+25 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; 


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

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;
@@ -40,10 +42,12 @@ import static org.mockito.Mockito.when; 


import android.app.Notification;

import android.app.NotificationChannel;

import android.content.Context;

import android.graphics.Color;

import android.graphics.drawable.AnimatedVectorDrawable;

import android.graphics.drawable.AnimationDrawable;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -56,6 +60,7 @@ import androidx.test.filters.SmallTest; 
import com.android.internal.R;

import com.android.internal.widget.CachingIconView;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestableContext;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
@@ -733,6 +738,26 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        verify(lowPriVectorDrawable, times(1)).start();

    }



    @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);

    }



    private void setDrawableIconsInImageView(CachingIconView icon, Drawable iconDrawable,

            Drawable rightIconDrawable) {

        ImageView iconView = mock(ImageView.class);

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

+9 −8
Original line number Diff line number Diff line
@@ -526,14 +526,6 @@ public class NotificationTestHelper { 
            @InflationFlag int extraInflationFlags,

            int importance)

            throws Exception {

        LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(

                mContext.LAYOUT_INFLATER_SERVICE);

        mRow = (ExpandableNotificationRow) inflater.inflate(

                R.layout.status_bar_notification_row,

                null /* root */,

                false /* attachToRoot */);

        ExpandableNotificationRow row = mRow;



        final NotificationChannel channel =

                new NotificationChannel(

                        notification.getChannelId(),
@@ -553,6 +545,15 @@ public class NotificationTestHelper { 
                .setChannel(channel)

                .build();



        LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(

                Context.LAYOUT_INFLATER_SERVICE);

        inflater.setFactory2(new RowInflaterTask.RowAsyncLayoutInflater(entry));

        mRow = (ExpandableNotificationRow) inflater.inflate(

                R.layout.status_bar_notification_row,

                null /* root */,

                false /* attachToRoot */);

        ExpandableNotificationRow row = mRow;



        entry.setRow(row);

        mIconManager.createIcons(entry);