summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.Stuart Scott2015-01-142-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | bug:19015551 Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
* | | | | resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
| * | | | am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to ↵Junda Liu2015-01-141-3/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev * commit 'ead0184548fdd341f5903d9ce35604c926dcddde': Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
| | * | | Merge "Rename setGlobalPreferredNetworkType to ↵Junda Liu2015-01-141-3/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
| | | * | | Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per ↵Junda Liu2015-01-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API council. Bug: b/18983535 Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
* | | | | | am 2d68b428: am e3b0449b: Merge "Update javadoc and hide getNameSource and ↵Stuart Scott2015-01-141-11/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDataRoaming." into lmp-mr1-dev automerge: dfb99e8 * commit '2d68b428b06df4f91ffd12c01ccbac61ce9cb163': Update javadoc and hide getNameSource and getDataRoaming.
| * | | | | am e3b0449b: Merge "Update javadoc and hide getNameSource and ↵Stuart Scott2015-01-131-11/+14
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDataRoaming." into lmp-mr1-dev automerge: dfb99e8 * commit 'dfb99e82740fe21006bb6972af6af610ed12edbe': Update javadoc and hide getNameSource and getDataRoaming.
| | * | | | Merge "Update javadoc and hide getNameSource and getDataRoaming." into ↵Stuart Scott2015-01-131-11/+14
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | lmp-mr1-dev
| | | * | | Update javadoc and hide getNameSource and getDataRoaming.Stuart Scott2015-01-131-11/+14
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet. bug:18983672 Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
* | | | | am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg ↵Wink Saville2015-01-132-8/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnSubscriptionsChangedListener." into lmp-mr1-dev automerge: 9482799 * commit '948279954ac88ecfd0678713158175702d981c73': Rename reg/unreg OnSubscriptionsChangedListener.
| * | | | am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg ↵Wink Saville2015-01-132-8/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | OnSubscriptionsChangedListener." into lmp-mr1-dev * commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7': Rename reg/unreg OnSubscriptionsChangedListener.
| | * | | Rename reg/unreg OnSubscriptionsChangedListener.Wink Saville2015-01-132-8/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | To addOnSubscriptionsChangedListener and removeOnSubscriptionsChangedListener. Bug: 18984103 Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
* | | | API to satisfy the dependency in https://go/contacthandler1135Ben Gilad2015-01-081-20/+46
| | | | | | | | | | | | | | | | | | | | Bug: 17586396 Change-Id: I10bad15b4db3ec8928316507119c529c5d1f304b
* | | | am 0994d12b: am d38218d8: am b385e0b4: Merge "Telephony: Initialize ↵Robert Greenwalt2015-01-051-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | GsmCellLocation class members properly" * commit '0994d12b0d37f81b4b5b619b82db6bc20b3b6384': Telephony: Initialize GsmCellLocation class members properly
| * | | am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class ↵Robert Greenwalt2015-01-051-3/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | members properly" * commit 'd38218d880f02951015733a3d3e00deb546465bf': Telephony: Initialize GsmCellLocation class members properly
| | * | Telephony: Initialize GsmCellLocation class members properlySrikanth Chintala2014-12-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am d00b6067: Merge "IMS: add the api to get IMS registration information." ↵Amit Mahajan2014-12-282-0/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 4f68c0c automerge: 4b2cbae * commit '4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2': IMS: add the api to get IMS registration information.
| * | | am d00b6067: Merge "IMS: add the api to get IMS registration information." ↵Amit Mahajan2014-12-282-0/+18
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 4f68c0c * commit '4f68c0c1d8811d610021d97839af303c2752eff2': IMS: add the api to get IMS registration information.
| | * | IMS: add the api to get IMS registration information.Libin.Tang@motorola.com2014-12-222-0/+18
| | | | | | | | | | | | | | | | Bug: 18668325 Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
* | | | am 7c580cab: am b5f1e878: Fix build breakage.Wink Saville2014-12-191-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 7478d51 * commit '7478d51f7042f6b78741058668060e87ce80a703': Fix build breakage.
| * | | am 7c580cab: am b5f1e878: Fix build breakage.Wink Saville2014-12-191-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7c580caba94ca3b917c887b9e8353809c7f320c7': Fix build breakage.
| | * | Fix build breakage.Wink Saville2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | I rebased a change and didn't compile, my mistake. Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
* | | | am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 700b8f0 * commit '700b8f080ae39345b7174deea3c8acf6e1b51972': Update mapping between RAF and Network Type.
| * | | am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '57859d704ef2bc61798c172c4524596393f0beef': Update mapping between RAF and Network Type.
| | * | Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
| | | | | | | | | | | | | | | | | | | | bug:18754476 Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
* | | | am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network ↵Wink Saville2014-12-191-3/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type." into lmp-mr1-dev automerge: 7b727e2 * commit '7b727e2e0aedef50aba8e3d4081a643b79329497': Update mapping between RAF and Network Type.
| * | | am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network ↵Wink Saville2014-12-191-3/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Type." into lmp-mr1-dev * commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812': Update mapping between RAF and Network Type.
| | * | Merge "Update mapping between RAF and Network Type." into lmp-mr1-devWink Saville2014-12-191-3/+26
| | |\ \
| | | * | Update mapping between RAF and Network Type.Stuart Scott2014-12-151-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | bug:18754476 Change-Id: Ibca856fe10bc4a7dc620ab7936a70d1f0427fe56
* | | | | am e69b5d68: Merge "Change to write (create) setting+subid if it does not ↵Amit Mahajan2014-12-181-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already exist when it is queried for the first time." into lmp-mr1-dev automerge: eac6db5 automerge: ea1656f * commit 'ea1656f408376d71b124d1ea62116862731aa4ab': Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
| * | | | am e69b5d68: Merge "Change to write (create) setting+subid if it does not ↵Amit Mahajan2014-12-181-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Merge "Change to write (create) setting+subid if it does not already exist ↵Amit Mahajan2014-12-171-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | when it is queried for the first time." into lmp-mr1-dev
| | | * | | Change to write (create) setting+subid if it does not already existAmit Mahajan2014-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it is queried for the first time. Bug: 18791109 Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
* | | | | | am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into ↵Raph Levien2014-12-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 28e6910 * commit '28e691010f2990825c2e30ea244ba3bbac935725': Preserve leading "+" in phone numbers
| * | | | | am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into ↵Raph Levien2014-12-171-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '510042688ad8ffee499974b45551cfdf528f86da': Preserve leading "+" in phone numbers
| | * | | | Merge "Preserve leading "+" in phone numbers" into lmp-mr1-devRaph Levien2014-12-171-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Preserve leading "+" in phone numbersRaph Levien2014-12-151-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo ↵Pavel Zhamaitsiak2014-12-162-0/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additions" into lmp-mr1-dev automerge: 4abd09f * commit '4abd09f773a938fe006e4cc0839f0dc6023cb2f3': IMS OMA-DM Intent and ImsReasonInfo Additions
| * | | | am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo ↵Pavel Zhamaitsiak2014-12-162-0/+16
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Additions" into lmp-mr1-dev * commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7': IMS OMA-DM Intent and ImsReasonInfo Additions
| | * | | IMS OMA-DM Intent and ImsReasonInfo AdditionsOmkar Kolangade2014-12-162-0/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers ↵Amit Mahajan2014-12-151-6/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | as default." into lmp-mr1-dev automerge: 98cc133 * commit '98cc133f077ba393d6c9a6e302c3e89ade64247f': Change to treat slotId 0 emergency numbers as default.
| * | | am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers ↵Amit Mahajan2014-12-151-6/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | as default." into lmp-mr1-dev * commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1': Change to treat slotId 0 emergency numbers as default.
| | * | Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-devAmit Mahajan2014-12-151-6/+4
| | |\ \
| | | * | Change to treat slotId 0 emergency numbers as default.Amit Mahajan2014-12-151-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use ↵Wink Saville2014-12-121-11/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc automerge: 05e2ada * commit '05e2ada58a79994170e8e98ff9a619715cdddc28': Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
| * | | | am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use ↵Wink Saville2014-12-121-11/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc * commit '6cc44cce0e375b165580a8061359b2ff163a4556': Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
| | * | | Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.Wink Saville2014-12-111-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename isValidSubId to isValidSubscriptionId. Bug: 18668873 Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
* | | | | am fda0ff02: Merge "Add missing member to string conversion - helps in ↵Pavel Zhamaitsiak2014-12-111-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging." into lmp-mr1-dev automerge: b07de8d automerge: de67144 * commit 'de6714474d9d54c5ba0d6a83eafe5ecb96bf337e': Add missing member to string conversion - helps in debugging.
| * | | | am fda0ff02: Merge "Add missing member to string conversion - helps in ↵Pavel Zhamaitsiak2014-12-111-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging." into lmp-mr1-dev automerge: b07de8d * commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c': Add missing member to string conversion - helps in debugging.
| | * | | Merge "Add missing member to string conversion - helps in debugging." into ↵Pavel Zhamaitsiak2014-12-111-0/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | lmp-mr1-dev