Commit Graph

509624 Commits

Author SHA1 Message Date
Automerger Merge Worker
697cb8451f Merge "Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe093 am: 60d328b77a" into rvc-d1-dev-plus-aosp 2020-06-13 02:51:27 +00:00
Automerger Merge Worker
75827ee3cb Merge "Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff2625493 am: faac366840" into rvc-d1-dev-plus-aosp 2020-06-13 02:51:21 +00:00
TreeHugger Robot
6ebb2883ad Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe093 am: 60d328b77a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11856230

Change-Id: I4375c6b8c398c0169df21e8e35bab1ad6ab04597
2020-06-13 02:51:21 +00:00
TreeHugger Robot
24391b6b22 Merge "Enabling New Insets API with Multi-Session IME." into rvc-dev am: 09419a8129 am: 185a6d154e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11802630

Change-Id: I8efe91fcab95c5764f3776c7730d94b080eed060
2020-06-13 02:51:12 +00:00
TreeHugger Robot
a699455dc0 Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff2625493 am: faac366840
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855413

Change-Id: Ibea8a3de1421f7a673ca2582b82569c617328718
2020-06-13 02:51:04 +00:00
TreeHugger Robot
cbdecba26f Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff2625493 am: 514e8d9637
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855413

Change-Id: Iaec6360af632d7e72391551bb54cfea0fb5de48b
2020-06-13 02:50:54 +00:00
TreeHugger Robot
60d328b77a Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe093
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11856230

Change-Id: I1c3cd3061fa834d4da441e329cd939964fa884fa
2020-06-13 02:44:22 +00:00
TreeHugger Robot
185a6d154e Merge "Enabling New Insets API with Multi-Session IME." into rvc-dev am: 09419a8129
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11802630

Change-Id: Ifa72b9fda0796fe82fbcecc5a73d68d86f08f02e
2020-06-13 02:44:01 +00:00
TreeHugger Robot
ecb9cfe093 Merge "Fix testMultipleConditions flake" into rvc-dev 2020-06-13 02:42:54 +00:00
TreeHugger Robot
09419a8129 Merge "Enabling New Insets API with Multi-Session IME." into rvc-dev 2020-06-13 02:42:14 +00:00
TreeHugger Robot
faac366840 Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff2625493
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855413

Change-Id: I7d153d6fecc4f188ca46672c2117d7e3cb26e299
2020-06-13 02:36:47 +00:00
TreeHugger Robot
514e8d9637 Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff2625493
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855413

Change-Id: I6b9032b74e830066b94328251c36985849b70533
2020-06-13 02:36:44 +00:00
TreeHugger Robot
6acdb83d5c Merge "Incident dump does not include current bucket" into rvc-dev am: 298dd714eb am: bc36ed513b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852825

Change-Id: Ia11fdd1eb26f2b215b0d081e50d080accdcbbbbb
2020-06-13 02:24:11 +00:00
Automerger Merge Worker
8f6091b4e9 Merge "Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881" into rvc-dev-plus-aosp am: 3cc9f00077
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694355

Change-Id: I121aa172e6f346ff9aef733ff5c5d187f4fcad7c
2020-06-13 02:23:50 +00:00
TreeHugger Robot
9ff2625493 Merge "Fixed unreadble debug messages" into rvc-dev 2020-06-13 02:23:16 +00:00
Automerger Merge Worker
de86bdb681 Merge "[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5 am: b6d1814cef -s ours" into rvc-dev-plus-aosp am: 456051ffc8 -s ours
am skip reason: Change-Id I305ff855f0d5595be13b6ee4e4480abd89ed258f with SHA-1 2387cdee2c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331803

Change-Id: If40a63a88406d8fb1c85e3dcef7db1f4bc1ecfcc
2020-06-13 02:23:06 +00:00
TreeHugger Robot
ca376d76f1 Merge "Incident dump does not include current bucket" into rvc-dev am: 298dd714eb am: 35333908f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852825

Change-Id: Ia2ca18a4f53a3c78bedac23067a79e609125d519
2020-06-13 02:22:11 +00:00
Selim Cinek
50db05188b Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881 am: b9ed45c308
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694355

Change-Id: I3ab2c769b1c02e1e76195ca5519d9538e50117da
2020-06-13 02:21:57 +00:00
TreeHugger Robot
9ff889fc3d Merge "Dark grey overflow in dark mode" into rvc-dev am: 77d0f42ff9 am: 7f4d8cc590
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842538

