OSDN Git Service

android-x86/frameworks-base.git
9 years agoZenLog: Track changes to effect suppressorship.
John Spurlock [Mon, 9 Mar 2015 16:19:23 +0000 (12:19 -0400)]
ZenLog: Track changes to effect suppressorship.

Bug: 19656287
Change-Id: Ibbb42bef68f4588beac4ca971db73a19678c2b4c

9 years agoMerge "Audio: Remove the concept of master volume."
John Spurlock [Wed, 4 Mar 2015 22:59:39 +0000 (22:59 +0000)]
Merge "Audio: Remove the concept of master volume."

9 years agoAudio: Remove the concept of master volume.
John Spurlock [Tue, 3 Mar 2015 21:17:21 +0000 (16:17 -0500)]
Audio: Remove the concept of master volume.

- Remove two config resources (use master volume, and volume ramp).
- Remove master volume adjustments / getters / intents.
- Retain @hidden setMasterMute, needed for device admin
- Remove master volume logic in AudioService.
- Remove master volume logic in VolumePanel.
- Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion.

Bug: 19582978
Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24

9 years agoMerge "DOs can clear the DI; rehide hasUserSetupCompleted."
Julia Reynolds [Wed, 4 Mar 2015 22:38:16 +0000 (22:38 +0000)]
Merge "DOs can clear the DI; rehide hasUserSetupCompleted."

9 years agoDOs can clear the DI; rehide hasUserSetupCompleted.
Julia Reynolds [Wed, 11 Feb 2015 17:34:08 +0000 (12:34 -0500)]
DOs can clear the DI; rehide hasUserSetupCompleted.

Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95

9 years agoMerge "Temporarily disable Patch glops"
Chris Craik [Wed, 4 Mar 2015 22:30:59 +0000 (22:30 +0000)]
Merge "Temporarily disable Patch glops"

9 years agoMerge "Some refactoring of StaticLayout"
Raph Levien [Wed, 4 Mar 2015 22:28:18 +0000 (22:28 +0000)]
Merge "Some refactoring of StaticLayout"

9 years agoTemporarily disable Patch glops
Chris Craik [Wed, 4 Mar 2015 22:25:09 +0000 (14:25 -0800)]
Temporarily disable Patch glops

bug:19597454

Change-Id: I9dbe781a714582717a5585113b9a56821265b36e

9 years agoSome refactoring of StaticLayout
Raph Levien [Mon, 2 Mar 2015 22:30:53 +0000 (14:30 -0800)]
Some refactoring of StaticLayout

This patch refactors construction of StaticLayout to use an explicit
Builder object, which is intended to hold state used for constructing
the layout but not needed for merely reading out the results.

Builder objects are allocated from a pool and explicitly recycled,
so there is insignificant additional allocation cost.

This patch has very little impact on performance (it does avoid
allocating a FontMetricsInt object) but opens the way for significant
performance and functionality improvements as more of the Builder
functionality migrates to native code.

Change-Id: I2a576643e573a38b61f895a80d5d92a85c94b6b4

9 years agoMerge "Fix reading of daily data."
Dianne Hackborn [Wed, 4 Mar 2015 21:34:11 +0000 (21:34 +0000)]
Merge "Fix reading of daily data."

9 years agoFix reading of daily data.
Dianne Hackborn [Wed, 4 Mar 2015 21:28:36 +0000 (13:28 -0800)]
Fix reading of daily data.

Change-Id: I1f581197c938109cfe5cc21109eea57b4e0434dc

9 years agoMerge "Allow the device initializer to perform user setup tasks."
Julia Reynolds [Wed, 4 Mar 2015 19:01:30 +0000 (19:01 +0000)]
Merge "Allow the device initializer to perform user setup tasks."

9 years agoMerge "Remove spammy notification_cancel event log."
Chris Wren [Wed, 4 Mar 2015 18:40:20 +0000 (18:40 +0000)]
Merge "Remove spammy notification_cancel event log."

