4247 Commits

Author SHA1 Message Date
Tyler Gunn
ec22b62a3a Merge "Add carrier config to hide merge button for IMS conference"
am: 78b3cbe4e0

Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f
2017-03-31 15:12:37 +00:00
Tyler Gunn
78b3cbe4e0 Merge "Add carrier config to hide merge button for IMS conference" 2017-03-31 15:05:37 +00:00
Sanket Padawe
fa9e00bde5 Merge "Disable voice call barring notification for Verizon."
am: e0f0f6ca4b

Change-Id: Ia30a4e2dd76b5fcaced93ccbe16720c4ef808d2c
2017-03-31 00:23:28 +00: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
Sanket Padawe
e0f0f6ca4b Merge "Disable voice call barring notification for Verizon." 2017-03-31 00:01:31 +00:00
Sanket Padawe
25e4f1cb37 Disable voice call barring notification for Verizon.
Test: Manual
Bug: 31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
Merged-in: I2cb9f9b08f54faa276ddef9df36725aa76337746
2017-03-30 22:12:36 +00:00
Sanket Padawe
692ed97d87 Merge "Disable voice call barring notification for Verizon." into oc-dev
am: d1d3cdcd4f

Change-Id: I416b9ecd1176db89d6abf11e952b037e57d3429d
2017-03-30 20:57:51 +00:00
Sanket Padawe
d1d3cdcd4f Merge "Disable voice call barring notification for Verizon." into oc-dev 2017-03-30 20:52:22 +00:00
Sanket Padawe
db688bbad7 Disable voice call barring notification for Verizon.
Test: Manual
Bug: 31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
2017-03-30 11:23:49 -07:00
Abhijith Shastry
c8d771593a Merge "Update injectSmsPdu documentation." into oc-dev
am: 13dbbaf50a

Change-Id: I6174713b7b9a2b51bca56ffe680a00d0591a35dd
2017-03-30 00:40:30 +00:00
TreeHugger Robot
13dbbaf50a Merge "Update injectSmsPdu documentation." into oc-dev 2017-03-30 00:36:01 +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
Abhijith Shastry
bc1a6e60c8 Update injectSmsPdu documentation.
BUG: 35325136
Test: Comment only update.
Change-Id: I4ff38665a06de5e989e15e17aaac5f512da4303e
2017-03-29 10:54:53 -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
Ying Xu
ffce08e192 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" am: 23393da165 am: b2558c4ec1
am: 93d5948e51

Change-Id: I3028d999e93475bf729a357af40a78e8c94a1d51
2017-03-28 17:15:13 +00:00
Ying Xu
b2558c4ec1 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode""
am: 23393da165

Change-Id: Iaeae098f1185b045483334ff100e47a9be608c64
2017-03-28 17:04:04 +00:00
Ying Xu
23393da165 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" 2017-03-28 16:55:10 +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
Wei Huang
a8ad152269 Add carrier config to hide merge button for IMS conference
There is the case that operator's network does not support IMS
conference call although it supports IMS normal call. It sometimes
happens when operator starts up IMS service. In such case, it is
necessary to hide merge button for IMS conference.

Bug: 29430010
Change-Id: Iab8afaab297cd401ddea8ef4bbd6a06edfbcfeb3
2017-03-28 08:31:21 +09: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
yinxu
34016ae405 Add a carrier option to hide the option of "Enhanced 4G LTE Mode"
The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.

Bug: 36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
2017-03-24 10:31:28 -07: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
Pankaj Kanwar
b8ce44443c Merge "Updated javadocs for sendUssd APIs." 2017-03-21 00:45:55 +00: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
pkanwar
67819e0ae7 Updated javadocs for sendUssd APIs.
Bug: 35766546
Change-Id: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Test: manual
2017-03-20 13:27:09 -07:00
Narayan Kamath
66dc7be9e6 Merge "TelephonyManager: Avoid unnecessary object allocation." am: 5d3f14fe02 am: 088df2bd0a
am: 20fa635f7b

Change-Id: I1008a22a437b46d4830ef89189d43db0e3d07c45
2017-03-20 11:12:10 +00:00
Narayan Kamath
088df2bd0a Merge "TelephonyManager: Avoid unnecessary object allocation."
am: 5d3f14fe02

Change-Id: If425a64fe7820579045dfa40b356792f24d0de43
2017-03-20 10:57:52 +00:00
Narayan Kamath
5d3f14fe02 Merge "TelephonyManager: Avoid unnecessary object allocation." 2017-03-20 10:49: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 Chinnakkannu
9aa841d254 Merge "Add new precise call fail causes and OEM causes" 2017-03-17 22:18:24 +00:00
Narayan Kamath
eb7cb561f0 TelephonyManager: Avoid unnecessary object allocation.
No need to use a boxed type - the value is being passed to a function
that takes a boolean.

Test: make
Change-Id: Id6d5c581dd6e3a1832d3419a2fbec92e97c4240d
2017-03-17 10:30:50 +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
Brad Ebinger
0463a7d38e Merge "Added configuration for VT downgrade/tear down when data disabled" 2017-03-16 19:52:10 +00:00
Jack Yu
06caf58ac8 Added configuration for VT downgrade/tear down when data disabled
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I5c71fc9336b39f114a924861a766ca5cb93d4c69
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
2017-03-16 10:06:36 -07:00
Sooraj Sasindran
a98cefc55c Merge "Support Signal strength offset"
am: 98d499877f

Change-Id: I3087c3f8d6f975f399dfcf8aa8dd734f78caf69f
2017-03-16 03:19:37 +00:00