git.osdn.net Git - android-x86/frameworks-base.git/log

The Android Open Source Project [Mon, 15 Apr 2013 17:49:03 +0000 (10:49 -0700)]

am 2c5dca4a: Reconcile with jb-mr2-release - do not merge

* commit '2c5dca4a3f227d5e4e103bdbd61f584446bd229f':
Fix keyguard pattern invalidate bug
Ensure looper quits after all other messages are handled.

commit | commitdiff | tree

The Android Open Source Project [Mon, 15 Apr 2013 17:46:06 +0000 (10:46 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I618d51505419200bc282404ec2af470be97f1fa7

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 15 Apr 2013 17:22:42 +0000 (10:22 -0700)]

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

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 15 Apr 2013 17:19:24 +0000 (10:19 -0700)]

am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev

* commit '74e56f19299cd04e2e6c6a9a19af260551750d6a':
Public APIs for media position in RemoteControlClient

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 15 Apr 2013 17:13:45 +0000 (17:13 +0000)]

Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev

commit | commitdiff | tree

Ben Murdoch [Mon, 15 Apr 2013 15:56:42 +0000 (08:56 -0700)]

am e41c3cdb: am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev

* commit 'e41c3cdb9c4b56cb1dc48242d7910df9a16bf8b7':
Deprectate WebViewDatabase password methods.

commit | commitdiff | tree

Ben Murdoch [Mon, 15 Apr 2013 15:52:46 +0000 (08:52 -0700)]

am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev

* commit '7e157f321c690e41f0f18a556f989fd20709469f':
Deprectate WebViewDatabase password methods.

commit | commitdiff | tree

Ben Murdoch [Mon, 15 Apr 2013 15:48:24 +0000 (15:48 +0000)]

Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev

commit | commitdiff | tree

Andreas Huber [Mon, 15 Apr 2013 15:38:28 +0000 (08:38 -0700)]

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

commit | commitdiff | tree

Andreas Huber [Mon, 15 Apr 2013 15:38:25 +0000 (08:38 -0700)]

am baf4a057: am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev

* commit 'baf4a057f8d4b5a97a5b3da276b59c2cd175e4b7':
Document that MediaPlayer.getDuration() returns an invalid value (-1)

commit | commitdiff | tree

Andreas Huber [Mon, 15 Apr 2013 15:34:37 +0000 (08:34 -0700)]

am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev

* commit '2de0771da2b6c07f717d62ae4e4be93702af9a43':
MediaExtractor.setDataSource(...) has always thrown IOExceptions from

commit | commitdiff | tree

Andreas Huber [Mon, 15 Apr 2013 15:34:34 +0000 (08:34 -0700)]

am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev

* commit '5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
Document that MediaPlayer.getDuration() returns an invalid value (-1)

commit | commitdiff | tree

Andreas Huber [Mon, 15 Apr 2013 15:16:26 +0000 (15:16 +0000)]

Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev

commit | commitdiff | tree

Andreas Huber [Mon, 15 Apr 2013 15:15:41 +0000 (15:15 +0000)]

Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev

commit | commitdiff | tree

The Android Automerger [Mon, 15 Apr 2013 12:55:51 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Jason Sams [Mon, 15 Apr 2013 02:28:29 +0000 (19:28 -0700)]

am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev

* commit 'c4294ed2f1de5c89b5e283942e0d5f8cd8822bfb':
Unhide new RS APIs.

commit | commitdiff | tree

Jason Sams [Mon, 15 Apr 2013 02:25:10 +0000 (19:25 -0700)]

am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev

* commit '330a9fe323cfb2f492665b73822f056c2c6689c2':
Unhide new RS APIs.

commit | commitdiff | tree

Jason Sams [Mon, 15 Apr 2013 02:22:12 +0000 (02:22 +0000)]

Merge "Unhide new RS APIs." into jb-mr2-dev

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 11 Apr 2013 01:37:43 +0000 (18:37 -0700)]

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

commit | commitdiff | tree

Jason Sams [Fri, 12 Apr 2013 23:40:50 +0000 (16:40 -0700)]

Unhide new RS APIs.

This exposes the fast path handling of YUV data.

bug 8566866

Change-Id: Iaa3700100db61dd51d16d80ea8ae22f2dcc41bb0

commit | commitdiff | tree

Amith Yamasani [Sun, 14 Apr 2013 00:25:16 +0000 (17:25 -0700)]

am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUser

* commit '6064c5cf22b16464a82f04f0a9560f412ba2a90a':
Rename isUserLimited to isLinkedUser