9 years agoMerge "Fix a regression in UsbDebuggingManager"
Amith Yamasani [Wed, 4 Mar 2015 18:04:01 +0000 (18:04 +0000)]
Merge "Fix a regression in UsbDebuggingManager"

9 years agoFix a regression in UsbDebuggingManager
Amith Yamasani [Wed, 4 Mar 2015 18:00:11 +0000 (10:00 -0800)]
Fix a regression in UsbDebuggingManager

Catch NPE as well if socket object is null.

Bug: 19602060
Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f

9 years agoMerge "Revert "Added function to render a drawable in all available states""
Andrew Shulaev [Wed, 4 Mar 2015 17:44:10 +0000 (17:44 +0000)]
Merge "Revert "Added function to render a drawable in all available states""

9 years agoMerge "Fix some javadocs typos"
Evan Charlton [Wed, 4 Mar 2015 17:43:38 +0000 (17:43 +0000)]
Merge "Fix some javadocs typos"

9 years agoRevert "Added function to render a drawable in all available states"
Andrew Shulaev [Wed, 4 Mar 2015 17:43:19 +0000 (17:43 +0000)]
Revert "Added function to render a drawable in all available states"

This reverts commit 63483e17de4d2441acaabcee4185b0bb25e1d94c.

Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18

9 years agoMerge "Added function to render a drawable in all available states"
Andrew Shulaev [Wed, 4 Mar 2015 16:59:29 +0000 (16:59 +0000)]
Merge "Added function to render a drawable in all available states"

9 years agoAdded function to render a drawable in all available states
Andrew Shulaev [Wed, 4 Mar 2015 16:20:19 +0000 (16:20 +0000)]
Added function to render a drawable in all available states

Change-Id: I230cc5775a09120efe9c82a4017b001aa510ddff

9 years agoRemove spammy notification_cancel event log.
Chris Wren [Wed, 4 Mar 2015 16:47:46 +0000 (08:47 -0800)]
Remove spammy notification_cancel event log.

We also log when notifications are actually canceled,
so this only tells us how often clients cancel non-existent
notifications.  The answer: quite often.

Bug: 19599876
Change-Id: I812866cb080d51974d4db0b6e6b3eb50c3aeb560

9 years agoMerge "Update immersive cling visuals"
Adrian Roos [Wed, 4 Mar 2015 16:30:18 +0000 (16:30 +0000)]
Merge "Update immersive cling visuals"

9 years agoUpdate immersive cling visuals
Adrian Roos [Wed, 25 Feb 2015 17:05:34 +0000 (18:05 +0100)]
Update immersive cling visuals

Also enables the swipe from top gesture for revealing
the navigation bar, even if the status bar is visible.

Bug: 19282730
Change-Id: I7b562c2f0f00ff3f05b8b1e44657efe79b45f9c7

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Mar 2015 15:33:41 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 15:31:55 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ie73169cd2ccab4f812f7cabbf30d0c0adb570c65
Auto-generated-cl: translation import

9 years agoAllow the device initializer to perform user setup tasks.
Julia Reynolds [Wed, 11 Feb 2015 17:34:08 +0000 (12:34 -0500)]
Allow the device initializer to perform user setup tasks.

A device initializer is an application that is allowed to run
during user provisioning on device owner devices. During
device provisioning (or, user provisioning of the first user
of the device), a device initializer is granted device owner
permissions. During secondary user provisioning, a device
initializer is granted profile owner permissions. Once
provisioning is complete for a user, all elevated permissions
are removed from the device initializer and the device admin
component of the app is disabled.

Bug: 19230954
Change-Id: Ib6725fb3b09bb21e4198a5dc0b445ccebb40b27e

