Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,183 Commits 3 Branches 0 Tags
e29aceaeaba3fb108c4690a24c8a0c5248aa444b
Commit Graph

6868 Commits

Author SHA1 Message Date
Martijn Coenen
66f29aa4a5 am 5aa45ef5: Merge "HCE/SE foreground support." 
* commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9':
  HCE/SE foreground support.
 2014-05-08 23:37:00 +00:00
Martijn Coenen
781a83878a Merge "HCE/SE foreground support." 2014-05-08 23:33:51 +00:00
Eino-Ville Talvala
0a7540c53a am 59969600: Merge "Add android.hardware.camera.external feature." 
* commit '599696000400582773dcff7b6142b603ef68ec6b':
  Add android.hardware.camera.external feature.
 2014-05-08 21:50:32 +00:00
Eino-Ville Talvala
2e58d6de06 Merge "Add android.hardware.camera.external feature." 2014-05-08 21:33:49 +00:00
justinzhang
a0111698d4 am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task" 
* commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc':
  DevicePolicyManager Authentication for Lock Task
 2014-05-08 20:38:45 +00:00
justinzhang
ed32c842c6 Merge "DevicePolicyManager Authentication for Lock Task" 2014-05-08 20:35:12 +00:00
Emily Bernier
530f133a3f am f5a4eabb: Merge "New user restrictions for EDU" 
* commit 'f5a4eabbd7531271f523cd326e2b1d0a449b1168':
  New user restrictions for EDU
 2014-05-08 19:55:39 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
justinzhang
511e0d8323 DevicePolicyManager Authentication for Lock Task 
Here we let DevicePolicyManager keep a list of tasks that are
allowed to start the lock task mode. This list can only be set by
a device owner app. The ActivityManager will call
DevicePolicyManager to check whether a given task can start the
lock task mode or not.

Change-Id: I650fdae43fc35bf9fd63452283f4e2bbadd11551
Bug: 14611303
 2014-05-08 15:00:14 -04:00
Eino-Ville Talvala
9131da28e1 Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 11:53:01 -07:00
ztenghui
f563ef8102 am 3225a6b5: Further cleaning on animated part of VectorDrawable. 
* commit '3225a6b5b09c8ec78071186bfb20289600812c21':
  Further cleaning on animated part of VectorDrawable.
 2014-05-08 17:40:09 +00:00
ztenghui
ddbbb8ae85 Further cleaning on animated part of VectorDrawable. 
State changed support is gone.
Rename VAnimatedPath.
Remove the obsolete documents.
Update the tests to reflect the API changes.

Change-Id: Icdc19c6519a4e29975877c1d167e61c8fa14a371
 2014-05-08 10:16:34 -07:00
Jean-Michel Trivi
9b128af442 am 720f52c1: Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer" 
* commit '720f52c13af94e73ffcb3156a6e0a9999d017637':
  Unhide AudioTrack.write() method for non-blocking and ByteBuffer
 2014-05-08 16:04:07 +00:00
Jean-Michel Trivi
96567e2112 Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer" 2014-05-08 15:58:46 +00:00
Sander Alewijnse
12fa1fe307 am 7d5cd652: Merge "Add API to disable account management for certain types of accounts." 
* commit '7d5cd65262c9a5735f660e05ce89a02f2d28be14':
  Add API to disable account management for certain types of accounts.
 2014-05-08 12:52:50 +00:00
Sander Alewijnse
5c082dd22f Merge "Add API to disable account management for certain types of accounts." 2014-05-08 12:49:10 +00:00
Dan Sandler
fea08f22de am 20d80a4a: Merge "Quantum notification improvements." 
* commit '20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0':
  Quantum notification improvements.
 2014-05-08 11:34:31 +00:00
Dan Sandler
b325c80d3d Merge "Quantum notification improvements." 2014-05-08 11:30:46 +00:00
Sander Alewijnse
5c02db60be Add API to disable account management for certain types 
of accounts.

The account types with disabled account management are stored in a
blacklist in the active admin object, editable by profile owners.

Change-Id: I57dc5f709ad79674fa28dd006969283585daea24
 2014-05-08 12:28:07 +01:00
Neil Fuller
34a6418cba am a05be305: Merge "Unhide further 1.7-era APIs" 
* commit 'a05be305825501bdfc7fe812d675cc86d1cae221':
  Unhide further 1.7-era APIs
 2014-05-08 10:32:32 +00:00
Neil Fuller
37a61c5e84 Merge "Unhide further 1.7-era APIs" 2014-05-08 10:28:25 +00:00
Neil Fuller
c3eb973853 Unhide further 1.7-era APIs 
Related to change: I15ef2991b03a9503d6917a7f3351b32f42f662fb

Change-Id: Ie8185f78c749c3d48195c6943ebfe1cd7b3b8280
 2014-05-08 10:49:37 +01:00
Dan Sandler
26e81cf14b Quantum notification improvements. 
New API introduced here: Notification.color (and
Builder.setColor()), allowing apps to specify an accent
color to be used by the template. The Quantum templates
(which are now the only kind we support) use this when
creating a circular background to draw behind the smallIcon
in the expanded form.

