OSDN Git Service
Etan Cohen [Thu, 30 May 2019 22:55:19 +0000 (15:55 -0700)]
Merge "Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a am:
f30b0beae2" into qt-r1-dev-plus-aosp
am:
c73d6dc2ff
Change-Id: I816ac2f1acf6f4ff6b578a8ceb23da6f98c7d418
Matt Casey [Thu, 30 May 2019 22:53:34 +0000 (15:53 -0700)]
Merge "Fixes test that is currently failing" into qt-dev am:
20a2e7ae2f am:
0d60b4c868
am:
13f1230336
Change-Id: I1604cb4ee1c48c3e4424700e54584867c50ed625
Etan Cohen [Thu, 30 May 2019 22:52:00 +0000 (15:52 -0700)]
Merge "Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a am:
92d3ac8a7e" into qt-r1-dev-plus-aosp
am:
4fa527fb55
Change-Id: I494a70843f724325f5cf99cf7f976a7993157443
Evan Rosky [Thu, 30 May 2019 22:48:47 +0000 (15:48 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev am:
ed057ab244 am:
841ef9cd13
am:
57db75a5fb
Change-Id: Ied56c20739b346f2c0f0b30dc43edcef3171e37e
Evan Rosky [Thu, 30 May 2019 22:45:48 +0000 (15:45 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev am:
ed057ab244 am:
e06bed8570
am:
3e96ab4621
Change-Id: Iaa6ddd73c7ce3d2ee795672ead81c7d3e24cb04e
Android Build Merger (Role) [Thu, 30 May 2019 22:44:35 +0000 (22:44 +0000)]
Merge "Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a am:
f30b0beae2" into qt-r1-dev-plus-aosp
Etan Cohen [Thu, 30 May 2019 22:44:01 +0000 (15:44 -0700)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a
am:
f30b0beae2
Change-Id: I99810fb9edfebfc03058a1f57fcb61748daafa8b
Matt Casey [Thu, 30 May 2019 22:43:22 +0000 (15:43 -0700)]
Merge "Fixes test that is currently failing" into qt-dev am:
20a2e7ae2f
am:
0d60b4c868
Change-Id: Ic6ee0fdc207453a39c7b463feba86f8f3714f0ef
Android Build Merger (Role) [Thu, 30 May 2019 22:41:50 +0000 (22:41 +0000)]
Merge "Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a am:
92d3ac8a7e" into qt-r1-dev-plus-aosp
Etan Cohen [Thu, 30 May 2019 22:41:10 +0000 (15:41 -0700)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a
am:
92d3ac8a7e
Change-Id: Ibe283ce1f27398a59be6de2bd5a8052bb70c9657
Evan Rosky [Thu, 30 May 2019 22:40:44 +0000 (15:40 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev am:
ed057ab244
am:
841ef9cd13
Change-Id: Ida54d74ef9637d8e8a4ea1d1912386b9014e0269
Evan Rosky [Thu, 30 May 2019 22:37:51 +0000 (15:37 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev am:
ed057ab244
am:
e06bed8570
Change-Id: I9189fc97df443bb0b388c4bc05396b8bb35628c4
Matt Casey [Thu, 30 May 2019 22:35:15 +0000 (15:35 -0700)]
Merge "Fixes test that is currently failing" into qt-dev
am:
20a2e7ae2f
Change-Id: Id78942cc57c075f983984bb39da969e505938781
Etan Cohen [Thu, 30 May 2019 22:33:46 +0000 (15:33 -0700)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev
am:
08236f3d3a
Change-Id: I58894f7c34dd129ea43db7396bccb7720b2b467a
Etan Cohen [Thu, 30 May 2019 22:33:43 +0000 (15:33 -0700)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev
am:
08236f3d3a
Change-Id: I67f895f5bb227749edcdc859007622f0ac77723b
Evan Rosky [Thu, 30 May 2019 22:29:43 +0000 (15:29 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev
am:
ed057ab244
Change-Id: I3f127cf09d2ac6340095121a36795a59e1d5a94a
Evan Rosky [Thu, 30 May 2019 22:29:42 +0000 (15:29 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev
am:
ed057ab244
Change-Id: Ia08d8a9f04866e0e9b872f17ca49d049f9499fbb
Siarhei Vishniakou [Thu, 30 May 2019 22:27:49 +0000 (15:27 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev am:
2fb4cb55f0 am:
662c41bf53
am:
7fdd018deb
Change-Id: I8d356b9b7d32e4f9223cdcef28e1177c935ab358
Siarhei Vishniakou [Thu, 30 May 2019 22:25:42 +0000 (15:25 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev am:
2fb4cb55f0 am:
7e2a341ee1
am:
b603b68925
Change-Id: Ibbeffed2cedeb8abad756b92f52f7578dd557f49
TreeHugger Robot [Thu, 30 May 2019 22:24:24 +0000 (22:24 +0000)]
Merge "Brought back compatibility check for falling back on dest_out whenever clear is used as a blend mode to draw bitmaps"
Matt Casey [Thu, 30 May 2019 22:23:37 +0000 (22:23 +0000)]
Merge "Fixes test that is currently failing" into qt-dev
Govinda Wasserman [Thu, 30 May 2019 17:24:24 +0000 (13:24 -0400)]
Fixes test that is currently failing
Refactors yesterday caused tests to fail because of dependencies getting
initialized earlier. Refactored so that they are initialized late enough
for the tests to be able to mock them correctly.
Also fixes bug where handles would still show when there was no
Assistant.
Test: atest AssistHandleBehaviorControllerTest
BUG:
132424950
Fixes:
134086503
Change-Id: I645a2529bf56b5e996e8250267ead87bed9f4f2b
FIX:
132424950
Jeff Sharkey [Thu, 30 May 2019 22:21:22 +0000 (15:21 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev am:
c4289bdeca am:
192467bd3f
am:
8d4996acaf
Change-Id: Id142870378187a1b4dcc7e14c61d4c1401daca0b
Etan Cohen [Thu, 30 May 2019 22:16:09 +0000 (22:16 +0000)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev
Jeff Sharkey [Thu, 30 May 2019 22:12:45 +0000 (15:12 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev am:
c4289bdeca am:
143cc83668
am:
ae8db8697c
Change-Id: I0aae36517fa81d99632c3f53e4ed83713d8d25df
Evan Rosky [Thu, 30 May 2019 22:11:37 +0000 (22:11 +0000)]
Merge "Take snapshot directly during change transition" into qt-dev
Mehdi Alizadeh [Thu, 30 May 2019 22:11:07 +0000 (15:11 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev am:
32d97863d6 am:
71cb077172
am:
ce2e60ce2b
Change-Id: Ie6429aee4e3f5f62461daee6c9af0dc0afa118d1
Colin Cross [Thu, 30 May 2019 22:08:20 +0000 (15:08 -0700)]
[automerger skipped] Merge "Convert SettingsLib tests to Android.bp" am:
d0de38b222 am:
ec3a29c544 -s ours am:
58fa5df312 -s ours
am:
352e00c122 -s ours
am skip reason: change_id I69b5b2c6c22f93a31ef978710867226cb1ba3db0 with SHA1
fdec9ffee0 is in history
Change-Id: I59ce7e7bc2369420a9faaabab2f219705798ff08
Mehdi Alizadeh [Thu, 30 May 2019 22:01:54 +0000 (15:01 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev am:
32d97863d6 am:
0fd238797f
am:
1654bea4b8
Change-Id: I26c0283806f00f9d9b840a3c8d665cc64d19419c
Siarhei Vishniakou [Thu, 30 May 2019 22:00:29 +0000 (15:00 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev am:
2fb4cb55f0
am:
662c41bf53
Change-Id: I36881a92fa2fbf5520b275a5537110bfef8ab737
Siarhei Vishniakou [Thu, 30 May 2019 21:57:43 +0000 (14:57 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev am:
2fb4cb55f0
am:
7e2a341ee1
Change-Id: I19cbf07377642670059add0d27ffe7011a830f4b
TreeHugger Robot [Thu, 30 May 2019 21:57:17 +0000 (21:57 +0000)]
Merge "Adding version code R for development"
Jeff Sharkey [Thu, 30 May 2019 21:55:30 +0000 (14:55 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev am:
c4289bdeca
am:
192467bd3f
Change-Id: I3016b17c3a15b39b496b54820b0be794f46b4379
Siarhei Vishniakou [Thu, 30 May 2019 21:52:39 +0000 (14:52 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
am:
2fb4cb55f0
Change-Id: Ia2b1bcb2c98adac680bbe223b8818b1a62338132
Jeff Sharkey [Thu, 30 May 2019 21:51:08 +0000 (14:51 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev am:
c4289bdeca
am:
143cc83668
Change-Id: Ied9429c09214424ead9764a6f54088c281dbe70b
Siarhei Vishniakou [Thu, 30 May 2019 21:47:37 +0000 (14:47 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
am:
2fb4cb55f0
Change-Id: I1f638492b1be20670d2379da073519348a08e9fd
Anders Fridlund [Thu, 30 May 2019 21:47:25 +0000 (14:47 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev am:
36e3da7920 am:
8c6fbc6110
am:
d06c280c1c
Change-Id: Ic4fc607f93299f8db91738bdcd2f152c783fa890
Jeff Sharkey [Thu, 30 May 2019 21:45:29 +0000 (14:45 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev
am:
c4289bdeca
Change-Id: I914cfab337d18461321fff5ca3bcdb4a53be8e63
Jeff Sharkey [Thu, 30 May 2019 21:43:33 +0000 (14:43 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev
am:
c4289bdeca
Change-Id: I483473d7a65cde8269b2c4b75abe1a0c49ef1620
Makoto Onuki [Thu, 30 May 2019 21:42:50 +0000 (14:42 -0700)]
Merge "Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d am:
9fe268ccfd" into qt-r1-dev-plus-aosp
am:
224589e4b8
Change-Id: Ica57d73c1356a805866de76db05edc226cbc7cd5
TreeHugger Robot [Thu, 30 May 2019 21:42:27 +0000 (21:42 +0000)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
Anders Fridlund [Thu, 30 May 2019 21:37:12 +0000 (14:37 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev am:
36e3da7920 am:
0dd52a5985
am:
0b33c85dca
Change-Id: I5bbd5e763b5d4f5608c3a3adaebf25a4a3cb63b2
Mehdi Alizadeh [Thu, 30 May 2019 21:35:44 +0000 (14:35 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev am:
32d97863d6
am:
71cb077172
Change-Id: I02b89888bfeeb5b3797890f85215630c9ff1209b
Colin Cross [Thu, 30 May 2019 21:33:42 +0000 (14:33 -0700)]
[automerger skipped] Merge "Convert SettingsLib tests to Android.bp" am:
d0de38b222 am:
ec3a29c544 -s ours
am:
58fa5df312 -s ours
am skip reason: change_id I69b5b2c6c22f93a31ef978710867226cb1ba3db0 with SHA1
fdec9ffee0 is in history
Change-Id: I0d7216679a26ca84a3a7362354cedeef88e0ac60
Makoto Onuki [Thu, 30 May 2019 21:30:00 +0000 (14:30 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d am:
6550afbe33
am:
47398bb26e
Change-Id: Id0cd10270280d4220295d97ef1723a0a8402b348
Mehdi Alizadeh [Thu, 30 May 2019 21:29:54 +0000 (14:29 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev am:
32d97863d6
am:
0fd238797f
Change-Id: I8118bd8db631f96a3e428b6e39b7bef522c42b82
Jeff Sharkey [Thu, 30 May 2019 21:29:21 +0000 (21:29 +0000)]
Merge "Shift call statistics back to the original caller." into qt-dev
Nazanin Bakhshi [Thu, 30 May 2019 21:27:31 +0000 (21:27 +0000)]
Merge "Store subscriber ID / IMSI into telephony database"
Colin Cross [Thu, 30 May 2019 21:25:30 +0000 (14:25 -0700)]
[automerger skipped] Merge "Convert SettingsLib tests to Android.bp" am:
d0de38b222
am:
ec3a29c544 -s ours
am skip reason: change_id I69b5b2c6c22f93a31ef978710867226cb1ba3db0 with SHA1
fdec9ffee0 is in history
Change-Id: Ic2d055ddf34ad5fa1f91dca761f23b8c8cc9f3c0
Mehdi Alizadeh [Thu, 30 May 2019 21:22:19 +0000 (14:22 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev
am:
32d97863d6
Change-Id: I021814ff3030d9821ef8de1385b66f0b28278686
Mehdi Alizadeh [Thu, 30 May 2019 21:22:18 +0000 (14:22 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev
am:
32d97863d6
Change-Id: Ic6d507eed5cdcb6ed3c35847640ea13c30bf31c6
Anders Fridlund [Thu, 30 May 2019 21:18:06 +0000 (14:18 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev am:
36e3da7920
am:
8c6fbc6110
Change-Id: I711521f58b855a5aee26568db1cbc1cca2884ddb
Colin Cross [Thu, 30 May 2019 21:14:23 +0000 (14:14 -0700)]
Merge "Convert SettingsLib tests to Android.bp"
am:
d0de38b222
Change-Id: I2b41c0d12dc70102e4c620a61e5d9fc2706a881b
Android Build Merger (Role) [Thu, 30 May 2019 21:13:50 +0000 (21:13 +0000)]
Merge "Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d am:
9fe268ccfd" into qt-r1-dev-plus-aosp
Mehdi Alizadeh [Thu, 30 May 2019 21:13:08 +0000 (21:13 +0000)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev
Makoto Onuki [Thu, 30 May 2019 21:12:22 +0000 (14:12 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d
am:
9fe268ccfd
Change-Id: I533e4938fa667f3c3037b14d37d26d628b844ca6
Anders Fridlund [Thu, 30 May 2019 21:11:20 +0000 (14:11 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev am:
36e3da7920
am:
0dd52a5985
Change-Id: I4193bb1920e1f42a4b3737b10266c8bc88c91a37
Colin Cross [Thu, 30 May 2019 21:08:52 +0000 (21:08 +0000)]
Merge "Convert SettingsLib tests to Android.bp"
Varun Anand [Thu, 30 May 2019 21:08:06 +0000 (14:08 -0700)]
[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am:
b50e778fa7 am:
9561790069 -s ours am:
84a4f3e962 -s ours
am:
71d6f66d12 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1
1419b0b20e is in history
Change-Id: I5843bda44deaca837e2517465df3f8d9f3f2d5d2
Makoto Onuki [Thu, 30 May 2019 21:08:00 +0000 (14:08 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d
am:
6550afbe33
Change-Id: I7f8d84bba6b516d91303344c1b62f132c923ade6
Anders Fridlund [Thu, 30 May 2019 21:01:50 +0000 (14:01 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev
am:
36e3da7920
Change-Id: Idbdc8e24d7d986a0a785965f534c65f1add847a8
Anders Fridlund [Thu, 30 May 2019 20:59:26 +0000 (13:59 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev
am:
36e3da7920
Change-Id: Ib37abe37122d14a2e3d3a4ecaae5c24a23ba9992
Makoto Onuki [Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev
am:
70554da78d
Change-Id: I38bcfdf34ba0ff6c805f1909a2844d2a57835712
Makoto Onuki [Thu, 30 May 2019 20:53:53 +0000 (13:53 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev
am:
70554da78d
Change-Id: I8a9197a4b3b7b0ae85cf624ca1815c418bd94588
Matt Casey [Thu, 30 May 2019 20:49:04 +0000 (13:49 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am:
c71c7fe881 am:
bf5a232744
am:
e4b1df26c3
Change-Id: I118319c260893decd01e695a60e725c8e2d9d0ef
Varun Anand [Thu, 30 May 2019 20:47:41 +0000 (13:47 -0700)]
[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am:
b50e778fa7 am:
9561790069 -s ours
am:
84a4f3e962 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1
1419b0b20e is in history
Change-Id: I982ce55558624e26531695abf09e3108b2463780
Priyank Singh [Thu, 30 May 2019 20:47:18 +0000 (13:47 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4 am:
5dba9060ad
am:
e296c626c6 -s ours
am skip reason: subject contains skip directive
Change-Id: I851a511692a5bc25104667fced14fba6dcacd304
Priyank Singh [Thu, 30 May 2019 20:44:17 +0000 (13:44 -0700)]
[automerger skipped] DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am:
a6c1e6ab65 am:
77d976491c
am:
465084f080 -s ours
am skip reason: subject contains skip directive
Change-Id: Icba21cf39968e26eeb7f46b5647340374ec309ec
Julia Reynolds [Thu, 30 May 2019 20:42:11 +0000 (13:42 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev am:
58cfefe9cc am:
8c3767aba8
am:
a7bdb6af9c
Change-Id: Ie93839071c924f93abce5b17b172b5deba5ce034
Jean-Michel Trivi [Thu, 30 May 2019 20:39:50 +0000 (13:39 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev am:
3de2438d5c am:
e0cc30bcb8
am:
121bf66448
Change-Id: I0b60f42d8dd2c14964f5d84a70bdc1d4994412bf
TreeHugger Robot [Thu, 30 May 2019 20:37:19 +0000 (20:37 +0000)]
Merge "Look for bootanimation in apex-module" into qt-dev
Robert Carr [Thu, 30 May 2019 20:37:14 +0000 (13:37 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours am:
cd43a5f7ad am:
d6d018e3dc
am:
f74c066cd8 -s ours
am skip reason: subject contains skip directive
Change-Id: If4a491546bca8da7a8efc161b15e77f123bd1a41
Makoto Onuki [Thu, 30 May 2019 20:33:06 +0000 (20:33 +0000)]
Merge "Add one more config resource for contacts provider" into qt-dev
Matt Casey [Thu, 30 May 2019 20:31:48 +0000 (13:31 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am:
c71c7fe881 am:
f3534200b5
am:
840d2a971a
Change-Id: I6b092f32e0f8148394a65ea4591786f39bb169f5
Varun Anand [Thu, 30 May 2019 20:26:09 +0000 (13:26 -0700)]
[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am:
b50e778fa7
am:
9561790069 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1
1419b0b20e is in history
Change-Id: I86c99de74590e3ad54055a16b5c349b6ba3659ab
Matt Casey [Thu, 30 May 2019 20:22:19 +0000 (13:22 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am:
c71c7fe881
am:
bf5a232744
Change-Id: I3f50dae4c226630fbf45554cf623a7f8515a4688
Leon Scroggins [Thu, 30 May 2019 20:21:31 +0000 (13:21 -0700)]
Merge "Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb am:
8104d693d6" into qt-r1-dev-plus-aosp
am:
946dce179c
Change-Id: I56c8f6fe004385d2439f522feca4e440dd147a78
Priyank Singh [Thu, 30 May 2019 20:20:35 +0000 (13:20 -0700)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4
am:
5dba9060ad
Change-Id: I7bac30948a62ef27b9c4c5252ff1748fe4b5022e
Priyank Singh [Thu, 30 May 2019 20:20:18 +0000 (13:20 -0700)]
[automerger skipped] Merge "Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4 am:
77667ce117" into qt-r1-dev-plus-aosp
am:
f8c23c77e0 -s ours
am skip reason: subject contains skip directive
Change-Id: I9cd0936cd0beb38580e6fe38fecabec3d7adc45e
Josh Tsuji [Thu, 30 May 2019 20:19:38 +0000 (13:19 -0700)]
Merge "Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am:
06cbf65704 am:
65cba0fa32" into qt-r1-dev-plus-aosp
am:
9d813b8690
Change-Id: I5be08d581beec95e668b5852d3e2d95d8e357aad
Priyank Singh [Thu, 30 May 2019 20:19:11 +0000 (13:19 -0700)]
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am:
a6c1e6ab65
am:
77d976491c
Change-Id: I6e952c6192401fe860c835f84118b8c8999474c4
Priyank Singh [Thu, 30 May 2019 20:19:03 +0000 (13:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am:
a6c1e6ab65 am:
793cf2ee37" into qt-r1-dev-plus-aosp
am:
34ca6dd80b -s ours
am skip reason: subject contains skip directive
Change-Id: I565bea01b097b6237f1ef0f9513e4e60887ba8ba
Hongyi Zhang [Thu, 30 May 2019 20:18:25 +0000 (13:18 -0700)]
Merge "Merge "Add Usage info for LocationManager's APIs" into qt-dev am:
11ddc8ea0b am:
4e5d2a48c1" into qt-r1-dev-plus-aosp
am:
17ed19b08c
Change-Id: I1ddef4773fb46146873df315ae8e22225045bd5c
Winson Chung [Thu, 30 May 2019 20:17:33 +0000 (13:17 -0700)]
Merge "Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am:
6f24b88c71 am:
07917b9ee5" into qt-r1-dev-plus-aosp
am:
6f7402b95a
Change-Id: I397dba95b97ba2c6b26a230b93c0bc3c840d13ed
Julia Reynolds [Thu, 30 May 2019 20:16:55 +0000 (13:16 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev am:
58cfefe9cc
am:
8c3767aba8
Change-Id: I8c672ddbfcbf1aeaaf5f5694c7d951bead8c5ac3
Julia Reynolds [Thu, 30 May 2019 20:16:40 +0000 (13:16 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev am:
58cfefe9cc am:
9cdc4fa314
am:
a24860afb8
Change-Id: Ibaa61a880a13a7381e70bfc455d706532c5f638b
Jean-Michel Trivi [Thu, 30 May 2019 20:15:56 +0000 (13:15 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev am:
3de2438d5c am:
3222703156
am:
96d2c7898e
Change-Id: I9faf497e730c27eb756d3a374ad4825d8adbecd8
Robert Carr [Thu, 30 May 2019 20:15:06 +0000 (13:15 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours am:
cd43a5f7ad am:
6e373387c8
am:
7ed862dece -s ours
am skip reason: subject contains skip directive
Change-Id: I8d90564ed140e2ef705bf552dc6cf3e358fa5ff7
Jean-Michel Trivi [Thu, 30 May 2019 20:14:40 +0000 (13:14 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev am:
3de2438d5c
am:
e0cc30bcb8
Change-Id: I3ef3864e052201a3249acddf20f9804710b0619c
Robert Carr [Thu, 30 May 2019 20:11:47 +0000 (13:11 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours am:
cd43a5f7ad
am:
d6d018e3dc
Change-Id: Ic5614e7c1fbe6abbccb98b0d75de1adddce9ed39
Varun Anand [Thu, 30 May 2019 20:11:03 +0000 (13:11 -0700)]
Merge changes from topic "vpn_data_accn_tests"
am:
b50e778fa7
Change-Id: I52f55fe3ddcd06de6219078dd300f0995972100c
Leon Scroggins [Thu, 30 May 2019 20:10:47 +0000 (13:10 -0700)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb am:
0a9b7b4fca
am:
ba238a82fe
Change-Id: I66db31bb58400202a63826e805321c14e120d839
Josh Tsuji [Thu, 30 May 2019 20:09:47 +0000 (13:09 -0700)]
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am:
06cbf65704 am:
4aed7e0cb1
am:
3c728a0d82
Change-Id: Id291b6a5882a50c9909e4b6105f2f24ebc06203f
Hongyi Zhang [Thu, 30 May 2019 20:09:03 +0000 (13:09 -0700)]
Merge "Add Usage info for LocationManager's APIs" into qt-dev am:
11ddc8ea0b am:
98eed7dcca
am:
cc536a375b
Change-Id: I13b21b057085010338b29d6b0732908b479195e5
Matt Casey [Thu, 30 May 2019 20:08:39 +0000 (13:08 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
am:
c71c7fe881
Change-Id: Ie4c997b705ca56e10640f63d12d2ff8be0adaf09
Matt Casey [Thu, 30 May 2019 20:08:24 +0000 (13:08 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am:
c71c7fe881
am:
f3534200b5
Change-Id: I34c8b24cc1a97ccc3e61e7911ad2bf3708a132fe
Winson Chung [Thu, 30 May 2019 20:08:12 +0000 (13:08 -0700)]
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am:
6f24b88c71 am:
34d893c490
am:
f40fe3717f
Change-Id: If4283e50563fc9319d7e256823a8ada9c21c8b1b
Android Build Merger (Role) [Thu, 30 May 2019 19:59:55 +0000 (19:59 +0000)]
Merge "Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb am:
8104d693d6" into qt-r1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 May 2019 19:59:06 +0000 (19:59 +0000)]
Merge "Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4 am:
77667ce117" into qt-r1-dev-plus-aosp
Leon Scroggins [Thu, 30 May 2019 19:58:32 +0000 (12:58 -0700)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb
am:
8104d693d6
Change-Id: I889783e5b690b5aad6865bbfc0ccdbc185dd7a05
OSDN Git Service