9 years agoMerge "Replace absolute_uri with absolute_path when HTTP request is forwarded to...
Andrei Kapishnikov [Wed, 4 Mar 2015 14:56:21 +0000 (14:56 +0000)]
Merge "Replace absolute_uri with absolute_path when HTTP request is forwarded to non-proxy server."

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Mar 2015 14:55:09 +0000 (14:55 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:50:38 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7b7b245ade1c83878576c5e9e489a4506bfd7538
Auto-generated-cl: translation import

9 years agoam 850fd489: (-s ours) am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import...
Geoff Mendal [Wed, 4 Mar 2015 14:20:25 +0000 (14:20 +0000)]
am 850fd489: (-s ours) am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '850fd489dea0cdf7199cce73027fc95658b0993f':
  Import translations. DO NOT MERGE

9 years agoam 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translati...
Geoff Mendal [Wed, 4 Mar 2015 14:20:19 +0000 (14:20 +0000)]
am 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE

* commit '116b9336e2798fdbdea1b98aa4455b485268587b':
  Import translations. DO NOT MERGE

9 years agoam b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 4 Mar 2015 14:14:29 +0000 (14:14 +0000)]
am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'b214417a6e1a7cca5bac961c2b32b72d8baea2dd':
  Import translations. DO NOT MERGE

9 years agoam bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:14:24 +0000 (14:14 +0000)]
am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE

* commit 'bb9360e36cea7c2af17992c1b08eedbce707962b':
  Import translations. DO NOT MERGE

9 years agoam 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:08:11 +0000 (14:08 +0000)]
am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '3b9e64f3265ad146da1b9f5b523c406acd041f59':
  Import translations. DO NOT MERGE

9 years agoam 63069cc9: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:08:03 +0000 (14:08 +0000)]
am 63069cc9: (-s ours) Import translations. DO NOT MERGE

* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:04:03 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:02:36 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE

Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:56:33 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE

Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import

9 years agoam 3e938519: (-s ours) am 80b9bd85: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 4 Mar 2015 13:54:41 +0000 (13:54 +0000)]
am 3e938519: (-s ours) am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '3e938519e3b11251c5eae308276a7217fb7c6572':
  Import translations. DO NOT MERGE

9 years agoam 97735297: (-s ours) am 42796e97: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 4 Mar 2015 13:54:35 +0000 (13:54 +0000)]
am 97735297: (-s ours) am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '97735297307eccc3cedb537fe88a2a76d473f798':
  Import translations. DO NOT MERGE

9 years agoam 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:47:51 +0000 (13:47 +0000)]
am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '80b9bd854365bf052db9572bcff0fedf74090ff5':
  Import translations. DO NOT MERGE

9 years agoam 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:47:46 +0000 (13:47 +0000)]
am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2':
  Import translations. DO NOT MERGE

9 years agoam 89a2b286: (-s ours) am cba2873e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:44:24 +0000 (13:44 +0000)]
am 89a2b286: (-s ours) am cba2873e: (-s ours) Import translations. DO NOT MERGE

* commit '89a2b286ae69858a999d050ac30fdf171dee6d1c':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:42:01 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:41:21 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoam cba2873e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:37:36 +0000 (13:37 +0000)]
am cba2873e: (-s ours) Import translations. DO NOT MERGE

* commit 'cba2873edc7cba933484180109204839d68dce87':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:36:32 +0000 (07:36 -0600)]
Import translations. DO NOT MERGE