Change-Id: Ibc552c115fa20c5a1ba2dee3fa5649524cc792d4
2020-06-13 02:21:32 +00:00
TreeHugger Robot
4e8db8e0c1 Merge "Dark grey overflow in dark mode" into rvc-dev am: 77d0f42ff9 am: ef4b8c7dad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842538

Change-Id: I8d51a53aaaa5e0b241d392d672e2337cc8f68577
2020-06-13 02:21:13 +00:00
TreeHugger Robot
bc36ed513b Merge "Incident dump does not include current bucket" into rvc-dev am: 298dd714eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852825

Change-Id: I9a7224a28d03cbbe5cb8d4a54bf035a787f25024
2020-06-13 02:09:50 +00:00
Automerger Merge Worker
3cc9f00077 Merge "Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881" into rvc-dev-plus-aosp 2020-06-13 02:09:47 +00:00
TreeHugger Robot
35333908f9 Merge "Incident dump does not include current bucket" into rvc-dev am: 298dd714eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852825

Change-Id: I3529a17b6a8e2bcaeb4fc47ec72053b9761ff6a4
2020-06-13 02:09:42 +00:00
Selim Cinek
9c9f0f68da Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694355

Change-Id: I52b43e475f30445090abb9a15ba004f7b4ca0e5f
2020-06-13 02:09:39 +00:00
Automerger Merge Worker
456051ffc8 Merge "[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5 am: b6d1814cef -s ours" into rvc-dev-plus-aosp 2020-06-13 02:09:38 +00:00
Selim Cinek
b9ed45c308 Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694355

