Automerger Merge Worker
6afb28c9c8
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244 am: be2826e8dc
...
Change-Id: I18e07c3ae09432469b8a3a8804b40c76676b64c0
2019-12-11 22:34:14 +00:00
Automerger Merge Worker
bae05149de
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a
...
Change-Id: Id6995c02dc69230eab7cd1d312c4c4d569e44a25
2019-12-11 21:45:33 +00:00
Automerger Merge Worker
bccb8bec0a
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6
...
Change-Id: I43130453f6b576679c52be643344589ac624dadd
2019-12-11 21:14:16 +00:00
Tarandeep Singh
80e02c8b2c
DO NOT MERGE: Freeup lock when IME is set inactive and unbound
...
am: ad0a4a229a
2019-11-26 12:09:53 -08:00
Tarandeep Singh
7b729fa242
DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
...
am: 4b6acb4f39
2019-11-26 12:09:47 -08:00
TreeHugger Robot
c53b736775
Merge "DO NOT MERGE: Freeup lock when IME is set inactive and unbound" into qt-qpr1-dev
2019-11-26 19:42:45 +00:00
Tarandeep Singh
ad0a4a229a
DO NOT MERGE: Freeup lock when IME is set inactive and unbound
...
Any pending windowGainedFocus future should be cancelled when IME is
switched/unbound.
Additinally, startInputInner() inside synchronized block blocked
WINDOW_FOCUS_GAIN from executing. Its fine to remove synchronization
here since startInputInner() already has relevant synchronized blocks.
Change-Id: I98cb044d8cbfb80480312a3923f168aefa9b7e7d
Fix: 144103599
Bug: 139806621
Test: Manually using the steps in bug.
(cherry picked from commit 322ee9bf9e
2019-11-23 04:14:49 +00:00
Tarandeep Singh
4b6acb4f39
DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
...
For a typical window with Editor, IMM#startInputOrWindowGainedFocus
is called twice: first for WINDOW_FOCUS_GAIN (dummyInput), then
CHECK_FOCUS when actual editor receives focus and startsInput.
The first once can be moved to background thread and second startInput
will wait till its finished.
Bug: 139806621
Test: Manually launch activities with editors and confirm no change in
behavior.
Change-Id: I6aa4a664cfd0c86f75cee2457715317194bbe5e2
(cherry picked from commit e0172102b9
2019-11-23 04:13:28 +00:00
Artur Satayev
79aff5c601
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa
...
am: 59318bab67
2019-11-13 10:40:54 -08:00
Artur Satayev
59318bab67
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
...
am: a98026f7aa
2019-11-13 10:33:06 -08:00
Artur Satayev
5a525851a8
Add @UnsupportedAppUsage to test apis that are known to be used by apps.
...
go/testapi-enforcement
Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Artur Satayev
756d3b447a
Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
...
am: 7a565c45b1
2019-11-11 09:33:13 -08:00
Artur Satayev
7a565c45b1
Merge "Add @UnsupportedAppUsage annotations for greylist."
...
am: 423c3a32d6
2019-11-11 09:13:24 -08:00
Joshua Baxter
6d92ef5ea5
Merge "docs: remove incorrect (default) identifiers" into qt-dev am: 2c7d94c7ed am: b2a8b29d10
...
am: 311218304a
2019-11-08 15:34:36 -08:00
Joshua Baxter
311218304a
Merge "docs: remove incorrect (default) identifiers" into qt-dev am: 2c7d94c7ed
...
am: b2a8b29d10
2019-11-08 15:26:57 -08:00
Joshua Baxter
b2a8b29d10
Merge "docs: remove incorrect (default) identifiers" into qt-dev
...
am: 2c7d94c7ed
2019-11-08 15:18:53 -08:00
Artur Satayev
3be4d59369
Merge "Add @UnsupportedAppUsage annotations for max-p." am: 8893f158c6
...
am: da4d6567c2
2019-11-08 09:49:03 -08:00
Artur Satayev
da4d6567c2
Merge "Add @UnsupportedAppUsage annotations for max-p."
...
am: 8893f158c6
2019-11-08 09:38:12 -08:00
Artur Satayev
fc46be7dbd
Add @UnsupportedAppUsage annotations for greylist.
...
go/cleanup-greylist-txt
These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.
Bug: 137350495
Test: m
Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Artur Satayev
ee9c6e7571
Add @UnsupportedAppUsage annotations for max-p.
...
See go/UnsupportedAppUsage for more details.
These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.
Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
Merged-In: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-11-08 16:17:13 +00:00
Joshua Baxter
5411869170
docs: remove incorrect (default) identifiers
...
Change-Id: I4ce6bc8a7b0e2f18055416a21f465cd2cfe4ec66
test: make ds-docs
bug: 112679894
2019-11-06 22:14:11 +00:00
Joshua Baxter
fc66e118db
Merge "docs: fix typos" into qt-dev am: d732cbb7bd am: 77514bd077
...
am: 208e73ca76
2019-11-06 13:57:03 -08:00
Joshua Baxter
208e73ca76
Merge "docs: fix typos" into qt-dev am: d732cbb7bd
...
am: 77514bd077
2019-11-06 13:41:26 -08:00
Joshua Baxter
e9a62d5f86
Merge "docs: fix typos" into qt-dev am: 7bd7afabb8 am: 53fba24239
...
am: 20148858f5
2019-11-06 13:41:00 -08:00
Joshua Baxter
20148858f5
Merge "docs: fix typos" into qt-dev am: 7bd7afabb8
...
am: 53fba24239
2019-11-06 13:28:46 -08:00
Joshua Baxter
77514bd077
Merge "docs: fix typos" into qt-dev
...
am: d732cbb7bd
2019-11-06 13:26:00 -08:00
Joshua Baxter
53fba24239
Merge "docs: fix typos" into qt-dev
...
am: 7bd7afabb8
2019-11-06 13:21:12 -08:00
Joshua Baxter
d732cbb7bd
Merge "docs: fix typos" into qt-dev
2019-11-06 21:01:14 +00:00
Joshua Baxter
914bda7659
docs: fix typos
...
test: make ds-docs
bug: 36974889
2019-11-06 21:01:00 +00:00
Joshua Baxter
ec27701c78
docs: fix typos
...
Change-Id: Ie238360300cac54bd4717b4ff75d5534f82e0307
test: make ds-docs
bug: 36948876
2019-11-06 20:53:55 +00:00
John Reck
48145618d2
Merge "Ensure SKP serialization occurs on RenderThread" into qt-qpr1-dev
...
am: ab9d0b5103
2019-10-31 10:50:38 -07:00
Xin Li
6f48900f50
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Ember Rose
4ac4411300
Merge "Update Ember's email" am: 0e6683ef7e am: bf7239e2fb
...
am: 159091ed3f
2019-10-10 22:01:37 -07:00
Ember Rose
159091ed3f
Merge "Update Ember's email" am: 0e6683ef7e
...
am: bf7239e2fb
2019-10-10 21:46:22 -07:00
Ember Rose
bf7239e2fb
Merge "Update Ember's email"
...
am: 0e6683ef7e
2019-10-10 21:32:39 -07:00
Ember Rose
4e76b6acd6
Update Ember's email
...
Test: N/A
Fix: 141939605
Change-Id: Icd9ae23a74175a98f8495f71c85b69891d387df0
Merged-In: Icd9ae23a74175a98f8495f71c85b69891d387df0
2019-10-10 22:41:57 +00:00
John Reck
8d0da1a6c5
Ensure SKP serialization occurs on RenderThread
...
Instead of doing lazy serialization of SKP on the
background executor serialize to a byte[] immediately
at callback invocation. This ensures no potential
for later mutations, race conditions, or wrong-thread issues
at the expense of potentially impacting app rendering performance.
However it seems preferable for a debug-only tool to be a slow
instead of very crashy.
Bug: 141772764
Test: test app
Change-Id: I3316d49970b96f1c59bb0a28ff7335db608e539e
2019-10-03 13:20:08 -07:00
Kevin Hufnagle
0befd27389
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev am: 667b944522 am: 52145e2481
...
am: 3f80c14817
2019-09-30 09:36:01 -07:00
Kevin Hufnagle
3f80c14817
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev am: 667b944522
...
am: 52145e2481
2019-09-30 09:29:21 -07:00
Kevin Hufnagle
dc0d6668ff
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev am: 667b944522
...
am: 52145e2481
2019-09-30 09:29:21 -07:00
Kevin Hufnagle
52145e2481
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev
...
am: 667b944522
2019-09-30 09:23:00 -07:00
Kevin Hufnagle
36ef69743c
docs: Added link to multi-window drag how-to guide
...
Test: make ds-docs -j32
Bug: 71008103
Change-Id: Ifcc50920cf3828697add018d1d3a6a827c7c9f98
2019-09-27 23:56:09 +00:00
Kevin Hufnagle
c56a6f0800
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev am: e49cbb3a5d am: 786e8a2849
...
am: 5061c99b61
2019-09-24 15:24:12 -07:00
Kevin Hufnagle
8f473fb241
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev am: e49cbb3a5d
...
am: 786e8a2849
2019-09-24 15:14:18 -07:00
Kevin Hufnagle
5061c99b61
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev am: e49cbb3a5d
...
am: 786e8a2849
2019-09-24 15:14:14 -07:00
Kevin Hufnagle
786e8a2849
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev
...
am: e49cbb3a5d
2019-09-24 15:06:18 -07:00
Winson Chung
3f0b334926
Merge "Exposing flickerlib classes and layer tracing to sysui" am: e25075b2fb am: f19fcb5048
...
am: 8832611d4f
2019-09-19 07:17:25 -07:00
Winson Chung
8832611d4f
Merge "Exposing flickerlib classes and layer tracing to sysui" am: e25075b2fb
...
am: f19fcb5048
2019-09-19 07:09:21 -07:00
Winson Chung
f19fcb5048
Merge "Exposing flickerlib classes and layer tracing to sysui"
...
am: e25075b2fb
2019-09-19 06:55:30 -07:00
Winson Chung
2f8f814501
Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev
...
am: 4b15467f5f
2019-09-17 13:57:33 -07:00
