Adrian Roos
2e2d9842ac
Merge "Revert "Revert "API Lint: Enable for TestApi"""
2019-11-01 08:28:26 +00:00
TreeHugger Robot
16a8ea6c35
Merge changes Ia2a41432,Ib636515d
...
* changes:
ProtoLog: Add end-to-end test
ProtoLog: Fix broken hash computation
2019-11-01 08:05:25 +00:00
Adrian Roos
7c68a4023b
Revert "Revert "API Lint: Enable for TestApi""
...
This reverts commit 718428355f
2019-11-01 08:46:15 +01:00
TreeHugger Robot
39a3c60407
Merge "Populate WaitResult with AML data for hot launches"
2019-11-01 06:49:29 +00:00
Jacky Kao
66b1a264c5
Merge "Fix no correct window observer of an embedded display"
2019-11-01 06:36:08 +00:00
Remi NGUYEN VAN
970fbf37b5
Merge "Add API to set the sll_protocol on PacketSocket" am: 0d6c308c39 am: 7919e04f5b
...
am: 64e2f81eba
2019-10-31 22:09:20 -07:00
Remi NGUYEN VAN
64e2f81eba
Merge "Add API to set the sll_protocol on PacketSocket" am: 0d6c308c39
...
am: 7919e04f5b
2019-10-31 21:57:21 -07:00
Remi NGUYEN VAN
7919e04f5b
Merge "Add API to set the sll_protocol on PacketSocket"
...
am: 0d6c308c39
2019-10-31 21:50:40 -07:00
Meng Wang
977bd75f35
Merge "Expose IMSI encryption info APIs as system API"
2019-11-01 04:37:37 +00:00
Remi NGUYEN VAN
0d6c308c39
Merge "Add API to set the sll_protocol on PacketSocket"
2019-11-01 04:34:44 +00:00
markchien
2e63cedc0e
Merge "Fix netd_aidl_interface compatible problem" am: 80c3a5db12 am: 0e50b2c926
...
am: 66b818cabe
2019-10-31 20:01:46 -07:00
Nathan Harold
1ca896ae4f
Merge "Fix CellSignalStrengthNr to use SS-RSRP" am: ce698c4ab2 am: 2f0294d38e
...
am: 97f0a17dc5
2019-10-31 19:55:00 -07:00
markchien
66b818cabe
Merge "Fix netd_aidl_interface compatible problem" am: 80c3a5db12
...
am: 0e50b2c926
2019-10-31 19:54:53 -07:00
markchien
0e50b2c926
Merge "Fix netd_aidl_interface compatible problem"
...
am: 80c3a5db12
2019-10-31 19:42:46 -07:00
Nathan Harold
97f0a17dc5
Merge "Fix CellSignalStrengthNr to use SS-RSRP" am: ce698c4ab2
...
am: 2f0294d38e
2019-10-31 19:42:44 -07:00
Nathan Harold
2f0294d38e
Merge "Fix CellSignalStrengthNr to use SS-RSRP"
...
am: ce698c4ab2
2019-10-31 19:31:44 -07:00
Treehugger Robot
80c3a5db12
Merge "Fix netd_aidl_interface compatible problem"
2019-11-01 02:23:31 +00:00
Treehugger Robot
ce698c4ab2
Merge "Fix CellSignalStrengthNr to use SS-RSRP"
2019-11-01 02:08:48 +00:00
TreeHugger Robot
b93493f007
Merge "Add a subtext to remind user that profile connected fail"
2019-11-01 02:06:31 +00:00
Ahmed ElArabawy
d7ee013aff
Merge "Wifi: Support of HE Operation handling for Wifi-6"
2019-11-01 01:40:25 +00:00
JW Wang
282b6f505a
Disable testNetworkPassedDoesNotRollback
...
This is an effort to fix flaky StagedRollbackTest.
My local tests show that the crash has something to do with repeatedly
turn on/off network connection for each test. Several things are done
below to reduce the flakiness:
1. Disable testNetworkPassedDoesNotRollback
It sometimes takes more than 5 minutes for the device to be back
online after turning on the network connection during the test. This
test contributes a lot to the flakiness. Let's disable it for now so
other tests can keep running.
2. Rewrite testNetworkFailedRollback so we only turn on/off network
connection when necessary in the hope to reduce the WifiHandlerThread
crash. The change works pretty well for my local tests which run over
40 loops without a single failure.
Bug: 143514090
Test: atest StagedRollbackTest
Change-Id: I9aec5eafdd3368ef76517e3b8500970e60d07487
2019-11-01 01:31:13 +00:00
Ahmed ElArabawy
b746c431e7
Wifi: Support of HE Operation handling for Wifi-6
...
This Commit adds support for handling of HE Operation Information
element as part of the support for 11ax
Bug: 139354972
Test: atest com.android.wifi.server
Change-Id: I5e8319c4065e57eef1b89f21be2725b6bab3ad4d
2019-10-31 18:23:32 -07:00
TreeHugger Robot
d19566312e
Merge "Handle ANR for cases where there are no focused windows"
2019-11-01 01:07:24 +00:00
Kamaljeet Maini
d72d706dd8
Allow customization of display timeout value for volume dialog am: 4a1a68d36d
...
am: 13c3dc5be5
2019-10-31 17:15:42 -07:00
Kamaljeet Maini
13c3dc5be5
Allow customization of display timeout value for volume dialog
...
am: 4a1a68d36d
2019-10-31 17:08:39 -07:00
Amit Mahajan
b13767ad90
Merge "New APIs for SMSC address" am: 0a7690ce24 am: edae70454f
...
am: fea5b9b556
2019-10-31 16:50:51 -07:00
Amit Mahajan
fea5b9b556
Merge "New APIs for SMSC address" am: 0a7690ce24
...
am: edae70454f
2019-10-31 16:43:46 -07:00
TreeHugger Robot
0bec0be356
Merge "add support for multiple listeners from same package"
2019-10-31 23:41:15 +00:00
Amit Mahajan
edae70454f
Merge "New APIs for SMSC address"
...
am: 0a7690ce24
2019-10-31 16:33:25 -07:00
TreeHugger Robot
9a6c8eeab1
Merge "Add missing Deprecated annotations"
2019-10-31 23:21:28 +00:00
Amit Mahajan
0a7690ce24
Merge "New APIs for SMSC address"
2019-10-31 23:20:14 +00:00
Christine Tsai
77e3b1065d
Merge "Return false if incorrect event value type"
2019-10-31 23:14:01 +00:00
Hui Yu
a86a36b184
Merge "Add process capability as a new dimension."
2019-10-31 23:11:21 +00:00
Colin Cross
192f73507b
Merge "Fix fallthrough warning" am: e1813e522f am: 937e4af019
...
am: 19370ab6b1
2019-10-31 16:06:40 -07:00
Steven Moreland
82d25b8741
[automerger skipped] Merge changes Ia639dd01,I12cf8838 am: 583a1beac1 am: c1b61bdfed
...
am: ba5fa4dd527a4f1d23ea
2019-10-31 16:02:32 -07:00
Colin Cross
19370ab6b1
Merge "Fix fallthrough warning" am: e1813e522f
...
am: 937e4af019
2019-10-31 15:56:30 -07:00
Steven Moreland
ba5fa4dd52
Merge changes Ia639dd01,I12cf8838 am: 583a1beac1
...
am: c1b61bdfed
2019-10-31 15:53:03 -07:00
Edward Savage-Jones
df42e28172
[automerger skipped] Merge "[DO NOT MERGE] Get legacy recents working for secondary user" am: 786e7f34fa am: 67a8fa0ff7
...
am: 909b40c927
2019-10-31 15:52:57 -07:00
Colin Cross
937e4af019
Merge "Fix fallthrough warning"
...
am: e1813e522f
2019-10-31 15:51:35 -07:00
Edward Savage-Jones
909b40c927
Merge "[DO NOT MERGE] Get legacy recents working for secondary user" am: 786e7f34fa
...
am: 67a8fa0ff7
2019-10-31 15:44:50 -07:00
Paul Duffin
f204b33368
Merge "Regenerate API signature files to correct annotation order"
2019-10-31 22:44:17 +00:00
TreeHugger Robot
e4ef7cb182
Merge "Allow listener garbage collection"
2019-10-31 22:39:58 +00:00
TreeHugger Robot
dd300fc347
Merge "Fixed issue where tint would be applied to solid region of GradientDrawable even if none was defined"
2019-10-31 22:39:44 +00:00
Makoto Onuki
caff9d2cc2
Merge "Initialize JobScheduler without using preload"
2019-10-31 22:32:24 +00:00
TreeHugger Robot
e63c043cc4
Merge "Add some safety to Picture's JNI"
2019-10-31 22:25:12 +00:00
Colin Cross
e1813e522f
Merge "Fix fallthrough warning"
2019-10-31 22:20:40 +00:00
Shuo Qian
35de259385
Merge "Notify OTA Emergency Number Database Installation complete"
2019-10-31 22:14:23 +00:00
Xin Li
d6680563ee
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: abc015499a
...
am: e244cd4802
2019-10-31 14:56:47 -07:00
Steven Moreland
c1b61bdfed
Merge changes Ia639dd01,I12cf8838
...
am: 583a1beac1
2019-10-31 14:43:52 -07:00
Edward Savage-Jones
67a8fa0ff7
Merge "[DO NOT MERGE] Get legacy recents working for secondary user"
...
am: 786e7f34fa
2019-10-31 14:39:26 -07:00
