Commit Graph

2412 Commits

Author SHA1 Message Date
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
0285ee851d Merge "Unhide EMBMS download API" 2017-09-13 20:40:34 +00: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
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
94a3a079c3 Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c am: 447b7c49fc
am: 95fe8c1312

Change-Id: I514d635abcb039efa1cc218fe28ba0ed979b9bf7
2017-09-11 18:27:48 +00:00
nharold
447b7c49fc Merge "Un-hide TelephonyManager.getSignalStrength()"
am: 3e884ce13c

Change-Id: I0692185c533ca4a0999cbf3237c3afabd4b87972
2017-09-11 18:07:07 +00:00
nharold
3e884ce13c Merge "Un-hide TelephonyManager.getSignalStrength()" 2017-09-11 17:44:34 +00:00
Sanket Padawe
957bb655d2 Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am: a90205492f am: f0dd39f7d0
am: b706659354

Change-Id: Ibdaf08aca01df5582ed3042ac956155df590adb5
2017-09-11 03:58:23 +00:00
Sanket Padawe
f0dd39f7d0 Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
am: a90205492f

Change-Id: I1d15e13cb3ae8fa8caf098e34587e3599b5bc967
2017-09-11 03:40:47 +00:00
Hall Liu
d666a89163 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
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-08 14:55:03 -07:00
Hall Liu
39605add89 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-08 14:52:21 -07:00
Sanket Padawe
5aac2e91db Deprecate TelephonyManager APIs which are present in TelecomManager.
Bug: 62346128
Test: Build
Change-Id: I4c3b4652f5d22215572d64b764bcd42bb7295ebe
Merged-in: I4c3b4652f5d22215572d64b764bcd42bb7295ebe
2017-09-08 05:46:13 -07:00
Ping Sun
56b0dfb38c Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 23:25:29 +00:00
Ping Sun
86bd4769fa Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 21:02:05 +00:00
Ping Sun
816f93ed9f Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 21:00:06 +00:00
Tyler Gunn
60c202e27b Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev
am: e3cf5cda13

Change-Id: I1802be47585e42ecf7d09e6b523ae6ef1f6b0556
2017-09-07 17:14:49 +00:00
Chen Xu
4de11ebc0f Merge "disable carrier actions on redirection part 2" into oc-mr1-dev
am: b6a1c5f06b

Change-Id: Ida67351bac953f7b1bc4eb3d0ebc8a331e55b9a1
2017-09-07 16:40:51 +00:00
Tyler Gunn
e3cf5cda13 Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev 2017-09-07 15:14:44 +00:00
fionaxu
619e5c8ecc resolve merge conflicts of 6c7ef2e8d7 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205
2017-09-07 07:01:12 +00:00
fionaxu
d9c7e1bd21 disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
    portal page when users dont have data plan" might not be true for all
    carriers. We have seem issues like carriers random redirect users when
    they still have balance left.
    2. turn this off by default and turn it on if the carrier is
    behaving correctly and agree with it.

Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Bug: 65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
2017-09-06 22:34:13 +00:00
fionaxu
b537d740c1 disable carrier actions on redirection part 2
DO NOT MERGE handle the corner case: user on new pixel device update from O-DR to
O-MR when they are in captive portal scenario. In this scenrio,
we enabled captiveportalLoginActivity has the default url handler. this
will be persist and reset on sim absent/sim load/network avail.
On my previous fix, I removed all the signals which means after OTA
we won't reset this part. We should leave the reset signal to ensure
no carrier actions applied. even if something abnormal happens, we can
recover gracefully from reboot.

Bug: 65113738
Test: Manual
Change-Id: I445c7bce01e0bf36214f5f4f6327a0582c774dae
2017-09-06 14:55:35 -07:00
fionaxu
bd1a716135 Merge "disable carrier actions on redirection by default" into oc-mr1-dev
am: 5bed401148

