7285 Commits

Author SHA1 Message Date
Amith Yamasani
dc56ceb6a1 Merge "New permission to manage device admins" 2013-07-24 00:06:34 +00:00
Martijn Coenen
7ea1ab60b0 Merge "Re-use "name" attribute for NFC AIDs." 2013-07-23 22:27:05 +00:00
Scott Greenwald
9a05b31aab Add support for notification scorers.
This CL adds an interface and classes for scoring notifications.
The NotificationManagerService initializes an array of scorers
specified as a resource. When a Notification is enqueued, the
getScore() method is called successively on the scorers, each
getting the Notification to be scored, and the score outputted
by the previous scorer. At present there is a single scorer
which prioritizes Notifications that mention the display name of
a starred contact.

To turn off the StarredContactNotificationScorer:
  adb shell settings put global contact_scorer_enabled 0

Change-Id: Ic16c80952e7c85bdde292ebb3f7900efb01f2e29
2013-07-23 17:16:51 -04:00
Baligh Uddin
7b854fcc6e Merge "Import translations. DO NOT MERGE" 2013-07-23 15:39:46 +00:00
Martijn Coenen
434249ef62 Re-use "name" attribute for NFC AIDs.
Change-Id: I92895e0f21a639897c45ec184580c43ba8b22dca
2013-07-22 19:47:57 -07:00
Martijn Coenen
fd23eca5ba Merge "First shot at (host-based) card emulation APIs." 2013-07-22 23:20:01 +00:00
Amith Yamasani
a418cf21c9 New permission to manage device admins
The previously used permission was doing double duty as the permission
that device admins to check for to ensure that calls are coming from valid
system components.

MANAGE_DEVICE_ADMINS is system|signature and is now required to add/remove
device admins.

Required for:
Bug: 9856348

Change-Id: I64385d2ec734c3957af21b5a5d9cffd8a3bcd299
2013-07-22 10:42:46 -07:00
Martijn Coenen
5eaa8970aa First shot at (host-based) card emulation APIs.
HostApduService: convenience service class for implementing
a service that registers a set of ISO7816-4 AIDs and emulates
the corresponding application inside the service itself.

SeApduService: convenience service class for implementing
a service that registers a set of ISO7816-4 AIDs that reflect
applications installed on an embedded secure element or UICC. Contains
event hooks to allow the service to handle eSE/UICC events that
correspond to those AIDs.

Change-Id: I44191bd4abcbbe4f1fd36a9fd42639fe5c0cf496
2013-07-22 10:20:49 -07:00
Baligh Uddin
d5a701bc0a Import translations. DO NOT MERGE
Change-Id: Idc81ee9e199491d650d37bcd39ae26bba763f436
Auto-generated-cl: translation import
2013-07-22 08:58:39 -07:00
Robert Greenwalt
538cdb98ef resolved conflicts for merge of 85b5e4c4 to master
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
2013-07-19 14:09:30 -07:00
Robert Greenwalt
85b5e4c48f am b5bf655c: am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
  Add gservices updater for carrier provisioning url
2013-07-19 13:37:41 -07:00
Amith Yamasani
7e81dd274f Merge "Have UserManagerService clear the restrictions and unblock apps" 2013-07-19 19:48:21 +00:00
Baligh Uddin
a2089f47fe Merge "Import translations. DO NOT MERGE" 2013-07-19 17:12:19 +00:00
Amith Yamasani
1a7472e722 Have UserManagerService clear the restrictions and unblock apps
Since this is an operation that could take a few seconds to run and needs to be
completed even if Settings dies, best to do it in the user manager.

Refactored PIN challenge/setup UI with a field to verify existing pin
when changing to a new one.

Change-Id: I0b7df5b2ccb7f343aa9282a9245d3bc2b577a794
2013-07-18 16:12:27 -07:00
Baligh Uddin
ce68807087 Import translations. DO NOT MERGE
Change-Id: I93223b932aad3c6331d2da2acf27c5085af00028
Auto-generated-cl: translation import
2013-07-18 11:30:15 -07:00
Justin Koh
cacfe69b68 Add FX_KEYPRESS_INVALID constant to AudioManager.
Add FX_KEYPRESS_INVALID constant to AudioManager. This is a sound which should
play if the user tries to click or press on an element which is disabled.

