summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | Revert "Additional changes to SubscriptionManager API as per API council."Wink Saville2014-11-204-250/+267
* | | | am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API ...Wink Saville2014-11-214-267/+250
|\ \ \ \ | |/ / /
| * | | Merge "Additional changes to SubscriptionManager API as per API council." int...Wink Saville2014-11-204-267/+250
| |\ \ \ | | |/ /
| | * | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-194-267/+250
* | | | am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council su...Shishir Agrawal2014-11-211-32/+27
|\ \ \ \ | |/ / /
| * | | Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-devShishir Agrawal2014-11-201-32/+27
| |\ \ \ | | |/ / | |/| |
| | * | Carrierprivileges: Addressing API council suggestions.Shishir Agrawal2014-11-181-32/+27
| | |/
* | | am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" in...Amit Mahajan2014-11-181-2/+24
|\ \ \ | |/ /
| * | Telephony: STK CC feature implementationPreeti Ahuja2014-11-181-2/+24
| |/
* | am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into l...Shishir Agrawal2014-11-181-0/+35
|\ \ | |/
| * Merge "Add new API to set voicemail number." into lmp-mr1-devShishir Agrawal2014-11-171-0/+35
| |\
| | * Add new API to set voicemail number.Shishir Agrawal2014-11-121-0/+35
* | | am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr...Stuart Scott2014-11-171-2/+8
|\ \ \ | |/ /
| * | Updating Subscription Info IconStuart Scott2014-11-171-2/+8
* | | am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS...Andrew Lee2014-11-131-1/+19
|\ \ \ | |/ /
| * | Add telephony.DisconnectCause for merged IMS call.Andrew Lee2014-11-121-1/+19
| |/
* | Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev a...Wink Saville2014-11-124-97/+259
|\ \ | |/
| * Merge "Update SubscriptionManager API as per API council." into lmp-mr1-devWink Saville2014-11-124-97/+259
| |\
| | * Update SubscriptionManager API as per API council.Wink Saville2014-11-114-97/+259
* | | Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev au...Junda Liu2014-11-121-69/+0
|\ \ \ | |/ /
| * | Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-devJunda Liu2014-11-121-69/+0
| |\ \ | | |/ | |/|
| | * Add HIDE_CARRIER_NETWORK_SETTINGS global setting.Junda Liu2014-11-071-69/+0
* | | am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with th...Stuart Scott2014-11-082-120/+78
|\ \ \ | |/ /
| * | SubInfoRecord provides a tinted icon with the initial embossed.Stuart Scott2014-11-072-120/+78
* | | am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinfore...Sanket Padawe2014-11-072-5/+37
|\ \ \ | |/ /
| * | API changes to add carrier name to subinforecordSanket Padawe2014-11-072-5/+37
* | | am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev au...Stuart Scott2014-11-061-1/+1
|\ \ \ | |/ /