drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,155 Commits 1 Branch 0 Tags
Commit Graph

3553 Commits

Author SHA1 Message Date
Tyler Gunn
d07c30d68f Merge "Add new carrier config option for video conference support." into nyc-mr1-dev 
am: 8b38b22066

* commit '8b38b22066778b1e23583a915451c952f2221632':
  Add new carrier config option for video conference support.

Change-Id: Ia8281425aa17033489b0aa2c55669f578bfd73a7
 2016-05-11 01:23:26 +00:00
Tyler Gunn
8b38b22066 Merge "Add new carrier config option for video conference support." into nyc-mr1-dev 2016-05-11 01:17:24 +00:00
Youhan Wang
62305f9ff6 Merge "Add getAidForApptype()." into nyc-mr1-dev 
am: d4ddc7bcc1

* commit 'd4ddc7bcc14fafae55be393a240fbba82011b960':
  Add getAidForApptype().

Change-Id: Ifcd2f796884e58e2e5fbea8a12343f32460f91fa
 2016-05-09 17:12:16 +00:00
Youhan Wang
d4ddc7bcc1 Merge "Add getAidForApptype()." into nyc-mr1-dev 2016-05-09 17:04:57 +00:00
Nathan Harold
827bd873e0 Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev am: 08acd3ce28 
am: f7e4c04af3

* commit 'f7e4c04af38020b27647fa424db78ac2bfb14d8e':
  Coerce 8-bit bsic to Integer if Invalid

Change-Id: Iabcec0a020b195af49109f9693034c4982e8127a
 2016-05-06 03:36:40 +00:00
Nathan Harold
f4e69ad465 Merge "CellInfo Parceling for Invalid Values" into nyc-dev am: 5b45c62a1a 
am: d18da6fa93

* commit 'd18da6fa939aba229c7ec89ffa6e7ca95317c04c':
  CellInfo Parceling for Invalid Values

Change-Id: I80a37f2392bb2d07af074a3b8f7693c28b75e668
 2016-05-06 03:36:38 +00:00
Nathan Harold
f7e4c04af3 Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev 
am: 08acd3ce28

* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
  Coerce 8-bit bsic to Integer if Invalid

Change-Id: I0fed240d0cd84e76283fb663f826b420922d1dc1
 2016-05-06 03:31:35 +00:00
Nathan Harold
d18da6fa93 Merge "CellInfo Parceling for Invalid Values" into nyc-dev 
am: 5b45c62a1a

* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
  CellInfo Parceling for Invalid Values

Change-Id: I7ecbb84a507197e33771c3c1afb172bd89fbd557
 2016-05-06 03:31:31 +00:00
Nathan Harold
43864702b6 Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev 
am: 08acd3ce28

* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
  Coerce 8-bit bsic to Integer if Invalid

Change-Id: Ib1cf6ecce437c8198da169fd5a4f0d1301e1547e
 2016-05-06 03:31:30 +00:00
Nathan Harold
f0db11324a Merge "CellInfo Parceling for Invalid Values" into nyc-dev 
am: 5b45c62a1a

* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
  CellInfo Parceling for Invalid Values

Change-Id: I049eabf4ede20f591fd193e133e62444c1185fb7
 2016-05-06 03:31:28 +00:00
Youhan Wang
2da9b2b8bf Add getAidForApptype(). 
To TelephonyManager and ITelephony.aidl.

Bug:27612001
Change-Id: Icb9dc5e29f3a635b2d807e8abcd15a5e1a85b02d
 2016-05-05 16:12:58 -07: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
Jack Yu
0eda86c207 Merge "Added additional cbs channels support" into nyc-mr1-dev 
am: 597be61652

* commit '597be61652982bbafb91bdde7f8a913d3385e030':
  Added additional cbs channels support

Change-Id: Ibacf62058f18cc471bbe3c365b980df11f6e991b
 2016-05-05 21:10:03 +00:00
Jack Yu
597be61652 Merge "Added additional cbs channels support" into nyc-mr1-dev 2016-05-05 21:00:49 +00:00
Jack Yu
bf0fd7243b Added additional cbs channels support 
Added a new carrier config that allows carriers to enable
additional cell broadcast channels for CMAS.

bug: 21107166
Change-Id: I2bdce880dfb6a2d8d8e9e252d1f331f657f63ccc
 2016-05-03 11:53:30 -07:00
Amit Mahajan
8fba5bb7c6 Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev am: fc6a3ad85b 
am: dbb0028be0

* commit 'dbb0028be0d9f4ad18e83ea6504a7f259aae29a8':
  Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: I9f77d150abb4bac5da3c93afe6c123fe86637a41
 2016-05-02 21:52:52 +00:00
Amit Mahajan
15b33c636c Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev 
am: fc6a3ad85b

* commit 'fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71':
  Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: Ie1a7dfe3d285669f4ba8ab1ca873842b10ca154c
 2016-05-02 21:47:53 +00:00
