Qingxi Li
96c1a81c56
Merge \\"Add a key for setting carrier\\'s CDMA roaming mode\\" into nyc-dev am: 130db7715a
...
am: bd012f68ac
Change-Id: I8eaac539138c7a6936afa9ef64d43690e0f533f5
2016-06-14 17:27:34 +00:00
qingxi
bd012f68ac
Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
...
am: 130db7715a
Change-Id: I130ba1362d755e1859d5c22311867008d0626890
2016-06-14 17:15:41 +00:00
qingxi
247e7f4dca
Add a key for setting carrier's CDMA roaming mode
...
Change-Id: If092f0b23dc7e320c27e4231605756e990949d15
bug: 28836467
2016-06-13 13:31:06 -07:00
Robert Greenwalt
248a1c2d7b
Merge \"Clean up PCO plumbing.\" into nyc-mr1-dev
...
am: 4b6298b019
Change-Id: I3f0b125aeaa6c2016cef52c58771204e252b177b
2016-06-10 20:03:01 +00:00
Robert Greenwalt
eb17ccb608
Clean up PCO plumbing.
...
There's more data that needs to make it out to the carrier app.
Add the extras and correct some (it's a byte array, not an int, etc).
bug:28567303
Change-Id: I97ed41d9329ccc14851b8e171e8fa07919c8e38b
2016-06-08 20:25:39 -07:00
Sanket Padawe
3f8c335ec8
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
...
am: 2e9b43efd5
* commit '2e9b43efd53fbbce733b6e5c328f37c635c699a3':
Fix bug while writing data to parcel in TelephonyHistogram.java
Change-Id: I47cce50a4fdcc0bf4c747a410dd07658424dd9f3
2016-06-07 21:00:49 +00:00
Sanket Padawe
2e9b43efd5
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
2016-06-07 20:52:59 +00:00
Sanket Padawe
b9f0053b0c
Fix bug while writing data to parcel in TelephonyHistogram.java
...
Bug: 29117186
Change-Id: Ic694adc3323062e90c0e6586ea31e7691036ffcd
2016-06-06 15:49:42 -07:00
Stuart Scott
027e2d204e
Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev
...
am: 56760c65df
* commit '56760c65df6ca55d4570847b9f9777a23e2dfaf5':
Add carrier config key for carrier setup app.
Change-Id: Ie6ab4cd355c061a7c6f04228fefde2ebf690eb59
2016-06-06 20:17:20 +00:00
Stuart Scott
9abc2735fa
Add carrier config key for carrier setup app.
...
bug:28374700
bug:28374253
Change-Id: Icf56d4d2a89e32a062f3b8cc624f17e06c994599
2016-06-06 10:42:18 -07:00
fionaxu
2581d13f25
Merge "cold sim clean up" into nyc-mr1-dev
...
am: ba3428f01b
* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
cold sim clean up
Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
2016-06-04 05:53:44 +00:00
Chen Xu
ba3428f01b
Merge "cold sim clean up" into nyc-mr1-dev
2016-06-04 05:48:47 +00:00
fionaxu
1bf6ec2f86
cold sim clean up
...
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
to false if we want to hide "sign in" notification and placed
carrier-specific notification instead. it is set on connect, once set,
it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support
Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
Robert Greenwalt
c4e25b26de
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
...
am: 6a5c9560a3
* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
Add support for UNSOL PCO Data.
Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
2016-06-03 16:44:29 +00:00
Robert Greenwalt
6a5c9560a3
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
2016-06-03 16:38:58 +00:00
Sanket Padawe
a255d5de80
Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev
...
am: 1a6b6fc266
* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
2016-06-03 00:44:49 +00:00
Sanket Padawe
a7f74b1d43
Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d
...
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
2016-06-02 17:20:08 -07:00
Sanket Padawe
701cd3fe15
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
...
am: b68601d247
* commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
2016-06-02 23:15:57 +00:00
Robert Greenwalt
37409c5747
Add support for UNSOL PCO Data.
...
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.
bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
2016-06-02 15:21:59 -07:00
Sanket Padawe
49b204264e
Add carrier config variables for overriding carrier name from carrierconf.
...
Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
2016-06-01 12:17:23 -07:00
Jonathan Basseri
9a19e8948d
resolve merge conflicts of 4c04097 to nyc-mr1-dev
...
am: 04c35e78db
* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
Change how TelephonyManager handles subscriptions.
Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
2016-05-26 23:13:17 +00:00
Jonathan Basseri
04c35e78db
resolve merge conflicts of 4c04097 to nyc-mr1-dev
...
Change-Id: I256514588af20985108f72a5e204811904f87c9c
2016-05-26 11:41:17 -07:00
Jonathan Basseri
531cd8724c
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
...
am: 4c04097fdb
* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
Change how TelephonyManager handles subscriptions.
Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
2016-05-26 16:12:55 +00:00
Jonathan Basseri
4c04097fdb
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
2016-05-26 15:50:05 +00:00
Jonathan Basseri
8a6561d177
Change how TelephonyManager handles subscriptions.
...
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.
* The subId methods will be @hidden instead of deleted.
Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
2016-05-25 18:49:11 -07:00
Derek Tan
9b8b72748c
Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb
...
am: 869f32d810
* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
Per API review, revert the API renaming CL.
Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f
2016-05-26 00:00:49 +00:00
Derek Tan
869f32d810
Merge "Per API review, revert the API renaming CL." into nyc-dev
...
am: 03d3f4a6cb
* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.
Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
2016-05-25 23:50:45 +00:00
Derek Tan
e214ff00ea
Merge "Per API review, revert the API renaming CL." into nyc-dev
...
am: 03d3f4a6cb
* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.
Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
2016-05-25 23:50:12 +00:00
Derek Tan
03d3f4a6cb
Merge "Per API review, revert the API renaming CL." into nyc-dev
2016-05-25 23:41:21 +00:00
Junda Liu
ec319efbd5
Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
...
am: ea97857a78
* commit 'ea97857a7868467a5cbe986807d04854cc4c3442':
Add restricted card state to telephony manager.
Change-Id: I800619a54e75424d6dbb723216ae250ec6276e41
2016-05-25 21:50:29 +00:00
Junda Liu
ea97857a78
Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
2016-05-25 21:39:12 +00:00
Derek Tan
818822ad5d
Per API review, revert the API renaming CL.
...
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."
This reverts commit 3bf26b5605 .
Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
2016-05-25 18:37:05 +00:00
Ta-wei Yen
4567add419
Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
...
am: 85663d7edf
* commit '85663d7edfddd275e6e433bfe2c8b99bab019a49':
Switch VVM SMS filter to Builder pattern
Change-Id: I85aaa4fc34a7f0b240f05bba98104879438c6331
2016-05-25 00:18:58 +00:00
Ta-wei Yen
85663d7edf
Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
2016-05-25 00:13:06 +00:00
Junda Liu
a2f6a67511
Add restricted card state to telephony manager.
...
Bug: b/28564314
Change-Id: If19b12036b09a8cd015dce4faf5de26606ee2b97
2016-05-24 16:03:37 -07:00
Ta-wei Yen
67ab168b78
Switch VVM SMS filter to Builder pattern
...
Bug:27816386
Change-Id: I74c73f0a43530dc563df29f0df7ae1a40845e8f0
2016-05-24 15:25:16 -07:00
Meng Wang
fe9ed66227
Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev
...
am: ac517216c5
* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
2016-05-20 22:21:26 +00:00
Meng Wang
64997623bf
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
...
Also:
Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS
Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
2016-05-20 13:18:41 -07:00
Sanket Padawe
c4a4de836e
Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
...
am: 096e99e25c
* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
Add new TelephonyManager api to query Telephony metrics.
Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
2016-05-20 16:52:40 +00:00
Sanket Padawe
096e99e25c
Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
2016-05-20 16:47:05 +00:00
Ta-wei Yen
f652b1ec42
Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f
...
am: 621b68a213
* commit '621b68a2136b644734292655228503c42a541576':
Rename visual voicemail sync intent value
Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
2016-05-20 01:11:34 +00:00
Ta-wei Yen
7220c75f65
Merge "Rename visual voicemail sync intent value" into nyc-dev
...
am: 0f712b164f
* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
2016-05-20 01:06:04 +00:00
Ta-wei Yen
621b68a213
Merge "Rename visual voicemail sync intent value" into nyc-dev
...
am: 0f712b164f
* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
2016-05-20 01:06:03 +00:00
Sanket Padawe
06e1ae1a51
Add new TelephonyManager api to query Telephony metrics.
...
Bug: 28717269
Change-Id: I6f5e88509feda879162049955776cb61dda8c840
2016-05-18 16:51:49 -07:00
Tyler Gunn
7a63216d83
Merge "Continued multi-endpoint work." into nyc-mr1-dev
...
am: beb8c4954d
* commit 'beb8c4954db199412a8e59b45198b0c2ac449bfd':
Continued multi-endpoint work.
Change-Id: I1090df296dd4f0824202f5173e88ba8d6570db5f
2016-05-18 20:32:33 +00:00
Tyler Gunn
beb8c4954d
Merge "Continued multi-endpoint work." into nyc-mr1-dev
2016-05-18 20:22:07 +00:00
Ta-wei Yen
153fcd7ba1
Rename visual voicemail sync intent value
...
Rename value of KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL KEY_VVM_PREFETCH_BOOL
Change-Id: I13718333a8ddc38e8d2131b478562b76cf9aab64
Fixes:28819765
Fixes:28822093
2016-05-17 15:57:20 -07:00
Vineeta Srivastava
14fd0ca669
Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
...
am: db41be8ef4
* commit 'db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f':
wifi calling emergency address carrier config
Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185
2016-05-17 20:26:41 +00:00
Vineeta Srivastava
db41be8ef4
Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
2016-05-17 20:18:03 +00:00
Amit Mahajan
1a4329a9b2
Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab
...
am: db4c3aff33
* commit 'db4c3aff334c0cebea1e337fadb4b535e8ccaffa':
OMADM intent sent by both system and apps.
Change-Id: I7bbe6a5deee8bd2eeb0e7b59763ddfb6d615bc1f
2016-05-17 17:55:15 +00:00