Additionally, the quantum and legacy templates are no longer
in superposition; all apps using Builder will get quantum.

Change-Id: Iac5e2645cc5c2346ed458763f2280ae9c6368b62
 2014-05-08 01:21:55 -04:00
Jason Sams
5066ac85d3 am 6eb4c5bf: Merge "Add flags to context creation for RS" 
* commit '6eb4c5bf830c952d70473edff5f2b8e5ab98ce29':
  Add flags to context creation for RS
 2014-05-08 00:05:04 +00:00
Jason Sams
8999bdc63c Merge "Add flags to context creation for RS" 2014-05-08 00:01:39 +00:00
Alan Viverette
e80e2fc71e am 91c091cf: Merge "State based animators for Views" 
* commit '91c091cf7b732796d26971de6a508966e24d40a0':
  State based animators for Views
 2014-05-08 00:01:07 +00:00
Yigit Boyar
f4c5bf30b4 State based animators for Views 
Set quantum theme buttons to elevate 2dp on press

Change-Id: Ibf4f5ef166b901382c304d392eba075836a96a35
 2014-05-07 16:52:17 -07:00
Vinod Krishnan
6c6fd8ad50 am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'f215073420706e29305da762fa5f9f53dcf330ff':
  Adding a HeartRate Feature
 2014-05-07 23:44:59 +00:00
Zhijun He
02157bb93f am eb440873: Camera: remove some DNG tags 
* commit 'eb44087344cb545f97f78b802dc91bfec252f0f7':
  Camera: remove some DNG tags
 2014-05-07 23:42:39 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
 2014-05-07 22:57:45 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
 2014-05-07 21:46:45 +00:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags 
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
 2014-05-07 21:33:23 +00:00
Jason Sams
26e9051957 Add flags to context creation for RS 
We have a number of context options exposed though native
that were not available though the Java API.  This brings them
to parity.  Will finish plumbing in a follow on CL.

Change-Id: I8c65ee743d0e750e418304127b84088f25176c38
 2014-05-07 14:23:46 -07:00
Emily Bernier
394a6cdd98 New user restrictions for EDU 
New user restrictions will allow schools to prevent students from 1) using
device microphones, 2) adjusting device volume, and 3) mounting physical
external media.

Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
 2014-05-07 17:04:58 -04:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Jason Monk
1a285ee293 am 6e6d1f21: Merge "Make Lock Task API public." 
* commit '6e6d1f214766bbf00b4b0298d95ec1b42461e470':
  Make Lock Task API public.
 2014-05-07 19:22:38 +00:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00
Jason Monk
a57e5e006b Make Lock Task API public. 
Change-Id: Ieaf944dc69e206e091d8257e0f92013b082ceaac
 2014-05-07 15:15:53 -04:00
Jean-Michel Trivi
a713814f17 Unhide AudioTrack.write() method for non-blocking and ByteBuffer 
Unhide the write mode constants.
Unhide the write method where data is stored in a ByteBuffer.

Bug 7919023

Change-Id: Ie9e24c744067f164d1a3e3363c7718b0a70e1cae
 2014-05-07 12:10:06 -07:00
Jason Monk
4ef10931b4 am 059637c4: Merge "Make proxy API public" 
* commit '059637c4970bdbed19689a5e9ecb40a9ebe5a739':
  Make proxy API public
 2014-05-07 18:57:01 +00:00
Jason Monk
9d75ccb6a1 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
207900c23b Make proxy API public 
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
 2014-05-07 14:23:53 -04:00
RoboErik
d2b5fdcd89 am 0f4b0ba6: Merge "Add a class for managing Session priority" 
* commit '0f4b0ba6f43bffe68d7e96c6cd78b38406e32c0a':
  Add a class for managing Session priority
 2014-05-07 17:30:01 +00:00
RoboErik
49817456ab am 13ca0e29: Merge "Add APIs for creating a system priority session and getting controllers" 
* commit '13ca0e29030721f380082bc937f3b1c40d3fc318':
  Add APIs for creating a system priority session and getting controllers
 2014-05-07 17:29:57 +00:00
RoboErik
153187d05b Merge "Add a class for managing Session priority" 2014-05-07 17:26:28 +00:00
RoboErik
780bee2633 Merge "Add APIs for creating a system priority session and getting controllers" 2014-05-07 17:26:16 +00:00
Craig Mautner
cf24765664 am d5a99922: Merge "Add attributes and flags for DocCentric." 
* commit 'd5a9992273039671f2a7155597cf4150599df761':
  Add attributes and flags for DocCentric.
 2014-05-07 16:05:49 +00:00
Craig Mautner
77f5a0f517 Merge "Add attributes and flags for DocCentric." 2014-05-07 16:00:03 +00:00
Craig Mautner
2dac056179 Add attributes and flags for DocCentric. 
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: I04acc9333c3725b4db94a954358eb78df507ff53
 2014-05-07 08:41:27 -07:00
Adam Connors
0c89304fe0 am e068ba87: Add enableSystemApp methods to DevicePolicyManager 
* commit 'e068ba879ea9a712bf7ad6c91e55238f76f122d9':
  Add enableSystemApp methods to DevicePolicyManager
 2014-05-07 15:25:19 +00:00