Nate(Qiang) Jiang
d76f407953
Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev
...
am: e3ff000ca5
2019-11-12 15:11:59 -08:00
Kevin Hufnagle
d277bd6b30
Merge "docs: Fix broken link to NPN protocol" am: cab84c8dd3
...
am: 7c28465f70
2019-11-12 14:58:12 -08:00
TreeHugger Robot
e3ff000ca5
Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev
2019-11-12 22:55:10 +00:00
Kevin Hufnagle
7c28465f70
Merge "docs: Fix broken link to NPN protocol"
...
am: cab84c8dd3
2019-11-12 14:49:21 -08:00
Kevin Hufnagle
cab84c8dd3
Merge "docs: Fix broken link to NPN protocol"
2019-11-12 22:32:22 +00:00
Tyler Gunn
b0078ccd04
Merge "Cleanup video provider binder code." am: 398794c0a6
...
am: bd9bf9f9c7
2019-11-12 13:13:04 -08:00
Grace Jia
12726efeeb
Merge "Add response to notify that an outgoing call is screened." am: 46758be25c
...
am: 4f8cd35a90
2019-11-12 13:04:31 -08:00
Tyler Gunn
bd9bf9f9c7
Merge "Cleanup video provider binder code."
...
am: 398794c0a6
2019-11-12 13:04:21 -08:00
Grace Jia
4f8cd35a90
Merge "Add response to notify that an outgoing call is screened."
...
am: 46758be25c
2019-11-12 12:56:44 -08:00
Tyler Gunn
398794c0a6
Merge "Cleanup video provider binder code."
2019-11-12 20:47:38 +00:00
Treehugger Robot
46758be25c
Merge "Add response to notify that an outgoing call is screened."
2019-11-12 20:44:43 +00:00
Nate(Qiang) Jiang
6d0eef4d2c
[WifiAware] fix creator from parcel
...
creator should read all content from parcel before verify available
Bug: 144286370
Test: atest android.net.wifi
Change-Id: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
Merged-In: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
2019-11-12 11:36:33 -08:00
satayev
c265820ec3
Merge "Add --no-test-api-acces to am instrument." am: 188abff5b2
...
am: 5c8ed7f6e7
2019-11-12 10:53:34 -08:00
satayev
5c8ed7f6e7
Merge "Add --no-test-api-acces to am instrument."
...
am: 188abff5b2
2019-11-12 10:49:01 -08:00
Hector Dearman
bf83edfc5f
[automerger skipped] Merge "Add Perfetto upload logging atoms" am: 07c402335a -s ours
...
am: d9b11a283d32a89c15a7
2019-11-12 10:48:55 -08:00
Tyler Gunn
d1fdf3a85b
Cleanup video provider binder code.
...
1. Ensure we always unlink for death from the VideoCallImpl.
2. Ensure we compare the binders in the Call instance properly so that
we are not always replacing the VideoCallImpl used.
3. Ensure we cleanup the VideoCallImpl when its being removed.
Test: Manual testing of video calls for regressions.
Bug: 121156974
Change-Id: I440e8fb4ab9a5051ee02358933c495de736e2bd0
2019-11-12 10:43:09 -08:00
Hector Dearman
d9b11a283d
[automerger skipped] Merge "Add Perfetto upload logging atoms"
...
am: 07c402335a32a89c15a7
2019-11-12 10:41:42 -08:00
satayev
188abff5b2
Merge "Add --no-test-api-acces to am instrument."
2019-11-12 18:39:01 +00:00
Treehugger Robot
07c402335a
Merge "Add Perfetto upload logging atoms"
2019-11-12 18:29:15 +00:00
Kevin Hufnagle
298a24cc84
docs: Fix broken link to NPN protocol
...
Test: make ds-docs -j32
Bug: 24072424
Change-Id: I499325e0656e54e0a185539ca76c7b6f62f3be5b
2019-11-12 18:07:02 +00:00
Jayachandran Chinnakkannu
b71eb484e7
Merge "Remove usage of SignalStrength.getCdmaLevel() API" am: da41e66438
...
am: 76e84a1246
2019-11-12 10:05:22 -08:00
Jayachandran Chinnakkannu
76e84a1246
Merge "Remove usage of SignalStrength.getCdmaLevel() API"
...
am: da41e66438
2019-11-12 09:56:55 -08:00
Jayachandran Chinnakkannu
da41e66438
Merge "Remove usage of SignalStrength.getCdmaLevel() API"
2019-11-12 17:44:29 +00:00
Wang ArvinX
022a88a9b7
Merge "Set Assistant UID of the current user." am: 19a2507ea5
...
am: 202b6d11e4
2019-11-12 09:38:48 -08:00
Wang ArvinX
202b6d11e4
Merge "Set Assistant UID of the current user."
...
am: 19a2507ea5
2019-11-12 09:30:27 -08:00
Treehugger Robot
19a2507ea5
Merge "Set Assistant UID of the current user."
2019-11-12 17:17:35 +00:00
Artur Satayev
e2ebc1be4b
Add --no-test-api-acces to am instrument.
...
By default instrumented processed have access to @TestApis; however for certain CTS tests we want to disable access to test APIs, where this flag would be used.
Test: manual
Bug: 133832325
Change-Id: Id56ce3079bcea2632d4002edcf120d9d5c9e0a26
Merged-In: Id56ce3079bcea2632d4002edcf120d9d5c9e0a26
2019-11-12 12:52:19 +00:00
Tom Macieszczak
46b6b2b293
Merge "Add OWNERS to tvremote" am: 377b5543f7
...
am: 77fc91c6a8
2019-11-12 02:09:00 -08:00
Tom Macieszczak
77fc91c6a8
Merge "Add OWNERS to tvremote"
...
am: 377b5543f7
2019-11-12 02:04:24 -08:00
Tom Macieszczak
377b5543f7
Merge "Add OWNERS to tvremote"
2019-11-12 09:43:04 +00:00
Remi NGUYEN VAN
38fa66cd78
Merge "Add permissions to NetIntegrationTests manifest" am: cf46823faa
...
am: 089c0d9bc5
2019-11-11 21:48:51 -08:00
Remi NGUYEN VAN
089c0d9bc5
Merge "Add permissions to NetIntegrationTests manifest"
...
am: cf46823faa
2019-11-11 21:44:07 -08:00
Remi NGUYEN VAN
cf46823faa
Merge "Add permissions to NetIntegrationTests manifest"
2019-11-12 05:31:19 +00:00
Tyler Gunn
8468fd875d
Merge "More telephony updates for mainline." am: 5be8504888
...
am: 0f0dfaca35
2019-11-11 19:50:28 -08:00
Tyler Gunn
0f0dfaca35
Merge "More telephony updates for mainline."
...
am: 5be8504888
2019-11-11 19:41:26 -08:00
Tyler Gunn
5be8504888
Merge "More telephony updates for mainline."
2019-11-12 03:24:01 +00:00
Felipe Leme
26adde7eb4
Merge "DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users." into qt-qpr1-dev
...
am: 002deeda0c
2019-11-11 18:21:58 -08:00
Felipe Leme
ab15078860
DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users.
...
am: b286462f68
2019-11-11 18:21:56 -08:00
TreeHugger Robot
002deeda0c
Merge "DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users." into qt-qpr1-dev
2019-11-12 02:08:36 +00:00
Joshua Baxter
145de3be7e
Merge "docs: fix typo" into qt-dev am: aee0f9c343 am: bdaa73c0f9
...
am: 8c5d022296
2019-11-11 17:31:39 -08:00
Joshua Baxter
8c5d022296
Merge "docs: fix typo" into qt-dev am: aee0f9c343
...
am: bdaa73c0f9
2019-11-11 17:27:04 -08:00
Joshua Baxter
bdaa73c0f9
Merge "docs: fix typo" into qt-dev
...
am: aee0f9c343
2019-11-11 17:22:35 -08:00
Joshua Baxter
aee0f9c343
Merge "docs: fix typo" into qt-dev
2019-11-12 01:00:44 +00:00
Mathieu Chartier
b5ffced130
Merge "Add retry loop for BootImageProfileTest" am: f9cb43d6eb
...
am: 1f0c20e85f
2019-11-11 15:46:05 -08:00
Mathieu Chartier
1f0c20e85f
Merge "Add retry loop for BootImageProfileTest"
...
am: f9cb43d6eb
2019-11-11 15:38:17 -08:00
Jovana Knezevic
da91839267
Merge "DO NOT MERGE: Fix several issues with precreated users." into qt-qpr1-dev
...
am: 8de98aef28
2019-11-11 15:27:01 -08:00
jovanak
4b2c7d3e86
DO NOT MERGE: Fix several issues with precreated users.
...
am: debb009a2c
2019-11-11 15:26:59 -08:00
Eric Jeong
00fdfec2ec
Merge "Terminate statsd on a few signals including SIGTERM" into qt-qpr1-dev
...
am: 16854f5e22
2019-11-11 15:19:32 -08:00
Mathieu Chartier
f9cb43d6eb
Merge "Add retry loop for BootImageProfileTest"
2019-11-11 23:17:48 +00:00
Jovana Knezevic
8de98aef28
Merge "DO NOT MERGE: Fix several issues with precreated users." into qt-qpr1-dev
2019-11-11 23:13:57 +00:00
