374057 Commits

Author SHA1 Message Date
Jean-Michel Trivi
5cb7cd68a0 Merge "Audio assets: add NFC sounds" 2018-07-12 19:41:51 +00:00
Nathan Harold
f5f908c525 Merge "Remove Duplicate Override for Operator Alphas"
am: 24eaa6ab3d

Change-Id: I15004a7df3d922ba50d187769299723e888febae
2018-07-12 12:35:18 -07:00
Jordan Liu
e5c77fc978 Merge "WRITE_APN_SETTINGS is also required to read"
am: 0beefc0af5

Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
2018-07-12 11:46:32 -07:00
Neil Fuller
7add22db60 Merge "Move XML object factory logic to libcore"
am: 8176fb99e1

Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
2018-07-12 11:26:03 -07:00
Jack Yu
6af5ddcc4a [automerger skipped] Merge "Added documentation for network registration state"
am: c51397b161  -s ours

Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
2018-07-12 11:21:11 -07:00
Jack Yu
1cbcc50d0a Merge "Revert "Added documentation for network registration state"" 2018-07-12 18:16:26 +00:00
Nathan Harold
24eaa6ab3d Merge "Remove Duplicate Override for Operator Alphas" 2018-07-12 18:08:05 +00:00
Jack Yu
7e1be05b14 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
2018-07-12 17:39:12 +00:00
Jordan Liu
0beefc0af5 Merge "WRITE_APN_SETTINGS is also required to read" 2018-07-12 17:36:15 +00:00
Treehugger Robot
8176fb99e1 Merge "Move XML object factory logic to libcore" 2018-07-12 13:46:56 +00:00
Neil Fuller
23a97d8d46 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)
2018-07-12 08:56:59 +01:00
Jack Yu
c51397b161 Merge "Added documentation for network registration state" 2018-07-12 02:28:32 +00:00
Arun Rathi
cdac4d77f6 Merge "Add Channel 50 (area update info) support for LAM market"
am: 57df2a333f

Change-Id: I28ece8be0f12979bd037337c87df1ce8fd05c331
2018-07-11 16:08:33 -07:00
Treehugger Robot
57df2a333f Merge "Add Channel 50 (area update info) support for LAM market" 2018-07-11 21:52:01 +00:00
John Reck
af3e763358 Merge "Disable LTO on -eng"
am: 1918b39942

Change-Id: I925182b722d7bf6b1bb63c298a8ec9e345f0c4ac
2018-07-11 14:48:50 -07:00
Treehugger Robot
1918b39942 Merge "Disable LTO on -eng" 2018-07-11 20:21:19 +00:00
Nathan Harold
22590b06e8 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
am: c1e5c3ea82

Change-Id: I4bbedcc3f47706d677a1c66273bf1643c8f21be5
2018-07-11 12:09:10 -07:00
John Reck
2729418128 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
2018-07-11 18:24:58 +00:00
Jack Yu
b4094993f7 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
2018-07-11 11:08:48 -07:00
Nathan Harold
c1e5c3ea82 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" 2018-07-11 17:58:50 +00:00
Tyler Gunn
06f0616f6d 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
2018-07-11 09:04:43 -07:00
Neil Fuller
f4634736ca 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
2018-07-11 14:02:00 +01:00
David Brazdil
f8d22dec87 resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
2018-07-11 11:56:34 +01:00
David Brazdil
6e3c86c8ed Merge "Compile android.test.*.stubs into dex" 2018-07-11 09:18:15 +00:00
Arun Rathi
44d792015a 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
2018-07-11 07:24:54 +02:00
Jean-Michel Trivi
72a7c401bd 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
2018-07-10 17:34:42 -07:00
Hall Liu
0c149bd2d8 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
2018-07-10 15:51:26 -07:00
Colin Cross
d7647c1b66 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
2018-07-10 14:30:07 -07:00
Nathan Harold
59356594d2 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
2018-07-10 13:50:44 -07:00
Nathan Harold
054b79d49f 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)
2018-07-10 13:24:36 -07:00
Mathew Inwood
4500790a81 Merge "Add build rule for API->source mapping."
am: b4919259ab

Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
2018-07-10 11:41:48 -07:00
Jordan Liu
cd0bc57b84 WRITE_APN_SETTINGS is also required to read
Add documentation explaining this.

Bug: 110033164
Test: no change to behavior
Change-Id: I4b69e5e36c9e05cf14c999e4a5bb1664a02e82f3
2018-07-10 11:24:42 -07:00
Tyler Gunn
dc6e6c43bb 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
2018-07-10 10:53:12 -07:00
Michael Wachenschwanz
ccee79d9ce [automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am: 62d5e041a2  -s ours

Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f
2018-07-10 10:36:25 -07:00
Mathew Inwood
b4919259ab Merge "Add build rule for API->source mapping." 2018-07-10 17:12:37 +00:00
Treehugger Robot
62d5e041a2 Merge "Java side setup and access to Binder Proxy Tracking" 2018-07-10 16:24:47 +00:00
Colin Cross
19609a7993 Merge "Mark installable jars with installable: true"
am: 1035f48f61

Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922
2018-07-10 09:12:46 -07:00
Colin Cross
1035f48f61 Merge "Mark installable jars with installable: true" 2018-07-10 14:51:50 +00:00
David Brazdil
89c6432dbf 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
2018-07-10 13:37:05 +00:00
Olivier Gaillard
06aa142232 Merge "Add a getTransactionName method to Binder."
am: 079f03f584

Change-Id: Ie157d490cf074d5b015406cb9739366cc4d46b87
2018-07-10 01:50:30 -07:00
Mathew Inwood
0a6a273013 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
2018-07-10 09:20:42 +01:00
Olivier Gaillard
079f03f584 Merge "Add a getTransactionName method to Binder." 2018-07-10 07:23:14 +00:00
sgopal1
58484d7c69 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>
2018-07-10 09:54:03 +05:30
Haibo Huang
9fada2364f Merge "Remove CSV support"
am: 0faecf7b89

Change-Id: I02e8b74299afda2642567e3fcf9a41653cb7b888
2018-07-09 14:41:03 -07:00
Olivier Gaillard
d3d065dc42 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
2018-07-09 20:58:51 +00:00
Haibo Huang
0faecf7b89 Merge "Remove CSV support" 2018-07-09 20:32:31 +00:00
youngmin0822.lee
4dde7d19cb don't call setSize() when creating SurfaceControl
When SurfaceControl is created with creating variable
in updateSurface(), sizeChanged is also set.
So, setSize() is called, and it blocks UI thread
until the transaction is handled in SF.
There is no need to resize in the creation time,
because size is already set when creating SurfaceControl.

Test: systrace any app including SurfaceView

Change-Id: I65028b4d0d0ba2b75fbe089c98a11a56b6c08104
2018-07-09 15:27:43 +09:00
Haibo Huang
783d76ec31 Remove CSV support
CSV is deprecated upstream. See:
7b8d0249d8

Test: m checkbuild
Change-Id: I4b85535d4296c6f0d1f0eec95b40c065b3143134
2018-07-06 16:55:27 -07:00
Jordan Liu
50f29d8ecf Merge "Type Allocation Code & Manufacturer Code"
am: ff801e5fd7

Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1
2018-07-06 12:06:39 -07:00
Jordan Liu
ff801e5fd7 Merge "Type Allocation Code & Manufacturer Code" 2018-07-06 17:51:42 +00:00