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

2164 Commits

Author SHA1 Message Date
Chet Haase
873d3ca43d Merge "Remove Animatable interface" into jb-mr2-dev 2013-04-17 13:36:00 +00:00
Chet Haase
e8cee38c6a Remove Animatable interface 
Push the interface methods from the new Animatable interface back
down into Animator, from whence they came.

Issue #8634310 Remove Animatable interface

Change-Id: I79e26001709d791d54fcb02561640fe2e008b1fd
 2013-04-16 17:54:14 -07:00
Jesse Hall
25beec154b am b690c9a2: am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 
* commit 'b690c9a2210f020341ba68dd947b4e2ff43e007d':
  Unhide android.opengl.GLES30 class and contents
 2013-04-16 15:25:16 -07:00
Jesse Hall
c7bdd50c97 Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 2013-04-16 22:17:20 +00:00
Jesse Hall
58d80c53c0 Unhide android.opengl.GLES30 class and contents 
Bug: 8566953
Change-Id: I5273fb3bff642da5ff1eecb5899e8051402b19ca
 2013-04-15 17:38:36 -07:00
Jeff Sharkey
ba1bd9aab2 Merge "Support persistable Uri permission grants." 2013-04-15 20:23:14 +00:00
Jeff Sharkey
328ebf2221 Support persistable Uri permission grants. 
When granting a Uri permission with new PERSIST_GRANT_URI_PERMISSION
flag, persist that grant across device reboots until explicitly
revoked.  Adds new persistedModeFlags dimension to UriPermission,
and moves all flag mutation into UriPermission for clarity.  Adds
flag documentation.  Only inflate HashSet as needed.

Write persisted grants into XML file, saving based on source and
target package name and user handle.  Sanity check grants when
parsing.

Wipe all grants from/to a package when uninstalled, and wipe any
transient grants when a package or user is force stopped.

Persistable grants are always considered "needed."

Change-Id: I3f001571b498fd607456a1257a6383f904d19497
 2013-04-15 12:34:40 -07:00
Jean-Michel Trivi
46863c6dea am 42732e10: am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '42732e1037b48e9bf71e9965bc28ddb5d8242fa4':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:22:42 -07:00
Jean-Michel Trivi
74e56f1929 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 2013-04-15 17:13:46 +00:00
Ben Murdoch
5d4d155eaf am e41c3cdb: am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 
* commit 'e41c3cdb9c4b56cb1dc48242d7910df9a16bf8b7':
  Deprectate WebViewDatabase password methods.
 2013-04-15 08:56:42 -07:00
Ben Murdoch
7e157f321c Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 2013-04-15 15:48:25 +00:00
Andreas Huber
9015e018eb am e813a85c: am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 
* commit 'e813a85c97f542bbfc306a30ce2ae4c305133203':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
 2013-04-15 08:38:28 -07:00
Andreas Huber
2de0771da2 Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 2013-04-15 15:16:27 +00:00
Jason Sams
f38c6ab76a am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev 
* commit 'c4294ed2f1de5c89b5e283942e0d5f8cd8822bfb':
  Unhide new RS APIs.
 2013-04-14 19:28:29 -07:00
Jason Sams
330a9fe323 Merge "Unhide new RS APIs." into jb-mr2-dev 2013-04-15 02:22:14 +00:00
Jean-Michel Trivi
9157477300 Public APIs for media position in RemoteControlClient 
New APIs in android.media.RemoteControlClient to support application
 exposing their current media playback position and speed, and
 let the framework request position changes.

Bug 8120740

Change-Id: Ibfc41f60e279413c26147e3276d96f28b7f506e7
 2013-04-14 12:17:56 -07:00
Jason Sams
02d56d90e0 Unhide new RS APIs. 
This exposes the fast path handling of YUV data.

bug 8566866

Change-Id: Iaa3700100db61dd51d16d80ea8ae22f2dcc41bb0
 2013-04-14 02:51:57 +00:00
Amith Yamasani
6011355635 am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUser 
* commit '6064c5cf22b16464a82f04f0a9560f412ba2a90a':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:25:16 -07:00
Amith Yamasani
e1375908a5 Rename isUserLimited to isLinkedUser 
A linked user is derived from another user and shares their accounts.

Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
 2013-04-13 16:48:35 -07:00
Amith Yamasani
dc97936e36 Fix attr id update due to api change upstream 
Change-Id: Ief2e90522322ecc6e3832f27d7b00b146dce54fc
 2013-04-13 16:40:00 -07:00
Amith Yamasani
362c4ddff3 am 19c95bcc: am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit '19c95bcc76cd68e241e3d29a5e49fc892521527d':
  Introducing manifest flag requiredAccountType
 2013-04-13 16:01:59 -07:00
