| commit | 684b89c57a7ad145505b636630ebec6057e7cbe6 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Fri Oct 25 20:01:40 2019 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Oct 25 20:01:40 2019 +0000 |
| tree | 13d2d13a7dd73919e095510ee690dceb8abaff6f | |
| parent | 16fdeda6a6855e1c9f0645cc3ec230553ec00655 [diff] | |
| parent | d1e003be6904a2a7d5701bb7fa0a892922fa0a6d [diff] |
Merge cherrypicks of [9617721, 9617650, 9616775, 9616776, 9617925, 9617944] into rvc-release Change-Id: Ie98f53385621cffaa70748618728a80c644ba8a4
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index 0eafb44..5591e40 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -416,6 +416,9 @@ Log.e(TAG, "Unknown event " + ev); return; } + if (!mDeviceState.isUserUnlocked()) { + return; + } Object traceToken = TraceHelper.INSTANCE.beginFlagsOverride( TraceHelper.FLAG_ALLOW_BINDER_TRACKING);