OSDN Git Service
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
Hans Boehm [Tue, 12 Mar 2019 22:58:32 +0000 (15:58 -0700)]
Merge "Correct registerNativeAllocation type" am:
fe015a098c
am:
90e8135f1e
Change-Id: Ie379dc6782f77e051d7d3eb56ad8661bb3c33ee7
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
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
Nathan Harold [Tue, 12 Mar 2019 22:38:26 +0000 (15:38 -0700)]
Merge "[API Feedback] Rename DebugEventReporter"
am:
3a6dcad0a3
Change-Id: Iab9ed0e8160b45628286f6236f1bb5f61ecc74cd
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
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"
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 [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
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
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
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)
Shimi Zhang [Sat, 23 Feb 2019 01:47:28 +0000 (17:47 -0800)]
onPageFinished javadoc cleanup
PictureListener was deprecated, we need to replace its mentioning in
onPageFinished() javadoc with postVisualStateCallback().
Bug:
125939241
Test: make ds-docs
Change-Id: I7c1641c86632bb6c8214fd701e052096952deeec
Nathan Harold [Mon, 11 Mar 2019 18:56:38 +0000 (11:56 -0700)]
Merge "Add Missing getRssi to CellSignalStrengthGsm" am:
e17575c03e
am:
5aa9661739
Change-Id: I937fcd9eebd67e340af03ff5dc4e276922c018cb
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:36:15 +0000 (10:36 -0700)]
Merge "Add tethering event callback API" am:
5227285ad7
am:
b14afc3a5f
Change-Id: I083910feb7abf3f554fd2b8dddbc13a7aed8e27c
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:40:19 +0000 (09:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
am:
286062e5ce -s ours
am skip reason: subject contains skip directive
Change-Id: I0fe69052a7643f692471752d2dd88556f2d61326
The Android Open Source Project [Mon, 11 Mar 2019 16:21:09 +0000 (09:21 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
am:
53f7682117 -s ours
am skip reason: subject contains skip directive
Change-Id: I724c9dd2852cf947a99254763b60eb3db99246ad
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
Chalard Jean [Mon, 11 Mar 2019 15:14:03 +0000 (08:14 -0700)]
Merge "Add a static to get the Ip Memory Store" am:
bee0cbe5df
am:
9f1414dac1
Change-Id: Ibcd5e3cfb34262b69661329878f27587eaf84180
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:30:54 +0000 (04:30 -0700)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am:
af5acad9f1
am:
d378db0b2e
Change-Id: Iee504061c4b61668990489e70d0dd0b75606d24b
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:29:02 +0000 (21:29 -0700)]
Merge "Make ParseException less useless." am:
8e8ed1dfc2
am:
55fae4c14c
Change-Id: I045520c106529c266f5e06f29bb32cf078df7f8b
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:30:03 +0000 (19:30 -0700)]
Merge changes I9dbbf904,Iebc174ed am:
06d8067975
am:
91b2b0cc60
Change-Id: I5dc5cc12347755cf48dfedfdd20f50c63dfd30f5
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
TreeHugger Robot [Fri, 8 Mar 2019 23:47:40 +0000 (23:47 +0000)]
Merge "resolve merge conflicts of
04d262db157f15c2d822708e57715d80e3f14585 to pi-dev-plus-aosp" into pi-dev-plus-aosp
Nicolas Geoffray [Fri, 8 Mar 2019 23:44:20 +0000 (15:44 -0800)]
Merge "Update current API after adding nullable annotations." am:
c06c54662b
am:
f99fce01f2
Change-Id: I6de8a5f2eba41dd3aba306a79fcdb32acb9cc80b
Sasha Smundak [Fri, 8 Mar 2019 23:33:18 +0000 (15:33 -0800)]
Merge "Convert tests/**/Android.mk files to Android.bp" am:
40ff4f7d83
am:
c33506ce2f
Change-Id: Ia1a6c26f4f786f22763ebde95b238887914951f4
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:52:01 +0000 (14:52 -0800)]
Merge "update getStaticPhoneCapability to use HAL instead of default value" am:
9e6f5d1521
am:
109f4590ca
Change-Id: I2b43c2ad3f6e6b6789a6f124fce43d8d87b9d8c0
Nazanin Bakhshi [Fri, 8 Mar 2019 22:41:14 +0000 (14:41 -0800)]
Merge "make onActiveDataSubId in PhoneStateListener public API" am:
dfe984c3fe
am:
558a5e2632
Change-Id: Iecac7b32f88a2b4d8d3236b2e571dde832b49044
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
Irina Dumitrescu [Fri, 8 Mar 2019 22:26:20 +0000 (14:26 -0800)]
Merge "Add Keystore get option that supresses caught exceptions warnings." am:
f070b51670
am:
7bf37cf83d
Change-Id: I90d0e2f575f8291093e76d9b4908e3ff02e8f168
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
Nathan Harold [Fri, 8 Mar 2019 19:56:04 +0000 (11:56 -0800)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support" am:
f899e26857
am:
8dada71897
Change-Id: I402d3dfbaba9fabdd65956fd23b3879d0d77df7e
Nazanin Bakhshi [Wed, 6 Mar 2019 23:31:45 +0000 (15:31 -0800)]
update getStaticPhoneCapability to use HAL instead of default value
Bug:
123359867
Test: build
Change-Id: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
Merged-In: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
(cherry picked from commit
1772247b044795cdad1fa22069040df0bf657f42)
Nathan Harold [Fri, 8 Mar 2019 19:39:33 +0000 (11:39 -0800)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support"
am:
f899e26857
Change-Id: I9f96a8846bfb137bdcae8d8495188229637fac2c
Nazanin Bakhshi [Fri, 8 Mar 2019 19:29:56 +0000 (11:29 -0800)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am:
016409b3d5
am:
26891a4429
Change-Id: Ic9600095313ed557a119f9e0dd656b9230dd3056
Nazanin Bakhshi [Fri, 1 Mar 2019 18:10:22 +0000 (10:10 -0800)]
make onActiveDataSubId in PhoneStateListener public API
Bug:
124260187
Test: CTS
Change-Id: I6e5a5c8273348d822b8f552599784b8e986850bf
Merged-In: I6e5a5c8273348d822b8f552599784b8e986850bf
(cherry picked from commit
026c42d7521c390b171f2b42a9b961fdc325b44a)
OSDN Git Service