Change-Id: Id2c9f020009cdab069da039575998aedd4f51628
2020-06-13 02:09:24 +00:00
Xiangyu/Malcolm Chen
ee1c825e8c [automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5 am: b6d1814cef -s ours
am skip reason: Change-Id I305ff855f0d5595be13b6ee4e4480abd89ed258f with SHA-1 2387cdee2c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331803

Change-Id: I0a1e2fe364093bb67af967b04aad4e0b31449615
2020-06-13 02:09:24 +00:00
TreeHugger Robot
7f4d8cc590 Merge "Dark grey overflow in dark mode" into rvc-dev am: 77d0f42ff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842538

Change-Id: I73bdbecf8ab4ab0e6a6939ec3ed104e4fede1f16
2020-06-13 02:09:16 +00:00
TreeHugger Robot
ef4b8c7dad Merge "Dark grey overflow in dark mode" into rvc-dev am: 77d0f42ff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842538

Change-Id: Ib45ca0fb44f4c468a7d40ef8ecd9433e7e03b751
2020-06-13 02:08:57 +00:00
TreeHugger Robot
298dd714eb Merge "Incident dump does not include current bucket" into rvc-dev 2020-06-13 02:07:02 +00:00
Selim Cinek
3a8b73a881 Merge changes I3b8babc2,I56ea3eee into rvc-dev
* changes:
  Changed the landscape experience of quick settings
  Fixed an issue where the media player would shift when editing QS
2020-06-13 02:01:08 +00:00
Xiangyu/Malcolm Chen
b6d1814cef Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331803

Change-Id: I27caffd81ca9c1a9579831e35d5bf971ee69e7e9
2020-06-13 01:51:55 +00:00
TreeHugger Robot
77d0f42ff9 Merge "Dark grey overflow in dark mode" into rvc-dev 2020-06-13 01:49:25 +00:00
Automerger Merge Worker
3f67c4c42b Merge "Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe05e am: 2a30ca9e17" into rvc-d1-dev-plus-aosp 2020-06-13 01:40:58 +00:00
Sudheer Shanka
3918f4fc26 Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe05e am: 2a30ca9e17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744166

Change-Id: I0920e00760458595b2fc52ecdfed75ae13f27961
2020-06-13 01:40:51 +00:00
Sudheer Shanka
f81117f0d8 Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe05e am: 5a78574e55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744166

Change-Id: Iaf5645d296bac01b4eeba74699c9471552ff8e14
2020-06-13 01:40:38 +00:00
Xiangyu/Malcolm Chen
5821bbc6e5 Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" 2020-06-13 01:34:03 +00:00
Sudheer Shanka
2a30ca9e17 Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe05e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744166

Change-Id: Ie52ea68c064d9e62913bfb149241cc832189c2cf
2020-06-13 01:22:38 +00:00
Sudheer Shanka
5a78574e55 Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe05e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744166

Change-Id: Ic678cea2b0cf25da77a5e6893c4b664bc81dede0
2020-06-13 01:22:25 +00:00
Sudheer Shanka
51540fe05e Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev 2020-06-13 01:12:05 +00:00
Muhammad Qureshi
89358feae4 Fix testMultipleConditions flake
Use vector<int> instead of vector<bool>.
vector<bool> is not thread-safe:
https://en.cppreference.com/w/cpp/container#Thread_safety

Fixes: 156690351
Test: atest --iterations=500
statsd_test:MultiConditionTrigger#TestMultipleConditions

Change-Id: I9121747ffbee0864afbff993e7fe417104827952
2020-06-12 18:09:34 -07:00
Antonio Kantek
8403a13752 Enabling New Insets API with Multi-Session IME.
New insets based IME requires windows manager to properly link the
assocaited IME window token against the target window token.

Test script:
Step 1: Patch this CL on rvc-dev repo
Step 2: Build and flash Hawk
Step 3: Build and install a sample multi-client IME
  make -j MultiClientInputMethod
  adb install -r $OUT/system/priv-app/MultiClientInputMethod/MultiClientInputMethod.apk
Step 4: Enable multi-client IME for the side-loaded sample multi-client IME
  adb root
  adb shell setprop persist.debug.multi_client_ime com.example.android.multiclientinputmethod/.MultiClientInputMethod
  adb reboot
Step 5: Open KitchenSync app, select carboard, enter text on Plain Text
tab (sample multi-session keyboard doesn't support numeric keyboard yet)

Bug: 123718661
Test: manual (see test script above)
Change-Id: I2a27c0da3a243d9cb3c98541531396cd9ff819a0
2020-06-12 18:02:44 -07:00
Tej Singh
61f869e7bb Incident dump does not include current bucket
This is to avoid value metrics skipping buckets due to
DUMP_REPORT_REQUESTED, since if the metric needs to include the current
bucket under time constraints and needs to pull, it will drop the bucket
since it cannot pull.

Test: atest statsd_test
Bug: 158879346
Change-Id: Ia61e69530456ce2b3530add03ec6e068ffb25fb5
2020-06-12 17:25:17 -07:00
TreeHugger Robot
09488c364c Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev am: a840c1f3ea am: a447125c3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838105

Change-Id: I926a8bd2cdf95d96e33d715dba4991852db70ba0
2020-06-12 23:40:19 +00:00
Hall Liu
e9fd2d379e Merge "Throw exception from addServiceAnnouncement impl" am: a179e9f6e7 am: 15b0dc5eb3 am: dd1aa9dc92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322368

Change-Id: Iae3aa41b0ad069da5d0bc227466f1aaad8b7743a
2020-06-12 23:40:11 +00:00
Automerger Merge Worker
f472fd2aee Merge "Merge "Change the threshold for RSSNR from 10*db to db" into rvc-dev am: 46ff383585" into rvc-dev-plus-aosp am: 5fb38bc9e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838961

Change-Id: I421ddbf6025eeab1e70df175bfbccb22efa87edc
2020-06-12 23:39:40 +00:00
Hall Liu
e3966e111a Merge "Rename addServiceAnnouncement-related methods" am: 6f68b4bf53 am: c31fa35b94 am: c6fc7c6ca8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311925

Change-Id: I486951766ac2765053812a5c3fb04e8295ec61b3
2020-06-12 23:38:54 +00:00
Youngjun Kwak
cb3fb6960e Merge "Hide UserSwitchTransitionView if it is not hidden within timeout." into rvc-dev am: d42606d7c4 am: a9a8a815a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838963

Change-Id: I0635cb91b997dd2d82bc155a1a620495219ab7e4
2020-06-12 23:38:31 +00:00
TreeHugger Robot
ad8d6ad319 Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev am: a840c1f3ea am: 8070800916
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838105

Change-Id: Ia9379370ad00173e7dd960e925ec48412a186978
2020-06-12 23:34:28 +00:00
Shuo Qian
9bf3b2df05 Merge "Change the threshold for RSSNR from 10*db to db" into rvc-dev am: 46ff383585 am: ea1c4eeb2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838961

Change-Id: I7a864181a9a10e3f9b710348271168ee92902893
2020-06-12 23:34:02 +00:00