Commit Graph

4946 Commits

Author SHA1 Message Date
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
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
Brad Ebinger
3fa3e90c3f Merge "Add ims registration status" 2017-09-08 17:04:31 +00: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
Tyler Gunn
e9cccb4bcf Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev am: e3cf5cda13
am: 60c202e27b

Change-Id: Ie9ce490397eec47ccf5b0b9ba436fb696b2188fe
2017-09-07 22:09:42 +00:00
Chen Xu
382ec5fec8 Merge "disable carrier actions on redirection part 2" into oc-mr1-dev am: b6a1c5f06b
am: 4de11ebc0f

Change-Id: I035beeaf3c14f3ed42f15a2ae0036b065b9149f8
2017-09-07 21:29:18 +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
Ping Sun
e0e3cbd304 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
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-06 16:41:17 +00:00
Sanket Padawe
e01a735ebc Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." 2017-09-06 05:50:58 +00:00
fionaxu
1af24abbb9 Merge "disable carrier actions on redirection by default" into oc-mr1-dev am: 5bed401148
am: bd1a716135

Change-Id: I6e0ef66e1cd96683b37f8eff0a8f6fbd4d2901f7
2017-09-06 04:19:45 +00: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
Xiangyu/Malcolm Chen
d2dff96c45 Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev am: aa4c059da1
am: 647f6a7ceb

Change-Id: Idf5cf1c5ae7d85d4730fbed7522cb63942487ee9
2017-09-06 01:45:09 +00:00
Xiangyu/Malcolm Chen
647f6a7ceb Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev
am: aa4c059da1

Change-Id: Ie4484da4a56fc041d21afcc2a3ebb7a387cbd52c
2017-09-06 01:22:49 +00:00
Xiangyu/Malcolm Chen
aa4c059da1 Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev 2017-09-06 01:09:35 +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
Sanket Padawe
fc329a3ed6 Deprecate TelephonyManager APIs which are present in TelecomManager.
Bug: 62346128
Test: Build
Change-Id: I4c3b4652f5d22215572d64b764bcd42bb7295ebe
2017-09-05 01:47:40 -07:00
Brad Ebinger
7b01ee5cda Merge "Adds ERROR state to ImsConfig"
am: 6391598412

Change-Id: I612aae570b12b1106f515d32bd8caa3843a3953e
2017-09-01 21:37:49 +00:00
Brad Ebinger
6391598412 Merge "Adds ERROR state to ImsConfig" 2017-09-01 21:06:55 +00:00
Xiangyu/Malcolm Chen
913bdaaadc Merge "Remove getIntWithSubId in TelephonyManager." 2017-09-01 18:23:45 +00:00
Bin Chen
4a5a45be4b Merge "Fix typo in CarrierConfigManager javadoc." am: ea598a4f14 am: 3a443cd347 am: c08cbb31cc
am: 92ae90e85a

Change-Id: I28f3ae85f80084b0a29bf817ee7bdc2b80f95b46
2017-09-01 18:11:53 +00: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
Brad Ebinger
df99d59284 Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.

Bug: 64540800
Test: Manual
Merged-In: Id412c0be939da6240a66a942730fd18badabb6c6
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
2017-09-01 10:16:26 -07:00
Bin Chen
503513de9e Fix typo in CarrierConfigManager javadoc.
Change-Id: Ie9d2f7aa705b7895777dcfa27e6826babff64e29
2017-09-01 18:20:20 +08:00
TreeHugger Robot
2026fa3377 Merge "Unhide enable_apps carrier config key." 2017-08-31 18:54:57 +00:00
Tyler Gunn
8ce0ee01b5 Merge "De-couple data enabled from VT settings." into oc-mr1-dev am: e0f1f26d87
am: 8d2b05ab50

Change-Id: Ib96d9d3e1dbbf5252806c8b50c2e023ed71d9e8d
2017-08-31 15:31:37 +00: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
Hall Liu
1407bdd635 Merge "Make slight API and doc adjustments" into oc-mr1-dev 2017-08-30 20:41:53 +00:00
Brad Ebinger
381b228bb6 Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev am: ed6e29f292
am: 063d5e871a

Change-Id: Ie2fe8bcc167e91b983bf6ec9548589b140f3976e
2017-08-30 19:02:13 +00:00