Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
310,966 Commits 3 Branches 0 Tags
02ffbf039fb44919ead94de04c991a0957c79431
Commit Graph

4152 Commits

Author SHA1 Message Date
Jonathan Basseri
c74b2cea5b am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev 
* commit '48fb9d15ecaceedd5477b7b780f22b7663ca103f':
  Migrate 'csp_enabled' to CarrierConfigManager.
 2015-06-19 20:36:32 +00:00
Junda Liu
5385f5a0b8 Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev 2015-06-19 20:31:56 +00:00
Junda Liu
fbd740c3ca Add comments to carrierconfigmanager for required permission. 
Bug: b/20826627
Change-Id: Ia8a42f4792429e56108a423f27c3f843f6b0f958
 2015-06-19 13:27:58 -07:00
Jonathan Basseri
019523a8a4 Migrate 'csp_enabled' to CarrierConfigManager. 
This variable controls whether SIM cards are allowed to disable manual
carrier selection, so it makes more sense for it to be managed as
carrier config.

Currently the variable is only used in device overlays
for specific networks, but we are dropping the device-overlay so that
this simply applies to those networks.

Change-Id: Ia6ba6a89c94c0916c19bdf792e48a4feac87eded
 2015-06-19 12:28:08 -07:00
Jonathan Basseri
b88adc815e am cb8bb390: Merge "Add VVM carrier config to public API." into mnc-dev 
* commit 'cb8bb3900178c126b9f101e84edd07bb6b489637':
  Add VVM carrier config to public API.
 2015-06-19 06:29:41 +00:00
Jonathan Basseri
cb8bb39001 Merge "Add VVM carrier config to public API." into mnc-dev 2015-06-19 06:16:48 +00:00
Fyodor Kupolov
af4e05a2ee am 7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev 
* commit '7e603d69947566bd17ac76820fde59ac9fd11c0c':
  OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
 2015-06-18 23:23:59 +00:00
Fyodor Kupolov
7e603d6994 Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev 2015-06-18 23:17:01 +00:00
Jonathan Basseri
6c1dc315aa Add VVM carrier config to public API. 
These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.

Bug: 21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
 2015-06-18 16:05:39 -07:00
Sanket Padawe
60205322c4 am 3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev 
* commit '3fa285f93e2810cbd31a71490b364be2b6636d9d':
  SubscriptionManager: Fix NPE in getSimStateForSlotIdx
 2015-06-18 19:51:39 +00:00
Omkar Kolangade
1cce1ec352 IMS RAT Reporting in Registration Unsol 
Adding a parameter to the IMS registration complete
and progressing callbacks allowing frameworks to be
notified of the radio access technology over which
IMS is registered.

Bug: 21902225
Change-Id: I3b340da3776b617fd9d944585672bce51c5d9c1e
 2015-06-18 12:32:14 -07:00
Sanket Padawe
330dcac0cb SubscriptionManager: Fix NPE in getSimStateForSlotIdx 
bug: 21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
 2015-06-18 12:08:01 -07:00
Fyodor Kupolov
d24e4eafdb OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds 
Bug: 21726452
Bug: 21878243
Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15
 2015-06-17 15:34:03 -07:00
Chris Manton
b538bd4675 am 69dd4bba: Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev 
* commit '69dd4bba65f0b50bbee101d371425ad7fd13ed22':
  Add keys to handle GSM and CDMA roaming/non roaming overrides
 2015-06-17 21:33:06 +00:00
Chris Manton
69dd4bba65 Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev 2015-06-17 21:21:40 +00:00
Andrew Lee
736ebf2f92 am 94f30824: Merge "Add DisconnectCause for CDMA activated case." into mnc-dev 
* commit '94f30824959acf2d7c7e6555ecb642ba07b2187a':
  Add DisconnectCause for CDMA activated case.
 2015-06-17 20:55:04 +00:00
Andrew Lee
94f3082495 Merge "Add DisconnectCause for CDMA activated case." into mnc-dev 2015-06-17 20:42:06 +00:00
Junda Liu
02d4ea2d28 am a5aabfeb: Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev 
* commit 'a5aabfebcaad34b9fdea222d858fc54d18e462c0':
  Add carrier config variable to hide sim lock setting ui.
 2015-06-17 18:25:00 +00:00
Junda Liu
a5aabfebca Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev 2015-06-17 18:11:03 +00:00
Junda Liu
e15cca771c Add carrier config variable to hide sim lock setting ui. 
Bug: b/19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
 2015-06-17 10:57:23 -07:00
Chris Manton
ca16a79b18 Add keys to handle GSM and CDMA roaming/non roaming overrides 
bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
 2015-06-17 08:25:48 -07:00
Andrew Lee
0c4d2e84cf Add DisconnectCause for CDMA activated case. 
Bug: 19296388
Change-Id: Ic754534e6d0273ae73ed80e3bb25a681d410a03b
 2015-06-16 16:42:31 -07:00
Fyodor Kupolov
edd358cfe0 am 27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev 
* commit '27a88a3eb6a6a456ea3ec1b81a8fb26333f904a5':
  Additional OP_READ_PHONE_STATE AppOps checks for telephony
 2015-06-16 17:29:52 +00:00