commit | commitdiff | tree

Amith Yamasani [Sun, 14 Apr 2013 00:22:09 +0000 (17:22 -0700)]

am e1375908: Rename isUserLimited to isLinkedUser

* commit 'e1375908a5f05e5c926e95049970c4505e4dfad9':
Rename isUserLimited to isLinkedUser

commit | commitdiff | tree

Amith Yamasani [Sat, 13 Apr 2013 23:48:35 +0000 (16:48 -0700)]

Rename isUserLimited to isLinkedUser

A linked user is derived from another user and shares their accounts.

Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8

commit | commitdiff | tree

Amith Yamasani [Sat, 13 Apr 2013 23:40:00 +0000 (16:40 -0700)]

Fix attr id update due to api change upstream

Change-Id: Ief2e90522322ecc6e3832f27d7b00b146dce54fc

commit | commitdiff | tree

Amith Yamasani [Sat, 13 Apr 2013 23:01:59 +0000 (16:01 -0700)]

am 19c95bcc: am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev

* commit '19c95bcc76cd68e241e3d29a5e49fc892521527d':
Introducing manifest flag requiredAccountType

commit | commitdiff | tree

Amith Yamasani [Sat, 13 Apr 2013 22:56:31 +0000 (15:56 -0700)]

am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev

* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
Introducing manifest flag requiredAccountType

commit | commitdiff | tree

Amith Yamasani [Sat, 13 Apr 2013 22:54:00 +0000 (22:54 +0000)]

Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev

commit | commitdiff | tree

Xavier Ducrohet [Sat, 13 Apr 2013 16:59:07 +0000 (09:59 -0700)]

am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable."

* commit 'ade20f49a1a0226c06a6ae5d8074c9c1cc14a152':
Revert "Make --non-constant-id generates non final IDs for styleable."

commit | commitdiff | tree

Xavier Ducrohet [Sat, 13 Apr 2013 16:57:01 +0000 (09:57 -0700)]

am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable."

* commit 'a068eeddc9d47af1a12afbe6efe7d00e8e903b9f':
Revert "Make --non-constant-id generates non final IDs for styleable."

commit | commitdiff | tree

Xavier Ducrohet [Sat, 13 Apr 2013 16:48:01 +0000 (09:48 -0700)]

Revert "Make --non-constant-id generates non final IDs for styleable."

This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.

commit | commitdiff | tree

Dianne Hackborn [Sat, 13 Apr 2013 01:09:58 +0000 (18:09 -0700)]

am 00c4c670: am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev

* commit '00c4c67069b9d13005ae072b8744c728aa73f99a':
Add a little more resource load tracing.

commit | commitdiff | tree

Dianne Hackborn [Sat, 13 Apr 2013 01:07:12 +0000 (18:07 -0700)]

am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev

* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
Add a little more resource load tracing.

commit | commitdiff | tree

Romain Guy [Sat, 13 Apr 2013 01:05:48 +0000 (18:05 -0700)]

am 5141bf80: am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev

* commit '5141bf801e9d58e618c76e4cdc042218b24193fc':
There should be a mandatory coder's license. Bug #8586560

commit | commitdiff | tree

Xavier Ducrohet [Sat, 13 Apr 2013 01:05:46 +0000 (18:05 -0700)]

am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev

* commit '95637018052655783a25e8123c5b6f898c4171e6':
Make --non-constant-id generates non final IDs for styleable.

commit | commitdiff | tree

Mathias Agopian [Sat, 13 Apr 2013 01:05:43 +0000 (18:05 -0700)]

am 4c87edfe: am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev

* commit '4c87edfe4d2dce71b7b723f25078cd4bd5d48456':
always trigger a re-draw when updating the transparent region hint

commit | commitdiff | tree

Jaikumar Ganesh [Sat, 13 Apr 2013 01:05:38 +0000 (18:05 -0700)]

am d347d519: am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev

* commit 'd347d519766e80b27c4f469f391c388c78f75373':
Fix race condition and disable call.

commit | commitdiff | tree

Svetoslav [Sat, 13 Apr 2013 01:03:50 +0000 (18:03 -0700)]

resolved conflicts for merge of dd03b6dc to master

Change-Id: Ie6628e26d8a033bdce54f9d20156b0358a0956c3

commit | commitdiff | tree

Dianne Hackborn [Sat, 13 Apr 2013 01:03:46 +0000 (01:03 +0000)]