Change-Id: Ie7fc58959699716fc3bd25dfa67a9f1567452009
2017-09-06 04:11:02 +00:00
TreeHugger Robot
5bed401148 Merge "disable carrier actions on redirection by default" into oc-mr1-dev 2017-09-06 04:01:43 +00:00
Tyler Gunn
c78a615dc0 Ensure *# are included in TTS spans generated with PhoneNumberUtils.
PhoneNumber utils has a method, createTtsSpan, which creates a span
for talkback to speak a phone number.  Due to a bug in Talkback it used
to strip out * and # characters.

Removing this limitation as the bug in talkback has been fixed.

Test: Manual, added unit tests
Bug: 63613215
Change-Id: I983a98a18830e32760602723e695f11e3eab9ffe
2017-09-05 14:28:47 -07:00
fionaxu
204777011d disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.

Bug: 65113738
Test: Manual
Change-Id: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
2017-09-05 14:15:04 -07:00
Bin Chen
92ae90e85a Merge "Fix typo in CarrierConfigManager javadoc." am: ea598a4f14 am: 3a443cd347
am: c08cbb31cc

Change-Id: Ifd1728d99c72644854e0161fefa4ac13bcc2bbee
2017-09-01 17:54:56 +00:00
Bin Chen
3a443cd347 Merge "Fix typo in CarrierConfigManager javadoc."
am: ea598a4f14

Change-Id: I663aab8773193681760b6ac0a241fde913e5d585
2017-09-01 17:25:07 +00:00
Bin Chen
503513de9e Fix typo in CarrierConfigManager javadoc.
Change-Id: Ie9d2f7aa705b7895777dcfa27e6826babff64e29
2017-09-01 18:20:20 +08:00
Tyler Gunn
8d2b05ab50 Merge "De-couple data enabled from VT settings." into oc-mr1-dev
am: e0f1f26d87

Change-Id: I424cd828a7616c2947367bdb4a82a62cf17847e7
2017-08-31 15:22:44 +00:00
Tyler Gunn
e0f1f26d87 Merge "De-couple data enabled from VT settings." into oc-mr1-dev 2017-08-31 15:13:08 +00:00
Nathan Harold
2b86092afe Un-hide TelephonyManager.getSignalStrength()
Expose the API to directly retrieve the latest cached
signal strength from ServiceStateTracker.

Bug: 36133439
Test: manual/sl4a
Change-Id: I36e4a24f19d49da5797d875ccfd10576ca0a68b8
2017-08-29 14:13:33 -07:00
Hall Liu
1e211675ca Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons

Bug: 30981736
Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
2017-08-28 18:17:58 -07:00
Hall Liu
571293ad96 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-08-28 14:27:56 -07:00
Hall Liu
ff6f9862e5 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-08-28 14:26:33 -07:00
Brad Ebinger
0a538a2804 Merge "Emergency redial implementation" am: b3b09849bc am: f5a457244c
am: 1d8a6e4ee7

Change-Id: I8689b700ff77127534d5560fac1d849615e8f567
2017-08-25 20:56:03 +00:00
Brad Ebinger
f5a457244c Merge "Emergency redial implementation"
am: b3b09849bc

Change-Id: If7fe179da4eb4c639dad1e2957f091bbee9e54f9
2017-08-25 20:31:26 +00:00
Brad Ebinger
b3b09849bc Merge "Emergency redial implementation" 2017-08-25 20:05:53 +00:00
Shuo Qian
782395561d Merge "Add new error code in SmsManager"
am: 387ed22fef

Change-Id: Iff96995b90ecd6ae7fcceebf6b2017344038be72
2017-08-25 18:15:12 +00:00
Shuo Qian
387ed22fef Merge "Add new error code in SmsManager" 2017-08-25 18:01:18 +00:00
Srikanth Chintala
fcb1501620 Emergency redial implementation
Define connection event to notify
Telecom/InCallUi about change in
account handle after redial and extra
for emergency phone handle.

Bug: 27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
2017-08-25 10:08:56 -07:00