OSDN Git Service
Jerry Zhang [Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
am:
20dca26f41
Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
Jerry Zhang [Tue, 17 Jul 2018 19:47:29 +0000 (19:47 +0000)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
John Reck [Tue, 17 Jul 2018 18:12:31 +0000 (11:12 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method"
am:
1febe4196e -s ours
Change-Id: I3a366342f1a94c34e0815e5941b7b13816a637c8
Treehugger Robot [Tue, 17 Jul 2018 17:00:30 +0000 (17:00 +0000)]
Merge "Remove unneeded JNI method"
Neil Fuller [Tue, 17 Jul 2018 16:16:15 +0000 (09:16 -0700)]
Merge "Track OkHttp changes"
am:
0083876870
Change-Id: Id872a519323e5e3237fb708fa7d2d9eeae579650
Treehugger Robot [Tue, 17 Jul 2018 13:43:10 +0000 (13:43 +0000)]
Merge "Track OkHttp changes"
David Brazdil [Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)]
Merge changes If285d71a,Iffe5be7c
am:
f37950d8c3
Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
David Brazdil [Tue, 17 Jul 2018 10:37:16 +0000 (03:37 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
am:
ed1f171cb9 -s ours
Change-Id: Ied01c65b3352129d1ced3e41d2ce281077c52d37
Neil Fuller [Tue, 10 Jul 2018 20:13:34 +0000 (21:13 +0100)]
Track OkHttp changes
As part of creating a full facade over OkHttp code there
are some changes to OkHttp-related classes that must be tracked.
See the related external/okhttp commit for details.
Some non-functional lint / WS changes have been made as part of this
change.
Test: Ran CtsLibcoreOkHttpTestCases entirely
Test: Ran CtsLibcoreTestCases entirely
Test: run cts-dev -m CtsNetTestCases -t android.net.http.cts.HttpResponseCacheTest
Bug:
111055375
Change-Id: I0b0ec21fa376ea33e2fa5486e203e92d3c3337cf
David Brazdil [Tue, 17 Jul 2018 08:24:36 +0000 (08:24 +0000)]
Merge changes If285d71a,Iffe5be7c
* changes:
Revert^2: Build dark greylist from public + light grey API
[DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
Mark Chien [Tue, 17 Jul 2018 07:10:56 +0000 (00:10 -0700)]
Merge "Remove SimChangeListener from Tethering"
am:
6e35b2c596
Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48
Mark Chien [Tue, 17 Jul 2018 05:49:09 +0000 (05:49 +0000)]
Merge "Remove SimChangeListener from Tethering"
Mathieu Chartier [Tue, 17 Jul 2018 01:22:04 +0000 (18:22 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating"
am:
600aeb124b -s ours
Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6
Hall Liu [Tue, 17 Jul 2018 00:12:05 +0000 (17:12 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
am:
fce4acd679 -s ours
Change-Id: Id43c6c5c39767964e55b40d62785e3d14d4a4828
John Reck [Tue, 7 Nov 2017 00:02:49 +0000 (16:02 -0800)]
Remove unneeded JNI method
Test: ran PFD CTS tests
Change-Id: I9a40319595c757835f7e19a50dc0311077c9e627
Merged-In: I9a40319595c757835f7e19a50dc0311077c9e627
(cherry picked from commit
d7bd9190759e3a6658455ada987453928caec8a8)
Mathieu Chartier [Mon, 16 Jul 2018 23:16:13 +0000 (23:16 +0000)]
Merge "old paths contains all entries when updating"
Hall Liu [Mon, 16 Jul 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
Todd Kennedy [Wed, 2 May 2018 09:59:45 +0000 (10:59 +0100)]
old paths contains all entries when updating
In certains circumstances, only the base and split APKs were included in
the "old paths" list when updating the application info. Instead, this
list should contain _all_ elements, including any additional libraries
that may be added to the overall classpath.
Bug:
77342775
Bug:
80337129
Test: Manual. Install a package. Install a split with --dont_kill. See that the path doesn't contain duplicate entries
Test: Uninstall GMS updates and reinstall. Verify that GMS Dex files aren't extrated out of the APK.
(cherry picked from commit
b9656a93aac435cefaa4ca0e1b06495d690ba019)
Merged-In: Id9739cce215ab07bff1b17966583c0cf51a0b34a
Change-Id: I3c61b1b61dc1ab8a1a51a5be68f19ae9af586692
markchien [Mon, 16 Jul 2018 11:54:26 +0000 (19:54 +0800)]
Remove SimChangeListener from Tethering
SimChangeListener is obsolete. It is replace by
ACTION_CARRIER_CONFIG_CHANGED.
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes (with --no-hidden-api-checks)
- tethering/hotspot on/off
Bug:
111490073
Change-Id: I82644ea136f43869a953a1f7b72dc489fe90f380
Neil Fuller [Mon, 16 Jul 2018 08:50:04 +0000 (01:50 -0700)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
am:
e859c42e23
Change-Id: I6b6452f9609d88ce61959e7c4ae4f0fd8fa97e64
Neil Fuller [Mon, 16 Jul 2018 07:44:58 +0000 (07:44 +0000)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
Jack Yu [Mon, 16 Jul 2018 00:12:41 +0000 (17:12 -0700)]
Merge "Added documentation for network registration state"
am:
3c1604da8b
Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
Treehugger Robot [Sun, 15 Jul 2018 22:34:30 +0000 (22:34 +0000)]
Merge "Added documentation for network registration state"
Chih-hung Hsieh [Sat, 14 Jul 2018 04:13:18 +0000 (21:13 -0700)]
Merge "Fix unnecessary copy initialization warnings"
am:
38858d6dd3
Change-Id: Ic96829517269abfdb9fbf1661deffe0758356d57
Hall Liu [Sat, 14 Jul 2018 00:30:49 +0000 (00:30 +0000)]
Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""
This reverts commit
0082b161ca42b41925fd5973f1779fc4c46f6034.
Reason for revert: build breaks fixed
Change-Id: I75ea63ceaae6e970ce51a971c9a4635d0ce3f9e4
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
Reordered the params for network registration
Test: Build
Bug:
73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit
7928c4d1c370a67be81ccb5b70696b8ef9db48ba)
(cherry picked from commit
c683c3930e6d03825fd80fa71a2b3d5de5639f7d)
Nathan Harold [Fri, 13 Jul 2018 22:45:31 +0000 (15:45 -0700)]
Merge "Re-Number RIL Message IDs to Match RIL.h"
am:
8424001a04
Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9
Chih-hung Hsieh [Fri, 13 Jul 2018 22:42:26 +0000 (22:42 +0000)]
Merge "Fix unnecessary copy initialization warnings"
Tyler Gunn [Fri, 13 Jul 2018 22:37:40 +0000 (15:37 -0700)]
Merge "Update InCallService API docs to explain how to show incoming call UI."
am:
ac47c63b36
Change-Id: I4b3f34199c471006c71c2560f365ad314580b0a3
Jack Yu [Wed, 6 Jun 2018 00:38:56 +0000 (17:38 -0700)]
Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.
Bug:
73659459
Test: Build
Change-Id: Ia67ebf94771c7ff5f5d90f6cdd303cb2716f9186
(cherry picked from commit
b4094993f742fbe9d07bd5783030aa82a3045f79)
Chih-Hung Hsieh [Fri, 13 Jul 2018 20:37:03 +0000 (13:37 -0700)]
Fix unnecessary copy initialization warnings
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: I333d3a6b3394f50712148eeabf2253f1e01b21f3
Nathan Harold [Fri, 13 Jul 2018 19:57:06 +0000 (19:57 +0000)]
Merge "Re-Number RIL Message IDs to Match RIL.h"
Jack Yu [Fri, 13 Jul 2018 19:28:23 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
Tyler Gunn [Fri, 13 Jul 2018 19:15:45 +0000 (12:15 -0700)]
Merge "Make Connection#onSilence a public API."
am:
cbe3737f13
Change-Id: I4ab192ca160219770d7384e88c8e0025137b42bd
Yueming Wang [Fri, 13 Jul 2018 19:10:40 +0000 (12:10 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am:
f92ad05fa5 -s ours
Change-Id: If211a292335419751be21e670b1ddb489d3c54b4
Neil Fuller [Fri, 13 Jul 2018 18:49:51 +0000 (19:49 +0100)]
Avoid use of DateUtilsBridge.icuTimeZone()
DateUtilsBridge is only used in one place in framework.
The usage is avoidable by sticking to java.util. This
decreases the number of non-public libcore classes in
use by framework.
Test: build
Bug:
111055375
Change-Id: Ifd6576b5b6df1e154f16ec201a4575d0b95de66d
Treehugger Robot [Fri, 13 Jul 2018 18:52:52 +0000 (18:52 +0000)]
Merge "Update InCallService API docs to explain how to show incoming call UI."
Tyler Gunn [Fri, 13 Jul 2018 17:02:36 +0000 (17:02 +0000)]
Merge "Make Connection#onSilence a public API."
Treehugger Robot [Fri, 13 Jul 2018 16:34:30 +0000 (16:34 +0000)]
Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
David Brazdil [Thu, 31 May 2018 12:58:41 +0000 (13:58 +0100)]
Revert^2: Build dark greylist from public + light grey API
The dark greylist is meant to contain non-SDK APIs which are "related"
to APIs accessible to apps without restrictions. The list used to be
built as all non-SDK APIs in the same package as those on the light
greylist. That is not sufficient and should include the public SDK API
packages too.
This patch modifies the makefile to generate a list of public API DEX
signatures with Doclava and then use that as a basis for the dark
greylist generation.
Bug:
80461842
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: If285d71ab82c3046fca94c325d664bd9073c1a69
David Brazdil [Fri, 13 Jul 2018 14:42:49 +0000 (14:42 +0000)]
[DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
This reverts commit
6f6a126b9c64e49abcabcb6ea7b563535d22b04e.
Reason for revert: Bad merge into internal
Change-Id: Iffe5be7c10e8438bd46f71dc22e0867c0d316d40
Yueming Wang [Fri, 13 Jul 2018 10:29:43 +0000 (10:29 +0000)]
Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit
0c149bd2d84d6e7c21dd4d7fff1e4dcfd51318f3.
Reason for revert: reverting this topic as it breaks several branches.
Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Jack Yu [Thu, 12 Jul 2018 22:10:34 +0000 (15:10 -0700)]
DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit
ea440a765e2774320910073e5350bdccd39afb6c, reversing
changes made to
0b90c524cb8288f3b8d8111b5724c02630c5b4c6.
Test: Build
Bug:
73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
Hall Liu [Thu, 12 Jul 2018 22:22:52 +0000 (15:22 -0700)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
am:
0babf1815c
Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
Jean-Michel Trivi [Thu, 12 Jul 2018 21:36:35 +0000 (14:36 -0700)]
Merge "Audio assets: add NFC sounds"
am:
5cb7cd68a0
Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
Hall Liu [Thu, 12 Jul 2018 21:13:16 +0000 (21:13 +0000)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
Jack Yu [Thu, 12 Jul 2018 20:52:49 +0000 (13:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state""
am:
1cbcc50d0a -s ours
Change-Id: I02d1877b0bd5d84895ea12590c8ea0668e0255db
Nathan Harold [Thu, 12 Jul 2018 18:34:17 +0000 (11:34 -0700)]
Re-Number RIL Message IDs to Match RIL.h
-Renumber RIL requests to match the message IDs
for NATT Keepalive messages.
-Update comments to indicate RIL+HAL and HAL-only
messages.
-Add new message offsets to explicitly support
HAL-only messages in the list.
Bug:
110181475
Test: runtest frameworks-telephony
Change-Id: I58544f9291f426b5c195ece81113e15ed423d2df
Jean-Michel Trivi [Thu, 12 Jul 2018 19:41:51 +0000 (19:41 +0000)]
Merge "Audio assets: add NFC sounds"
Nathan Harold [Thu, 12 Jul 2018 19:35:18 +0000 (12:35 -0700)]
Merge "Remove Duplicate Override for Operator Alphas"
am:
24eaa6ab3d
Change-Id: I15004a7df3d922ba50d187769299723e888febae
Jordan Liu [Thu, 12 Jul 2018 18:46:32 +0000 (11:46 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read"
am:
0beefc0af5
Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
Neil Fuller [Thu, 12 Jul 2018 18:26:03 +0000 (11:26 -0700)]
Merge "Move XML object factory logic to libcore"
am:
8176fb99e1
Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
Jack Yu [Thu, 12 Jul 2018 18:21:11 +0000 (11:21 -0700)]
[automerger skipped] Merge "Added documentation for network registration state"
am:
c51397b161 -s ours
Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
Jack Yu [Thu, 12 Jul 2018 18:16:26 +0000 (18:16 +0000)]
Merge "Revert "Added documentation for network registration state""
Nathan Harold [Thu, 12 Jul 2018 18:08:05 +0000 (18:08 +0000)]
Merge "Remove Duplicate Override for Operator Alphas"
Jack Yu [Thu, 12 Jul 2018 17:39:12 +0000 (17:39 +0000)]
Revert "Added documentation for network registration state"
This reverts commit
b4094993f742fbe9d07bd5783030aa82a3045f79.
Reason for revert: Caused merge conflict. Need to come up with a better solution.
Change-Id: Id7b7f35c25775a7a095b77a90724cf3a0f8daf7e
Jordan Liu [Thu, 12 Jul 2018 17:36:15 +0000 (17:36 +0000)]
Merge "WRITE_APN_SETTINGS is also required to read"
Treehugger Robot [Thu, 12 Jul 2018 13:46:56 +0000 (13:46 +0000)]
Merge "Move XML object factory logic to libcore"
Neil Fuller [Tue, 10 Jul 2018 14:18:58 +0000 (15:18 +0100)]
Remove unnecessary libcore includes
This commit removes includes that don't appear to be needed.
Test: build
Bug:
111055375
Merged-In: Ia660abcf992c4acd8709d217116f895b07d9c61c
Change-Id: Ia660abcf992c4acd8709d217116f895b07d9c61c
(cherry picked from commit
fa956d5d722dd600ed429f02c55e796f9dc2c772)
Jack Yu [Thu, 12 Jul 2018 02:28:32 +0000 (02:28 +0000)]
Merge "Added documentation for network registration state"
Arun Rathi [Wed, 11 Jul 2018 23:08:33 +0000 (16:08 -0700)]
Merge "Add Channel 50 (area update info) support for LAM market"
am:
57df2a333f
Change-Id: I28ece8be0f12979bd037337c87df1ce8fd05c331
Treehugger Robot [Wed, 11 Jul 2018 21:52:01 +0000 (21:52 +0000)]
Merge "Add Channel 50 (area update info) support for LAM market"
John Reck [Wed, 11 Jul 2018 21:48:50 +0000 (14:48 -0700)]
Merge "Disable LTO on -eng"
am:
1918b39942
Change-Id: I925182b722d7bf6b1bb63c298a8ec9e345f0c4ac
Treehugger Robot [Wed, 11 Jul 2018 20:21:19 +0000 (20:21 +0000)]
Merge "Disable LTO on -eng"
Nathan Harold [Wed, 11 Jul 2018 19:09:10 +0000 (12:09 -0700)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
am:
c1e5c3ea82
Change-Id: I4bbedcc3f47706d677a1c66273bf1643c8f21be5
John Reck [Wed, 11 Jul 2018 18:21:09 +0000 (11:21 -0700)]
Disable LTO on -eng
Speeds up incremental compile of one cpp file change
from over a minute to around 15 seconds
Bug:
111277863
Test: touch a .cpp file in hwui & mmm
Change-Id: I946ecad411a7a59f87ed9e1eeb146d6f57bd038a
Jack Yu [Wed, 6 Jun 2018 00:38:56 +0000 (17:38 -0700)]
Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.
Bug:
73659459
Test: Build
Change-Id: Ia7b4a53070c06edd98ae767fd6f56c4000d8e4d0
Nathan Harold [Wed, 11 Jul 2018 17:58:50 +0000 (17:58 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
Tyler Gunn [Mon, 18 Jun 2018 18:24:15 +0000 (11:24 -0700)]
Make Connection#onSilence a public API.
Connection#onSilence is generally applicable to apps implementing the
self-managed ConnectionService API.
Also updated the docs to make it more clear where that API is to be used
and how the developer can silence the ringtone.
Test: CTS test, manual test.
Bug:
110348674
Change-Id: I1c1791c101827780949fd633c531ed83037e7b4e
Neil Fuller [Tue, 10 Jul 2018 17:41:19 +0000 (18:41 +0100)]
Move XML object factory logic to libcore
It makes sense to hide the details of the parser implementation
(and other similar objects) in libcore so it could be changed.
This change removes the "ExpatPerformanceTest" which appears not to have
been maintained and was comparing KxmlParser with itself. It is assumed
that android.util.Xml used to return the expat parser.
Test: build
Bug:
111055375
Merged-In: Ibad247323ba90cd949aecb2bd92f2f73306a4327
Change-Id: Ibad247323ba90cd949aecb2bd92f2f73306a4327
David Brazdil [Wed, 11 Jul 2018 10:56:34 +0000 (11:56 +0100)]
resolve merge conflicts of
6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
David Brazdil [Wed, 11 Jul 2018 09:18:15 +0000 (09:18 +0000)]
Merge "Compile android.test.*.stubs into dex"
Arun Rathi [Wed, 27 Jun 2018 12:04:41 +0000 (14:04 +0200)]
Add Channel 50 (area update info) support for LAM market
Add Channel 50 (area update info) support for LAM market.
Below is the list of MCC MNC:
MCC MNC 334 030 /334 03 (Movistar MX)
MCC MNC 722 07 (Movistar AR)
MCC MNC 732 123 (Movistar CO)
MCC MNC 740 00 (Movistar EC)
MCC MNC 712 04 (Movistar CR)
MCC MNC 706 04 (Movistar SV)
MCC MNC 704 03 (Movistar GT)
MCC MNC 716 17 (Entel PE)
MCC MNC 716 06 (Movistar PE)
MCC MNC 716 10 (Claro PE)
Bug:
111260033
Test: Manual
Change-Id: I2fe53cbfd103140125422e28723280ada7522cd1
Jean-Michel Trivi [Wed, 11 Jul 2018 00:32:11 +0000 (17:32 -0700)]
Audio assets: add NFC sounds
Add audio assets for NFC events.
Add new audio package that includes the NFC sounds in the UI "sound
effects"
Bug:
80405985
Test: use AudioPackage14 in device build, verify NFC sounds are under system/media/audio/ui
Change-Id: Ifdb79286ad4ba083a5515402f8d3e62e0ba61c3f
Hall Liu [Sat, 9 Jun 2018 01:14:21 +0000 (18:14 -0700)]
Update SubscriptionInfo o use strings for mccmnc
Add methods to get mcc/mnc as strings so that the leading-zero
ambiguity is resolved.
Test: manual (db update), unit tests
Bug:
35064313
Change-Id: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Colin Cross [Tue, 10 Jul 2018 21:24:31 +0000 (14:24 -0700)]
Mark installable jars with installable: true
Most jars don't need to be installed on the device. Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.
Bug:
110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf
Nathan Harold [Tue, 10 Jul 2018 20:38:23 +0000 (13:38 -0700)]
Remove Duplicate Override for Operator Alphas
These methods override the base class methods
and don't actually add any value. Removing them
as redundant.
Bug:
76153768
Test: telephony unit test - testCellIdentityTdscdma()
Change-Id: I98200a7198e182e6279851c51082bf625ee09fe9
Nathan Harold [Wed, 28 Mar 2018 15:39:43 +0000 (08:39 -0700)]
Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.
Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.
-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
the getLevel() methods of CellSignalStrength<RAT>
Bug:
76153768
Test: RILTests added for TDSCDMA
Merged-In: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
(cherry picked from commit
88f44024bb068829358d66107360223dc73131f7)
Mathew Inwood [Tue, 10 Jul 2018 18:41:48 +0000 (11:41 -0700)]
Merge "Add build rule for API->source mapping."
am:
b4919259ab
Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
Jordan Liu [Tue, 10 Jul 2018 18:24:42 +0000 (11:24 -0700)]
WRITE_APN_SETTINGS is also required to read
Add documentation explaining this.
Bug:
110033164
Test: no change to behavior
Change-Id: I4b69e5e36c9e05cf14c999e4a5bb1664a02e82f3
Tyler Gunn [Tue, 3 Jul 2018 23:08:17 +0000 (16:08 -0700)]
Update InCallService API docs to explain how to show incoming call UI.
Updating InCallService API docs to give an example of how an InCallService
should display a new incoming call notification.
Test: make docs ; proof generated HTML
Bug:
110916900
Change-Id: I6f3c8d0d9f14a916336d5a84897772ed4aba3105
Michael Wachenschwanz [Tue, 10 Jul 2018 17:36:25 +0000 (10:36 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am:
62d5e041a2 -s ours
Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f
Mathew Inwood [Tue, 10 Jul 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Add build rule for API->source mapping."
Treehugger Robot [Tue, 10 Jul 2018 16:24:47 +0000 (16:24 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"
Colin Cross [Tue, 10 Jul 2018 16:12:46 +0000 (09:12 -0700)]
Merge "Mark installable jars with installable: true"
am:
1035f48f61
Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922
Colin Cross [Tue, 10 Jul 2018 14:51:50 +0000 (14:51 +0000)]
Merge "Mark installable jars with installable: true"
David Brazdil [Thu, 28 Jun 2018 09:23:50 +0000 (10:23 +0100)]
Compile android.test.*.stubs into dex
Adjust the build rules of android.test.*.stubs packages to also
produce a jar with dex files. This will be used by the `hiddenapi`
tool to categorize the boot class path equivalents as public API.
Bug:
79409988
Test: m android.test.base.stubs ; check javalib.jar contains dex
Merged-In: I1d0850b18044c559ea4b9893d929dc45884b32c3
Change-Id: Ief28cd5e6d0cdd58f22fab751e0173ccf8c69a0c
Olivier Gaillard [Tue, 10 Jul 2018 08:50:30 +0000 (01:50 -0700)]
Merge "Add a getTransactionName method to Binder."
am:
079f03f584
Change-Id: Ie157d490cf074d5b015406cb9739366cc4d46b87
Mathew Inwood [Fri, 22 Jun 2018 14:30:02 +0000 (15:30 +0100)]
Add build rule for API->source mapping.
This is used to get source positions of all class members in the boot
class path, to automate the addition of annotations. See
go/hidden-api-annotations for more context.
Mappings printed in:
out/soong/.intermediates/frameworks/base/hiddenapi-mappings
/android_common/dex-mapping.txt
Test: make hiddenapi-mappings
Bug:
110868826
Change-Id: Ie67a8be6a5a71447a25d081bd466b8b5e01b0725
Olivier Gaillard [Tue, 10 Jul 2018 07:23:14 +0000 (07:23 +0000)]
Merge "Add a getTransactionName method to Binder."
sgopal1 [Tue, 10 Jul 2018 04:01:33 +0000 (09:31 +0530)]
UsbDescriptor: Add finite timeout to control transfer
Using "0" as value for USB control transfer timeout
results in an unlimited timeout in case of bad USB
devices. In host kernels where hung task panic
is enabled, this results in device reboot.
So, add a finite timeout for USB control transfer.
Test: manual run and test with bad USB devices.
Change-Id: Ibc13ca4d8259a08ae7419bb3bcac9c161b1d3693
Signed-off-by: sgopal1 <saranya.gopal@intel.com>
Haibo Huang [Mon, 9 Jul 2018 21:41:03 +0000 (14:41 -0700)]
Merge "Remove CSV support"
am:
0faecf7b89
Change-Id: I02e8b74299afda2642567e3fcf9a41653cb7b888
Olivier Gaillard [Thu, 5 Jul 2018 14:07:35 +0000 (15:07 +0100)]
Add a getTransactionName method to Binder.
This method transforms a binder call code to a human readable name.
AIDL generator will have the ability to override this method.
Test: n/a
Bug:
111200705
Change-Id: Ic1d82e9b403ab40c8b625ca977a819ccd521dd97
Haibo Huang [Mon, 9 Jul 2018 20:32:31 +0000 (20:32 +0000)]
Merge "Remove CSV support"
Haibo Huang [Fri, 6 Jul 2018 23:55:27 +0000 (16:55 -0700)]
Remove CSV support
CSV is deprecated upstream. See:
https://github.com/google/benchmark/commit/
7b8d0249d8d66040ce9ffe6b94cc8421ef3e61d8
Test: m checkbuild
Change-Id: I4b85535d4296c6f0d1f0eec95b40c065b3143134
Jordan Liu [Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)]
Merge "Type Allocation Code & Manufacturer Code"
am:
ff801e5fd7
Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1
Jordan Liu [Fri, 6 Jul 2018 17:51:42 +0000 (17:51 +0000)]
Merge "Type Allocation Code & Manufacturer Code"
Neil Fuller [Fri, 6 Jul 2018 15:32:44 +0000 (16:32 +0100)]
resolve merge conflicts of
7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014
Treehugger Robot [Fri, 6 Jul 2018 13:58:29 +0000 (13:58 +0000)]
Merge "Track changes in libcore to remove a constructor"
Neil Fuller [Thu, 5 Jul 2018 12:24:39 +0000 (05:24 -0700)]
Merge "Remove unusual static method call"
am:
cbe9c295a3
Change-Id: I3ae602232226ef3a1e482dd5a34e1025118c30b7