| commit | 15612640f006ea5503c674eaebb9c9e0522881b2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 29 03:01:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 03:01:28 2021 +0000 |
| tree | 143098d497842fecadb860698faa9c021f970e29 | |
| parent | 25d3f38fac51e455060ad315dad80fe407fa248d [diff] | |
| parent | 5354abb0e77ca537ac6a44d9e962292230b85920 [diff] |
Merge "[Overview Sharing] Turn on the feature flag for overview sharing." into sc-dev am: 5354abb0e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14342901 Change-Id: I4fb500cd540c68a3ba42e01769c275f38d8cbfb9
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java index 7c8041c..c8a72cd 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -111,11 +111,6 @@ public void initialize(Task task) { mTask = task; - if (task.key.userId != UserHandle.myUserId()) { - setNoLimit(); - return; - } - THREAD_POOL_EXECUTOR.execute(() -> { final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit( task.getTopComponent().getPackageName(),
diff --git a/tests/Android.mk b/tests/Android.mk index 2c7d30a..883a69e 100644 --- a/tests/Android.mk +++ b/tests/Android.mk
@@ -76,6 +76,9 @@ LOCAL_INSTRUMENTATION_FOR := Launcher3 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE include $(BUILD_PACKAGE) include $(call all-makefiles-under,$(LOCAL_PATH))