2632 Commits

Author SHA1 Message Date
Ta-wei Yen
63668e4396 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
am: ad989b1711

Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
2017-04-14 04:11:29 +00:00
TreeHugger Robot
ad989b1711 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 2017-04-14 01:44:06 +00:00
Shuo Qian
cfe9e61ce4 ECBM SystemProperty cleanup
- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Change-Id: I83fbdeef5c0b43a8fc16ece044c9e191e9922bce
Test: manual
Bug: 30361624
2017-04-12 22:36:00 +00:00
Shuo Qian
56d3af6680 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f
am: 36611a0958

Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
2017-04-12 21:11:58 +00:00
Shuo Qian
4718606368 Merge "ECBM SystemProperty cleanup" 2017-04-12 20:52:20 +00:00
Ajay Nambi
ebe860e5cc Add p2 option in openLogicalChannel.
- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Test: Basic telephony sanity
Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
2017-04-11 17:39:42 -07:00
shuoq
d199113e97 ECBM SystemProperty cleanup
- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Test: manual
Bug: 30361624

Change-Id: I355d69820b157f23e077a95a13f8509ee0fa5874
2017-04-11 14:59:29 -07:00
Amit Mahajan
ef23fff630 Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc am: 7c6fa75512
am: 9c113787a4

Change-Id: Iad26507830edceb39433766d7b6e3f0bb708c0e2
2017-04-11 21:50:19 +00:00
Amit Mahajan
f954f2d5cc Merge "Add p2 option in openLogicalChannel." 2017-04-11 21:25:43 +00:00
Chen Xu
6fd0d2b37f Merge "remove deprecated API sendDialerCode" into oc-dev
am: 31fcda576f

Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
2017-04-07 16:03:02 +00:00
Chen Xu
31fcda576f Merge "remove deprecated API sendDialerCode" into oc-dev 2017-04-07 15:53:11 +00:00
Hall Liu
5d810f47da Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71 am: 53d241411a
am: b0e36dec89

Change-Id: Idf51f20246e2bd91dcc0b65ec2102b788d9e10fe
2017-04-05 19:43:39 +00:00
Hall Liu
eb7c287c71 Merge "Query geo description in worker thread to prevent ANR" 2017-04-05 19:23:32 +00:00
Chen Xu
7abbc20610 Merge "move ACTION_SERVICE_STATE to system api" into oc-dev
am: 5effb5f645

Change-Id: I5b61b20b646a9bfae4e0f89c70f7af71f626c740
2017-04-04 23:49:02 +00:00
Ajay Nambi
eca5ebb075 Add p2 option in openLogicalChannel.
- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
2017-04-04 22:08:02 +00:00
Hall Liu
85313f8c35 Merge "IMS: RTT interface changes" am: 814fdf9312 am: bc56b97770
am: 7d1712e5b9

Change-Id: Ia5c6a16a69c71cfd96479e8df403669d5aaff6f9
2017-04-04 21:37:53 +00:00
fionaxu
90fee27577 move ACTION_SERVICE_STATE to system api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_SERVICE_STATE intent is generally useful for system/oem
apps thus move to system api

Bug: 33679956
Test: Manual
Change-Id: Ie38b53f077e8a013351d35387f9133e0ebb26cc9
2017-04-04 14:26:40 -07:00
Hall Liu
814fdf9312 Merge "IMS: RTT interface changes" 2017-04-04 21:21:17 +00:00
Sanket Padawe
edf3bae41e Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed
Change-Id: I5c5daf994092fba7ef6ff4a2987344f0503d9dfe
2017-04-04 10:53:19 -07:00
Ta-wei Yen
d6099178f1 Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled
The visual voicemail client is removed from telephony service. There
are no longer code to handle these methods. These methods are only
used by dialer during NMR1.

Bug: 36173451
Fixes: 36173451

Test: smoke test dialer visual voicemail operations.
Change-Id: I82a35026821b4c4d98420e5bfcecff78b2163822
2017-04-04 10:24:25 -07:00
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
2017-04-04 16:59:13 +00:00
Sanket Padawe
e4f5f79c65 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 15:53:05 -07:00
Sanket Padawe
a374081697 Merge "Make some intents public in SubscriptionManager." into oc-dev
am: 9077faab1f

Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
2017-04-03 22:16:54 +00:00
Sanket Padawe
2c1a49f933 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 10:13:12 -07:00
fionaxu
cf828f2e11 remove deprecated API sendDialerCode
Bug: 35767402
Test: run cts -m CtsPermissionTestCases -t
android.permission.cts.TelephonyManagerPermissionTest

Change-Id: I738cb5680e598ff84ad09f9c2d1cb18b01ad7d06
2017-03-31 00:18:03 +00:00
Robert Greenwalt
23c5a5e966 Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent.  Changed to use com.android.internal.* namespace.

bug:35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
2017-03-29 11:30:12 -07:00
Brad Ebinger
ae8a95883b Merge "Remove non-localized message" am: ddbd256954 am: 70a09c00e5
am: 9c7b7f0de7

Change-Id: Ifc9f2278c7497f357b7db82ed27e6083351bf84b
2017-03-28 22:44:30 +00:00
Brad Ebinger
70a09c00e5 Merge "Remove non-localized message"
am: ddbd256954

Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
2017-03-28 22:35:36 +00:00
Brad Ebinger
ddbd256954 Merge "Remove non-localized message" 2017-03-28 22:21:54 +00:00
Robert Greenwalt
f8966a0a50 Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" am: 07be9a0ef9 am: 79bde60db2
am: 8072754768

