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

2725 Commits

Author SHA1 Message Date
Junda Liu
427e7162ca am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:17:58 +00:00
Junda Liu
6e41019633 Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 2015-01-14 00:06:19 +00:00
Stuart Scott
2d68b428b0 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:23:20 +00:00
Stuart Scott
e3b0449b0f Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 2015-01-13 22:43:14 +00:00
Junda Liu
3fb3abd10a Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council. 
Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
 2015-01-13 14:11:11 -08:00
Stuart Scott
4abdd07949 Update javadoc and hide getNameSource and getDataRoaming. 
Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
 2015-01-13 12:31:04 -08:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Robert Greenwalt
0994d12b0d am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly" 
* commit 'd38218d880f02951015733a3d3e00deb546465bf':
  Telephony: Initialize GsmCellLocation class members properly
 2015-01-05 23:39:01 +00:00
Srikanth Chintala
e4ec09da0b Telephony: Initialize GsmCellLocation class members properly 
Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.

CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
 2014-12-29 11:05:22 +00:00
Amit Mahajan
4b2cbae9cf am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
  IMS: add the api to get IMS registration information.
 2014-12-28 05:29:52 +00:00
Libin.Tang@motorola.com
0303be4a8a IMS: add the api to get IMS registration information. 
Bug: 18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
 2014-12-22 19:35:18 +00:00
Wink Saville
7478d51f70 am 7c580cab: am b5f1e878: Fix build breakage. 
* commit '7c580caba94ca3b917c887b9e8353809c7f320c7':
  Fix build breakage.
 2014-12-19 19:22:41 +00:00
Wink Saville
b5f1e878d1 Fix build breakage. 
I rebased a change and didn't compile, my mistake.

Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
 2014-12-19 11:02:01 -08:00
Wink Saville
700b8f080a am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type. 
* commit '57859d704ef2bc61798c172c4524596393f0beef':
  Update mapping between RAF and Network Type.
 2014-12-19 18:33:20 +00:00
Wink Saville
7b727e2e0a am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev 
* commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812':
  Update mapping between RAF and Network Type.
 2014-12-19 18:09:26 +00:00
Wink Saville
f73c2d1f0b Update mapping between RAF and Network Type. 
bug:18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
 2014-12-19 10:08:15 -08:00
Wink Saville
63c79ce4bf Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev 2014-12-19 17:58:52 +00:00
Amit Mahajan
ea1656f408 am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 
automerge: eac6db5

* commit 'eac6db511b02ebf398a5e70eb70a7a5f05133945':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
 2014-12-18 00:03:08 +00:00
Amit Mahajan
e69b5d68c2 Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 2014-12-17 23:58:11 +00:00
Amit Mahajan
2a65688d40 Change to write (create) setting+subid if it does not already exist 
when it is queried for the first time.

Bug: 18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
 2014-12-17 15:42:56 -08:00
Raph Levien
28e691010f am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 
* commit '510042688ad8ffee499974b45551cfdf528f86da':
  Preserve leading "+" in phone numbers
 2014-12-17 23:15:07 +00:00
Raph Levien
0b6e78d997 Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 2014-12-17 23:04:17 +00:00
Pavel Zhamaitsiak
4abd09f773 am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:37:15 +00:00
Omkar Kolangade
827fcb7f8d IMS OMA-DM Intent and ImsReasonInfo Additions 
Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
 2014-12-16 09:48:27 -08:00
Raph Levien
50e9228493 Preserve leading "+" in phone numbers 
The normalizeNumber method in PhoneNumberUtils preserves a leading "+"
but only if it's the first character in the string. Thus it gets
dropped if there is leading punctuation such as "(". This patch
preserves the leading "+" as long as it would be the first character
in the normalized phone number.

Bug: 18418335
Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
 2014-12-15 15:46:17 -08:00
Stuart Scott
482b4246c2 Update mapping between RAF and Network Type. 
bug:18754476
Change-Id: Ibca856fe10bc4a7dc620ab7936a70d1f0427fe56
 2014-12-15 14:11:44 -08:00
Amit Mahajan
98cc133f07 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:27:10 +00:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
Wink Saville
05e2ada58a am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:38 +00:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 13:37:50 -08:00
Pavel Zhamaitsiak
de6714474d am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 
automerge: b07de8d

* commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 05:47:45 +00:00
Pavel Zhamaitsiak
fda0ff020d Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 2014-12-11 04:47:20 +00:00
Shishir Agrawal
23172c706b am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 00:24:33 +00:00
Shishir Agrawal
951dcdd940 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 2014-12-10 23:19:16 +00:00
Wink Saville
3a426694ff am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev 
automerge: afd6f5a

* commit 'afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 19:23:23 +00:00
Etan Cohen
db45a01e22 Add missing member to string conversion - helps in debugging. 
Change-Id: I0c8b58f69adcd89038a2c320c9d75172b7a10d5c
 2014-12-10 18:17:26 +00:00
Wink Saville
eb4de87683 Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev 2014-12-10 17:56:58 +00:00
Pavel Zhamaitsiak
6549e9be44 am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev 
* commit '1e989df50d3435c47c8685caabb463ec34f59840':
  IMS: change getMasterValue to getProvisionedValue.
 2014-12-09 20:34:48 +00:00
Pavel Zhamaitsiak
863fb4ddca am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev 
* commit 'd2762ca9bcb902cc9c66d26ac4268d14a164c46e':
  IMS: add ImsConfig api to get volte provisioned value.
 2014-12-09 20:34:43 +00:00
Shishir Agrawal
5fb1118d8c Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming. 
The calls allow us to specify MCC/MNCs (for GSM) and SIDs for CDMA that should
not be considered as roaming for the current ICCID.

Bug: 13288143

Change-Id: Iae97b02f3eb9954fedf1b005c9ecd2aa09138505
 2014-12-09 10:37:16 -08:00
Wink Saville
7a4df2b7d8 am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '2f5cb843553a596d314596c2bb776541db864d63':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 18:06:03 +00:00
Libin.Tang@motorola.com
2cdac3bd53 IMS: change getMasterValue to getProvisionedValue. 
Bug: 18576107
Change-Id: I21293d42b87911a98af8169b697d0e40eafb8760
 2014-12-09 10:03:21 -08:00
Libin.Tang@motorola.com
bec2c3e251 IMS: add ImsConfig api to get volte provisioned value. 
Bug: 18576107
Change-Id: I22d9f675ec607c30906b36cdab72e4d25463ecf5
 2014-12-09 10:03:21 -08:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
Narayan Kamath
8ff1a5ee0d am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc." 
* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
  Fix PhoneStateListener constructor javadoc.
 2014-12-09 11:25:04 +00:00
Pavel Zhamaitsiak
963db3fa69 am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 
* commit 'c67da06df74095e44ecf9449216563b622927463':
  IMS: start and stop dtmf tones.
 2014-12-09 01:42:53 +00:00
Uma Maheswari Ramalingam
a8af6bb333 IMS: start and stop dtmf tones. 
Support of start and stop dtmf tones in Imsphone

Bug: 18371919
Change-Id: I986f6b8e9aa1a5729d280eb8a5c60e129c3796cd
CRs-Fixed: 751797
 2014-12-08 22:59:44 +00:00
Wink Saville
98513d7bd4 Update API and documentation for invalid subscriptions id's 
Bug: 18668873
Change-Id: I3ee987b77fef856e97ea09898c695147cb87a517
 2014-12-08 12:44:16 -08:00