Merge "Add a little more resource load tracing." into jb-mr2-dev

commit | commitdiff | tree

Amith Yamasani [Sat, 13 Apr 2013 00:52:42 +0000 (17:52 -0700)]

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

commit | commitdiff | tree

Dianne Hackborn [Sat, 13 Apr 2013 00:49:17 +0000 (17:49 -0700)]

Add a little more resource load tracing.

Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1

commit | commitdiff | tree

Romain Guy [Sat, 13 Apr 2013 00:41:35 +0000 (17:41 -0700)]

am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev

* commit '80fccb4dda9b2c46955e05b8be9e6071e0cc347b':
There should be a mandatory coder's license. Bug #8586560

commit | commitdiff | tree

Xavier Ducrohet [Sat, 13 Apr 2013 00:38:04 +0000 (17:38 -0700)]

am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev

* commit '629b1c4f2042ef0f1da4fe543cca34deedd3ba5d':
Make --non-constant-id generates non final IDs for styleable.

commit | commitdiff | tree

Romain Guy [Sat, 13 Apr 2013 00:37:37 +0000 (00:37 +0000)]

Merge "There should be a mandatory coder's license. Bug #8586560" into jb-mr2-dev

commit | commitdiff | tree

Xavier Ducrohet [Sat, 13 Apr 2013 00:35:54 +0000 (00:35 +0000)]

Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev

commit | commitdiff | tree

Mathias Agopian [Sat, 13 Apr 2013 00:32:32 +0000 (17:32 -0700)]

am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev

* commit '1763d6f957163faf6d3b629c36f4e8e90e0e31bd':
always trigger a re-draw when updating the transparent region hint

commit | commitdiff | tree

Mathias Agopian [Sat, 13 Apr 2013 00:28:16 +0000 (00:28 +0000)]

Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev

commit | commitdiff | tree

Jaikumar Ganesh [Sat, 13 Apr 2013 00:25:41 +0000 (17:25 -0700)]

am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev

* commit '02087754fb49de7421b982267a283482b70bc297':
Fix race condition and disable call.

commit | commitdiff | tree

Jaikumar Ganesh [Sat, 13 Apr 2013 00:22:06 +0000 (00:22 +0000)]

Merge "Fix race condition and disable call." into jb-mr2-dev

commit | commitdiff | tree

Svetoslav [Sat, 13 Apr 2013 00:21:52 +0000 (17:21 -0700)]

am 64076958: am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev

* commit '640769589b5eb6a4c9a09f8710c3a585320fa075':
Respect custom view drawing order when dispatching hover events.

commit | commitdiff | tree

Svetoslav Ganov [Sat, 13 Apr 2013 00:17:59 +0000 (17:17 -0700)]

am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev

* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
Allow for setting test type as a monkey.

commit | commitdiff | tree

Svetoslav [Sat, 13 Apr 2013 00:17:57 +0000 (17:17 -0700)]

am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev

* commit '72ab9b801794d42de83d3e7afb70ccc96ade7dfb':
Respect custom view drawing order when dispatching hover events.

commit | commitdiff | tree

Svetoslav Ganov [Sat, 13 Apr 2013 00:15:39 +0000 (00:15 +0000)]

Merge "Allow for setting test type as a monkey." into jb-mr2-dev

commit | commitdiff | tree

Svetoslav [Sat, 13 Apr 2013 00:14:56 +0000 (00:14 +0000)]

Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev

commit | commitdiff | tree

Kenny Root [Sat, 13 Apr 2013 00:13:39 +0000 (17:13 -0700)]

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

commit | commitdiff | tree

Kenny Root [Sat, 13 Apr 2013 00:09:57 +0000 (17:09 -0700)]

am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev

* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted

commit | commitdiff | tree

Dianne Hackborn [Sat, 13 Apr 2013 00:06:37 +0000 (17:06 -0700)]

am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev

* commit '18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93':
Add new resources trace, also trace apk dex loading.

commit | commitdiff | tree

Craig Mautner [Sat, 13 Apr 2013 00:05:50 +0000 (00:05 +0000)]

Merge "Implement separate stacks."

commit | commitdiff | tree

Kenny Root [Sat, 13 Apr 2013 00:04:16 +0000 (00:04 +0000)]

Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev

* changes:
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted

commit | commitdiff | tree

Dianne Hackborn [Sat, 13 Apr 2013 00:03:03 +0000 (17:03 -0700)]

am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev

* commit '15fed390c44972932f6dd7ce3bef1004e8b98b61':
Add new resources trace, also trace apk dex loading.

