Merge "Resolve message/conversation image Uris with the correct user id" into sc-dev am: 579df7d189 (27db5259) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import android.graphics.drawable.Drawable;
		import android.os.AsyncTask;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.service.notification.StatusBarNotification;
		import android.util.ArraySet;
		import android.util.AttributeSet;
		@@ -1528,8 +1529,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView

		public ExpandableNotificationRow(Context context, AttributeSet attrs) {
		super(context, attrs);
		mImageResolver = new NotificationInlineImageResolver(context,
		new NotificationInlineImageCache());
		initDimens();
		}

		@@ -1558,6 +1557,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		NotificationGutsManager gutsManager,
		IStatusBarService statusBarService) {
		mEntry = entry;
		mImageResolver = new NotificationInlineImageResolver(userContextForEntry(mContext, entry),
		new NotificationInlineImageCache());
		mAppName = appName;
		if (mMenuRow == null) {
		mMenuRow = new NotificationMenuRow(mContext, peopleNotificationIdentifier);
		@@ -1591,6 +1592,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		cacheIsSystemNotification();
		}

		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
		@@ -63,7 +63,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) {
		@@ -73,6 +73,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);
		@@ -113,4 +117,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

+27 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,10 @@ 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;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		@@ -36,6 +40,8 @@ import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		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;
		@@ -46,6 +52,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;
		@@ -330,4 +337,24 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {

		assertTrue(row.getIsNonblockable());
		}

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