OSDN Git Service
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
Nathan Harold [Thu, 12 Jul 2018 18:08:05 +0000 (18:08 +0000)]
Merge "Remove Duplicate Override for Operator Alphas"
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"
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
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
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."
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
Erik Kline [Thu, 5 Jul 2018 12:20:25 +0000 (05:20 -0700)]
Merge "Always close file descriptors"
am:
26025a06ec
Change-Id: Ib1d8f74832b8b649dc83de39f8f16651a9924e69
Neil Fuller [Thu, 5 Jul 2018 12:14:26 +0000 (05:14 -0700)]
Merge "Track constructor changes in libcore/"
am:
f94eb29500
Change-Id: I344d9210bd173f78651318366c852f65afe969d6
Treehugger Robot [Thu, 5 Jul 2018 11:12:35 +0000 (11:12 +0000)]
Merge "Remove unusual static method call"
Neil Fuller [Wed, 4 Jul 2018 15:41:14 +0000 (16:41 +0100)]
Remove unusual static method call
The code is using static method Calendar.getInstance() but via a
subclass of Calendar. It works, and getInstance() returns a
GregorianCalendar on Android, but it's odd and was probably unintended.
Noticed during static analysis of SystemUI bytecode.
Bug:
111055375
Test: build / boot
Change-Id: I1762cbeb2cc7882868f84ec11100815671cd29ec
Treehugger Robot [Thu, 5 Jul 2018 09:07:21 +0000 (09:07 +0000)]
Merge "Always close file descriptors"
Neil Fuller [Thu, 5 Jul 2018 08:57:13 +0000 (08:57 +0000)]
Merge "Track constructor changes in libcore/"
Erik Kline [Wed, 4 Jul 2018 08:57:51 +0000 (17:57 +0900)]
Always close file descriptors
Every error thrown leaked a netlink NETFILTER socket.
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes
- enabled tethering and tried to cause conntrack updates to sessions
that had expired (which causes ErrnoExceptions to be thrown)
while monitoring lsof for system_server's NETFILTER sockets
Bug:
32163131
Bug:
64976634
Bug:
110122306
Change-Id: Ib52b812e8434c27ad9f2596666400c13e03c2216
Shuichi.Noguchi [Thu, 5 Jul 2018 00:07:32 +0000 (17:07 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name"
am:
d004710e0e
Change-Id: Ieecde6f75fd7788835fa34300f1fbec5eb963862
Treehugger Robot [Wed, 4 Jul 2018 22:45:16 +0000 (22:45 +0000)]
Merge "Fix the logic to get tv_pip_settings_class_name"
David Kelly [Mon, 12 Mar 2018 14:17:24 +0000 (14:17 +0000)]
Type Allocation Code & Manufacturer Code
- Addition of getTypeAllocationCode & getManufacturerCode to
android.telephony.TelephonyManager.
- The Type Allocation Code is the first eight characters of the IMEI.
The Type Allocation Code identifies a particular GSM device model.
- The Manufacturer Code is the first eight characters of the MEID.
The Manufacturer Code identifies the manufacturer of a CDMA device.
- The reasoning behind adding getTypeAllocationCode is to be
able to obtain the Type Allocation Code without requiring the
READ_PHONE_STATE permission. Currently in order to obtain the
Type Allocation Code a substring operation must be performed on
getImei which is protected by the READ_PHONE_STATE permission.
- The reasoning behind adding getManufacturerCode is to be
able to obtain the Manufacturer Code without requiring the
READ_PHONE_STATE permission. Currently in order to obtain the
Manufacturer Code a substring operation must be performed on
getMeid which is protected by the READ_PHONE_STATE permission.
- The reasoning that these additional methods do not require the
READ_PHONE_STATE permission is that neither the Type Allocation
Code nor the Manufacturer Code can identify a unique device.
The Type Allocation Code and the Manufacturer Code are analogous
to other device information such as device model or device
screen dimensions.
Test: run cts -m CtsTelephonyTestCases
Bug:
74613795
Change-Id: I5a586b5a362b39aae13357329efb19eb93f0434c
Signed-off-by: David Kelly <dkelly@afilias.info>
Neil Fuller [Tue, 3 Jul 2018 17:46:10 +0000 (18:46 +0100)]
Track changes in libcore to remove a constructor
Track changes in libcore to remove a constructor + lint
import order changes. Instead of the constructor a utility
method is introduced.
Test: Build / boot
Bug:
111055375
Merged-In: Id683a9d9d6e27d4c8df623dae189da9e74a6d410
Change-Id: Id683a9d9d6e27d4c8df623dae189da9e74a6d410
Tyler Gunn [Tue, 3 Jul 2018 23:27:56 +0000 (16:27 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
bc103bdf18
Change-Id: I2dbc17af8694cdb92e189202e0786fc39573b0d1
Tyler Gunn [Tue, 3 Jul 2018 22:15:21 +0000 (22:15 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Sumit Das [Sat, 30 Jun 2018 00:12:01 +0000 (17:12 -0700)]
ImsMultiEndPoint - Sip Notify Change
-Added log message, getter method and set/read from parcel
Change-Id: I832bd2cf51382bb0919ab0ea1b5c7fcba8b2b136
Neil Fuller [Tue, 3 Jul 2018 20:08:26 +0000 (13:08 -0700)]
Merge "Make Half class use public APIs"
am:
7e957e57b7
Change-Id: I7f41f07ed5d35a0c538c90b49b4500ba9952f74d
Neil Fuller [Tue, 3 Jul 2018 18:32:27 +0000 (18:32 +0000)]
Merge "Make Half class use public APIs"
Neil Fuller [Tue, 3 Jul 2018 18:22:45 +0000 (19:22 +0100)]
Track constructor changes in libcore/
The 2-arg constructor is being removed.
Test: build / boot
Bug:
111055375
Change-Id: I72413a8c7885f9514a88f59deb649fa755deff92
Erik Kline [Tue, 3 Jul 2018 10:09:16 +0000 (03:09 -0700)]
Merge "Push DNS configuration on network validation"
am:
ef941e192a
Change-Id: I5907831e5f5f1f3659580cc56e2e081cbe88b1cc
Treehugger Robot [Tue, 3 Jul 2018 09:03:35 +0000 (09:03 +0000)]
Merge "Push DNS configuration on network validation"
Jack Yu [Tue, 3 Jul 2018 08:12:03 +0000 (01:12 -0700)]
[automerger skipped] Merge "Reordered the params for network registration"
am:
38f7576297 -s ours
Change-Id: Ibbe9027176ff14eae912c794fb0724cdc32f4926
Erik Kline [Tue, 26 Jun 2018 09:53:43 +0000 (18:53 +0900)]
Push DNS configuration on network validation
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes
- connected to captive portal network,
saw failed validation attempt (opportunistic),
passed portal, saw successful revalidation attempt
Bug:
64133961
Bug:
72344805
Bug:
109928338
Change-Id: I0471685c2234af8a8c7f5b2ad3205eb6e36333c5
Carmen Jackson [Tue, 3 Jul 2018 00:57:29 +0000 (17:57 -0700)]
Merge "Add in-app tracepoints to TouchLatency app."
am:
674fd12278
Change-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf
Treehugger Robot [Mon, 2 Jul 2018 23:56:11 +0000 (23:56 +0000)]
Merge "Reordered the params for network registration"
Treehugger Robot [Mon, 2 Jul 2018 23:39:21 +0000 (23:39 +0000)]
Merge "Add in-app tracepoints to TouchLatency app."
Nathan Harold [Mon, 2 Jul 2018 23:07:37 +0000 (16:07 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte"
am:
5e8a5d4b79
Change-Id: Id41fb2ccdeaf43fcc62193c78c93f4ca765d2fa2
Carmen Jackson [Thu, 28 Jun 2018 22:15:44 +0000 (15:15 -0700)]
Add in-app tracepoints to TouchLatency app.
Test: Traced the TouchLatency app and saw the added tracepoints.
Change-Id: I72ab8f88731e635f98831f045dddd086a05acc3b
Nathan Harold [Mon, 2 Jul 2018 20:40:55 +0000 (20:40 +0000)]
Merge "Update Docstrings for CellSignalStrengthLte"
Sehee Park [Mon, 2 Jul 2018 13:23:35 +0000 (06:23 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
am:
ccd6a0f6c2
Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097
Treehugger Robot [Mon, 2 Jul 2018 11:22:28 +0000 (11:22 +0000)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
Neil Fuller [Mon, 2 Jul 2018 11:04:39 +0000 (12:04 +0100)]
Make Half class use public APIs
Half has a dependency on an internal sun.misc.FloatingDecimal
that can be replaced by an equivalent call on java.lang.Float
(which calls through to FloatingDecimal).
Any performance hit is worth it for a smaller API surface.
Bug:
111055375
Test: Build
Change-Id: Iecdf3aa9414922a77edbdc439b0c2b88033b3af8
Sehee Park [Tue, 19 Jun 2018 11:07:37 +0000 (20:07 +0900)]
Modify catch when addInterfaceToLocalNetwork() is called.
Fatal Exception is occured in system process. Becuase addInterfaceToLocalNetwork()
throw IllegalStateException but it can not be handled in TetherInterfaceStateMachine.
Modify catch from "RemoteException" to "Exception" when addInterfaceToLocalNetwork() is called.
Test: Repeat on/off tethering
Test: "runtest --no-hidden-api-checks frameworks-net" passes
Bug:
110396460
Change-Id: I2f2f1325cfcce40c3113ccccf69b2bbd5df4ae5b
Signed-off-by: Sehee Park <sehee32.park@samsung.com>
Jack Yu [Sat, 30 Jun 2018 01:06:39 +0000 (18:06 -0700)]
Merge "Used APN type instead of APN id"
am:
2e371c1b5a
Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
Jack Yu [Fri, 29 Jun 2018 23:54:32 +0000 (23:54 +0000)]
Merge "Used APN type instead of APN id"
Nathan Harold [Fri, 29 Jun 2018 22:39:19 +0000 (15:39 -0700)]
Merge changes I0d635067,I1424973b
am:
4d7a010983
Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
Jack Yu [Tue, 26 Jun 2018 00:40:02 +0000 (17:40 -0700)]
Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.
Test: Telephony sanity tests + unit tests
Bug:
77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit
f42d06010a522b0d519df1a2ce9fa5ba3aefb51f)
Nathan Harold [Fri, 29 Jun 2018 21:23:26 +0000 (21:23 +0000)]
Merge changes I0d635067,I1424973b
* changes:
Simplify equals() method of ServiceState
Update ServiceState.hashCode()
Amit Mahajan [Fri, 29 Jun 2018 21:05:51 +0000 (14:05 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am:
c8eb9ef591
Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
Treehugger Robot [Fri, 29 Jun 2018 19:55:16 +0000 (19:55 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
Amit Mahajan [Tue, 5 Jun 2018 23:27:32 +0000 (16:27 -0700)]
Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug:
80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit
22e89f4773d9cbc8f5911b65b2dae3e3add7bdb6)
Sundong Ahn [Fri, 29 Jun 2018 03:38:09 +0000 (20:38 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
am:
10cfc61774
Change-Id: Ie6abdaa1c9f58ada60da5514bbd1ed261d09fd0b
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:34:19 +0000 (20:34 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests"
am:
855f0f03e1 -s ours
Change-Id: I9ad7743e43efd5aaa722e73ea0b2543537d23c50
Treehugger Robot [Fri, 29 Jun 2018 02:51:43 +0000 (02:51 +0000)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
Remi NGUYEN VAN [Fri, 29 Jun 2018 02:15:47 +0000 (02:15 +0000)]
Merge "Disable hidden API checks on unit tests"
Brad Ebinger [Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)]
Merge "Emergency SMS carrier config flag"
am:
36a9fa62be
Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017
Nathan Harold [Thu, 28 Jun 2018 23:26:56 +0000 (16:26 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
am:
9ca4d43922 -s ours
Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
Reordered the params for network registration
Test: Build
Bug:
73659459
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
Brad Ebinger [Thu, 28 Jun 2018 22:16:10 +0000 (22:16 +0000)]
Merge "Emergency SMS carrier config flag"
Nathan Harold [Thu, 28 Jun 2018 22:05:56 +0000 (22:05 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Merged-In: Ie18be2cd72c49f1859d1434428f82f164bed8756
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Michael Wachenschwanz [Tue, 15 Aug 2017 06:10:13 +0000 (23:10 -0700)]
Java side setup and access to Binder Proxy Tracking
Expose Binder Proxy Tracking by Uid from the native side. Enable
tracking for SYSTEM and killing of any bad behaving uids.
Merged-In: Ifd6d0f30a93fad406417dd83c1495c105bced974
Change-Id: Ifd6d0f30a93fad406417dd83c1495c105bced974
Fixes:
63901963
Test: bit FrameworksCoreTests:android.os.BinderProxyCountingTest
(cherry picked from commit
55182464fb9f6536ee500eac02a031e7b7226fc4)
Nathan Harold [Thu, 28 Jun 2018 00:21:17 +0000 (17:21 -0700)]
Simplify equals() method of ServiceState
For whatever reason, ServiceState used a
somewhat-convoluted check for null and
class type. Updating to use a canonical
and brief approach.
Bug:
8675309
Test: compilation
Change-Id: I0d635067a06093affff478e13c28bbbe2bfda7df
Nathan Harold [Thu, 28 Jun 2018 00:07:52 +0000 (17:07 -0700)]
Update ServiceState.hashCode()
hashCode() was missing about 10 fields and was
using some unnecessary bespoke logic to generate
hashes for individual fields. This CL simplifies
the hashCode() implementation and adds the missing
fields.
Bug:
8675309
Test: compilation
Change-Id: I1424973b11fcc6480d6f8c83d5fd0eb1b5533c7f
Tyler Gunn [Wed, 27 Jun 2018 22:28:10 +0000 (15:28 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
af228ca978
Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
Nathan Harold [Wed, 27 Jun 2018 20:02:59 +0000 (20:02 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
Tyler Gunn [Wed, 27 Jun 2018 20:02:37 +0000 (20:02 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Brad Ebinger [Wed, 27 Jun 2018 19:46:39 +0000 (12:46 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
am:
f03b8e2471
Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc