| commit | 0928e5a4e363c248cd3a0e0e267f247f9797c87c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 29 08:57:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 08:57:41 2021 +0000 |
| tree | 7cccb1b8c16231a82ae73a8a2adfc6842d1a3499 | |
| parent | 15612640f006ea5503c674eaebb9c9e0522881b2 [diff] | |
| parent | e1a2ea769fafa673af51151842e156460eeccb77 [diff] |
Merge "Remove debugging logs from the full widgets picker" into sc-dev am: e1a2ea769f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14339828 Change-Id: I674d00e06f06b93a622eb1f011f9ff9cc109997a
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))