Amith Yamasani
e188c984dd Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 2013-04-13 22:54:01 +00:00
Svetoslav
14210466bf resolved conflicts for merge of dd03b6dc to master 
Change-Id: Ie6628e26d8a033bdce54f9d20156b0358a0956c3
 2013-04-12 18:03:50 -07:00
Amith Yamasani
ccbe389b4d Introducing manifest flag requiredAccountType 
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.

Bug: 8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
 2013-04-12 17:52:42 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Kenny Root
520c1036cb am 019895e2: am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '019895e2e4744f9ddd76f5df6d59a74dbc5bcd42':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:13:39 -07:00
Kenny Root
8692685a54 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-13 00:04:17 +00:00
Amith Yamasani
8c176b2513 am b0511d47: am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'b0511d47eb15f4f7941d278467964f2cd6dd2871':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:39:15 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
1d9648df51 am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:26:55 -07:00
Kenny Root
2eeda7286f AndroidKeyStore: Add encrypted flag 
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.

Bug: 8122243
Change-Id: Ia802afe965f2377ad3f282dab8c512388c705850
 2013-04-12 15:19:48 -07:00
Chet Haase
0a41431d69 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87 Rename isUserRestricted to isUserLimited 
Avoid confusion with user restrictions which can be applied to
non-limited users as well.

Updated the java docs.

Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
 2013-04-12 15:13:53 -07:00
Kristian Monsen
6c3ec1cf99 am 82b6de03: am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '82b6de03cf2d3a66881cc3664dfdcf80c885c226':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:14:30 -07:00
Kristian Monsen
03499a23f9 Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 2013-04-12 21:05:15 +00:00
Chet Haase
430742f090 API and doc cleanup, plus small animation/UI features 
Adding features which round out the animation APIs (missing
getters, etc.). Also fix doc typos.

Issue #8350510 Add APIs needed for future animation capabilities

Change-Id: I063736848ba26e6d6c809b15fc3a103c74222f46
 2013-04-12 13:44:22 -07:00
Emily Bernier
d65b268fcd am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:29:35 -07:00
Emily Bernier
ce70311b67 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 2013-04-12 20:21:36 +00:00
Tim Murray
d7fec6edad am f151a541: am d6b8a035: Merge "Add support for synchronous get()." into jb-mr2-dev 
* commit 'f151a5411eb6afd104daac10b3e43f5e3a60c61d':
  Add support for synchronous get().
 2013-04-12 13:11:45 -07:00
Tim Murray
d6b8a03533 Merge "Add support for synchronous get()." into jb-mr2-dev 2013-04-12 20:03:52 +00:00
Adam Momtaz
8f6f1f43ee Allow for setting test type as a monkey. 
1. This allows UiAutomation type tests to run as if an
   android monkey test is running. This allows applications
   that recognize that they are drive by a test framework and
   avoid performing certain actions such as calling 911.

2. Fixed a bug where the UiAutomation#disconnect() was not
   called when the instrumentation is shutdown.

bug: 8588857

Change-Id: I9e3624dfbe2b8f81f27805711de1098ea2edd03d
 2013-04-12 12:54:34 -07:00
Svetoslav
3ba01a7cc3 am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 
* commit '9d02928e4349cecfa14e195d3d6f40e68c5fc468':
  Adding APIs for an accessibility service to intercept key events.
 2013-04-11 22:51:09 -07:00
Svetoslav
14c8c741f7 Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 2013-04-12 05:45:43 +00:00
Jason Sams
ca22277d33 am d4b1b98d: am a2f289a4: Merge "USAGE_IO_INPUT buffer notifications" into jb-mr2-dev 
* commit 'd4b1b98dfd9090cf8ccf7e713d0cca9049cb10a2':
  USAGE_IO_INPUT buffer notifications
 2013-04-11 19:27:15 -07:00
Jason Sams
a2f289a40d Merge "USAGE_IO_INPUT buffer notifications" into jb-mr2-dev 2013-04-12 02:20:11 +00:00
Jason Sams
739c8263a1 USAGE_IO_INPUT buffer notifications 
Change-Id: I6ec0508089029da9ed118127f0c13b7b189ef5e9
 2013-04-11 18:14:26 -07:00
Fabrice Di Meglio
98c8c890aa am 4febbf35: am bd286426: Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb-mr2-dev 
* commit '4febbf35011ecb30796c78cf3e159ef781564f45':
  Fix bug #8599905 Add simple BidiFormatter getInstance() helper API
 2013-04-11 17:50:26 -07:00
Fabrice Di Meglio
bd286426fa Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb-mr2-dev 2013-04-12 00:46:07 +00:00
Dianne Hackborn
b999d37009 am d9d9c17d: am 77216642: Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev 
* commit 'd9d9c17dda9a343b8b5386d1b9233c89ab6f3419':
  Implement #7341342 API request: way to determine current orientation...
 2013-04-11 17:15:02 -07:00
Dianne Hackborn
7721664288 Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev 2013-04-12 00:08:13 +00:00