Commit Graph

5000 Commits

Author SHA1 Message Date
Jack Yu
630c4d1744 Merge "Fixed that telephony registry service reference incorrectly assigned" into oc-mr1-dev am: baf1201b43
am: 9e3d9686a4

Change-Id: Iacb91e0f5a8ba5ac7b7e024950bff8f9ee79491c
2017-09-25 17:40:10 +00:00
Jack Yu
9e3d9686a4 Merge "Fixed that telephony registry service reference incorrectly assigned" into oc-mr1-dev
am: baf1201b43

Change-Id: I1470e1195ac34282b0fffc6fd9d594601294cb01
2017-09-25 17:29:59 +00:00
Jack Yu
66420e258a Fixed that telephony registry service reference incorrectly assigned
The reference to telephony registry service was assigned
prior telephony registry service was ready. Fixed by
casting the binder every time when we use it.

Test: Manual
Bug: 65593241
Change-Id: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
2017-09-22 10:04:51 -07:00
Jordan Liu
33770e95ce Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7 am: 649f3bf73f am: 56ed1f9c9d
am: 2869e57522

Change-Id: I5e70bd06ae409eb17989a3767b862d997d04cda2
2017-09-20 00:24:00 +00:00
Jordan Liu
2869e57522 Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7 am: 649f3bf73f
am: 56ed1f9c9d

Change-Id: I039843725244d892248591cf4e88e1840e506733
2017-09-20 00:12:10 +00:00
Jordan Liu
649f3bf73f Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am: c8ad4a82c7

Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
2017-09-19 23:55:48 +00:00
Jordan Liu
c8ad4a82c7 Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" 2017-09-19 23:39:42 +00:00
Tyler Gunn
2b308b51d2 Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda am: 8b2e421025 am: c26e534bef" into oc-mr1-dev-plus-aosp
am: dfcd7852a2

Change-Id: Iff9efc0b5dbb0593592f95db5924d045cc68d8e1
2017-09-19 17:05:49 +00:00
Tyler Gunn
4714011c23 Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda am: 8b2e421025
am: c26e534bef

Change-Id: I447794014fe74f6efb4c712808704b8b0f8bc43f
2017-09-19 16:52:09 +00:00
Tyler Gunn
8b2e421025 Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am: 99d28ebbda

Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
2017-09-19 16:37:38 +00:00
Tyler Gunn
99d28ebbda Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." 2017-09-19 16:28:52 +00:00
Pengquan Meng
b94f5bccd5 Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac am: b3bc234dfa
am: f05a01caf3

Change-Id: I817598283a95460cebd6890ddcc44950d630d7c0
2017-09-19 01:44:24 +00:00
Pengquan Meng
f05a01caf3 Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac
am: b3bc234dfa

Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
2017-09-19 01:38:10 +00:00
Pengquan Meng
74bd3daaac Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
2017-09-19 01:23:53 +00:00
Erika Avenberg
0be6d7cbd8 Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
 information in the semi-octets other than "1111" (e.g. 1110)
 it shall display the semi-octet as the representation given
 in GSM 44.008 [12] under "called BCD number", viz 1010="*",
 1011="#", 1100="a", 1101="b", 1110="c"."

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
2017-09-18 15:21:08 -07:00
Hall Liu
e77a09c7ae Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb am: 7fd9aa2654
am: 3715bced3a

Change-Id: Ie4dacc599a561e60f40e5ef26f03aa7ef19fbda8
2017-09-15 14:04:33 +00:00
Hall Liu
3812601906 Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd am: 3934c475ce am: febecb8218
am: 3e0f22f676

Change-Id: I4c10058445c1252447f2cd5889bb35f425efa468
2017-09-15 14:00:18 +00:00
Hall Liu
69e4d0561f Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242 am: 4de6420978
am: 9408a33b7e

Change-Id: Ib8a57869ce456e65069c5d63d99f9a80aa7258ca
2017-09-15 11:12:08 +00:00
Hall Liu
3715bced3a Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb
am: 7fd9aa2654

Change-Id: I6764968b4b3f71be799b0a5e835fdc3624849364
2017-09-15 03:26:50 +00:00
Hall Liu
3e0f22f676 Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd am: 3934c475ce
am: febecb8218

Change-Id: Ibf5acac5b44c772b629472591124151c479c8f6c
2017-09-15 03:22:23 +00:00
Hall Liu
4c4fb3bdfb Merge "API council suggested edits, part 3"
am: 7a4cc05d45

Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
2017-09-15 00:45:05 +00:00
Hall Liu
3934c475ce Merge "Apply suggested edits to the file-download API"
am: f6c9baa0cd

Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
2017-09-15 00:40:49 +00:00
Hall Liu
bfc5f1c9a8 API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.

Bug: 30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
2017-09-14 17:14:24 -07:00
Hall Liu
1a5b130468 Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale

Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 17:04:49 -07:00
Hall Liu
df3b70691f Merge "Unhide EMBMS download API" am: 0285ee851d am: e9b31e8eaf am: c55378fad4
am: ca077a992d

Change-Id: I5ffe374cc11824d456fff1981a5a83e0a03f4e84
2017-09-14 23:04:04 +00:00
Hall Liu
4fdd87eacc Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide" am: 910e5751b6 am: dd6878ad03 am: 6288f42286
am: fc2bd9ee5e

Change-Id: Id580c89aba080df52e7e8c2ec19cf22bcf4a1e2b
2017-09-14 23:01:28 +00:00
Hall Liu
e373ee5d5c API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.

