Commit Graph

373927 Commits

Author SHA1 Message Date
Jack Yu
5e7bbe01c4 Merge "Added documentation for network registration state"
am: 3c1604da8b

Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
2018-07-15 17:12:41 -07:00
Treehugger Robot
3c1604da8b Merge "Added documentation for network registration state" 2018-07-15 22:34:30 +00:00
Chih-hung Hsieh
d5de710016 Merge "Fix unnecessary copy initialization warnings"
am: 38858d6dd3

Change-Id: Ic96829517269abfdb9fbf1661deffe0758356d57
2018-07-13 21:13:18 -07:00
Jack Yu
d6284d9e0a Reordered the params for network registration
Test: Build
Bug: 73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c3)
(cherry picked from commit c683c3930e)
2018-07-14 00:30:29 +00:00
Nathan Harold
f448662744 Merge "Re-Number RIL Message IDs to Match RIL.h"
am: 8424001a04

Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9
2018-07-13 15:45:31 -07:00
Chih-hung Hsieh
38858d6dd3 Merge "Fix unnecessary copy initialization warnings" 2018-07-13 22:42:26 +00:00
Tyler Gunn
0bd810f5ea Merge "Update InCallService API docs to explain how to show incoming call UI."
am: ac47c63b36

Change-Id: I4b3f34199c471006c71c2560f365ad314580b0a3
2018-07-13 15:37:40 -07:00
Jack Yu
b494f72750 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 b4094993f7)
2018-07-13 14:50:02 -07:00
Chih-Hung Hsieh
c134063ab8 Fix unnecessary copy initialization warnings
Bug: 30413862
Test: build with WITH_TIDY=1
Change-Id: I333d3a6b3394f50712148eeabf2253f1e01b21f3
2018-07-13 13:37:03 -07:00
Nathan Harold
8424001a04 Merge "Re-Number RIL Message IDs to Match RIL.h" 2018-07-13 19:57:06 +00:00
Jack Yu
1bee26f4c3 Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master 2018-07-13 19:28:23 +00:00
Tyler Gunn
01ab0b90bf Merge "Make Connection#onSilence a public API."
am: cbe3737f13

Change-Id: I4ab192ca160219770d7384e88c8e0025137b42bd
2018-07-13 12:15:45 -07:00
Yueming Wang
6dd8f735d2 [automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am: f92ad05fa5  -s ours

Change-Id: If211a292335419751be21e670b1ddb489d3c54b4
2018-07-13 12:10:40 -07:00
Treehugger Robot
ac47c63b36 Merge "Update InCallService API docs to explain how to show incoming call UI." 2018-07-13 18:52:52 +00:00
Tyler Gunn
cbe3737f13 Merge "Make Connection#onSilence a public API." 2018-07-13 17:02:36 +00:00
Treehugger Robot
f92ad05fa5 Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" 2018-07-13 16:34:30 +00:00
Yueming Wang
0082b161ca Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit 0c149bd2d8.

Reason for revert:  reverting this topic as it breaks several branches.

Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-13 11:15:50 +00:00
Jack Yu
f2add90de4 DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit ea440a765e, reversing
changes made to 0b90c524cb.

Test: Build
Bug: 73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
2018-07-12 19:41:33 -07:00
Hall Liu
08a4eb9445 Merge "Update SubscriptionInfo o use strings for mccmnc"
am: 0babf1815c

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
2018-07-12 15:22:52 -07:00
Jean-Michel Trivi
8df8455384 Merge "Audio assets: add NFC sounds"
am: 5cb7cd68a0

Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
2018-07-12 14:36:35 -07:00
Hall Liu
0babf1815c Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-12 21:13:16 +00:00
Jack Yu
2016ffc9ec [automerger skipped] Merge "Revert "Added documentation for network registration state""
am: 1cbcc50d0a  -s ours

Change-Id: I02d1877b0bd5d84895ea12590c8ea0668e0255db
2018-07-12 13:52:49 -07:00
Nathan Harold
13e47d018d 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
2018-07-12 13:38:20 -07:00
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 b4094993f7.

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 fa956d5d72)
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 6e3c86c8ed 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