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

2969 Commits

Author SHA1 Message Date
Junda Liu
b27dbd2151 am 92205a33: am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '92205a33655f8a4f487e8d85a9d6d151d0db21a1':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:52:28 +00:00
Junda Liu
92205a3365 am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:45:41 +00:00
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +00:00
Cheuksan Wang
b72eb97e4b new SMS/MMS carrier app API 
Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
 2014-12-01 18:11:07 -08:00
Pavel Zhamaitsiak
9c2268388a am fd5fc197: am 75371fd7: am 73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 
* commit 'fd5fc197985701c23025481c145df407983f237c':
  MSIM IMS: convert to phone ID based selection.
 2014-12-02 01:45:59 +00:00
Pavel Zhamaitsiak
fd5fc19798 am 75371fd7: am 73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 
* commit '75371fd7eeda52cb04a77b4e218c470c79e20402':
  MSIM IMS: convert to phone ID based selection.
 2014-12-02 01:39:26 +00:00
Etan Cohen
fbedecc099 MSIM IMS: convert to phone ID based selection. 
Bug: 18576822
Change-Id: I2a756782ccdab5e4d10193c593cf89a7aa4fcda4
 2014-12-01 23:30:58 +00:00
Shishir Agrawal
688b107330 am 7158dfb1: am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '7158dfb1be1689282e0014bd779b7510e85022c8':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:36:12 +00:00
Shishir Agrawal
7158dfb1be am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '592707c5250655cbed2b48848701b288605c01ac':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:29:07 +00:00
Shishir Agrawal
0201a6f6f1 TelephonyManager.setLine1NumberForDisplay should return a boolean. 
The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
 2014-12-01 11:48:53 -08:00
Amit Mahajan
cf45709e5c am 719638af: am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit '719638afea79a3cee77fc75c4c54d36de2ca44a5':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:37:54 +00:00
Amit Mahajan
719638afea am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:32:06 +00:00
Stuart Scott
7151cde3ca Subscription Info density-dependent text size and localized SIM slot index 
Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
 2014-12-01 11:14:53 -08:00
Amit Mahajan
bc2f1371bb am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:09:47 +00:00
Amit Mahajan
65940c4ceb am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:02:28 +00:00
Amit Mahajan
5ed82c8ca0 Change to use DATA_ROAMING setting correctly with subId. 
Bug: 18466745
Change-Id: Ib2d7979d164ca3cf32c6619340fae1dc578ca686
 2014-11-25 16:29:10 -08:00
Amit Mahajan
3749541a20 Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 2014-11-25 20:39:09 +00:00
Amit Mahajan
421a53900d Adding helper functions to retrieve settings that are stored per subId. 
Bug: 18392680
Change-Id: I360bc19c4501020afd9dfa1cfb7e66ce2fad9536
 2014-11-24 15:57:41 -08:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Junda Liu
38531581fc Add hasMatchedTetherApnSetting to telmgr API. 
Bug: b/18158411
Change-Id: Id1285b79194ad21fb728fd18fb09026e51354656
 2014-11-21 16:21:30 -08:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Wink Saville
49414b5b21 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
Shishir Agrawal
3e8a9053dc am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
automerge: 84b988e

* commit '84b988e6eea690c33e5f08b3a7f41d3a8cd8d912':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 01:47:25 +00:00
Shishir Agrawal
84b988e6ee am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
* commit '0783a61d8a6f17ca0fe3d0e55a3c48aceec823d4':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 00:43:23 +00:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Shishir Agrawal
a9b6777154 Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 2014-11-20 17:44:36 +00:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 16:03:09 -08:00
Amit Mahajan
5ed01f6427 am bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'bb35bbf198201fc00858ea56cdf97eae8f2cfdbb':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 18:05:33 +00:00
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
Amit Mahajan
4fea0923be Adding new setting LTE_SERVICE_FORCED. 
Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
 2014-11-18 17:34:36 -08:00
Shishir Agrawal
ab57c29092 Carrierprivileges: Addressing API council suggestions. 
- hasCarrierPrivileges - renamed to getCarrierPrivilegeStatus
- setLine1NumberForDisplay should not be usable by apps that have MODIFY_PHONE_STATE
- setVoiceMailNumber should not be usable by apps that have MODIFY_PHONE_STATE
- setOperatorBrandOverride should not be usable by apps that have MODIFY_PHONE_STATE

Not addressed:
- setGlobalPreferredNetworkType() should not be usable by apps that have MODIFY_PHONE_STATE

The underlying call is needed by system apps (OMADM) too.

Bug: 18356155
Change-Id: Idc6468a0bd0b0c52b9de1d8446f98c90ac0b3238
 2014-11-18 17:05:12 -08:00
Amit Mahajan
5cb315fd0f am 51064ec6: am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit '51064ec6f0f75eb03f86d3b3fa091c857d603506':
  Telephony: STK CC feature implementation
 2014-11-18 22:04:29 +00:00
Amit Mahajan
51064ec6f0 am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit 'ca1e3e5e830c1e2eb63a3653117bb6c9c0589ebe':
  Telephony: STK CC feature implementation
 2014-11-18 21:56:06 +00:00
Preeti Ahuja
d4180cc2d4 Telephony: STK CC feature implementation 
Add strings and constants required for stk cc feature.

Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
 2014-11-18 13:01:02 -08:00
Shishir Agrawal
585ad040a1 am b9b2aa2f: am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev 
* commit 'b9b2aa2f19de547ad0804389e8e18dd20828ec86':
  Add new API to set voicemail number.
 2014-11-18 02:31:46 +00:00
Shishir Agrawal
b9b2aa2f19 am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev 
* commit '2f74e913c85ccb405e4fe18a8f3c4c90153663a8':
  Add new API to set voicemail number.
 2014-11-18 02:07:57 +00:00
Shishir Agrawal
c9f1b3a0e8 Merge "Add new API to set voicemail number." into lmp-mr1-dev 2014-11-17 23:49:29 +00:00
Stuart Scott
0c29f1b832 am a7697fa8: am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit 'a7697fa81fc0682494a80e0435cb47c38ad7cbe7':
  Updating Subscription Info Icon
 2014-11-17 20:27:03 +00:00
Stuart Scott
a7697fa81f am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit '343a88da1b93642f8d8b75f7de43918378b573f8':
  Updating Subscription Info Icon
 2014-11-17 19:53:16 +00:00
Stuart Scott
da5be611d8 Updating Subscription Info Icon 
bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
 2014-11-17 19:11:40 +00:00
Andrew Lee
c78e44e025 am 38f99e55: am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '38f99e55d561e8bc7a5a5cbcfd518621d70994f0':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:34:31 +00:00
Andrew Lee
38f99e55d5 am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '49b03c2374d035524908251113d27733219e9323':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:25:22 +00:00
xinhe
88a666b237 am 7c420368: am f6eb33fd: am 031d8fea: Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 
* commit '7c420368550cba683cc647cb6547da5cfe4790ed':
  Update enabe/disableCellBroadcast with RAN argument
 2014-11-13 02:17:23 +00:00
Andrew Lee
990bbbb352 Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 2014-11-13 02:15:15 +00:00