Abhijeet Kaur
8deb2ecb31
Merge "Clean up bugreport API."
...
am: 2e44838064
Change-Id: Ib21ecea8a3dc63808784aba20f018ddd012c03c8
2019-03-13 07:20:42 -07:00
Treehugger Robot
2e44838064
Merge "Clean up bugreport API."
2019-03-13 14:07:43 +00:00
Neil Fuller
3ffddc2444
Merge "Improve documentation around HostnameVerifier"
...
am: abff3f4f21
Change-Id: I7f61ebc9aa41190b6d1508fb3c511c066d3a269c
2019-03-13 06:36:30 -07:00
Neil Fuller
abff3f4f21
Merge "Improve documentation around HostnameVerifier"
2019-03-13 13:26:02 +00:00
Alan Stokes
fa974346e4
Merge "Refactor OWNERS file."
...
am: e27b409046
Change-Id: Ibd472d9389bd3892e0e796b284849328aae13517
2019-03-13 05:44:08 -07:00
Alan Stokes
e27b409046
Merge "Refactor OWNERS file."
2019-03-13 12:33:03 +00:00
Abhijeet Kaur
0bbb9f6882
Clean up bugreport API.
...
Make BugreportManager class final.
Add FloatRange annotation for BugreportManager.onProgress() function's
parameter.
Make @IntDef in BugreportMode hidden.
Bug: 126434607
Test: builds
Change-Id: I95f004106ba97bc9e99859a8b23b96a86b6a43f4
Merged-In: I95f004106ba97bc9e99859a8b23b96a86b6a43f4
2019-03-13 11:49:42 +00:00
Ganesh Mahendran
2a82e9a69c
Merge "continue read file when returned count > 0"
...
am: 894c578a02
Change-Id: I43f5be6a4b365e2e7ea11ae413860d9cb0c37949
2019-03-13 00:59:30 -07:00
Treehugger Robot
894c578a02
Merge "continue read file when returned count > 0"
2019-03-13 07:36:51 +00:00
Chiachang Wang
cca7cdc8d9
Merge "Support partial connectivity probe result option"
...
am: da0ebedb47
Change-Id: Ia1696b640abd50b8a1e03cc6817c8e339e8ad104
2019-03-12 23:58:20 -07:00
Chiachang Wang
da0ebedb47
Merge "Support partial connectivity probe result option"
2019-03-13 06:49:03 +00:00
Mathieu Chartier
96040ee591
Merge "Call notifyStartupCompleted from reportFullyDrawn"
...
am: 13f15b3752
Change-Id: I6c293f77639421a5517e0c56391e60982ce8ce31
2019-03-12 22:44:04 -07:00
Jeremy Klein
33a9d34e8a
Merge "Rename entitlement callback to adhere to API guidelines."
...
am: 0102e3d548
Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
2019-03-12 22:39:53 -07:00
Xiangyu/Malcolm Chen
c078d39d46
Merge "Only return one mobile subscription per group in Settings."
...
am: 58385e9796
Change-Id: I2133bd9ba315a862a25fdd65afd981cbe34d5e62
2019-03-12 22:35:39 -07:00
Stanley Tng
68e00291e0
Merge "Add @NonNull annotations to LE CoC APIs"
...
am: 8b57ab7989
Change-Id: I16c1d5c6c7c31b0c96172f0baaed361eae8f4a5e
2019-03-12 22:30:47 -07:00
Xin Li
d82de1d484
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
...
am: a5fe44c6b5 -s ours
am skip reason: subject contains skip directive
Change-Id: I1ef13e9b82d2f5b55a603c00105fbc6fb392dcc8
2019-03-12 22:17:07 -07:00
Mathieu Chartier
13f15b3752
Merge "Call notifyStartupCompleted from reportFullyDrawn"
2019-03-13 05:02:58 +00:00
Mathieu Chartier
67f02a1fff
Call notifyStartupCompleted from reportFullyDrawn
...
ART will now know when startup is startup is finished.
Test: manual
Bug: 120671223
Bug: 123377072
(cherry-picked from commit 63e14c10b3 )
Merged-In: I1134f66792bddc9ab33606fa4c2807b3918d5261
Change-Id: I1134f66792bddc9ab33606fa4c2807b3918d5261
2019-03-13 05:01:58 +00:00
Treehugger Robot
0102e3d548
Merge "Rename entitlement callback to adhere to API guidelines."
2019-03-13 04:48:24 +00:00
Xin Li
c26c4f8e60
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
...
am: 3e112d56a4 -s ours
am skip reason: subject contains skip directive
Change-Id: Id7415c8795196d717dbb4093e2d060a951c0de03
2019-03-12 21:44:30 -07:00
Chalard Jean
b8b94ba4c0
Merge "Tell the factory it is already serving a request."
...
am: ae79013ec2
Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828
2019-03-12 21:42:18 -07:00
Ian Kasprzak
36da0beab3
Merge "Temporarily disable flaky test."
...
am: 3fb5ba9e61
Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3
2019-03-12 21:38:43 -07:00
Kiyoung Kim
d5f216ac8b
Merge "Schematize Crypto state system property"
...
am: 88b57a2c4d
Change-Id: Idb96ab95b1ea69a636f315edeb84c8ba025d75bd
2019-03-12 21:33:34 -07:00
Xiao Ma
d3c00327b9
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
...
am: f1e012ae9b
Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6
2019-03-12 21:29:48 -07:00
Josh Hou
69e802e6e6
Merge "add NonNull annotation to API"
...
am: 56c9d22970
Change-Id: Iaa22836680e45c4244a4380d9688b968b7877c8e
2019-03-12 21:26:18 -07:00
Xiangyu/Malcolm Chen
58385e9796
Merge "Only return one mobile subscription per group in Settings."
2019-03-13 04:14:14 +00:00
Malcolm Chen
b82864c801
Only return one mobile subscription per group in Settings.
...
Right now getSelectableSubscriptionInfoList returns all subscriptions
that are visible and available. But we should only show one per
subscription group. So updating getSelectableSubscriptionInfoList
to make sure of it.
Bug: 126438122
Test: manual - group Fi primary subscriptions and make sure only
one Fi subscription is shown in Settings UI.
Change-Id: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
Merged-In: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
2019-03-13 04:14:07 +00:00
Treehugger Robot
8b57ab7989
Merge "Add @NonNull annotations to LE CoC APIs"
2019-03-13 02:28:32 +00:00
Stanley Tng
97341da063
Add @NonNull annotations to LE CoC APIs
...
Added NonNull annotations to the 4 LE Connection-oriented channel API in
BluetoothDevice and BluetoothAdapter.
Bug: 126701988
Bug: 126701989
Test: Compile only
Change-Id: I2d4dc8fbd06e30c782123e01f8481d249e40ee02
2019-03-13 02:27:38 +00:00
Xin Li
a5fe44c6b5
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
2019-03-13 02:26:04 +00:00
Chalard Jean
ae79013ec2
Merge "Tell the factory it is already serving a request."
2019-03-13 02:07:29 +00:00
Ian Kasprzak
3fb5ba9e61
Merge "Temporarily disable flaky test."
2019-03-13 01:52:21 +00:00
Treehugger Robot
88b57a2c4d
Merge "Schematize Crypto state system property"
2019-03-13 01:30:58 +00:00
Xiao Ma
f1e012ae9b
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
2019-03-13 01:13:08 +00:00
Josh Hou
56c9d22970
Merge "add NonNull annotation to API"
2019-03-13 00:58:21 +00:00
Lorenzo Colitti
5ae2caf8db
Temporarily disable flaky test.
...
Test: None
Bug: 128426024
Change-Id: Id88bf452f41f512703d5831e357d9ba72dc5b911
2019-03-13 09:23:54 +09:00
Xiangyu/Malcolm Chen
851ec326d9
Merge "Don't return hidden subscription in getActiveSubIdList"
...
am: d2cb5a0608
Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
2019-03-12 16:12:05 -07:00
Xiangyu/Malcolm Chen
d2cb5a0608
Merge "Don't return hidden subscription in getActiveSubIdList"
2019-03-12 22:59:00 +00:00
Xiangyu/Malcolm Chen
6dc894e962
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
...
am: 8cbe957dba
Change-Id: I372f27a1ee10cd46c5f0633586709ee14cd6e070
2019-03-12 15:55:53 -07:00
Jiyong Park
6623e402b3
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""
...
am: 1a14dedcce
Change-Id: Ia70c876b6d95074cc8502b3ff1467cb5dc0d4302
2019-03-12 15:49:30 -07:00
Xiangyu/Malcolm Chen
8cbe957dba
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
2019-03-12 22:40:39 +00:00
Nathan Harold
e80b170949
Merge "[API Feedback] Rename DebugEventReporter"
...
am: 3a6dcad0a3
Change-Id: Iab9ed0e8160b45628286f6236f1bb5f61ecc74cd
2019-03-12 15:38:26 -07:00
Treehugger Robot
1a14dedcce
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""
2019-03-12 22:34:26 +00:00
Jiyong Park
552ad7b7f1
Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."
...
This reverts commit a6bb8916b0 .
Bootanim doesn't need to be delayed because the APEXes from the system partition are now
activated very early in the boot sequence (far before bootanim is started).
See https://android-review.googlesource.com/q/topic:%22apex_earlymount_base%22+(status:open%20OR%20status:merged)
Bug: 125549215
Test: bootanim is started without being delayed
Change-Id: I367b1a5c6bf08dad770cd2bf7f6d67dbf1a813e6
2019-03-12 22:33:44 +00:00
Nathan Harold
3a6dcad0a3
Merge "[API Feedback] Rename DebugEventReporter"
2019-03-12 22:25:46 +00:00
Hans Boehm
90e8135f1e
Merge "Correct registerNativeAllocation type"
...
am: fe015a098c
Change-Id: Ie202df6d1f36534d5bea0e65aa21570be891b5b4
2019-03-12 14:17:39 -07:00
Malcolm Chen
9ac7e52a93
Don't return hidden subscription in getActiveSubIdList
...
Now getActiveSubscriptionInfoList will not return hidden
subscriptions. And getActiveSubIdList should be consistent
with it. In the mean time, internal SubscriptionController
API should have a way to specify if caller wants hidden
subscriptions or not.
Bug: 124690005
Test: manual
Change-Id: I46ccae88167c2988d71a6e07da2937bf9644a1f0
Merged-In: I46ccae88167c2988d71a6e07da2937bf9644a1f0
2019-03-12 14:09:33 -07:00
Hans Boehm
fe015a098c
Merge "Correct registerNativeAllocation type"
2019-03-12 21:07:03 +00:00
Hall Liu
281b94320e
Merge "Change summary text of Wi-Fi calling"
...
am: 68fdc5b7be
Change-Id: Ia52d09817e260ad144d37937b5caa48d4ba054e5
2019-03-12 14:05:33 -07:00
Hall Liu
68fdc5b7be
Merge "Change summary text of Wi-Fi calling"
2019-03-12 20:49:21 +00:00