Change-Id: Idd8953abeddd1afb51f7f190f9fb612ef672defa
2013-07-18 10:46:19 -07:00
Robert Greenwalt
e182bfe398 Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-17 14:05:33 -07:00
Svetoslav
17b7f6e6d4 Clean up of the print APIs.
1. Fixed a case in which the onPrintCompleted callback may not be invoked.

2. Added string resulrces for the different error messages for failed
   printing in OnPrintCompletedCallback

3. Fixed the string comments for the MediaSize constants.

4. Added APIs to create certain print attributes by passing in a
   string label instead of resource and package name since in some cases
   a print service may be getting already internationalized lables
   or it may not know all possible values.

5. Fixed a crash in PrintJobConfigActivity if there is no input or
   output tray.

Change-Id: Ie877b7dc669051606394aa290e6d2b979a42db4c
2013-07-16 14:39:32 -07:00
Svetoslav Ganov
c59df3caeb Merge "Refactoring of the print sub-system and API clean up." 2013-07-16 20:01:34 +00:00
Svetoslav Ganov
a00271533f Refactoring of the print sub-system and API clean up.
1. Now a user state has ins own spooler since the spooler app is
   running per user. The user state registers an observer for the state
   of the spooler to get information needed to orchestrate unbinding
   from print serivces that have no work and eventually unbinding from
   the spooler when all no service has any work.

2. Abstracted a remote print service from the perspective of the system
   in a class that is transparently managing binding and unbinding to
   the remote instance.

3. Abstracted the remote print spooler to transparently manage binding
   and unbinding to the remote instance when there is work and when
   there is no work, respectively.

4. Cleaned up the print document adapter (ex-PrintAdapter) APIs to
   enable implementing the all callbacks on a thread of choice. If
   the document is really small, using the main thread makes sense.

   Now if an app that does not need the UI state to layout the printed
   content, it can schedule all the work for allocating resources, laying
   out, writing, and releasing resources on a dedicated thread.

5. Added info class for the printed document that is now propagated
   the the print services. A print service gets an instance of a
   new document class that encapsulates the document info and a method
   to access the document's data.

6. Added APIs for describing the type of a document to the new document
   info class. This allows a print service to do smarts based on the
   doc type. For now we have only photo and document types.

7. Renamed the systemReady method for system services that implement
   it with different semantics to systemRunning. Such methods assume
   the the service can run third-party code which is not the same as
   systemReady.

8. Cleaned up the print job configuration activity.

9. Sigh... code clean up here and there. Factoring out classes to
   improve readability.

Change-Id: I637ba28412793166cbf519273fdf022241159a92
2013-07-16 12:59:59 -07:00
Baligh Uddin
59983f7b45 Merge "Import translations. DO NOT MERGE" 2013-07-16 02:24:34 +00:00
michaelwr
20555cb645 Merge "Add a keycode to switch audio tracks (1/2)" 2013-07-16 01:38:46 +00:00
Alan Viverette
08ec9b2f93 Merge "Revert "Update ListMenuItemView to use a single RelativeLayout"" 2013-07-15 23:56:24 +00:00
Alan Viverette
d9ddf52c12 Revert "Update ListMenuItemView to use a single RelativeLayout"
This reverts commit 8933efd49a0b2c10ddb30b23b57f5676634d0277.

BUG: 9774755
Change-Id: Ib6481e396092da81edd2c69f619f45f61e8fa393
2013-07-15 16:43:58 -07:00
Jeff Brown
6c1c0b6cbe Declare permission for accessing input flinger.
Change-Id: I2914b301b74e0d310a9e95e2d6fb5cb72d3e3703
2013-07-15 15:08:39 -07:00
Evan Charlton
10dd2b6464 Merge "Add carrier setup app integration" 2013-07-15 18:31:20 +00:00
Baligh Uddin
7ac4b9662d Import translations. DO NOT MERGE
Change-Id: I4fe9c9f3884aa5c5a3ffce69f72bd1cafde0802b
Auto-generated-cl: translation import
2013-07-15 09:45:36 -07:00
Jaekyun Seok
bfdad8ecad Add a keycode to switch audio tracks (1/2)
A key to switch audio tracks is general on media devices like blu-ray.

