| commit | fc6217fad88f6a9471dd7bc2c970015a6c29f089 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 30 01:38:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 30 01:38:07 2021 +0000 |
| tree | 16664a56f7477ab4aec6af21f61a603db62cb219 | |
| parent | b2d8e306beff89eca21f94c145a731819f8b66a2 [diff] | |
| parent | 5ed594fde0a057aab4f3ba89f811aeeaa2b12909 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5ed594fde0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14356025 Change-Id: I715c80137ed2386a7d17cd95fb21775d3fa4e978
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))