summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
Commit message (Expand)AuthorAgeFilesLines
* am e69b5d68: Merge "Change to write (create) setting+subid if it does not alr...Amit Mahajan2014-12-181-0/+2
|\
| * Merge "Change to write (create) setting+subid if it does not already exist wh...Amit Mahajan2014-12-171-0/+2
| |\
| | * Change to write (create) setting+subid if it does not already existAmit Mahajan2014-12-171-0/+2
* | | am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into ...Raph Levien2014-12-171-1/+1
|\ \ \ | |/ /
| * | Preserve leading "+" in phone numbersRaph Levien2014-12-151-1/+1
| |/
* | am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers a...Amit Mahajan2014-12-151-6/+4
|\ \ | |/
| * 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
* | | am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isVal...Wink Saville2014-12-121-11/+11
|\ \ \ | |/ /
| * | Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.Wink Saville2014-12-111-11/+11
| |/
* | am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks...Shishir Agrawal2014-12-111-0/+34
|\ \ | |/
| * Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/n...Shishir Agrawal2014-12-101-0/+34
| |\
| | * Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roam...Shishir Agrawal2014-12-091-0/+34
* | | am eb4de876: Merge "Update API and documentation for invalid subscriptions id...Wink Saville2014-12-101-5/+6
|\ \ \ | |/ /
| * | Merge "Update API and documentation for invalid subscriptions id's" into lmp-...Wink Saville2014-12-101-5/+6
| |\ \ | | |/ | |/|
| | * Update API and documentation for invalid subscriptions id'sWink Saville2014-12-081-5/+6
* | | am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnable...Wink Saville2014-12-091-3/+19
|\ \ \ | |/ /
| * | Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-devWink Saville2014-12-091-3/+19
| |\ \ | | |/ | |/|
| | * Add subId as parameter for get/setDataEnabled.Wink Saville2014-12-051-3/+19
* | | am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."Narayan Kamath2014-12-091-2/+1
|\ \ \
| * | | Fix PhoneStateListener constructor javadoc.Karol Wrótniak2014-12-081-2/+1
* | | | am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage....Jeff Sharkey2014-12-082-3/+21
|\ \ \ \ | | |/ / | |/| |
| * | | Offer to "merge" subscribers for data usage.Jeff Sharkey2014-12-082-3/+21
* | | | am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone num...Ihab Awad2014-12-082-0/+56
|\ \ \ \ | |/ / /
| * | | Add Text-to-Speech annotations for phone number displays (1/3)Ihab Awad2014-12-052-0/+56
* | | | am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" in...Stuart Scott2014-12-081-0/+16
|\ \ \ \ | |/ / /
| * | | Add mapping between RAT and Network ModeStuart Scott2014-12-051-0/+16
| | |/ | |/|
* | | am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional ...Wink Saville2014-12-042-49/+76
|\ \ \ | |/ /
| * | Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" int...Wink Saville2014-12-032-49/+76
| |\ \
| | * | Add getSimStateForSubscriber and additional SIM_STATE_XXXX valuesWink Saville2014-12-022-49/+76
* | | | am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" ...Robert Greenwalt2014-12-041-50/+279
|\ \ \ \ | |/ / /
| * | | Merge "Separate voice/data roaming state and type" into lmp-mr1-devRobert Greenwalt2014-12-031-50/+279
| |\ \ \ | | |/ / | |/| |
| | * | Separate voice/data roaming state and typeJing Zhao2014-12-021-50/+279
* | | | am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text siz...Stuart Scott2014-12-021-5/+8
|\ \ \ \ | |/ / /
| * | | Merge "Subscription Info density-dependent text size and localized SIM slot i...Stuart Scott2014-12-021-5/+8
| |\ \ \
| | * | | Subscription Info density-dependent text size and localized SIM slot indexStuart Scott2014-12-011-5/+8
* | | | | am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API...Junda Liu2014-12-021-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-devJunda Liu2014-12-021-0/+20
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add hasMatchedTetherApnSetting to telmgr API.Junda Liu2014-11-211-0/+20
* | | | | am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay sh...Shishir Agrawal2014-12-011-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | TelephonyManager.setLine1NumberForDisplay should return a boolean.Shishir Agrawal2014-12-011-4/+7
| | |/ / | |/| |
* | | | am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly...Amit Mahajan2014-12-011-0/+3
|\ \ \ \ | |/ / /
| * | | Change to use DATA_ROAMING setting correctly with subId.Amit Mahajan2014-11-251-0/+3
* | | | am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings...Amit Mahajan2014-11-261-0/+47
|\ \ \ \ | |/ / /
| * | | Merge "Adding helper functions to retrieve settings that are stored per subId...Amit Mahajan2014-11-251-0/+47
| |\ \ \
| | * | | Adding helper functions to retrieve settings that are stored per subId.Amit Mahajan2014-11-241-0/+47
* | | | | am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager AP...Wink Saville2014-11-245-276/+295
|\ \ \ \ \ | |/ / / /
| * | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-225-276/+295
| |/ / /
* | | | am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as ...Wink Saville2014-11-214-250/+267
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Additional changes to SubscriptionManager API as per API counc...Wink Saville2014-11-204-250/+267
| |\ \ \