Bug: 30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
2017-09-14 14:51:32 -07:00
Hall Liu
23d80af5c1 Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale

Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 14:37:47 -07:00
Hall Liu
a96478a9b7 Make changes to MBMS Streaming APIs per recommendations
* Rename MbmsStreamingManager -> MbmsStreamingSession
* MbmsStreamingSession now implements AutoClosable instead of using
dispose()
* No longer throw checked MbmsExceptions from any methods. All such
errors will be reported via the async callback.
* null arguments no longer accepted for Handlers
* Guarantee that no further callbacks will get enqueued after closing.

Test: run testapps
Bug: 30981736
Merged-In: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-14 13:42:08 -07:00
Hall Liu
9408a33b7e Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242
am: 4de6420978

Change-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
2017-09-14 20:11:32 +00:00
Hall Liu
200d8f6242 Merge "Make changes to MBMS Streaming APIs per recommendations"
am: 1bbf287859

Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
2017-09-14 19:45:04 +00:00
Hall Liu
1bbf287859 Merge "Make changes to MBMS Streaming APIs per recommendations" 2017-09-14 19:34:11 +00:00
Hall Liu
ca077a992d Merge "Unhide EMBMS download API" am: 0285ee851d am: e9b31e8eaf
am: c55378fad4

Change-Id: Ib2a05680a219c45705db30420787d1b8ed827cca
2017-09-14 10:30:06 +00:00
Hall Liu
fc2bd9ee5e Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide" am: 910e5751b6 am: dd6878ad03
am: 6288f42286

Change-Id: I62c0d1f6e8d82ccda9740672263f8dfe11f475a4
2017-09-14 10:26:20 +00:00
Hall Liu
e9b31e8eaf Merge "Unhide EMBMS download API"
am: 0285ee851d

Change-Id: Ib94f80270615f3d4a710c31b6ab81b40d77333ad
2017-09-13 22:22:04 +00:00
Hall Liu
dd6878ad03 Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
am: 910e5751b6

Change-Id: I07e7d0d4d799aded59797e237ec733354f3293df
2017-09-13 22:17:01 +00:00
Hall Liu
242de1bcda Unhide EMBMS download API
Make changes to the download API so that it passes the linter, remove
@hide tags.

Test: manual
Bug: 30981736
Change-Id: Ifa0d36896338b0108fbaad4b1e9b8d857a43d491
2017-09-13 14:02:44 -07:00
Hall Liu
0285ee851d Merge "Unhide EMBMS download API" 2017-09-13 20:40:34 +00:00
Hall Liu
9903558d9d Make EMBMS adjustments for 08/04
* Add a download state callback to the callback formerly for progress
* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it
should be a String rather than a ServiceInfo
* Add documentation to clarify that the progress/state callback may be
null

Bug: 30981736
Test: manual
Change-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56
2017-09-13 13:19:18 -07:00
Hall Liu
3b51e07889 Prepare EMBMS apis for un-hiding
Add more documentation to places that were lacking, bring more things in
line with the API guidelines

Change-Id: I809af5534ab425ee7e1e2dc8695d5b7e649dd22d
Test: testapps
Bug: 30981736
2017-09-13 13:18:59 -07:00
Hall Liu
910e5751b6 Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
* changes:
  Make EMBMS adjustments for 08/04
  Prepare EMBMS apis for un-hiding
2017-09-13 19:55:58 +00:00
Sanket Padawe
8ccd08c76e Merge "Fix doc for Telephony Manager api and make isTtySupported public." 2017-09-13 04:39:36 +00:00
Tyler Gunn
c4fd93e43b Fix ImsCallProfile parceling and add protection for invalid parcelables.
Two things:
1. The writeToParcel and readFromParcel in the ImsCallProfile never
worked; they were not parceling the Bundle properly.
2. Ensuring on writeToParcel that invalid Bundle contents are removed and
not sent across a Binder interface.

The existing Bundle.filterValues method accomplishes this by ensuring only
primitive types and android.* namespace parcelables are included in the
Bundle.  We use this to ensure that when the ImsCallProfile instances cross
the binder call boundary, package-local Parcelables don't cause the
Bundle to be invalidated when unmarshaled in a place where the
pacakge-local parcelable is not available.

Test: Manual, also wrote new unit tests
Bug: 65562929
Change-Id: Iea982d14a053414b9a4daba998c021c61902119d
2017-09-12 19:13:30 -07:00
Jordan Liu
2687abc188 Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1 am: 2602e5ff62 am: ab9cd2868e
am: c0a0a08ee8

Change-Id: I2ae4702a288943cee889edd03a565ad2be39ac30
2017-09-11 23:31:35 +00:00
Jordan Liu
c0a0a08ee8 Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1 am: 2602e5ff62
am: ab9cd2868e

Change-Id: Ief0f4d2f5c53917cc1f8d91091bf1644bc7c3589
2017-09-11 23:21:48 +00:00
Jordan Liu
2602e5ff62 Merge "Show 3G data icon for TD-SCDMA network type"
am: 9da895b5e1

Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970
2017-09-11 23:06:22 +00:00
Wileen Chiu
4105ab0856 Show 3G data icon for TD-SCDMA network type
- The data annunciator on the UI shows up as
"G" instead of "3G"
- Map the 3G telephony icon to network type
TD-SCDMA

Bug: 36802489
Test: manual
Change-Id: I63a0e54aab7fda2bcc6f098bb0b43799aad2f6c2
2017-09-11 13:23:37 -07:00
Treehugger Robot
d217a0c5a7 Merge "Add ims registration status" 2017-09-11 19:44:31 +00:00
Brad Ebinger
bd1f2b56bb Merge "Add ims registration status" into stage-aosp-master 2017-09-11 19:42:43 +00:00
nharold
dfb62b6177 Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c am: 447b7c49fc am: 95fe8c1312
am: 94a3a079c3

Change-Id: I13af7f2497590a276e255326307ff32bb49d21b6
2017-09-11 18:51:14 +00:00