OSDN Git Service
Brian Colonna [Mon, 15 Apr 2013 21:20:08 +0000 (21:20 +0000)]
Merge "Enabling Face Unlock for user switching (bug
8495282)" into jb-mr2-dev
Amith Yamasani [Mon, 15 Apr 2013 20:59:50 +0000 (20:59 +0000)]
Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev
Amith Yamasani [Mon, 15 Apr 2013 20:42:57 +0000 (13:42 -0700)]
Allow non-system apps to use restricted accounts
Anyway they need to request account access and user will be asked to approve access to the account
at runtime.
Bug:
8617168
Change-Id: I31de852b9bb25f496becc3e6470265b5c330e6ad
Jeff Tinker [Mon, 15 Apr 2013 20:11:17 +0000 (20:11 +0000)]
Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
Kenny Root [Mon, 15 Apr 2013 19:54:55 +0000 (19:54 +0000)]
Merge "Remove old KeyStore call sites" into jb-mr2-dev
Jason Sams [Mon, 15 Apr 2013 19:40:47 +0000 (19:40 +0000)]
Merge "Revert GC thread changes" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 19:25:10 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Scott Main [Mon, 15 Apr 2013 18:13:17 +0000 (18:13 +0000)]
Merge "fix javadoc build" into jb-mr2-dev
Scott Main [Mon, 15 Apr 2013 18:11:44 +0000 (11:11 -0700)]
fix javadoc build
Change-Id: I9b86dda5aea075832d5e165043f45c8d507b5c16
Scott Main [Mon, 15 Apr 2013 18:04:33 +0000 (11:04 -0700)]
am
80f8c84e: am
0451003f: am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
80f8c84e0cf9b2703939af6bb4aeff7000e3fd9e':
add oppo and xiaomi driver links bug:
8523141
Daniel Sandler [Mon, 15 Apr 2013 18:02:51 +0000 (18:02 +0000)]
Merge "Putting the gesture debugging back in the box." into jb-mr2-dev
Scott Main [Mon, 15 Apr 2013 18:00:06 +0000 (11:00 -0700)]
am
0451003f: am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
0451003f681c830fe626e4e0e6861c0bca8de51f':
add oppo and xiaomi driver links bug:
8523141
Scott Main [Mon, 15 Apr 2013 17:56:42 +0000 (10:56 -0700)]
am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
c06776912d75190966c5f00e617edffbfe01851c':
add oppo and xiaomi driver links bug:
8523141
Scott Main [Mon, 15 Apr 2013 17:52:40 +0000 (10:52 -0700)]
am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
92fd5508aae8f8b43164405a5b725d0e60e464e1':
add oppo and xiaomi driver links bug:
8523141
Scott Main [Mon, 15 Apr 2013 17:49:35 +0000 (10:49 -0700)]
am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
c70e0f5e182ab209ab9b272c1408ac3170ca6345':
add oppo and xiaomi driver links bug:
8523141
Scott Main [Mon, 15 Apr 2013 17:45:22 +0000 (17:45 +0000)]
Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
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
Baligh Uddin [Mon, 15 Apr 2013 15:59:28 +0000 (08:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcb746e1bec6ba3252d57feef425738ef84636e6
Auto-generated-cl: translation import
Ben Murdoch [Mon, 15 Apr 2013 15:48:24 +0000 (15:48 +0000)]
Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev
Brian Colonna [Mon, 15 Apr 2013 15:45:40 +0000 (11:45 -0400)]
Enabling Face Unlock for user switching (bug
8495282)
We had been intentionally disabling FUL when switching to a new user.
The reason was that we were only getting a signal when the user switch
started, not when it completed. If we started FUL at the beginning of
the user switch, it could be completed by the time the user switch
completed. We now have a signal to tell us that the switch completed.
Prior to this change, FUL would start whenever keyguard is created.
For a user switch, keyguard is recreated when we get
onUserSwitching(), but we don't want FUL to start until we get
onUserSwitchComplete(). So with this change, if onResume() happens
because of a user switch it doesn't start FUL until we get
onUserSwitchComplete().
Change-Id: I1d3da0a32b9b4cf0cfa5c577f1697d2a41ee4fda
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
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
Jason Sams [Mon, 15 Apr 2013 02:22:12 +0000 (02:22 +0000)]
Merge "Unhide new RS APIs." into jb-mr2-dev
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
Jason Sams [Sun, 14 Apr 2013 02:48:36 +0000 (19:48 -0700)]
Revert GC thread changes
This is not quite a straight revery, some manual edits were necessary.
The original CL didn't undergo sufficient design review or testing. Revert until the regressions can be sorted out.
Bug
8585185
This reverts commit
6dacf8355a0692b52c49f603f43317772cb36175
This reverts commit
f8c033db1edf36a0ab09568c3142054f0be2d1a1
Change-Id: Ie7215bdf881332e822603547e92f810f595077fc
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
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
Amith Yamasani [Sat, 13 Apr 2013 22:54:00 +0000 (22:54 +0000)]
Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev
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.
Kenny Root [Sat, 13 Apr 2013 00:36:25 +0000 (17:36 -0700)]
Remove old KeyStore call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.
Bug:
8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
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
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
Dianne Hackborn [Sat, 13 Apr 2013 00:49:17 +0000 (17:49 -0700)]
Add a little more resource load tracing.
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
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
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
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
Jaikumar Ganesh [Sat, 13 Apr 2013 00:22:06 +0000 (00:22 +0000)]
Merge "Fix race condition and disable call." into jb-mr2-dev
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
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
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
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
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
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
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
Romain Guy [Fri, 12 Apr 2013 23:39:26 +0000 (23:39 +0000)]
Merge "Properly computer gradient textures width" into jb-mr2-dev
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
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
Amith Yamasani [Fri, 12 Apr 2013 22:33:05 +0000 (22:33 +0000)]
Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
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
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
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
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)
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)
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
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)
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)
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)
Robert Greenwalt [Fri, 12 Apr 2013 21:10:52 +0000 (21:10 +0000)]
Merge "Disconnect from AP when teardown requested." into jb-mr2-dev
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
Scott Main [Fri, 12 Apr 2013 21:00:30 +0000 (14:00 -0700)]
moar doc tags for search suggestions (Design docs)
Change-Id: I842bc00f7ede23b1bebe4bf2e54ba32d026cf04c
Romain Guy [Fri, 12 Apr 2013 20:58:36 +0000 (20:58 +0000)]
Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev
Romain Guy [Fri, 12 Apr 2013 20:57:59 +0000 (20:57 +0000)]
Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev
Chet Haase [Fri, 12 Apr 2013 18:18:36 +0000 (11:18 -0700)]
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
Emily Bernier [Fri, 12 Apr 2013 20:21:35 +0000 (20:21 +0000)]
Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
Scott Main [Fri, 12 Apr 2013 20:14:43 +0000 (13:14 -0700)]
am
4a88777e: am
2ad00035: am
6c79bc7e: am
bfc4e4eb: am
c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
* commit '
4a88777e53ae26768255feeb49b46e2f7698d62e':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
Scott Main [Fri, 12 Apr 2013 20:14:39 +0000 (13:14 -0700)]
am
8a18006e: am
e54d44b3: am
ab23611c: am
816e905a: am
32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
* commit '
8a18006e9de3901d1ee32eace9f37d638df27b1f':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Scott Main [Fri, 12 Apr 2013 20:11:30 +0000 (13:11 -0700)]
am
2ad00035: am
6c79bc7e: am
bfc4e4eb: am
c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
* commit '
2ad0003576dccedcfe5bff0af9bfbb6db97a2351':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
Scott Main [Fri, 12 Apr 2013 20:11:26 +0000 (13:11 -0700)]
am
e54d44b3: am
ab23611c: am
816e905a: am
32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
* commit '
e54d44b35bc87bd8c44a3657f65c19754a5d5ae9':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Raph Levien [Fri, 12 Apr 2013 20:08:33 +0000 (20:08 +0000)]
Merge "Fix for bug
8500202: Right-to-left text not showing in list view" into jb-mr2-dev
Scott Main [Fri, 12 Apr 2013 20:04:58 +0000 (13:04 -0700)]
am
6c79bc7e: am
bfc4e4eb: am
c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
* commit '
6c79bc7ed1bea9013884907261cb1cd465c13741':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
Scott Main [Fri, 12 Apr 2013 20:04:56 +0000 (13:04 -0700)]
am
ab23611c: am
816e905a: am
32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
* commit '
ab23611c32a3887367b481cb023aa49c250eb0a3':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Tim Murray [Fri, 12 Apr 2013 20:03:51 +0000 (20:03 +0000)]
Merge "Add support for synchronous get()." into jb-mr2-dev
Scott Main [Fri, 12 Apr 2013 20:02:56 +0000 (13:02 -0700)]
am
bfc4e4eb: am
c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
* commit '
bfc4e4ebf65fff4a07a8b0a7d1fc56e58965f564':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
Scott Main [Fri, 12 Apr 2013 20:02:53 +0000 (13:02 -0700)]
am
816e905a: am
32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
* commit '
816e905ac241529919e3cb1adde533429924b02f':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Scott Main [Fri, 12 Apr 2013 20:00:08 +0000 (13:00 -0700)]
am
c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
* commit '
c9762f201bb511a1566f0054cedea0115da6dab8':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
Scott Main [Fri, 12 Apr 2013 20:00:06 +0000 (13:00 -0700)]
am
32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
* commit '
32bd549520fdb46842f2e8fff8365cf7c9ee83a7':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Scott Main [Fri, 12 Apr 2013 19:57:56 +0000 (19:57 +0000)]
Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
Adam Momtaz [Wed, 10 Apr 2013 19:42:58 +0000 (12:42 -0700)]
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
Robert Greenwalt [Thu, 4 Apr 2013 22:51:08 +0000 (15:51 -0700)]
Disconnect from AP when teardown requested.
We can leave the driver running if it can't handle quick
start/stop cycles, but we must disconnect when requested.
Bug:
8549078
Change-Id: Id2e930fb48ca78bb459b775cba7e9aa31a6c9941
Robert Greenwalt [Fri, 12 Apr 2013 19:02:24 +0000 (19:02 +0000)]
Merge "Add new route.hasGateway() api" into jb-mr2-dev
Craig Mautner [Fri, 12 Apr 2013 19:02:06 +0000 (19:02 +0000)]
Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev
Kenny Root [Fri, 12 Apr 2013 18:54:23 +0000 (18:54 +0000)]
Merge "Remove keystore entries when app data cleared" into jb-mr2-dev
Raph Levien [Fri, 12 Apr 2013 18:31:31 +0000 (11:31 -0700)]
Fix for bug
8500202: Right-to-left text not showing in list view
In single line mode, changing the text from LTR to RTL (or vice versa)
affects the alignment, which in turn means that bringTextIntoView is
needed to update the scrolling. A registerForPredraw should be done to
make this happen, but it was missing. This patch tests explicitly for
direction changes in this case, and schedules a predraw if so.
Change-Id: I16e0e23141c244dc8adc00ea8306dfe4c9bf487d
Scott Main [Fri, 12 Apr 2013 18:40:38 +0000 (11:40 -0700)]
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Change-Id: Ideacad7f2b7dd78f56faef93de1f4d5bc60db6a7
Robert Greenwalt [Thu, 11 Apr 2013 20:48:16 +0000 (13:48 -0700)]
Add new route.hasGateway() api
Fixes issues brought in by change to isHostRoute. isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.
bug:
8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
Scott Main [Fri, 12 Apr 2013 18:19:39 +0000 (11:19 -0700)]
exclude IAB docs and various SDK docs from search suggestions
Also delete several useless files
Change-Id: I1b17e4eca17e69169002fc617180beb2ac83f67a
Baligh Uddin [Fri, 12 Apr 2013 18:16:47 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Romain Guy [Fri, 12 Apr 2013 17:31:25 +0000 (17:31 +0000)]
Merge "Introduce PixelBuffer API to enable PBOs" into jb-mr2-dev
Scott Main [Fri, 12 Apr 2013 17:20:31 +0000 (10:20 -0700)]
am
d6c7d6a7: am
8b3516e0: am
600d40a6: am
2545e285: am
4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
* commit '
d6c7d6a7e33da6f182ff138227fecc924b3c6e21':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
Scott Main [Fri, 12 Apr 2013 17:18:39 +0000 (10:18 -0700)]
am
8b3516e0: am
600d40a6: am
2545e285: am
4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
* commit '
8b3516e0bba2b3ecf46b3ca8f7c459e3f8b2ac7c':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
Scott Main [Fri, 12 Apr 2013 17:16:34 +0000 (10:16 -0700)]
am
600d40a6: am
2545e285: am
4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
* commit '
600d40a6a523557748103dc536458fdb35d2c52c':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
Scott Main [Fri, 12 Apr 2013 17:14:43 +0000 (10:14 -0700)]
am
2545e285: am
4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
* commit '
2545e2856308b86449842638d1915d434a1a7ac9':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
Scott Main [Fri, 12 Apr 2013 17:11:35 +0000 (10:11 -0700)]
am
4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
* commit '
4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
Scott Main [Fri, 12 Apr 2013 17:10:57 +0000 (10:10 -0700)]
am
8d53821d: am
46a1b362: am
657d7b8c: am
4f4d243d: am
64461bf4: doc tags for api guides and delete a useless file
* commit '
8d53821d055a826f7b6745ab17769308df5eb547':
doc tags for api guides and delete a useless file
Kenny Root [Fri, 12 Apr 2013 17:06:51 +0000 (10:06 -0700)]
Remove keystore entries when app data cleared
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.
Bug:
8566369
Change-Id: I201c92d0893f0d18e87970dcd59ef6cd904584dc
Scott Main [Fri, 12 Apr 2013 17:08:08 +0000 (17:08 +0000)]
Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
Scott Main [Fri, 12 Apr 2013 17:08:06 +0000 (10:08 -0700)]
am
46a1b362: am
657d7b8c: am
4f4d243d: am
64461bf4: doc tags for api guides and delete a useless file
* commit '
46a1b362dbbee0feaa395e6014b8c086ed54d7e0':
doc tags for api guides and delete a useless file
Scott Main [Fri, 12 Apr 2013 17:04:14 +0000 (10:04 -0700)]
am
657d7b8c: am
4f4d243d: am
64461bf4: doc tags for api guides and delete a useless file
* commit '
657d7b8cbce5cdbd5d30cca56ab009e672373470':
doc tags for api guides and delete a useless file
Scott Main [Fri, 12 Apr 2013 17:00:10 +0000 (10:00 -0700)]
am
4f4d243d: am
64461bf4: doc tags for api guides and delete a useless file
* commit '
4f4d243d699d37310a914606fb4e5fc09ba9fc00':
doc tags for api guides and delete a useless file
Jeff Tinker [Fri, 12 Apr 2013 15:54:55 +0000 (08:54 -0700)]
Clarify how release of offline keys is handled in the MediaDrm API
bug:
8603820
Change-Id: Ifeda018fbbbb9905e62ee242da2ede1ed89868a2
OSDN Git Service