Change-Id: Ibbd6d3677d2e146de85bfc7130371546b31cb404
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:35:11 +0000 (05:35 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:29:01 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import

9 years agoMerge "Fix handling of LOCAL_JACK_ENABLED"
Yohann Roussel [Wed, 4 Mar 2015 10:14:32 +0000 (10:14 +0000)]
Merge "Fix handling of LOCAL_JACK_ENABLED"

9 years agoMerge "Change fingerprint behavior in keyguard to dismiss on notification"
Jim Miller [Wed, 4 Mar 2015 01:34:41 +0000 (01:34 +0000)]
Merge "Change fingerprint behavior in keyguard to dismiss on notification"

9 years agoChange fingerprint behavior in keyguard to dismiss on notification
Jim Miller [Wed, 4 Mar 2015 01:12:09 +0000 (17:12 -0800)]
Change fingerprint behavior in keyguard to dismiss on notification

This changes fingerprint to dismiss the notification screen rather
than moving to a trusted state.

Fixes bug 19592835

Change-Id: I5020408df2e8b73a34c264b5ac052251e3a17b8d

9 years agoMerge "Add new "daily stats" tracking to battery stats."
Dianne Hackborn [Wed, 4 Mar 2015 00:57:52 +0000 (00:57 +0000)]
Merge "Add new "daily stats" tracking to battery stats."

9 years agoMerge "Fix user switching dialog colors for television."
Andrew Wilson [Tue, 3 Mar 2015 23:52:36 +0000 (23:52 +0000)]
Merge "Fix user switching dialog colors for television."

9 years agoAdd new "daily stats" tracking to battery stats.
Dianne Hackborn [Tue, 3 Mar 2015 18:06:15 +0000 (10:06 -0800)]
Add new "daily stats" tracking to battery stats.

Currently is only used for tracking the daily charge
and discharge rates.  We keep up to 10 days of data.

Change-Id: I54e29e35ff60d9277da9e476cdab22f4a6d540bf

9 years agoMerge "Fix TransitionManager.go not running transition."
George Mount [Tue, 3 Mar 2015 23:37:20 +0000 (23:37 +0000)]
Merge "Fix TransitionManager.go not running transition."

9 years agoFix TransitionManager.go not running transition.
George Mount [Tue, 3 Mar 2015 23:28:44 +0000 (15:28 -0800)]
Fix TransitionManager.go not running transition.

Bug 19459362

Change-Id: I17595390c9fb289dec8de44447ca490c46570fb4

9 years agoMediaPlayer: add setPlaybackRate JAVA API.
Wei Jia [Tue, 10 Feb 2015 00:05:53 +0000 (16:05 -0800)]
MediaPlayer: add setPlaybackRate JAVA API.

Bug: 19196501
Change-Id: I43daced7d9b53bcaca4e6a8d81ca729b32efc79f

9 years agoam 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequence...
Craig Mautner [Tue, 3 Mar 2015 22:25:13 +0000 (22:25 +0000)]
am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

* commit '5d3f00e38b84c107037de1250a6e55d89f84ef77':
  Change ActivityView startActivity state sequence

9 years agoam 59e06d3a: am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent...
Nick Kralevich [Tue, 3 Mar 2015 22:24:26 +0000 (22:24 +0000)]
am 59e06d3a: am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."

* commit '59e06d3ab479ab04df84b783cb119f032549f492':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.

9 years agoMerge "CameraManager: implement flashlight controls"
Chien-Yu Chen [Tue, 3 Mar 2015 22:24:11 +0000 (22:24 +0000)]
Merge "CameraManager: implement flashlight controls"

9 years agoCameraManager: implement flashlight controls
Chien-Yu Chen [Wed, 11 Feb 2015 19:23:28 +0000 (11:23 -0800)]
CameraManager: implement flashlight controls

Implement the flashlight controls and callbacks and update the
torch mode states.

Bug: 2682206
Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b

9 years agoMerge "resolved conflicts for merge of 5864f5ed to master"
Joe Fernandez [Tue, 3 Mar 2015 21:10:40 +0000 (21:10 +0000)]
Merge "resolved conflicts for merge of 5864f5ed to master"

9 years agoresolved conflicts for merge of 5864f5ed to master
Joe Fernandez [Tue, 3 Mar 2015 21:08:57 +0000 (13:08 -0800)]
resolved conflicts for merge of 5864f5ed to master

Change-Id: I6e413076af7fce85a5300abb2ba529c589dbc7e8

9 years agoam 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1...
Craig Mautner [Tue, 3 Mar 2015 21:08:45 +0000 (21:08 +0000)]
am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

* commit '358188f5891f5645dbff4fd8cb1a3e7341371f74':
  Change ActivityView startActivity state sequence

9 years agoMerge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
Craig Mautner [Tue, 3 Mar 2015 21:03:28 +0000 (21:03 +0000)]
Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

9 years agoMerge "add null guards around notification listener handlers"
Chris Wren [Tue, 3 Mar 2015 20:08:06 +0000 (20:08 +0000)]
Merge "add null guards around notification listener handlers"

9 years agoChange ActivityView startActivity state sequence
Craig Mautner [Fri, 27 Feb 2015 04:40:19 +0000 (20:40 -0800)]
Change ActivityView startActivity state sequence

Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.

This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.

This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.

Fixes bug 19147472.

Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244

9 years agoMerge "Glop DrawPatch support"
Chris Craik [Tue, 3 Mar 2015 18:12:26 +0000 (18:12 +0000)]
Merge "Glop DrawPatch support"

9 years agoMerge "Add missing paramater to AudioPort jni initialization."
David Stevens [Tue, 3 Mar 2015 18:11:06 +0000 (18:11 +0000)]
Merge "Add missing paramater to AudioPort jni initialization."

9 years agoMerge "Glop drawBitmaps, drawPatches"
Chris Craik [Tue, 3 Mar 2015 18:02:00 +0000 (18:02 +0000)]
Merge "Glop drawBitmaps, drawPatches"

9 years agoGlop DrawPatch support
Chris Craik [Tue, 3 Mar 2015 17:54:14 +0000 (09:54 -0800)]
Glop DrawPatch support

Change-Id: Icaa78bdb2cf52c1fc2194ec4016634967d17fb6a

9 years agoam 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or...
Nick Kralevich [Tue, 3 Mar 2015 17:08:50 +0000 (17:08 +0000)]
am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."

* commit '98fdff61dd651f52d36c0e88dcce8a04568b7cc7':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.

9 years agoam 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy...
Nick Kralevich [Tue, 3 Mar 2015 17:02:22 +0000 (17:02 +0000)]
am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."

* commit '56fde9e70ef850ca7e3f076e52567f5c75b5e7da':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.

9 years agoGlop drawBitmaps, drawPatches
Chris Craik [Sat, 28 Feb 2015 01:43:02 +0000 (17:43 -0800)]
Glop drawBitmaps, drawPatches

Change-Id: I3f1cd3f47f97d2e0c9b9d153732e26ee0b1c58c2

9 years agoMerge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
Nick Kralevich [Tue, 3 Mar 2015 16:55:09 +0000 (16:55 +0000)]
Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."

9 years agoMerge "Improve docs for drawable tint and color filters"
Chris Craik [Tue, 3 Mar 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Improve docs for drawable tint and color filters"

9 years agoMerge "Constructor cleanup"
Chris Craik [Tue, 3 Mar 2015 16:44:32 +0000 (16:44 +0000)]
Merge "Constructor cleanup"

9 years agoFix build: Revert "docs: Android 5.1 API Release notes (Lollipop MR1)"
Ed Heyl [Tue, 3 Mar 2015 07:03:09 +0000 (23:03 -0800)]
Fix build: Revert "docs: Android 5.1 API Release notes (Lollipop MR1)"

This reverts commit 50d0953a86af7d6ad2bfaa2ac13d943781f210cb.

9 years agoam 55902316: am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge...
Joe Fernandez [Tue, 3 Mar 2015 06:48:21 +0000 (06:48 +0000)]
am 55902316: am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '559023163d7e9e0aad4846bc0fccfc5c28705ec7':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo...
Joe Fernandez [Tue, 3 Mar 2015 06:42:39 +0000 (06:42 +0000)]
am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '1137ca03be9b9143c472d9adc51ea511cfd68a6b':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in manage...
Joe Fernandez [Tue, 3 Mar 2015 06:36:02 +0000 (06:36 +0000)]
am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam e0a4a469: am a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates...
Rich Slogar [Tue, 3 Mar 2015 06:32:53 +0000 (06:32 +0000)]
am e0a4a469: am a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22

* commit 'e0a4a469ef0f97e0586c135aa14bb0cd774fc137':
  docs: support library updates for sdk 22

9 years agoam 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile...
Joe Fernandez [Tue, 3 Mar 2015 06:29:33 +0000 (06:29 +0000)]
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 06:25:27 +0000 (06:25 +0000)]
am a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22

* commit 'a08f2047025b741b6356d2bf0320da57eda7e2bc':
  docs: support library updates for sdk 22

9 years agoam c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc referenc...
Joe Fernandez [Tue, 3 Mar 2015 06:22:42 +0000 (06:22 +0000)]
am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 06:18:54 +0000 (06:18 +0000)]
am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22