Amit Mahajan
dbb0028be0 Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev 
am: fc6a3ad85b

* commit 'fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71':
  Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: Ideaaec05272ecee36504e7207d1187a7d2cdcd5f
 2016-05-02 21:47:50 +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
Chen Xu
aaa41a3a65 Merge "Add CarrierConfig for metered roaming" into nyc-dev am: 73efde0 
am: c1df936

* commit 'c1df936c1602f91a623279d602f454d636463fde':
  Add CarrierConfig for metered roaming

Change-Id: Ib1e8a78f7a5aabdaeeb04afafa9cc6c0725d2880
 2016-04-26 23:16:18 +00:00
fionaxu
5880e55860 Merge "Add CarrierConfig for metered roaming" into nyc-dev 
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
  Add CarrierConfig for metered roaming

Change-Id: I9b8ea629e72fa2d0f09ce8f56d0b6f458d884153
 2016-04-26 22:53:48 +00:00
fionaxu
c1df936c16 Merge "Add CarrierConfig for metered roaming" into nyc-dev 
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
  Add CarrierConfig for metered roaming

Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
 2016-04-26 22:50:14 +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
334a936e15 Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp 
am: cc0eaf4

* commit 'cc0eaf4124011d8a370f3c354e241887a633e8f1':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: Ia4ea8bbd2a4fd5cb3094f3682034542b8f7d8e80
 2016-04-25 09:59:09 +00: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 ca0182073530a237babe65b9ec7a9b41e667f8d1)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
 2016-04-25 10:47:02 +01:00
Ta-wei Yen
c63cf69707 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48 
am: e85b334

* commit 'e85b334c4160a60f3cc873bca32445561b0591a7':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: Ie313f719d49c1104c10ce4cce1e3356d6f7d7c0f
 2016-04-22 23:39:34 +00:00
Ta-wei Yen
e85b334c41 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev 
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I20ec57dbcaad08e02a9bcea40f52f077eff0e730
 2016-04-22 23:33:59 +00:00
Ta-wei Yen
da83b755a3 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev 
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I5c176db61c64048973eae5377164eb658e8ede88
 2016-04-22 23:33:56 +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
825d4b8143 Merge "Add comments to apptype and authtype constants." into nyc-dev am: cc69bed 
am: e96849f

* commit 'e96849f564bcb31d70a7143d60e92c40bbcd6cad':
  Add comments to apptype and authtype constants.

Change-Id: I329bf0e2a56ada4f03e0f8ad4a5e84dfeb32c21e
 2016-04-22 19:23:48 +00:00
Junda Liu
e96849f564 Merge "Add comments to apptype and authtype constants." into nyc-dev 
am: cc69bed

* commit 'cc69bed61fadd99627751b6e04e99f2c42ef3025':
  Add comments to apptype and authtype constants.

Change-Id: Ie7f2d97b7ac79d31bac8b77d0a8056f4c13cc5b7
 2016-04-22 19:18:50 +00:00
Junda Liu
060e8f9dc5 Merge "Add comments to apptype and authtype constants." into nyc-dev 
am: cc69bed

* commit 'cc69bed61fadd99627751b6e04e99f2c42ef3025':
  Add comments to apptype and authtype constants.

Change-Id: I0e30f5907051dd0f9c4d3256588a4726620e3f17
 2016-04-22 19:18:44 +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
2eee49f082 Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce 
am: 2a403859b6

* commit '2a403859b6ef90c30deffd1613c55471d4d1b086':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: Ieaf1840c8025913f4b9691884356d8b7256194ed
 2016-04-21 02:18:11 +00:00
Nathan Harold
2a403859b6 Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev 
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40
 2016-04-21 02:16:03 +00:00
Nathan Harold
795939499d Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev 
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370
 2016-04-21 02:16:00 +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
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
 2016-04-20 21:15:11 +00:00
Trevor Johns
c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev 
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
 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
254f1b8a43 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev 
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I3ce213d0e7412125861d39f1726be4b5a751c828
 2016-04-20 18:43:55 +00: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 to nyc-dev
 2016-04-20 18:35:57 +00:00
Pavel Zhamaitsiak
e682152e7b Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev 
am: 644a007

* commit '644a00734f679cb570164e0974c0a98f2a642a59':
  Add addRegistrationListener function to IImsService.aidl

Change-Id: I0beec52050efa8ca9412600657286128ec617121
 2016-04-20 05:20:43 +00:00
Vineeta Srivastava
644a00734f Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev 2016-04-20 02:43:15 +00:00
Chen Xu
23493de983 Merge "Cold Sim issue fix" into nyc-dev am: 771fbfef27 
am: 6ee7417cd7

* commit '6ee7417cd7c14b17548f34931e5c3393733c6698':
  Cold Sim issue fix

Change-Id: Idc3784df620745ef7563b6e64608f0dcc7e96510
 2016-04-20 00:16:48 +00:00