Mark Renouf
838e25e72e
Merge "Set system gesture exclusion rects for Bubbles" into qt-dev am: 0f6b976405
...
am: 0b0b2787f7
Change-Id: I3a010ad7e9cf766658b1dcdbe0e14bcdfb49bedc
2019-04-05 10:55:16 -07:00
TreeHugger Robot
afaa528e3c
Merge "Add ContentSuggestionsService call counters"
2019-04-05 17:21:12 +00:00
Android Build Merger (Role)
fe2b320fc4
Merge "Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev am: 7b0c0c7694 am: c75cc8e5e2"
2019-04-05 17:20:02 +00:00
Quang Luong
5901e436bd
Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev am: 7b0c0c7694
...
am: c75cc8e5e2
Change-Id: I7001fee8111f469395a513ee237db6e6660d60c1
2019-04-05 10:19:38 -07:00
Christian Wailes
799eead4a9
Merge "Enabled the USAP Pool by default."
2019-04-05 17:18:50 +00:00
Android Build Merger (Role)
4a9d758b9d
Merge "Merge "Merge "Fix isExternalStorageSandboxed() bug." into qt-dev am: 10a222bf3c" into qt-dev-plus-aosp am: ffe47c199f"
2019-04-05 17:09:26 +00:00
Jeff Sharkey
5faf2feb35
Merge "Merge "Fix isExternalStorageSandboxed() bug." into qt-dev am: 10a222bf3c" into qt-dev-plus-aosp
...
am: ffe47c199f
Change-Id: I287c8ae02bd20d17a59cfd1a46bb35eed0c013d3
2019-04-05 10:07:50 -07:00
Tarandeep Singh
fa95edaf0f
Merge "Fix InsetsSourceConsumer visibility"
2019-04-05 17:02:59 +00:00
Mark Renouf
0b0b2787f7
Merge "Set system gesture exclusion rects for Bubbles" into qt-dev
...
am: 0f6b976405
Change-Id: I23df4e99b5e172f6eafdde40acd539ae3965ace8
2019-04-05 09:49:24 -07:00
Quang Luong
c75cc8e5e2
Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev
...
am: 7b0c0c7694
Change-Id: I854a2106a59542463c3c20383f99d1073203b6ac
2019-04-05 08:58:29 -07:00
Sungsoo Lim
492fa28212
[automerger skipped] Merge "DO NOT MERGE: Fix system_server watchdog timeout" am: 5b3a0d18ae -s ours am: 5b6e4b8901 -s ours
...
am: 84cfdf95b0 -s ours
am skip reason: subject contains skip directive
Change-Id: I6daa6a53b69869b94b3b0471cda9c450a7a86511
2019-04-05 08:55:02 -07:00
Android Build Merger (Role)
ffe47c199f
Merge "Merge "Fix isExternalStorageSandboxed() bug." into qt-dev am: 10a222bf3c" into qt-dev-plus-aosp
2019-04-05 15:46:37 +00:00
Jeff Sharkey
89204bd4dd
Merge "Fix isExternalStorageSandboxed() bug." into qt-dev
...
am: 10a222bf3c
Change-Id: I644c984dbc3de7518a7bb50427b848aafb3b2944
2019-04-05 08:45:31 -07:00
TreeHugger Robot
0f6b976405
Merge "Set system gesture exclusion rects for Bubbles" into qt-dev
2019-04-05 15:41:25 +00:00
Evan Laird
39a9df4de8
Merge "Expose notification guts on menu shown" into qt-dev am: ea2cba2759
...
am: 236e1c3093
Change-Id: Ic02a21631de67948c983abddf59927d5a0a1be2b
2019-04-05 08:40:21 -07:00
Sungsoo Lim
84cfdf95b0
[automerger skipped] Merge "DO NOT MERGE: Fix system_server watchdog timeout" am: 5b3a0d18ae -s ours
...
am: 5b6e4b8901 -s ours
am skip reason: subject contains skip directive
Change-Id: Ife4334651184641bbe867ecf04bd414f38c7ad11
2019-04-05 08:40:21 -07:00
Evan Laird
236e1c3093
Merge "Expose notification guts on menu shown" into qt-dev
...
am: ea2cba2759
Change-Id: I452762ab8c44cc478e647936a3be427e86bc54a3
2019-04-05 08:28:31 -07:00
TreeHugger Robot
7b0c0c7694
Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev
2019-04-05 15:27:05 +00:00
Jeff Sharkey
10a222bf3c
Merge "Fix isExternalStorageSandboxed() bug." into qt-dev
2019-04-05 15:18:23 +00:00
TreeHugger Robot
ea2cba2759
Merge "Expose notification guts on menu shown" into qt-dev
2019-04-05 15:05:15 +00:00
Android Build Merger (Role)
e6d32041c0
Merge "Merge "Update icon for Calendar permission." into qt-dev am: fb05af1a17 am: 77ceb41479"
2019-04-05 15:02:13 +00:00
Joel Galenson
b05457cdf5
Merge "Update icon for Calendar permission." into qt-dev am: fb05af1a17
...
am: 77ceb41479
Change-Id: I398929b9266247e0415da06066be783e788da192
2019-04-05 08:01:45 -07:00
TreeHugger Robot
115edcae44
Merge "Don't bother resetting settings; they use testable context"
2019-04-05 15:00:33 +00:00
Todd Kennedy
323f95552a
[automerger skipped] Merge "fix nullability" into qt-dev am: 6cf751cda5
...
am: 4f953527da -s ours
am skip reason: change_id I43e02551ced8a6aa51b84dd8df7e57e75e1d58a9 with SHA1 6ee36a1d7c is in history
Change-Id: I21082941edd8c5dc811bf6e9e4aff392fa1f4d28
2019-04-05 07:52:01 -07:00
Joel Galenson
77ceb41479
Merge "Update icon for Calendar permission." into qt-dev
...
am: fb05af1a17
Change-Id: I013d2d8b514689144482d78bd57d37431017e49e
2019-04-05 07:48:12 -07:00
Matt Pietal
ecd7555226
Merge "Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2" into qt-dev am: 4c648a027f
...
am: 0bd4d885ca
Change-Id: I685009fadfb07816983d057176d3118a3e3caf32
2019-04-05 07:40:47 -07:00
Todd Kennedy
4f953527da
Merge "fix nullability" into qt-dev
...
am: 6cf751cda5
Change-Id: I7bd4eb6d86b4ebd510b7f17d990ef76809e4dd66
2019-04-05 07:36:53 -07:00
Amin Shaikh
54f32b9357
Merge "Update theme icon packs." into qt-dev am: 3642e79fda
...
am: f8d216102e
Change-Id: Ib01f67f1580a0399b815ea56b5d4299ee2035323
2019-04-05 07:30:32 -07:00
Matt Pietal
0bd4d885ca
Merge "Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2" into qt-dev
...
am: 4c648a027f
Change-Id: I8e1d67837dd591d53cd3750919e17d3bb72f2247
2019-04-05 07:26:42 -07:00
TreeHugger Robot
fb05af1a17
Merge "Update icon for Calendar permission." into qt-dev
2019-04-05 14:26:14 +00:00
Amin Shaikh
f8d216102e
Merge "Update theme icon packs." into qt-dev
...
am: 3642e79fda
Change-Id: If1cbd443ac1f9c6ccb384ed5669d7aab9f1554dc
2019-04-05 07:20:49 -07:00
Todd Kennedy
6cf751cda5
Merge "fix nullability" into qt-dev
2019-04-05 14:16:37 +00:00
TreeHugger Robot
4c648a027f
Merge "Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2" into qt-dev
2019-04-05 14:10:41 +00:00
TreeHugger Robot
3642e79fda
Merge "Update theme icon packs." into qt-dev
2019-04-05 14:08:52 +00:00
TreeHugger Robot
2e42a4a429
Merge "Revert "ApplicationLoaders: hard failures & tests""
2019-04-05 14:08:27 +00:00
Tony Mak
c882db9723
Merge "Stores serialized entity data to the extras" into qt-dev am: f8aeee04c3
...
am: b252a3f7c3
Change-Id: I2ac27681c4dba715ada9b365e003e1387d639191
2019-04-05 06:58:47 -07:00
Narayan Kamath
7f421df3ff
[automerger skipped] Merge "Fix rollbacks in multi-user case." into qt-dev am: fb1a20e4fb
...
am: 70bf1bcd1b -s ours
am skip reason: change_id I1a7cf101b3bc3575421629c4bf0ff63418eb8731 with SHA1 d81ff97866 is in history
Change-Id: I0fa94ab5297cdab7a5e978824c42e276afb79c5c
2019-04-05 06:52:31 -07:00
Susi Kharraz-Post
b7f11070eb
Merge "Fast follow-on unit tests for HashedStringCache" into qt-dev am: 884e901cf4
...
am: 37a66aff6a
Change-Id: If474da4bdf66fd4c2392d0c0174d3e91614bc876
2019-04-05 06:39:29 -07:00
Tony Mak
b252a3f7c3
Merge "Stores serialized entity data to the extras" into qt-dev
...
am: f8aeee04c3
Change-Id: I422d2e65861e528081e4878a7f8a0c9b24376f36
2019-04-05 06:37:09 -07:00
Mark Renouf
821e678d8f
Set system gesture exclusion rects for Bubbles
...
When there is at least one Bubble on-screen, the bounds
of the first (top) bubble are set to exclude system
navigation gestures.
Test: manually w/fully gesture nav enabled
Bug: 126360272
Change-Id: I47a3c69fdc89476805d48b5214a7f05f5d033306
2019-04-05 13:35:48 +00:00
TreeHugger Robot
f8aeee04c3
Merge "Stores serialized entity data to the extras" into qt-dev
2019-04-05 13:26:20 +00:00
Tim Murray
67aae03704
Merge "Merge "zygote: initialize ashmem early" am: 6c155a2cf7 am: 38326bd809" into qt-dev-plus-aosp
...
am: 7039de7e09
Change-Id: I24e4f67d3f7c02e606143a3db260ad5aa4c1cdb8
2019-04-05 06:25:51 -07:00
Sungsoo Lim
5b6e4b8901
[automerger skipped] Merge "DO NOT MERGE: Fix system_server watchdog timeout"
...
am: 5b3a0d18ae -s ours
am skip reason: subject contains skip directive
Change-Id: I15835d75c9a1af2d3875d626615dc3551407589f
2019-04-05 06:21:06 -07:00
Sungsoo Lim
5b3a0d18ae
Merge "DO NOT MERGE: Fix system_server watchdog timeout"
2019-04-05 13:10:03 +00:00
Joonghong Park
a9f9880558
Merge "Merge "Fix BT keeping wrong state issue" am: 7cd490c941 am: 4f73919dd7" into qt-dev-plus-aosp
...
am: ec5db12440
Change-Id: I801f311bd9f8450239e4f420877de6eea54e85e2
2019-04-05 06:05:29 -07:00
Remi NGUYEN VAN
13125e8b27
Merge "Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba74 am: 47c803e334" into qt-dev-plus-aosp
...
am: 199e67ea82
Change-Id: I8b544c083f5a493786efe7a84f43a32507b089ac
2019-04-05 05:52:31 -07:00
Narayan Kamath
70bf1bcd1b
Merge "Fix rollbacks in multi-user case." into qt-dev
...
am: fb1a20e4fb
Change-Id: I006cae670e3c863d06c408cb743f9854a1fd7199
2019-04-05 05:51:01 -07:00
Narayan Kamath
fb1a20e4fb
Merge "Fix rollbacks in multi-user case." into qt-dev
2019-04-05 12:39:42 +00:00
Remi NGUYEN VAN
77f9d85f12
Merge "Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e958d am: 2e74de0a31" into qt-dev-plus-aosp
...
am: d61c984e06
Change-Id: If4a75f23c6c0589c23cadce3b088966649062463
2019-04-05 05:39:23 -07:00
Matt Pietal
4e2e36323d
Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2
...
Will eventually merge with suggested apps
Bug: 129979509
Test: ChooserActivityTest
Change-Id: I0e5f5a42155c83c77c6f6e355289218bc88033e7
2019-04-05 08:32:47 -04:00