qingxi
bd012f68ac
Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
...
am: 130db7715a
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
Sanket Padawe
701cd3fe15
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
...
am: b68601d247
2016-06-02 23:15:57 +00: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
531cd8724c
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
...
am: 4c04097fdb
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
869f32d810
Merge "Per API review, revert the API renaming CL." into nyc-dev
...
am: 03d3f4a6cb
2016-05-25 23:50:45 +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
Derek Tan
818822ad5d
Per API review, revert the API renaming CL.
...
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."
This reverts commit 3bf26b5605
2016-05-25 18:37:05 +00:00
Ta-wei Yen
7220c75f65
Merge "Rename visual voicemail sync intent value" into nyc-dev
...
am: 0f712b164f
2016-05-20 01:06:04 +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
Amit Mahajan
4e36794b49
Merge "OMADM intent sent by both system and apps." into nyc-dev
...
am: 65ca16ebab
2016-05-17 17:49:56 +00:00
Amit Mahajan
65ca16ebab
Merge "OMADM intent sent by both system and apps." into nyc-dev
2016-05-17 17:41:11 +00:00
Sanket Padawe
fc848e9c2b
Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev
...
am: 8c60dbe3ca
2016-05-16 21:23:04 +00:00
Sanket Padawe
232667bdda
Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.
...
Bug: 24450765
Change-Id: I42c9f9b2b1c34d774c28d8431bc7c21bbf5909fd
2016-05-16 19:02:39 +00:00
Amit Mahajan
d375a04d2e
OMADM intent sent by both system and apps.
...
Adding an exception for "com.android.omadm.service.CONFIGURATION_UPDATE"
as it is sent by both system and OEM apps.
Bug: 28757729
Change-Id: Ic89d38bbd78e436ca3c259f1aa61be450033a232
2016-05-13 17:39:29 -07:00
fionaxu
c3b0c1f304
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
...
am: 8fde916de8
2016-05-12 23:05:57 +00:00
Chen Xu
8fde916de8
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
2016-05-12 22:57:40 +00:00
fionaxu
dcf5c2b8e2
disable wifi only mode from wfc setting for nyc
...
Bug: 28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7
2016-05-12 13:40:05 -07:00
Nathan Harold
f7e4c04af3
Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
...
am: 08acd3ce28
2016-05-06 03:31:35 +00:00
Nathan Harold
d18da6fa93
Merge "CellInfo Parceling for Invalid Values" into nyc-dev
...
am: 5b45c62a1a
2016-05-06 03:31:31 +00:00
Nathan Harold
a326a4827e
Coerce 8-bit bsic to Integer if Invalid
...
Bug: 28299027
Change-Id: I1ff3314844991cf49cab6099a7a4c436980d52c9
2016-05-05 16:04:56 -07:00
Nathan Harold
efbb8f3376
CellInfo Parceling for Invalid Values
...
Within CellInfo Fields, Integer.MAX_VALUE should indicate
that a field is not present in a report. This change makes the
invalid value consistent, and also ensures that it is checked
in the calculation of power levels / asu.
-Update parcel/unparcel functions to avoid -MAX_VALUE
-Update LTE and CDMA asuLevel() and level() functions to be
consistently aware of the possibility of incomplete information
Bug: 27946114
Change-Id: Iacdc85db894e4a7809da8b5dc759488a1b6321ea
2016-05-05 16:04:56 -07:00
Amit Mahajan
15b33c636c
Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev
...
am: fc6a3ad85b
2016-05-02 21:47:53 +00:00
Amit Mahajan
fc6a3ad85b
Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev
2016-05-02 21:37:07 +00:00
fionaxu
5880e55860
Merge "Add CarrierConfig for metered roaming" into nyc-dev
...
am: 73efde0
2016-04-26 22:53:48 +00:00
Chen Xu
73efde04ef
Merge "Add CarrierConfig for metered roaming" into nyc-dev
2016-04-26 22:42:18 +00:00
Amit Mahajan
2c222510f6
Change to return phone count as 0 if voice, sms, data not supported.
...
If any of the 3 is supported, and multi-sim capabilities are unknown,
return 1.
Bug: 23016052
Change-Id: Id19aaf33d9a86fc24116704c668977c727c2a1f2
2016-04-25 10:33:34 -07:00
Tobias Thierer
b0800dce4a
Avoid instantiations of Boolean that are immediately unboxed.
...
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).
Also fixed a couple of other valueOf()s in SyncStorageEngine.
Bug: 28289401
(cherry-picked from commit ca01820735
2016-04-25 10:47:02 +01:00
Ta-wei Yen
e85b334c41
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
...
am: 8431a48
2016-04-22 23:33:59 +00:00
Ta-wei Yen
8431a48f77
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
2016-04-22 22:43:59 +00:00
Junda Liu
e96849f564
Merge "Add comments to apptype and authtype constants." into nyc-dev
...
am: cc69bed
2016-04-22 19:18:50 +00:00
Junda Liu
cc69bed61f
Merge "Add comments to apptype and authtype constants." into nyc-dev
2016-04-22 19:05:35 +00:00
fionaxu
28ffb600db
Add CarrierConfig for metered roaming
...
Bug: 26317905
Change-Id: Ib243de266736598cecdb8bcf76ac4db7275a1c01
2016-04-22 10:09:50 -07:00
Junda Liu
c7004f5648
Add comments to apptype and authtype constants.
...
Bug: b/28296053
Change-Id: Ib79d9106ac4415f495fd3ec4d0bea036d0b9c9f4
2016-04-21 10:05:21 -07:00
Nathan Harold
2a403859b6
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
...
am: f6496db8ce
2016-04-21 02:16:03 +00:00
Nathan Harold
f6496db8ce
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
2016-04-21 02:09:28 +00:00
Ta-wei Yen
3f9306fe84
Rename _BOOLEAN visual voicemail config keys to _BOOL
...
Bug:28294644
Change-Id: I1a512008c7e42041f87416782c023348f5dd8693
2016-04-20 14:46:20 -07:00
Trevor Johns
c0d2c43a22
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
...
am: 59c9a93a5060ee
2016-04-20 21:12:38 +00:00
Nathan Harold
98a40d3ca6
Additional checks for ModemActivityInfo.isValid()
...
Added checks in isValid for:
-A non-empty report
-Valid individual TxTime values
-Valid RxTime
-Valid EnergyUsed
Bug: 28278425
Bug: 28247832
Change-Id: I294fc200e81c828fbdd0e92b9ac4ae96fd7db6dc
2016-04-20 12:41:32 -07:00
Trevor Johns
59c9a93fc2
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
...
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee
2016-04-20 18:35:57 +00:00
fionaxu
8a05d513e6
Merge "Cold Sim issue fix" into nyc-dev
...
am: 771fbfef27
2016-04-20 00:14:35 +00:00
Chen Xu
771fbfef27
Merge "Cold Sim issue fix" into nyc-dev
2016-04-20 00:10:01 +00:00
fionaxu
b5592dc9f4
Cold Sim issue fix
...
Bug: 25203607
Change-Id: Ibde6a483477cb7c94f75b656d5e41748b13b23b2
2016-04-19 14:24:56 -07:00
Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3
2016-04-19 02:03:59 -07:00
Adam Lesinski
63696c00e2
Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
...
am: 0d47f4b
2016-04-18 23:38:11 +00:00
Adam Lesinski
0d47f4b646
Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
2016-04-18 23:27:10 +00:00
Shishir Agrawal
54cf95f618
Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
...
am: 3f6e211
* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
Adding slotId to certain Telephony broadcasts.
Change-Id: If4b3ca0500b43137bd33d22449fb362bdf30c1d1
2016-04-18 16:33:08 +00:00
Sunil Dutt
7299ce924f
Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev
...
am: 951fe29
2016-04-18 16:33:05 +00:00
