OSDN Git Service
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
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
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
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
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
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"
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
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
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.""
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: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: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"
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: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:37:29 +0000 (22:37 -0700)]
Merge "Move NetworkStack start to AM.systemReady"
am:
f9cca7dcc2
Change-Id: I80776bcaf5888b7244f83a467bc7c67267ccfee0
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 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"
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 21:54:34 +0000 (14:54 -0700)]
Merge "rename precise carrier id to specific carrier id"
am:
118354f77c
Change-Id: I2ef97c1013e3e77b7ec4ec311eaa437503a758e8
Chen Xu [Mon, 11 Mar 2019 21:34:30 +0000 (21:34 +0000)]
Merge "rename precise carrier id to specific carrier id"
Ian Kasprzak [Sat, 9 Mar 2019 02:49:31 +0000 (18:49 -0800)]
Remove android-support-test lib from testutils.
Fixed dependencies as needed.
Fixes apct/net/networking_framework_unit_test broken
in aosp/919393.
Test: m tests, checkbuild and Forrest (via gerritt) testing
Bug:
127910239
Change-Id: Ida0ca8012ede9227d204935b11002ddfa2f134ff
Merged-In: Ia825e0926b46855f9056739441cb21a065692076
(Manual partial cherry-pick of
ec6bcbceee8fed0f99d1d5d1760b74eead98668a)
Nathan Harold [Mon, 11 Mar 2019 18:19:00 +0000 (11:19 -0700)]
Merge "Add Missing getRssi to CellSignalStrengthGsm"
am:
e17575c03e
Change-Id: I882f00ce55571c66a1c9b50a839d848af950d68d
Nathan Harold [Mon, 11 Mar 2019 17:53:40 +0000 (17:53 +0000)]
Merge "Add Missing getRssi to CellSignalStrengthGsm"
Chalard Jean [Mon, 11 Mar 2019 17:26:28 +0000 (10:26 -0700)]
Merge "Add tethering event callback API"
am:
5227285ad7
Change-Id: Ie38a521abf09e0eb530173508b14aa2acdb9267c
Chalard Jean [Mon, 11 Mar 2019 17:04:57 +0000 (17:04 +0000)]
Merge "Add tethering event callback API"
Xin Li [Mon, 11 Mar 2019 16:09:43 +0000 (16:09 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
Josh Hou [Mon, 11 Mar 2019 15:59:34 +0000 (23:59 +0800)]
add NonNull annotation to API
Bug:
126702863
Test: Build pass
Change-Id: I3398d43837bef90ebe685d7f7c35c6c5d0defd7e
Chalard Jean [Mon, 11 Mar 2019 15:04:48 +0000 (08:04 -0700)]
Merge "Add a static to get the Ip Memory Store"
am:
bee0cbe5df
Change-Id: I8cf868ca1801f30a772fea7716e0b9fd322a80de
Treehugger Robot [Mon, 11 Mar 2019 14:56:34 +0000 (14:56 +0000)]
Merge "Add a static to get the Ip Memory Store"
danielwbhuang [Mon, 11 Mar 2019 03:52:10 +0000 (11:52 +0800)]
Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.
Test: build pass
Bug:
124616182
Merged-In: I32fe1407deabe36485227ec75931bec334d85abe
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
Chalard Jean [Mon, 11 Mar 2019 11:44:24 +0000 (20:44 +0900)]
Add a static to get the Ip Memory Store
This is so that there is some AOSP stable API while the
memory store is moved to the network.
Test: atest FrameworksNetTests
Change-Id: Ib51dbee77fcb0d14a5c85240ac711b3b1aa71286
Chalard Jean [Mon, 11 Mar 2019 11:21:36 +0000 (04:21 -0700)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
am:
af5acad9f1
Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
Treehugger Robot [Mon, 11 Mar 2019 11:07:21 +0000 (11:07 +0000)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
Chalard Jean [Mon, 15 Oct 2018 05:27:15 +0000 (14:27 +0900)]
[PT17.5] Revert to booleans for send/not send broadcast constants.
In PT17, for security of the patch these two constants have been
switched from boolean to enum values. While this is nice for making
sure a patch is correct, it's also pretty wasteful. Now that it's
certain that the values of these fields don't matter, they can be
set to logical values (as opposed to reversed as it was the case
before PT17.
Test: runtest
Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86
Chalard Jean [Mon, 11 Mar 2019 04:19:42 +0000 (21:19 -0700)]
Merge "Make ParseException less useless."
am:
8e8ed1dfc2
Change-Id: If582e61ca92e5414edea351934053fa0ab6b04bf
Treehugger Robot [Mon, 11 Mar 2019 04:06:48 +0000 (04:06 +0000)]
Merge "Make ParseException less useless."
Kiyoung Kim [Wed, 20 Feb 2019 09:07:41 +0000 (18:07 +0900)]
Add product apk support from libnativeloader
Currently libnativeloader appends vendor lib path if apk is from vendor
partition. Similar to this we should add product lib path if apk if from product partition.
Bug:
124705551
Test: m -j && tested from crosshatch with product apps (such as Wallpaper)
Change-Id: Ic85b16e8e4484a35c659c16e067f1e7c7285d05e
Merged-In: Iaa8d0ea61b1b9ab8a1da676a492f75c6a5d71d5d
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:22:45 +0000 (19:22 -0700)]
Merge changes I9dbbf904,Iebc174ed
am:
06d8067975
Change-Id: I30176a7bd0992d3a038458c0ccbe3a7ba9ecc9f7
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:06:27 +0000 (02:06 +0000)]
Merge changes I9dbbf904,Iebc174ed
* changes:
Move NetworkStackTests to presubmit
Remove NetworkStack test dependency on testutils
chen xu [Wed, 6 Mar 2019 22:43:40 +0000 (14:43 -0800)]
rename precise carrier id to specific carrier id
Bug:
126727010
Test: atest CtsTelephonyTestCases
Change-Id: I4561ae8c15c429912695e0753b2ab3137a4e1e44
(cherry picked from commit
45f662139190df65f15d57a6e415c9559b580efe)
Merged-in: I4561ae8c15c429912695e0753b2ab3137a4e1e44
The Android Open Source Project [Fri, 8 Mar 2019 23:56:58 +0000 (15:56 -0800)]
DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
Bug:
127812889
Change-Id: I104af105cc225ae76eb176f227e9dd198f74e4b7
Nicolas Geoffray [Fri, 8 Mar 2019 23:27:04 +0000 (15:27 -0800)]
Merge "Update current API after adding nullable annotations."
am:
c06c54662b
Change-Id: If2c150f68b79f990edc046cce6ccc0d5bd85b5bf
Sasha Smundak [Fri, 8 Mar 2019 23:20:09 +0000 (15:20 -0800)]
Merge "Convert tests/**/Android.mk files to Android.bp"
am:
40ff4f7d83
Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
Nicolas Geoffray [Fri, 8 Mar 2019 23:15:03 +0000 (23:15 +0000)]
Merge "Update current API after adding nullable annotations."
Treehugger Robot [Fri, 8 Mar 2019 22:54:11 +0000 (22:54 +0000)]
Merge "Convert tests/**/Android.mk files to Android.bp"
Nazanin Bakhshi [Fri, 8 Mar 2019 22:31:03 +0000 (14:31 -0800)]
Merge "update getStaticPhoneCapability to use HAL instead of default value"
am:
9e6f5d1521
Change-Id: Ib146ba3b8a7db7ed151ea721ceb57b21e4b44ac3
Nazanin Bakhshi [Fri, 8 Mar 2019 22:21:29 +0000 (14:21 -0800)]
Merge "make onActiveDataSubId in PhoneStateListener public API"
am:
dfe984c3fe
Change-Id: Ic385f5372535220bbeda6351974b22081a2e8b30
Irina Dumitrescu [Fri, 8 Mar 2019 22:16:35 +0000 (14:16 -0800)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
am:
f070b51670
Change-Id: I5f229fc9d08e445c32ea8cf4e971129d79019cef
Treehugger Robot [Fri, 8 Mar 2019 22:05:59 +0000 (22:05 +0000)]
Merge "update getStaticPhoneCapability to use HAL instead of default value"
Nazanin Bakhshi [Fri, 8 Mar 2019 22:00:33 +0000 (22:00 +0000)]
Merge "make onActiveDataSubId in PhoneStateListener public API"
Treehugger Robot [Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
Nathan Harold [Fri, 8 Mar 2019 19:51:56 +0000 (11:51 -0800)]
[API Feedback] Rename DebugEventReporter
To address concerns that the DebugEventReporter would
be misconstrued as a generic logging mechanism, for
which use of system broadcasts is inappropriate, this
component and the accompanying broadcast are renamed
as AnomalyReporter and the event renamed from
ACTION_DEBUG_EVENT to ACTION_ANOMALY_REPORTED.
Bug:
126178766
Test: manual (fire event from PhoneGlobals at boot).
Change-Id: I13381d6c551db161d9858601df8be98f5c25976c