commit | commitdiff | tree

Mathias Agopian [Fri, 12 Apr 2013 22:13:12 +0000 (15:13 -0700)]

always trigger a re-draw when updating the transparent region hint

since SF now relies on receiving a frame for latching the
transparent region hint, we make sure we will indeed redraw
something.

Bug: 8581533

Change-Id: Ia12ddf5654a7deeac7628b799bfde4b8c16c992b

commit | commitdiff | tree

Svetoslav [Fri, 12 Apr 2013 21:13:20 +0000 (14:13 -0700)]

Respect custom view drawing order when dispatching hover events.

1. The event dispatch methods should respect the child drawing order.
Hover event dispatch in ViewGroup was not repsecting this order.

bug:8606799

Change-Id: Ie2fd3aff1292c21df23a04ca0aa03a97813c44ef

commit | commitdiff | tree

Dianne Hackborn [Fri, 12 Apr 2013 23:58:50 +0000 (23:58 +0000)]

Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 23:51:21 +0000 (16:51 -0700)]

There should be a mandatory coder's license.
Bug #8586560

And I don't deserve to pass the test.

Change-Id: Ic7886205511f16145a925fc860e4a03dfaf473d5

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 23:49:14 +0000 (16:49 -0700)]

am 543c5dcf: am efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev

* commit '543c5dcfcb93925a5b9ac073eedb0bd813b2ebe0':
Properly computer gradient textures width

commit | commitdiff | tree

Geremy Condra [Fri, 12 Apr 2013 23:48:19 +0000 (23:48 +0000)]

Merge "Add logic to handle changes to file_contexts during update."

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 23:42:20 +0000 (16:42 -0700)]

am efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev

* commit 'efcb252f767ab8737cc41cab4ee155faf2271417':
Properly computer gradient textures width

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 23:39:26 +0000 (23:39 +0000)]

Merge "Properly computer gradient textures width" into jb-mr2-dev

commit | commitdiff | tree

Geremy Condra [Sat, 6 Apr 2013 21:01:40 +0000 (14:01 -0700)]

Add logic to handle changes to file_contexts during update.

Bug: 8116902
Change-Id: I961a202f583eccd30f923c2f0882597096e8175c

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 23:32:05 +0000 (16:32 -0700)]

Properly computer gradient textures width

Only on devices that do not have the npot extension

Change-Id: I472a13dc707d2abaf5fcc06f99c9da343b333558

commit | commitdiff | tree

Xavier Ducrohet [Fri, 12 Apr 2013 23:00:49 +0000 (16:00 -0700)]

Make --non-constant-id generates non final IDs for styleable.

This was already done for all other types of resources, but not
for styleable (or the constants for the styleable array indices).

This fixes this. This only affects the SDK as this is used by the
SDK toolchain only.

Change-Id: Idfc2f7915be2b0e88590f38fd660610ffc7e160c

commit | commitdiff | tree

Craig Mautner [Mon, 8 Apr 2013 02:01:33 +0000 (19:01 -0700)]

Implement separate stacks.

One for home activity(s), one for other activities. Coordination
between the stacks is handled by the ActivityStackSupervisor.

Change-Id: I11395edea501d2f84a18a6a8bced1ce3d0797dad

commit | commitdiff | tree

Craig Mautner [Fri, 12 Apr 2013 22:41:35 +0000 (22:41 +0000)]

Merge "Prepare WindowManager for multiple stacks."

commit | commitdiff | tree

Craig Mautner [Fri, 12 Apr 2013 22:40:34 +0000 (22:40 +0000)]

Merge "Separate stacks into Home and others."

commit | commitdiff | tree

Amith Yamasani [Fri, 12 Apr 2013 22:39:15 +0000 (15:39 -0700)]

am b0511d47: am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev

* commit 'b0511d47eb15f4f7941d278467964f2cd6dd2871':
Rename isUserRestricted to isUserLimited

commit | commitdiff | tree

Amith Yamasani [Fri, 12 Apr 2013 22:36:22 +0000 (15:36 -0700)]

am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev

* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
Rename isUserRestricted to isUserLimited

commit | commitdiff | tree

Amith Yamasani [Fri, 12 Apr 2013 22:33:05 +0000 (22:33 +0000)]

Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev

commit | commitdiff | tree

Chet Haase [Fri, 12 Apr 2013 22:26:55 +0000 (15:26 -0700)]

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

commit | commitdiff | tree

