| commit | edba28478c950856c7e3423d11cbc78168b244e4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Feb 12 18:08:39 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 12 18:08:39 2019 +0000 |
| tree | 232c1d0778f67509acbf914d73db2113d883997d | |
| parent | 5a518a9b8b127b0491168443e7cb5c3c9a481857 [diff] | |
| parent | 224b028092f19a37bc2d8c7d176df97720432098 [diff] |
Merge changes Ibe5f1cdc,I219f48b2 into ub-launcher3-master * changes: Increase icon cache version Not using reflection for app-usage API
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java index 2966cb1..d84633d 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java +++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
@@ -505,7 +505,7 @@ } static final class IconDB extends SQLiteCacheHelper { - private final static int RELEASE_VERSION = 25; + private final static int RELEASE_VERSION = 26; public final static String TABLE_NAME = "icons"; public final static String COLUMN_ROWID = "rowid";
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java index bbcd425..cbd6b2f 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -78,6 +78,12 @@ public void initialize(Task task, InitializeCallback callback) { mTask = task; + + if (task.key.userId != UserHandle.myUserId()) { + callback.call(1, task.titleDescription); + return; + } + Utilities.THREAD_POOL_EXECUTOR.execute(() -> { long appUsageLimitTimeMs = -1; long appRemainingTimeMs = -1;