Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,246 Commits 3 Branches 0 Tags
19457a41e92aa18b643aced596a7b40af6884dff
Commit Graph

948 Commits

Author SHA1 Message Date
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
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
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
Jeff Davidson
0cf20cdf81 Mark CARRIER_PRIVILEGE_* constants as @SystemApi. 
These constants are returned by checkCarrierPrivilegesForPackage which
is marked as @SystemApi, so this seems like an oversight.

Bug: 21613234
Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
 2015-06-09 14:40:21 -07:00
Andrew Flynn
ceaed68b07 notifyCarrierNetworkChange:TelephonyManager->CarrierService 
Re-checkin of 7f8be9d89b.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
  does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
 2015-06-09 16:28:54 -04:00
Fyodor Kupolov
c69efef11f am 4056b814: Merge "Do not enforce PHONE_STATE_PERMISSION to register listener" into mnc-dev 
* commit '4056b814023cf168d125d63e1bf0abb231f2434f':
  Do not enforce PHONE_STATE_PERMISSION to register listener
 2015-06-09 19:55:10 +00:00
Fyodor Kupolov
309b2f63f3 Do not enforce PHONE_STATE_PERMISSION to register listener 
PHONE_STATE_PERMISSION should not be required to register to the following
event types:
- PhoneStateListener.LISTEN_CALL_STATE
- PhoneStateListener.LISTEN_DATA_ACTIVITY
- PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

In case of LISTEN_CALL_STATE, an empty string should be passed instead of
incomingNumber, when caller has no PHONE_STATE_PERMISSION.

Bug: 21588537
Change-Id: I5b6d0308924f7e4cd13a983b8e0c9b3a5bbb119b
 2015-06-09 12:44:39 -07:00
Zach Johnson
bbc2568ee1 am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit 'd56958c440dffd85349adee5ca0bf4d0893215c6':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:14:55 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Prerepa Viswanadham
c0979958fd am 8711ed64: Merge changes from topic \'modemActivityInfo\' into mnc-dev 
* commit '8711ed644bab42c03ab9a22c14e1cb2825a107a6':
  API for get modem activity info
  Activity info and stats from modem
 2015-06-08 23:57:18 +00:00
Prerepa Viswanadham
8711ed644b Merge changes from topic 'modemActivityInfo' into mnc-dev 
* changes:
  API for get modem activity info
  Activity info and stats from modem
 2015-06-08 23:44:51 +00:00
Jonathan Basseri
9da4d7d5fc am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:36:07 +00:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId 
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
 2015-06-08 14:59:09 -07:00
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness 
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
 2015-06-08 13:49:13 -07:00
Nathan Harold
9c9f6c0e6a am 71feb72b: Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 
* commit '71feb72b76777afa10dca555287f954d63deeb9d':
  Fix a typo in the docstring of getAllCellInfo()
 2015-06-08 20:07:24 +00:00
Andrew Flynn
0c13fa8466 am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '21a4f17c942165684bc590de594984912459396d':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:07:10 +00:00
Nathan Harold
71feb72b76 Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 2015-06-08 20:05:07 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService" 
This reverts commit 7f8be9d89b.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
 2015-06-08 19:59:29 +00:00
Nathan Harold
fde06fd323 Fix a typo in the docstring of getAllCellInfo() 
Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
 2015-06-08 12:38:40 -07:00
Amit Mahajan
158988c971 am 829c0977: Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 
* commit '829c097761e39b608b8b965a2c03f11ce5a95d2b':
  Adding temporary logging to debug CTS failure (for CellLocationTest).
 2015-06-08 17:39:05 +00:00
Amit Mahajan
08ffeb63c9 am 9b5e2124: Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 
* commit '9b5e2124d0bc80370e80e0525e34a46eda61ded7':
  Changing getSimState to use slot idx instead of sub id.
 2015-06-08 17:39:01 +00:00
Andrew Flynn
410bceba5b am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit '2429e6a8d96a4eba83e22c35595fa05e0f5e51f2':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 17:38:55 +00:00
Amit Mahajan
829c097761 Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 2015-06-08 17:27:29 +00:00
Amit Mahajan
9b5e2124d0 Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 2015-06-08 17:26:03 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Amit Mahajan
9387f1dfe3 Changing getSimState to use slot idx instead of sub id. 
Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
 2015-06-08 17:01:23 +00:00
Etan Cohen
024557b2af Merge changes Ie0dd7a44,I5b3c0a48 into mnc-vt-dev 
* changes:
  Merge commit 'e79fed5' into merge
  Merge commit 'abfdaea' into merge
 2015-06-06 00:10:37 +00:00
Etan Cohen
89a2c471bc Merge commit 'abfdaea' into merge 
Change-Id: I5b3c0a48c9d47bcb02d49132077f9e258481de2d
 2015-06-05 17:07:48 -07:00
Sanket Padawe
6bf85052a9 am 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev 
* commit '912f705f1f98ba2fc744601994dfbe12f391b0ae':
  Suppress default logging in SubscriptionManager.
 2015-06-06 00:06:36 +00:00