Chet Haase [Fri, 12 Apr 2013 22:23:22 +0000 (15:23 -0700)]

am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev

* commit '0a41431d697a34e7fe4ed2c481484d7a63949037':
API and doc cleanup, plus small animation/UI features

commit | commitdiff | tree

Kenny Root [Wed, 10 Apr 2013 18:30:58 +0000 (11:30 -0700)]

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

commit | commitdiff | tree

Chet Haase [Fri, 12 Apr 2013 22:18:23 +0000 (22:18 +0000)]

Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev

commit | commitdiff | tree

Amith Yamasani [Fri, 12 Apr 2013 20:26:50 +0000 (13:26 -0700)]

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

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 22:07:06 +0000 (15:07 -0700)]

am e4a92e3a: am faaaa223: am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)

* commit 'e4a92e3a92593e53154143c1be539157dd4ad57a':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 22:01:30 +0000 (15:01 -0700)]

am faaaa223: am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)

* commit 'faaaa223996308f1d666e3d9c8bfaa7e17eca4fe':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 21:57:34 +0000 (14:57 -0700)]

am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)

* commit '27248105a17eb64564cb904d6c9019afbfc5ac0f':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 21:54:27 +0000 (14:54 -0700)]

am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)

* commit '044d08b0f10ca3a9e45c35bd6638763915c1f253':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Dianne Hackborn [Fri, 12 Apr 2013 21:52:58 +0000 (14:52 -0700)]

Add new resources trace, also trace apk dex loading.

Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 21:50:15 +0000 (14:50 -0700)]

am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)

* commit '7d62462bacc4235d4e99dfe7a75783a70688537d':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 21:48:13 +0000 (14:48 -0700)]

am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)

* commit '8ab0f12f5ea44f5eb0f7c0cb6f05c289c33774d3':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 21:46:19 +0000 (14:46 -0700)]

am 64d51032: moar doc tags for search suggestions (Design docs)

* commit '64d51032cc1f20ae496ba49ca975e822dea02b7c':
moar doc tags for search suggestions (Design docs)

commit | commitdiff | tree

Robert Greenwalt [Fri, 12 Apr 2013 21:18:12 +0000 (14:18 -0700)]

am b06cc749: am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev

* commit 'b06cc749ae463a37701601092ad468a4faaf634b':
Disconnect from AP when teardown requested.

commit | commitdiff | tree

Kristian Monsen [Fri, 12 Apr 2013 21:14:30 +0000 (14:14 -0700)]

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.

commit | commitdiff | tree

Robert Greenwalt [Fri, 12 Apr 2013 21:14:20 +0000 (14:14 -0700)]

am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev

* commit 'e203384f1627f27c81ff72426498927fb9d80698':
Disconnect from AP when teardown requested.

commit | commitdiff | tree

Robert Greenwalt [Fri, 12 Apr 2013 21:10:52 +0000 (21:10 +0000)]

Merge "Disconnect from AP when teardown requested." into jb-mr2-dev

commit | commitdiff | tree

Kristian Monsen [Fri, 12 Apr 2013 21:10:48 +0000 (14:10 -0700)]

am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev

* commit '03499a23f9d84fab95a7383b50cc7f87a974e4a8':
Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.

commit | commitdiff | tree

Kristian Monsen [Fri, 12 Apr 2013 21:05:15 +0000 (21:05 +0000)]

Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 21:04:10 +0000 (14:04 -0700)]

am a583a5ac: am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev

* commit 'a583a5ac7fcf5b1478297e20b2cd34872f0e18e9':
Trace ValueAnimator based animations in systrace

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 21:04:07 +0000 (14:04 -0700)]

am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev

* commit 'a378bab7a7ea4f748c72b0d14acbdf9359dbebfb':
Add async events tracing to android.os.Trace

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 21:00:34 +0000 (14:00 -0700)]

am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev

* commit 'dec4bb9e4b5a46b179a6aa3e90f9d9240d9c99cb':
Trace ValueAnimator based animations in systrace

commit | commitdiff | tree

Romain Guy [Fri, 12 Apr 2013 21:00:31 +0000 (14:00 -0700)]

am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev

* commit '50b68bf8364fd728553cb8066ece8f7905885625':
Add async events tracing to android.os.Trace

commit | commitdiff | tree

Scott Main [Fri, 12 Apr 2013 21:00:30 +0000 (14:00 -0700)]

moar doc tags for search suggestions (Design docs)

Change-Id: I842bc00f7ede23b1bebe4bf2e54ba32d026cf04c