Change-Id: Iff682d4d9dc83544c0fce49c98d4c10563bf6317
2017-03-28 16:45:00 +00:00
Robert Greenwalt
79bde60db2 Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"
am: 07be9a0ef9

Change-Id: I3158ce88ca76a3ad4e8894f514030b31ae40f1fb
2017-03-28 16:20:57 +00:00
Robert Greenwalt
7811b34b36 Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent.  Changed to use com.android.internal.* namespace.

bug:35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
2017-03-27 22:43:15 +00:00
Jack Yu
9b7d3a86bd Merge "Deprecated getDeviceId and added getMeid and getImei"
am: ad2e7405ad

Change-Id: I4e006290c54a371fc5f080c37f86ca946507d871
2017-03-24 17:10:54 +00:00
Shuto Nagamatsu
e74c8103a4 Remove non-localized message
Remove non-localized english "code" from ImsException constructor.
Non-localized message causes user confusion.

Bug: 32792378
Change-Id: I0c71c35e7830db7de5b1d041211de54c92285b4d
2017-03-24 08:03:49 +09:00
Jack Yu
f301dab471 Deprecated getDeviceId and added getMeid and getImei
Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Merged-In: Iad4c05d2fd2efc538214f466861497c973882dfe
Change-Id: Iad4c05d2fd2efc538214f466861497c973882dfe
2017-03-23 14:42:33 -07:00
Jack Yu
0dc3b9104b Deprecated getDeviceId and added getMeid and getImei
Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Change-Id: Iad4c05d2fd2efc538214f466861497c973882dfe
2017-03-23 14:35:38 -07:00
Jeff Davidson
f7368e05b4 Merge "Move IccUtils to reflect Java package declaration." 2017-03-23 17:08:45 +00:00
Sanket Padawe
bdee77da38 Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
am: 1df4c1ae54

Change-Id: I9233a85edb9321faaeb3f7813d4020159e52b691
2017-03-23 00:45:37 +00:00
fionaxu
388eab4147 sendDialerCode API review
1. address the feeback from API review:
throw exception rather than a boolean return
throw Security exception for permission denial and non-default dailer app.
throw invalidStateException if telephonyServie unavaialble.
2. sendDialerCode API will only check permission and package match without
enforcing the format of secret code(*#*# CODE #*#*) as throwing an unchecked
exception for wrong bad format seems to be an overkill regarding the API usage.
Dialer calls this API for each keyboard press to check format and send the intent
altogether which is no longer appropriate if we plan to return void and will
reduce frquent API calls.
3. allow callers with carrier privilege
4. not require MODIFY_PHONE_STATE as third party dialer apps won't be
granted
5. TODO mark android.provider.Telephony.SECRET_CODE to be protected
after calling apps move to this API.

Bug:35767402
Test: Manual
Change-Id: I8287aa93f2f79d356935a48cf808705d9b49984b
2017-03-22 16:56:38 -07:00
Sanket Padawe
1df4c1ae54 Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." 2017-03-22 21:27:22 +00:00
Sanket Padawe
90e022a73c Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis.
Bug: 35767068
Test: No build failure.
Change-Id: I3b15901ff18742b5e99f03e74a6412d352461458
Merged-in: I3b15901ff18742b5e99f03e74a6412d352461458
2017-03-21 22:29:12 +00:00
Sanket Padawe
980231f317 Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." 2017-03-21 22:13:02 +00:00
Sanket Padawe
7e46025199 Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis.
Bug: 35767068
Test: No build failure.
Change-Id: I3b15901ff18742b5e99f03e74a6412d352461458
2017-03-21 11:31:29 -07:00
Jack Yu
e3070ede55 Added ETWS primary message default message support
ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.

Test: manual
bug: 33595007
Change-Id: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
2017-03-20 22:37:50 -07:00
Jeff Davidson
46d7fbed6b Move IccUtils to reflect Java package declaration.
This class was in com/android/internal/telephony but declared itself
in com.android.internal.telephony.uicc. Mismatches here make IDEs
unhappy when resolving imports, and only the latter is used in
compilation, so consolidate on the latter.

Test: N/A (will rely on TreeHugger)
Change-Id: I598341bacbd70947b6e2789b2e543879cd41a4c9
2017-03-21 00:08:18 +00:00
Jayachandran Chinnakkannu
e7cd345537 Merge "Add new precise call fail causes and OEM causes" am: 9aa841d254 am: 4992b1533e
am: a7c4fdbf03

Change-Id: Iea9ee9c4a407638dfa19669b25d0c1534978d4a6
2017-03-17 22:41:35 +00:00
Jayachandran Chinnakkannu
4992b1533e Merge "Add new precise call fail causes and OEM causes"
am: 9aa841d254

Change-Id: I2b52c9c332fc73a37ac2c4c492ac9b85b2025897
2017-03-17 22:27:11 +00:00
Jayachandran C
5cbadddff2 Add new precise call fail causes and OEM causes
Bug: 35609963
Change-Id: Ia0579721e7132950ccfafd7be38f43d1963c016c
2017-03-16 15:43:41 -07:00
TreeHugger Robot
76c27d8b04 Merge "Update VVM API" 2017-03-10 18:40:00 +00:00
Brad Ebinger
6202c5e005 Merge "Disable a phone number log for user build" am: 59a40691a5 am: d31314d550
am: c906a167cb

Change-Id: I0c1bef7c7b436dcee5dfc8a06e8141f7757d7199
2017-03-10 00:03:18 +00:00