OSDN Git Service
Jeremy Klein [Wed, 13 Mar 2019 06:36:36 +0000 (23:36 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines." am:
0102e3d548
am:
33a9d34e8a
Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 06:13:05 +0000 (23:13 -0700)]
Merge "Only return one mobile subscription per group in Settings." am:
58385e9796
am:
c078d39d46
Change-Id: I748be95d8cf99ac03457ac740829cf5855331444
Stanley Tng [Wed, 13 Mar 2019 06:05:26 +0000 (23:05 -0700)]
Merge "Add @NonNull annotations to LE CoC APIs" am:
8b57ab7989
am:
68e00291e0
Change-Id: If0de3820ab36ddeaeb57d332f332a84963c8ad5d
Xin Li [Wed, 13 Mar 2019 05:53:19 +0000 (22:53 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am:
a5fe44c6b5 -s ours
am:
d82de1d484 -s ours
am skip reason: subject contains skip directive
Change-Id: I5860bb0aecbaf101773a7b92589899c60cf0dd88
Jeremy Klein [Wed, 13 Mar 2019 05:39:53 +0000 (22:39 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines."
am:
0102e3d548
Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 05:35:39 +0000 (22:35 -0700)]
Merge "Only return one mobile subscription per group in Settings."
am:
58385e9796
Change-Id: I2133bd9ba315a862a25fdd65afd981cbe34d5e62
Xin Li [Wed, 13 Mar 2019 05:31:18 +0000 (22:31 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am:
3e112d56a4 -s ours
am:
c26c4f8e60 -s ours
am skip reason: subject contains skip directive
Change-Id: Id71172612e6fc471b82af4066cce701fb3e289be
Stanley Tng [Wed, 13 Mar 2019 05:30:47 +0000 (22:30 -0700)]
Merge "Add @NonNull annotations to LE CoC APIs"
am:
8b57ab7989
Change-Id: I16c1d5c6c7c31b0c96172f0baaed361eae8f4a5e
Chalard Jean [Wed, 13 Mar 2019 05:21:24 +0000 (22:21 -0700)]
Merge "Tell the factory it is already serving a request." am:
ae79013ec2
am:
b8b94ba4c0
Change-Id: I8c89110d3b8d55fb8c516a966f4726d4059a098e
Xin Li [Wed, 13 Mar 2019 05:17:07 +0000 (22:17 -0700)]
[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
Ian Kasprzak [Wed, 13 Mar 2019 05:15:44 +0000 (22:15 -0700)]
Merge "Temporarily disable flaky test." am:
3fb5ba9e61
am:
36da0beab3
Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8
Kiyoung Kim [Wed, 13 Mar 2019 05:08:25 +0000 (22:08 -0700)]
Merge "Schematize Crypto state system property" am:
88b57a2c4d
am:
d5f216ac8b
Change-Id: I38fa65ef0864d8a40eb7546ad50ab254e7e0ec25
Xiao Ma [Wed, 13 Mar 2019 05:01:06 +0000 (22:01 -0700)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am:
f1e012ae9b
am:
d3c00327b9
Change-Id: I2a2061df07612a9415528e18c6f741e750127adb
Josh Hou [Wed, 13 Mar 2019 04:55:13 +0000 (21:55 -0700)]
Merge "add NonNull annotation to API" am:
56c9d22970
am:
69e802e6e6
Change-Id: Ieed6eba51fc2c3fdf7823415c783482a77c2d29c
Treehugger Robot [Wed, 13 Mar 2019 04:48:24 +0000 (04:48 +0000)]
Merge "Rename entitlement callback to adhere to API guidelines."
Xin Li [Wed, 13 Mar 2019 04:44:30 +0000 (21:44 -0700)]
[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
Chalard Jean [Wed, 13 Mar 2019 04:42:18 +0000 (21:42 -0700)]
Merge "Tell the factory it is already serving a request."
am:
ae79013ec2
Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828
Ian Kasprzak [Wed, 13 Mar 2019 04:38:43 +0000 (21:38 -0700)]
Merge "Temporarily disable flaky test."
am:
3fb5ba9e61
Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3
Kiyoung Kim [Wed, 13 Mar 2019 04:33:34 +0000 (21:33 -0700)]
Merge "Schematize Crypto state system property"
am:
88b57a2c4d
Change-Id: Idb96ab95b1ea69a636f315edeb84c8ba025d75bd
Tiger Huang [Wed, 13 Mar 2019 04:32:11 +0000 (21:32 -0700)]
Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev
am:
2eec1279c6
Change-Id: I8403fd309da5f0390b02dc0999606ca0c78b6638
Xiao Ma [Wed, 13 Mar 2019 04:29:48 +0000 (21:29 -0700)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
am:
f1e012ae9b
Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6
Josh Hou [Wed, 13 Mar 2019 04:26:18 +0000 (21:26 -0700)]
Merge "add NonNull annotation to API"
am:
56c9d22970
Change-Id: Iaa22836680e45c4244a4380d9688b968b7877c8e
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 04:14:14 +0000 (04:14 +0000)]
Merge "Only return one mobile subscription per group in Settings."
Malcolm Chen [Wed, 27 Feb 2019 00:48:40 +0000 (16:48 -0800)]
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
Treehugger Robot [Wed, 13 Mar 2019 02:28:32 +0000 (02:28 +0000)]
Merge "Add @NonNull annotations to LE CoC APIs"
Stanley Tng [Tue, 12 Mar 2019 17:19:49 +0000 (10:19 -0700)]
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
Xin Li [Wed, 13 Mar 2019 02:26:04 +0000 (02:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
Chalard Jean [Wed, 13 Mar 2019 02:07:29 +0000 (02:07 +0000)]
Merge "Tell the factory it is already serving a request."
Ian Kasprzak [Wed, 13 Mar 2019 01:52:21 +0000 (01:52 +0000)]
Merge "Temporarily disable flaky test."
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"
Xiao Ma [Wed, 13 Mar 2019 01:13:08 +0000 (01:13 +0000)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
Josh Hou [Wed, 13 Mar 2019 00:58:21 +0000 (00:58 +0000)]
Merge "add NonNull annotation to API"
Lorenzo Colitti [Wed, 13 Mar 2019 00:23:50 +0000 (09:23 +0900)]
Temporarily disable flaky test.
Test: None
Bug:
128426024
Change-Id: Id88bf452f41f512703d5831e357d9ba72dc5b911
Tiger Huang [Wed, 13 Mar 2019 00:21:27 +0000 (00:21 +0000)]
Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev
Jordan Liu [Wed, 13 Mar 2019 00:10:31 +0000 (00:10 +0000)]
Merge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus-aosp
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 23:36:02 +0000 (16:36 -0700)]
Merge "Don't return hidden subscription in getActiveSubIdList" am:
d2cb5a0608
am:
851ec326d9
Change-Id: I9356cfd364f7a9d65c299a10d9aea37f1d3d79de
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 23:25:18 +0000 (16:25 -0700)]
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am:
8cbe957dba
am:
6dc894e962
Change-Id: Idc50eab22bc89207868349a96dfbc38783125165
Jiyong Park [Tue, 12 Mar 2019 23:19:31 +0000 (16:19 -0700)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."" am:
1a14dedcce
am:
6623e402b3
Change-Id: Ic58b4c2dee735ff2e07bc1217173c23810c1d14c
Nathan Harold [Tue, 12 Mar 2019 23:12:08 +0000 (16:12 -0700)]
Merge "[API Feedback] Rename DebugEventReporter" am:
3a6dcad0a3
am:
e80b170949
Change-Id: I2c458c5a5fa2b1f47f9bc92e89a7385ca35d877d
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 23:12:05 +0000 (16:12 -0700)]
Merge "Don't return hidden subscription in getActiveSubIdList"
am:
d2cb5a0608
Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 22:59:00 +0000 (22:59 +0000)]
Merge "Don't return hidden subscription in getActiveSubIdList"
Hans Boehm [Tue, 12 Mar 2019 22:58:32 +0000 (15:58 -0700)]
Merge "Correct registerNativeAllocation type" am:
fe015a098c
am:
90e8135f1e
Change-Id: Ie379dc6782f77e051d7d3eb56ad8661bb3c33ee7
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 22:55:53 +0000 (15:55 -0700)]
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
am:
8cbe957dba
Change-Id: I372f27a1ee10cd46c5f0633586709ee14cd6e070
Hall Liu [Tue, 12 Mar 2019 22:51:26 +0000 (15:51 -0700)]
Merge "Change summary text of Wi-Fi calling" am:
68fdc5b7be
am:
281b94320e
Change-Id: Idd9ea6149ec9ddd3d122bcb6d4f9192a774f113d
Jiyong Park [Tue, 12 Mar 2019 22:49:30 +0000 (15:49 -0700)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""
am:
1a14dedcce
Change-Id: Ia70c876b6d95074cc8502b3ff1467cb5dc0d4302
Jordan Liu [Tue, 12 Mar 2019 22:43:42 +0000 (15:43 -0700)]
[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notification" am:
46f5897ae8
am:
58d5921d07 -s ours
am skip reason: SHA1
58d5921d07 skipped by user jminjie
Change-Id: I7fdcc48a5f85c05c6367eef9e47894c7e7ea6531
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 22:40:39 +0000 (22:40 +0000)]
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
Nathan Harold [Tue, 12 Mar 2019 22:38:26 +0000 (15:38 -0700)]
Merge "[API Feedback] Rename DebugEventReporter"
am:
3a6dcad0a3
Change-Id: Iab9ed0e8160b45628286f6236f1bb5f61ecc74cd
Treehugger Robot [Tue, 12 Mar 2019 22:34:26 +0000 (22:34 +0000)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""
Seongho Kim [Tue, 13 Nov 2018 06:08:34 +0000 (15:08 +0900)]
Add carrier's option to cancel CS reject cause notification
Some carrier still want to cancel CS reject notification automatically
when it gets service. So, we need a way to set carrier's option for it.
Bug:
79889307
Test: Manual
Change-Id: If4c696e8116094d0cb555fe87c92243af1f34cec
Merged-In: If4c696e8116094d0cb555fe87c92243af1f34cec
Jiyong Park [Thu, 28 Feb 2019 03:21:16 +0000 (12:21 +0900)]
Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."
This reverts commit
a6bb8916b057bb619aab2aae5cb07e190e97c79d.
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
Nathan Harold [Tue, 12 Mar 2019 22:25:46 +0000 (22:25 +0000)]
Merge "[API Feedback] Rename DebugEventReporter"
Hans Boehm [Tue, 12 Mar 2019 21:17:39 +0000 (14:17 -0700)]
Merge "Correct registerNativeAllocation type"
am:
fe015a098c
Change-Id: Ie202df6d1f36534d5bea0e65aa21570be891b5b4
Malcolm Chen [Wed, 20 Feb 2019 03:00:26 +0000 (19:00 -0800)]
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
Hans Boehm [Tue, 12 Mar 2019 21:07:03 +0000 (21:07 +0000)]
Merge "Correct registerNativeAllocation type"
Hall Liu [Tue, 12 Mar 2019 21:05:33 +0000 (14:05 -0700)]
Merge "Change summary text of Wi-Fi calling"
am:
68fdc5b7be
Change-Id: Ia52d09817e260ad144d37937b5caa48d4ba054e5
Hall Liu [Tue, 12 Mar 2019 20:49:21 +0000 (20:49 +0000)]
Merge "Change summary text of Wi-Fi calling"
Malcolm Chen [Wed, 13 Feb 2019 01:29:59 +0000 (17:29 -0800)]
Don't return hidden subscription in getActiveSubscriptionInfoList.
Bug:
121396526
Test: manual
Change-Id: I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047
Merged-In: I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047
Jeremy Klein [Tue, 12 Mar 2019 20:32:08 +0000 (13:32 -0700)]
Rename entitlement callback to adhere to API guidelines.
The method for OnTetheringEntitlementResultListener needs to be
onTetheringEntitlementResult in order to meet our API guidelines:
"Use Listener when there is a single callback method and there will
never be any others. It should be an interface whose name is the same
as the callback method plus Listener."
Bug:
126392011
Change-Id: I9a883765541ae853c4eb3bd52c9d93a7af16e661
Test: Manual build
Jordan Liu [Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)]
Merge "Add carrier's option to cancel CS reject cause notification"
am:
46f5897ae8
Change-Id: I5f95b337c6fca60d8ef66308b606081c5d9451d0
Jordan Liu [Tue, 12 Mar 2019 19:57:35 +0000 (19:57 +0000)]
Merge "Add carrier's option to cancel CS reject cause notification"
Seongho Kim [Tue, 13 Nov 2018 06:08:34 +0000 (15:08 +0900)]
Add carrier's option to cancel CS reject cause notification
Some carrier still want to cancel CS reject notification automatically
when it gets service. So, we need a way to set carrier's option for it.
Bug:
79889307
Test: Manual
Change-Id: If4c696e8116094d0cb555fe87c92243af1f34cec
Merged-In: If4c696e8116094d0cb555fe87c92243af1f34cec
Chalard Jean [Wed, 2 May 2018 12:14:54 +0000 (21:14 +0900)]
Tell the factory it is already serving a request.
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.
Gives each factory a serial number and propagates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.
Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.
This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.
Bug:
18637384
Bug:
29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
Merged-In: I597ac588f76dd507512ff02868fd1310b7e63f7e
Chalard Jean [Tue, 12 Mar 2019 12:35:00 +0000 (05:35 -0700)]
Merge "[CS] Support "instant failure" from factories" am:
eb3e7b3f64
am:
65d66eec82
Change-Id: I2dbee9b36a500ff1140c208997581064dd0b4ef1
Chalard Jean [Tue, 12 Mar 2019 12:25:48 +0000 (05:25 -0700)]
Merge "[CS] Support "instant failure" from factories"
am:
eb3e7b3f64
Change-Id: I0c5f2823763857edfc5095686345c764d9be12e1
Chalard Jean [Tue, 12 Mar 2019 12:04:46 +0000 (12:04 +0000)]
Merge "[CS] Support "instant failure" from factories"
Kiyoung Kim [Tue, 12 Mar 2019 09:14:20 +0000 (02:14 -0700)]
Merge "Add product apk support from libnativeloader" am:
307df45b5f
am:
ad0ca523a6
Change-Id: I896f609e4994eb6b0494e3fcf38737c4a69352a8
Kiyoung Kim [Tue, 12 Mar 2019 09:05:13 +0000 (02:05 -0700)]
Merge "Add product apk support from libnativeloader"
am:
307df45b5f
Change-Id: I1f9c9e63c1cf7477436b8bc38e5e62e075183c64
Kiyoung Kim [Tue, 12 Mar 2019 08:48:46 +0000 (08:48 +0000)]
Merge "Add product apk support from libnativeloader"
Lucas Lin [Tue, 12 Mar 2019 08:37:59 +0000 (01:37 -0700)]
Merge "Check if network has partial connectivity" am:
174ae05817
am:
6cf91d1558
Change-Id: I1c552638f576738540dda033f35bd32b011485b5
Xiao Ma [Thu, 7 Feb 2019 06:03:57 +0000 (15:03 +0900)]
[KA13]: add unit test for exposed TCP socket keepalive API.
Bug:
123987272
Test: atest FrameworksNetTests
Change-Id: I543d8f00ae539b706592a149981e3e8992999284
Lucas Lin [Tue, 12 Mar 2019 08:28:50 +0000 (01:28 -0700)]
Merge "Check if network has partial connectivity"
am:
174ae05817
Change-Id: I3e94029fe067a1a22acc640a0df6a87720572b94
Lucas Lin [Tue, 12 Mar 2019 08:11:14 +0000 (08:11 +0000)]
Merge "Check if network has partial connectivity"
lucaslin [Tue, 12 Mar 2019 05:08:03 +0000 (13:08 +0800)]
Check if network has partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.
Bug:
113450764
Test: 1. Build pass.
2. Fake partial connectivity case for testing.
3. atest FrameworksNetTests
4. atest NetworkStackTests
Change-Id: I69ed00ac4850904ff708c9fef22e148879a10e92
Xin Li [Tue, 12 Mar 2019 07:17:37 +0000 (00:17 -0700)]
DO NOT MERGE - Merge PPRL.190305.001 into master
Bug:
127812889
Change-Id: I7c5ada5c5afe38848be733616cbb1568440ab1c5
Daniel Huang [Tue, 12 Mar 2019 06:32:14 +0000 (23:32 -0700)]
Merge "Modify API return type and add callback." am:
f96cc08066
am:
9b82062164
Change-Id: I6f54522dba518416445c647a1aaef11caf6865ec
Daniel Huang [Tue, 12 Mar 2019 06:16:53 +0000 (23:16 -0700)]
Merge "Modify API return type and add callback."
am:
f96cc08066
Change-Id: I8d8ff3efd4666c4548dfe8a142ae0ad3f0b34b2c
Daniel Huang [Tue, 12 Mar 2019 06:02:04 +0000 (06:02 +0000)]
Merge "Modify API return type and add callback."
Remi NGUYEN VAN [Tue, 12 Mar 2019 05:46:48 +0000 (22:46 -0700)]
Merge "Move NetworkStack start to AM.systemReady" am:
f9cca7dcc2
am:
1091513f93
Change-Id: Ie86202fa755c1aa77938d82a7fbc3f2f39b42135
Tony Huang [Tue, 12 Mar 2019 05:38:40 +0000 (22:38 -0700)]
Merge "Update nullability of api" am:
47890345d0
am:
434096edef
Change-Id: If4e283682ec64eabb7f85421b275bf0424df9355
Remi NGUYEN VAN [Tue, 12 Mar 2019 05:37:29 +0000 (22:37 -0700)]
Merge "Move NetworkStack start to AM.systemReady"
am:
f9cca7dcc2
Change-Id: I80776bcaf5888b7244f83a467bc7c67267ccfee0
Junyu Lai [Tue, 12 Mar 2019 05:30:39 +0000 (22:30 -0700)]
Merge "Improve keepalive offload documentation and error handling" am:
cc3a190b07
am:
7bb0014975
Change-Id: Iae2c4dfcfa2695a57ed54eb93c64eac54f18cf98
Tony Huang [Tue, 12 Mar 2019 05:29:24 +0000 (22:29 -0700)]
Merge "Update nullability of api"
am:
47890345d0
Change-Id: Ie8ed183155b16c87a98c19f11f69fe869e797880
Remi NGUYEN VAN [Tue, 12 Mar 2019 05:27:33 +0000 (05:27 +0000)]
Merge "Move NetworkStack start to AM.systemReady"
Tony Huang [Tue, 12 Mar 2019 05:22:28 +0000 (05:22 +0000)]
Merge "Update nullability of api"
Junyu Lai [Tue, 12 Mar 2019 05:21:27 +0000 (22:21 -0700)]
Merge "Improve keepalive offload documentation and error handling"
am:
cc3a190b07
Change-Id: Ia87def27904309d405c39607326a77133632461d
Junyu Lai [Tue, 12 Mar 2019 05:11:50 +0000 (05:11 +0000)]
Merge "Improve keepalive offload documentation and error handling"
Remi NGUYEN VAN [Tue, 12 Mar 2019 02:50:22 +0000 (11:50 +0900)]
Move NetworkStack start to AM.systemReady
In practice the NetworkStack was not started after
ActivityManager#systemReady, since ActivityManager was only scheduling
the start (mPendingStarts).
Requesting the start too early causes issues for the PackageManager to
install updates/rollbacks.
Test: flashed AOSP and internal builds, WiFi working
Bug:
128331883
Change-Id: I93315ad31925bd436e21d1eabb21d5967e6aae60
Remi NGUYEN VAN [Tue, 12 Mar 2019 02:06:03 +0000 (19:06 -0700)]
Merge "Use an in-process APK for in-process NetworkStack" am:
b8f2ab9362
am:
13f2f93cd3
Change-Id: I9018b01f0cf60a8595506cc347f4afac32684e2f
Remi NGUYEN VAN [Tue, 12 Mar 2019 01:53:23 +0000 (18:53 -0700)]
Merge "Use an in-process APK for in-process NetworkStack"
am:
b8f2ab9362
Change-Id: I4437757ba95f39d62a3418214d780f36daaada6e
Kazuki Iwami [Thu, 1 Nov 2018 10:02:34 +0000 (19:02 +0900)]
Change summary text of Wi-Fi calling
According to the wording change of the settings app, also change the
FWK resource for Wi-Fi calling.
Test: manual
Bug:
34793636
Change-Id: I75b970ed2094c4efcb5a8cf8b89cf3d8c78bb5db
Merged-In: I75b970ed2094c4efcb5a8cf8b89cf3d8c78bb5db
Remi NGUYEN VAN [Tue, 12 Mar 2019 01:37:26 +0000 (01:37 +0000)]
Merge "Use an in-process APK for in-process NetworkStack"
Shimi Zhang [Tue, 12 Mar 2019 00:36:38 +0000 (17:36 -0700)]
Merge "onPageFinished javadoc cleanup" into pi-dev
am:
dfd3a1b852
Change-Id: Ib79006f63037bbbdc6a22c46ab790fc01a40c010
Ian Kasprzak [Tue, 12 Mar 2019 00:11:44 +0000 (17:11 -0700)]
Merge "Remove android-support-test lib from testutils." am:
bc18cc9b19
am:
2a8c949988
Change-Id: I43eac6807d208c35e1338a6cc0bd626da440b6e3
TreeHugger Robot [Mon, 11 Mar 2019 23:59:07 +0000 (23:59 +0000)]
Merge "onPageFinished javadoc cleanup" into pi-dev
Ian Kasprzak [Mon, 11 Mar 2019 23:51:41 +0000 (16:51 -0700)]
Merge "Remove android-support-test lib from testutils."
am:
bc18cc9b19
Change-Id: I6931a899078460e8879b6c0f5b3dcb1f8d55b884
Etan Cohen [Tue, 8 Jan 2019 20:09:18 +0000 (12:09 -0800)]
[CS] Support "instant failure" from factories
Add a mechanism by which a factory can declare "instant failure" for
a request - which would result in it getting an OnUnavailable()
(even without a timeout).
Factories may only do this iff:
1. They know they are the only factory which may fulfill this
request (common for transport-specific requests).
2. The know that the request can definitely not be
fulfilled at any point in the future.
Bug:
31382922
Test: atest ConnectivityServiceTest
Merged-In: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
Change-Id: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
Treehugger Robot [Mon, 11 Mar 2019 22:57:58 +0000 (22:57 +0000)]
Merge "Remove android-support-test lib from testutils."
Chen Xu [Mon, 11 Mar 2019 22:33:16 +0000 (15:33 -0700)]
Merge "rename precise carrier id to specific carrier id" am:
118354f77c
am:
ab85849ce7
Change-Id: Icb53a9998d1f93852aadbee36a0f61322d8962b3
Chen Xu [Mon, 11 Mar 2019 21:54:34 +0000 (14:54 -0700)]
Merge "rename precise carrier id to specific carrier id"
am:
118354f77c
Change-Id: I2ef97c1013e3e77b7ec4ec311eaa437503a758e8