Fyodor Kupolov
27a88a3eb6 Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev 2015-06-16 17:15:03 +00:00
Junda Liu
84077de8e5 am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 
* commit '73d043232434f3ad37af26615919eac3117536b7':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
 2015-06-16 00:01:13 +00:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager. 
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
 2015-06-15 16:12:02 -07:00
Amit Mahajan
d7a1242241 resolved conflicts for merge of 28a8cf68 to mnc-vt-dev 
Change-Id: I094220b4d61914d0774bc62f1065e2a1c85f4000
 2015-06-15 15:54:29 -07:00
Amit Mahajan
28a8cf6883 Merge "Adding config variables for triggering CI action on System update." into mnc-dev 2015-06-15 22:16:41 +00:00
Jonathan Basseri
b401f4fd48 am ecadb92e: Merge "Read MMS config from CarrierConfigManager." into mnc-dev 
* commit 'ecadb92e8dcea2d7d39333169600be76b8f3fb4e':
  Read MMS config from CarrierConfigManager.
 2015-06-12 04:51:21 +00:00
Jonathan Basseri
ecadb92e8d Merge "Read MMS config from CarrierConfigManager." into mnc-dev 2015-06-12 04:41:41 +00:00
Amit Mahajan
02008b78d0 Adding config variables for triggering CI action on System update. 
Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
 2015-06-11 15:50:52 -07:00
Jonathan Basseri
ee8ebd69d4 am b2af4220: Merge "Delete TODO and file a bug." into mnc-dev 
* commit 'b2af4220adccb68c67bc91022db6239a9b9e280b':
  Delete TODO and file a bug.
 2015-06-11 17:44:57 +00:00
Jonathan Basseri
293837e9b2 am 57b7ec04: Merge "Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL" into mnc-dev 
* commit '57b7ec0495377c961b7c74daa6f6fa0d7c37139f':
  Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL
 2015-06-11 15:57:03 +00:00
Robert Greenwalt
cab77d0af6 am 1f86c1ae: Merge "Update docs on SignalStrength.getLevel" into mnc-dev 
* commit '1f86c1ae83557d7e03c7bd3e5222137b03216bd4':
  Update docs on SignalStrength.getLevel
 2015-06-11 15:54:22 +00:00
Jeff Davidson
d2c4d9a894 am a66a067a: Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev 
* commit 'a66a067a9c9b706035f48f445561100f29c960bf':
  Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
 2015-06-11 15:43:23 +00:00
Santos Cordon
28c65e6d64 am cefc16df: Merge "TelephonyManager should use TelecomManager\'s getCallState()." into mnc-dev 
* commit 'cefc16df98a985b8a7c40bca5d5ff3fde6b42dbf':
  TelephonyManager should use TelecomManager's getCallState().
 2015-06-11 15:38:41 +00:00
Jonathan Basseri
b2af4220ad Merge "Delete TODO and file a bug." into mnc-dev 2015-06-11 15:36:34 +00:00
Andrew Flynn
64af0511ca am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-11 14:48:29 +00:00
Jonathan Basseri
3360c26579 Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL 
Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: Ib981b5e442b56d0167a19326fe34935b7a1cfbf1
 2015-06-10 20:57:40 -07:00
Jonathan Basseri
5bf0ca1b3a Delete TODO and file a bug. 
This TODO looks more like a feature request, so I filed b/21766386 to
evaluate the feature. We should remove the TODO especially because this
text is in the public API.

Note: I'm not deleting the exact same comment from
packages/services/Telephony/res/values/config.xml
because the data migrated to CarrierConfigManager is slated to be
deleted from config.xml files.

Bug: 21571894
Change-Id: Iaba042fb47ade24f5825a48b21960193d322363f
 2015-06-10 20:52:14 -07:00
Jonathan Basseri
6694f2a067 Read MMS config from CarrierConfigManager. 
Updating javadoc to point at the correct class.

Bug: 21085630
Change-Id: I02415191c8d331e431812ddba75f18af10805b98
 2015-06-10 19:58:03 -07:00
Fyodor Kupolov
735e61b30f Additional OP_READ_PHONE_STATE AppOps checks for telephony 
Bug: 21726452
Change-Id: Iab61372d0fc8cecc826564a218ff542ec4afde5c
 2015-06-10 17:32:13 -07:00
Robert Greenwalt
1f86c1ae83 Merge "Update docs on SignalStrength.getLevel" into mnc-dev 2015-06-10 23:59:00 +00:00
Robert Greenwalt
46982c5364 Update docs on SignalStrength.getLevel 
bug:21572049
Change-Id: I10b830859a253170184a2d874d0ed39fc6ee0503
 2015-06-10 16:00:41 -07:00
Jeff Davidson
a66a067a9c Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev 2015-06-10 22:40:29 +00:00
Santos Cordon
8c332b7275 TelephonyManager should use TelecomManager's getCallState(). 
Telecom's version includes non-cellular calls in its result. Many apps
compile against TelephonyManager's existing API so we should update it
to use telecom instead.

We kept the implementation as cellular-only for
getCallState[ForSubscription](...) version of the API (which is hidden
anyway).

Bug: 21732997
Change-Id: Ifd27e6b49d76fe96ccc969e5262b1a876670aeef
 2015-06-10 11:42:27 -07:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Tyler Gunn
64b7f1df2d am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit '69c4e2c57eb587709452d3319136da19db5e465b':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 22:13:34 +00:00
Tyler Gunn
69c4e2c57e Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 2015-06-09 22:04:10 +00:00