Bug: 9728155
Change-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448
2013-07-12 17:23:29 +09:00
Geremy Condra
1df62d2783 Merge "Permissions to protect socket marking settings" 2013-07-11 22:25:14 +00:00
Baligh Uddin
634c1cc6f8 Import translations. DO NOT MERGE
Change-Id: Ie5e451abf345a2dea6e4f970b24166f1ba7e205d
Auto-generated-cl: translation import
2013-07-10 18:24:25 -07:00
Chad Brubaker
f11e5d3476 Permissions to protect socket marking settings
Add the manifest entries for the net_mark group that protects marking
traffic as from another user in per user routing.

Change-Id: I97932a9e407467a7adc733caea8746a712bc6b68
2013-07-09 13:48:21 -07:00
Eric Laurent
7cf06209dc Headphones volume warning disabled by default
Enable headphone volume limitation explicitely for
countries where EN60950 is applicable.

Bug: 8877359.

Change-Id: Ida9e6678ee451350b826492f0085726003f0d39d
2013-07-03 17:59:03 -07:00
Baligh Uddin
7368bf9ebf Import translations. DO NOT MERGE
Change-Id: I59059107c587612def1a2e6a8aa07f62cf41d599
Auto-generated-cl: translation import
2013-07-03 11:36:26 -07:00
Baligh Uddin
440df1bbb9 am 505565c3: Import translations. DO NOT MERGE
* commit '505565c3481b59b2856c9b5c42ae19f54fdfcfb1':
  Import translations. DO NOT MERGE
2013-07-03 11:35:02 -07:00
Baligh Uddin
505565c348 Import translations. DO NOT MERGE
Change-Id: I5e1ae1aaa21b272c4731ec6f6f8d70a3c909a35a
Auto-generated-cl: translation import
2013-07-03 11:22:24 -07:00
Baligh Uddin
be432a6983 Import translations. DO NOT MERGE
Change-Id: I3e7dc51b5b326c7269cdb31a02642511d6dbf52b
Auto-generated-cl: translation import
2013-07-03 11:20:22 -07:00
Baligh Uddin
7f48bea96b Merge "Import translations. DO NOT MERGE" 2013-07-02 05:37:13 +00:00
Baligh Uddin
22b41b0c09 am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '178807d590c1c873bd5eaae4c1cf331549fb6bbf':
  Import translations. DO NOT MERGE
2013-07-01 20:32:18 -07:00
Baligh Uddin
d6696b7c0b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 03:28:52 +00:00
Wink Saville
9f6a7f424f Merge commit '3b5d686e' into fix-merge-conflict
* commit '3b5d686e':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
2013-07-01 16:12:31 -07:00
Wink Saville
3b5d686e68 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
2013-07-01 15:41:31 -07:00
Wink Saville
59046f40ba Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 2013-07-01 22:36:48 +00:00
Baligh Uddin
f53efeec68 Import translations. DO NOT MERGE
Change-Id: If06b3e3b67b99033bdf11df3f780c974f57ef832
Auto-generated-cl: translation import
2013-07-01 07:28:12 -07:00
Baligh Uddin
7dfba282d0 Import translations. DO NOT MERGE
Change-Id: I64e7aab52eb9fe13b709d0243d1275b381f3301e
Auto-generated-cl: translation import
2013-07-01 07:12:53 -07:00
Wink Saville
ab9321d13d Add checkMobileProvisioning to ConnectivityService.
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-06-29 21:10:57 -07:00
Evan Charlton
843d5ea5ec Add carrier setup app integration
Add an intent to invoke a native carrier setup app. This is paired
with the INVOKE_CARRIER_SETUP permission, though it is up to the app
to enforce that callers hold this permission.

Change-Id: I317a40675de7e9587de23c028459be2331a2f8a2
2013-06-27 15:06:55 -07:00
Yorke Lee
a2c8cbdd95 am 11b249f6: am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit '11b249f641163eefbe7ec8582107c4ed5726baea':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:57:43 -07:00
Yorke Lee
11b249f641 am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit 'f6ec3048546cf8f2821f8a67645df3bab243e591':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:52:37 -07:00
Yorke Lee
e6cb43a1ea Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev 2013-06-27 21:46:19 +00:00
Alan Viverette
62339911ba Merge "Update ListMenuItemView to use a single RelativeLayout" 2013-06-27 21:38:31 +00:00