Snap for 11775018 from ef4e537d03ee67726067ce422cb6a67c098bcf7d to 24Q3-release (d21900f4) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/volume/EventsTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/volume/EventsTest.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -34,12 +34,15 @@ import com.android.systemui.SysuiTestCase;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.junit.runners.Parameterized;

		import java.util.Arrays;
		import java.util.Collection;
		import java.util.Queue;

		import platform.test.runner.parameterized.Parameter;
		import platform.test.runner.parameterized.ParameterizedAndroidJunit4;
		import platform.test.runner.parameterized.Parameters;

		/**
		* Parameterized unit test for Events.logEvent.
		*
		@@ -51,7 +54,7 @@ import java.util.Queue;
		* either SysuiTestCase or SysUiBaseFragmentTest.
		*
		*/
		@RunWith(Parameterized.class)
		@RunWith(ParameterizedAndroidJunit4.class)
		@SmallTest
		public class EventsTest extends SysuiTestCase {
		private FakeMetricsLogger mLegacyLogger;
		@@ -66,23 +69,23 @@ public class EventsTest extends SysuiTestCase {
		}

		// Parameters for calling writeEvent with arbitrary args.
		@Parameterized.Parameter
		@Parameter
		public int mTag;

		@Parameterized.Parameter(1)
		@Parameter(1)
		public Object[] mArgs;

		// Expect returned string exactly matches.
		@Parameterized.Parameter(2)
		@Parameter(2)
		public String mExpectedMessage;

		// Expect these MetricsLogger calls.

		@Parameterized.Parameter(3)
		@Parameter(3)
		public int[] mExpectedMetrics;

		// Expect this UiEvent (use null if there isn't one).
		@Parameterized.Parameter(4)
		@Parameter(4)
		public UiEventLogger.UiEventEnum mUiEvent;

		@Test
		@@ -108,7 +111,10 @@ public class EventsTest extends SysuiTestCase {
		}
		}

		@Parameterized.Parameters(name = "{index}: {2}")
		/**
		* Collection of parameters for the test.
		*/
		@Parameters(name = "{index}: {2}")
		public static Collection<Object[]> data() {
		return Arrays.asList(new Object[][]{
		{Events.EVENT_SETTINGS_CLICK, null,
		@@ -217,4 +223,3 @@ public class EventsTest extends SysuiTestCase {
		});
		}
		}

packages/SystemUI/tests/src/com/android/systemui/volume/UtilTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/volume/UtilTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,13 +19,16 @@ import static com.google.common.truth.Truth.assertThat;

		import android.media.MediaMetadata;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		import com.android.systemui.SysuiTestCase;

		import org.junit.Test;
		import org.junit.runner.RunWith;

		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class UtilTest extends SysuiTestCase {

		@Test

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -2399,12 +2399,13 @@ public class NotificationStackScrollLayout
		private void updateContentHeight() {
		final float scrimTopPadding = mAmbientState.isOnKeyguard() ? 0 : mMinimumPaddings;
		final int shelfIntrinsicHeight = mShelf != null ? mShelf.getIntrinsicHeight() : 0;
		final int footerIntrinsicHeight = mFooterView != null ? mFooterView.getIntrinsicHeight() : 0;
		final float height =
		(int) scrimTopPadding + (int) mNotificationStackSizeCalculator.computeHeight(
		/* notificationStackScrollLayout= */ this, mMaxDisplayedNotifications,
		shelfIntrinsicHeight);
		mIntrinsicContentHeight = height;
		mScrollViewFields.sendStackHeight(height);
		mScrollViewFields.sendStackHeight(height + footerIntrinsicHeight);

		// The topPadding can be bigger than the regular padding when qs is expanded, in that
		// state the maxPanelHeight and the contentHeight should be bigger

services/core/java/com/android/server/am/ActiveServices.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3856,7 +3856,7 @@ public final class ActiveServices {
		void onFgsTimeout(ServiceRecord sr) {
		synchronized (mAm) {
		final int fgsType = getTimeLimitedFgsType(sr.foregroundServiceType);
		if (fgsType == ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE) {
		if (fgsType == ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE \|\| sr.app == null) {
		mFGSAnrTimer.discard(sr);
		return;
		}