* commit '646c7cd6e81904791b7ecc7ab7750ffe4919371b':
  docs: support library updates for sdk 22

9 years agoam a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages....
Joe Fernandez [Tue, 3 Mar 2015 06:15:29 +0000 (06:15 +0000)]
am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam a81ed3cd: docs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 06:13:41 +0000 (06:13 +0000)]
am a81ed3cd: docs: support library updates for sdk 22

* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
  docs: support library updates for sdk 22

9 years agoMerge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Joe Fernandez [Tue, 3 Mar 2015 06:11:49 +0000 (06:11 +0000)]
Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

9 years agodocs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 00:09:21 +0000 (16:09 -0800)]
docs: support library updates for sdk 22

Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c

9 years agoAdd missing paramater to AudioPort jni initialization.
David Stevens [Tue, 3 Mar 2015 05:33:09 +0000 (21:33 -0800)]
Add missing paramater to AudioPort jni initialization.

Change-Id: Ia50a810ca8ceeece52a712e1daf5ffa616951b02

9 years agoam 6717c36f: am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:27:05 +0000 (03:27 +0000)]
am 6717c36f: am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1

* commit '6717c36f4a8e74b13765c57a6aa01d7a2d0a7a6b':
  docs: platform revisions 5.1

9 years agoam 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:19:26 +0000 (03:19 +0000)]
am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1

