Merge changes Iba1cee95,Ic5192c78 into sc-dev am: ee5ca902e1 (e8d5f9a7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class NotificationEntryManager implements

		private final KeyguardEnvironment mKeyguardEnvironment;
		private final NotificationGroupManagerLegacy mGroupManager;
		private final NotificationRankingManager mRankingManager;
		private final Lazy<NotificationRankingManager> mRankingManager;
		private final FeatureFlags mFeatureFlags;
		private final ForegroundServiceDismissalFeatureController mFgsFeatureController;

		@@ -200,7 +200,7 @@ public class NotificationEntryManager implements
		public NotificationEntryManager(
		NotificationEntryManagerLogger logger,
		NotificationGroupManagerLegacy groupManager,
		NotificationRankingManager rankingManager,
		Lazy<NotificationRankingManager> rankingManager,
		KeyguardEnvironment keyguardEnvironment,
		FeatureFlags featureFlags,
		Lazy<NotificationRowBinder> notificationRowBinderLazy,
		@@ -419,7 +419,7 @@ public class NotificationEntryManager implements

		mActiveNotifications.put(entry.getKey(), entry);
		mGroupManager.onEntryAdded(entry);
		updateRankingAndSort(mRankingManager.getRankingMap(), "addEntryInternalInternal");
		updateRankingAndSort(mRankingManager.get().getRankingMap(), "addEntryInternalInternal");
		}

		/**
		@@ -886,13 +886,13 @@ public class NotificationEntryManager implements

		/** Resorts / filters the current notification set with the current RankingMap */
		public void reapplyFilterAndSort(String reason) {
		updateRankingAndSort(mRankingManager.getRankingMap(), reason);
		updateRankingAndSort(mRankingManager.get().getRankingMap(), reason);
		}

		/** Calls to NotificationRankingManager and updates mSortedAndFiltered */
		private void updateRankingAndSort(@NonNull RankingMap rankingMap, String reason) {
		mSortedAndFiltered.clear();
		mSortedAndFiltered.addAll(mRankingManager.updateRanking(
		mSortedAndFiltered.addAll(mRankingManager.get().updateRanking(
		rankingMap, mActiveNotifications.values(), reason));
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ import com.android.systemui.wmshell.BubblesManager;
		import java.util.Optional;
		import java.util.concurrent.Executor;

		import javax.inject.Provider;

		import dagger.Binds;
		import dagger.Lazy;
		import dagger.Module;
		@@ -102,7 +100,7 @@ public interface NotificationsModule {
		static NotificationEntryManager provideNotificationEntryManager(
		NotificationEntryManagerLogger logger,
		NotificationGroupManagerLegacy groupManager,
		NotificationRankingManager rankingManager,
		Lazy<NotificationRankingManager> rankingManager,
		NotificationEntryManager.KeyguardEnvironment keyguardEnvironment,
		FeatureFlags featureFlags,
		Lazy<NotificationRowBinder> notificationRowBinderLazy,

packages/SystemUI/src/com/android/systemui/util/concurrency/Execution.kt

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.util.concurrency

		import android.os.Looper
		import javax.inject.Inject

		/**
		* Methods to check or assert that we're on the main thread
		*/
		interface Execution {
		fun assertIsMainThread()
		fun isMainThread(): Boolean
		}

		class ExecutionImpl @Inject constructor() : Execution {
		private val mainLooper = Looper.getMainLooper()

		override fun assertIsMainThread() {
		if (!mainLooper.isCurrentThread) {
		throw IllegalStateException("should be called from the main thread." +
		" Main thread name=" + mainLooper.thread.name +
		" Thread.currentThread()=" + Thread.currentThread().name)
		}
		}

		override fun isMainThread(): Boolean {
		return mainLooper.isCurrentThread
		}
		}

		class FakeExecution : Execution {
		var simulateMainThread = true

		override fun assertIsMainThread() {
		if (!simulateMainThread) {
		throw IllegalStateException("should be called from the main thread")
		}
		}

		override fun isMainThread(): Boolean {
		return simulateMainThread
		}
		}

packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ import com.android.systemui.dagger.qualifiers.Main;

		import java.util.concurrent.Executor;

		import javax.inject.Singleton;

		import dagger.Binds;
		import dagger.Module;
		import dagger.Provides;
		@@ -67,4 +69,8 @@ public abstract class GlobalConcurrencyModule {
		return context.getMainExecutor();
		}

		/** */
		@Binds
		@Singleton
		public abstract Execution provideExecution(ExecutionImpl execution);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
		mEntryManager = new NotificationEntryManager(
		mLogger,
		mGroupManager,
		new NotificationRankingManager(
		() -> new NotificationRankingManager(
		() -> mNotificationMediaManager,
		mGroupManager,
		mHeadsUpManager,