* commit '522f5aa55ae7dcdf3c011de92939ca901f548a8f':
  docs: platform revisions 5.1

9 years agoam ad334de5: am e0ce0f2c: docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:12:54 +0000 (03:12 +0000)]
am ad334de5: am e0ce0f2c: docs: platform revisions 5.1

* commit 'ad334de54a89ab755ef16aebf47bb16e287782bc':
  docs: platform revisions 5.1

9 years agoam e0ce0f2c: docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:06:48 +0000 (03:06 +0000)]
am e0ce0f2c: docs: platform revisions 5.1

* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
  docs: platform revisions 5.1

9 years agoMerge "Use scheduled job rather than periodic alarms for key/value backups"
Christopher Tate [Tue, 3 Mar 2015 02:57:15 +0000 (02:57 +0000)]
Merge "Use scheduled job rather than periodic alarms for key/value backups"

9 years agodocs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 01:54:10 +0000 (17:54 -0800)]
docs: platform revisions 5.1

Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6

9 years agoam 92050710: am 545093df: am 75666e90: Merge "Revert "Add potential future APIs for...
Selim Gurun [Tue, 3 Mar 2015 02:51:18 +0000 (02:51 +0000)]
am 92050710: am 545093df: am 75666e90: Merge "Revert "Add potential future APIs for postmessage""

* commit '9205071093eee6c2fb80090210b88c506043da4f':
  Revert "Add potential future APIs for postmessage"

9 years agoam 647170d4: am a1dfb22a: am 8fe980e8: am 54643332: Merge "Doc change: Add diff repor...
Joe Fernandez [Tue, 3 Mar 2015 02:36:54 +0000 (02:36 +0000)]
am 647170d4: am a1dfb22a: am 8fe980e8: am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

* commit '647170d493ff20b9f0f2609b805f7617ab650bd5':
  Doc change: Add diff report for API 22.