OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Merge \"Fix savelayer rounding\" into nyc-mr1-dev am: 754ea612ec" into nyc...
Android Build Merger (Role) [Tue, 28 Jun 2016 17:39:51 +0000 (17:39 +0000)]
Merge "Merge \"Fix savelayer rounding\" into nyc-mr1-dev am: 754ea612ec" into nyc-mr1-dev-plus-aosp

8 years agoMerge \"Fix savelayer rounding\" into nyc-mr1-dev
Chris Craik [Tue, 28 Jun 2016 17:39:26 +0000 (17:39 +0000)]
Merge \"Fix savelayer rounding\" into nyc-mr1-dev
am: 754ea612ec

Change-Id: Ib86ae01c824b57c4c93562aefb6c264b02538e28

8 years agoMerge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc...
Allen Hair [Tue, 28 Jun 2016 17:38:06 +0000 (17:38 +0000)]
Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073
am: fb9d75e7cd

Change-Id: I4a5d45d9c33b713e6bdf0596ea498c3e521c26d8

8 years agoMerge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc...
Allen Hair [Tue, 28 Jun 2016 17:33:34 +0000 (17:33 +0000)]
Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073
am: fb20170c0f

Change-Id: I23336cd7dac59a0e2510b718ede8ae3a389047ac

8 years agoMerge "Fix savelayer rounding" into nyc-mr1-dev
Chris Craik [Tue, 28 Jun 2016 17:33:26 +0000 (17:33 +0000)]
Merge "Fix savelayer rounding" into nyc-mr1-dev

8 years agoMerge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
Allen Hair [Tue, 28 Jun 2016 17:30:28 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9

8 years agoMerge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
Allen Hair [Tue, 28 Jun 2016 17:30:21 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81

8 years agoMerge "Add a flag to enable instrumentation of the framework classes." into nyc-dev
Allen Hair [Tue, 28 Jun 2016 17:23:54 +0000 (17:23 +0000)]
Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev

8 years agoFix savelayer rounding
Chris Craik [Mon, 27 Jun 2016 23:30:27 +0000 (16:30 -0700)]
Fix savelayer rounding

bug:29456451

Change-Id: I8022163d2c004510da5db74efdca27582484224d

8 years agoMerge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458
Dan Yu [Tue, 28 Jun 2016 16:36:55 +0000 (16:36 +0000)]
Merge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458
am: 82bd5246e7

Change-Id: I668dddb48b464c61d77b2ddd4b94919c58356660

8 years agoMerge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458
Dan Yu [Tue, 28 Jun 2016 16:32:01 +0000 (16:32 +0000)]
Merge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458
am: a2ffb20c06

Change-Id: I4f859ca20376c10f1638ce80b2ec33b515815809

8 years agoMerge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
Daniel Yu [Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a

8 years agoMerge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
Daniel Yu [Tue, 28 Jun 2016 16:28:24 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a

8 years agoMerge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev
Dan Yu [Tue, 28 Jun 2016 16:21:56 +0000 (16:21 +0000)]
Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev

8 years agoMerge \"Syncronize renderPage vs. onServiceDisconnected\" into nyc-mr1-dev
Philip P. Moltmann [Tue, 28 Jun 2016 16:18:09 +0000 (16:18 +0000)]
Merge \"Syncronize renderPage vs. onServiceDisconnected\" into nyc-mr1-dev
am: c7c647bbf0

Change-Id: Ibd18df2822dbb0993eb4fc22392c3c523197c540

8 years agoMerge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev
Philip P. Moltmann [Tue, 28 Jun 2016 16:14:30 +0000 (16:14 +0000)]
Merge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev

8 years agoMerge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev
Lajos Molnar [Tue, 28 Jun 2016 16:02:13 +0000 (16:02 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev
am: 5b2fd818a0

Change-Id: Id7ed6f9342601ee8f67ff28f37c9b38b96e9c084

8 years agoMerge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 15:56:41 +0000 (15:56 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev

8 years agoMerge "Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4 am: 5098f...
Android Build Merger (Role) [Tue, 28 Jun 2016 15:47:12 +0000 (15:47 +0000)]
Merge "Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4 am: 5098fe97d6" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4
Shreyas Basarge [Tue, 28 Jun 2016 15:46:42 +0000 (15:46 +0000)]
Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4
am: 5098fe97d6

Change-Id: Ia34d8f6d577cf4ebbd45872c19629ba821c0427b

8 years agoMerge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4
Shreyas Basarge [Tue, 28 Jun 2016 15:46:37 +0000 (15:46 +0000)]
Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4
am: 0d27e2d624

Change-Id: I8d81d5db705e63fddfca9d652299eca9d4df207d

8 years agoMerge \"SyncOperation float cast fix\" into nyc-dev
Shreyas Basarge [Tue, 28 Jun 2016 15:43:00 +0000 (15:43 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am: 5f72b129c4

Change-Id: I50ab6249e81ff7523a82f26bd39b52bb362f4ae4

8 years agoMerge \"SyncOperation float cast fix\" into nyc-dev
Shreyas Basarge [Tue, 28 Jun 2016 15:42:59 +0000 (15:42 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am: 5f72b129c4

Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2

8 years agoMerge "SyncOperation float cast fix" into nyc-dev
Shreyas Basarge [Tue, 28 Jun 2016 15:38:05 +0000 (15:38 +0000)]
Merge "SyncOperation float cast fix" into nyc-dev

8 years agomedia: document VP9 CSD for MediaCodec
Lajos Molnar [Fri, 24 Jun 2016 00:52:48 +0000 (17:52 -0700)]
media: document VP9 CSD for MediaCodec

Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee

8 years agoMerge "Purr. am: 610f6ede25 am: 0e792f567a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:58 +0000 (07:15 +0000)]
Merge "Purr. am: 610f6ede25 am: 0e792f567a" into nyc-mr1-dev-plus-aosp

8 years agoMerge "One final tweak to the platlogo. am: 4b7e415803 am: d930306e13" into nyc-mr1...
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:48 +0000 (07:15 +0000)]
Merge "One final tweak to the platlogo. am: 4b7e415803 am: d930306e13" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Purr. am: 610f6ede25 am: 45294a6859" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:41 +0000 (07:15 +0000)]
Merge "Purr. am: 610f6ede25 am: 45294a6859" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix SuperNotCalledException. am: 04f8cc2bb3 am: 33a199e241" into nyc-mr1-dev...
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:33 +0000 (07:15 +0000)]
Merge "Fix SuperNotCalledException. am: 04f8cc2bb3 am: 33a199e241" into nyc-mr1-dev-plus-aosp

8 years agoPurr. am: 610f6ede25
Dan Sandler [Tue, 28 Jun 2016 07:15:02 +0000 (07:15 +0000)]
Purr. am: 610f6ede25
am: 0e792f567a

Change-Id: I0ddf8f169e44a5c9d2be96277609d6f0b206e0f1

8 years agoOne final tweak to the platlogo. am: 4b7e415803
Dan Sandler [Tue, 28 Jun 2016 07:14:59 +0000 (07:14 +0000)]
One final tweak to the platlogo. am: 4b7e415803
am: d930306e13

Change-Id: I8ce6d7d1718af2a98a624ad3c7f6ca693ddb2011

8 years agoPurr. am: 610f6ede25
Dan Sandler [Tue, 28 Jun 2016 07:14:56 +0000 (07:14 +0000)]
Purr. am: 610f6ede25
am: 45294a6859

Change-Id: I6db945a4ca001c330d658549500521748172d081

8 years agoFix SuperNotCalledException. am: 04f8cc2bb3
Dan Sandler [Tue, 28 Jun 2016 07:14:56 +0000 (07:14 +0000)]
Fix SuperNotCalledException. am: 04f8cc2bb3
am: 33a199e241

Change-Id: I7ebf9e7db1a21e213e3a88c29d215eb6f701cbf6

8 years agoOne final tweak to the platlogo. am: 4b7e415803
Dan Sandler [Tue, 28 Jun 2016 07:14:54 +0000 (07:14 +0000)]
One final tweak to the platlogo. am: 4b7e415803
am: 3fae8ae0c6

Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622

8 years agoFix SuperNotCalledException. am: 04f8cc2bb3
Dan Sandler [Tue, 28 Jun 2016 07:14:51 +0000 (07:14 +0000)]
Fix SuperNotCalledException. am: 04f8cc2bb3
am: ed48cbc8fc

Change-Id: Ie056fe7f9c1ab1a4cb0db9f262e158cedcb94706

8 years agoPurr.
Dan Sandler [Tue, 28 Jun 2016 07:07:35 +0000 (07:07 +0000)]
Purr.
am: 610f6ede25

Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5

8 years agoOne final tweak to the platlogo.
Dan Sandler [Tue, 28 Jun 2016 07:07:31 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae

8 years agoFix SuperNotCalledException.
Dan Sandler [Tue, 28 Jun 2016 07:07:28 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am: 04f8cc2bb3

Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362

8 years agoPurr.
Dan Sandler [Tue, 28 Jun 2016 07:07:24 +0000 (07:07 +0000)]
Purr.
am: 610f6ede25

Change-Id: I252d53781fbe151b21909617ecb92ab9f2e9187a

8 years agoOne final tweak to the platlogo.
Dan Sandler [Tue, 28 Jun 2016 07:07:22 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ibbe66c569c0be5fc1801d8af9b5810ac997854d8

8 years agoFix SuperNotCalledException.
Dan Sandler [Tue, 28 Jun 2016 07:07:20 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am: 04f8cc2bb3

Change-Id: I52977c00a41ec0db599b67cdc2617f1c602667a6

8 years agoPurr.
Dan Sandler [Tue, 28 Jun 2016 05:25:08 +0000 (01:25 -0400)]
Purr.

Bug: 27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432

8 years agoOne final tweak to the platlogo.
Dan Sandler [Tue, 28 Jun 2016 02:02:12 +0000 (22:02 -0400)]
One final tweak to the platlogo.

Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f

8 years agoFix SuperNotCalledException.
Dan Sandler [Tue, 28 Jun 2016 01:33:27 +0000 (21:33 -0400)]
Fix SuperNotCalledException.

Q. Dan, how did you make such a basic newbie mistake?
A. new phone who dis

Bug: 29779845
Change-Id: Iecba53effcf6252df228afd2cc80df43b2afaa59

8 years agoMerge \"Add disable add call during video call extra and carrier config key\" into...
Hall Liu [Tue, 28 Jun 2016 02:34:00 +0000 (02:34 +0000)]
Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
am: 2cd8281a23

Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9

8 years agoMerge "Add disable add call during video call extra and carrier config key" into...
Hall Liu [Tue, 28 Jun 2016 02:29:04 +0000 (02:29 +0000)]
Merge "Add disable add call during video call extra and carrier config key" into nyc-mr1-dev

8 years agoMerge \"Fix SurfaceViewPositionListener race bugs\" into nyc-mr1-dev
John Reck [Tue, 28 Jun 2016 01:31:02 +0000 (01:31 +0000)]
Merge \"Fix SurfaceViewPositionListener race bugs\" into nyc-mr1-dev
am: 8701bff9ba

Change-Id: I17b1cf4e81321edb04ae9ac99449160a705ba824

8 years agoMerge "Fix SurfaceViewPositionListener race bugs" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 01:26:42 +0000 (01:26 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" into nyc-mr1-dev

8 years agoMerge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
Amith Yamasani [Tue, 28 Jun 2016 01:06:47 +0000 (01:06 +0000)]
Merge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
am: 30a2b43f6d

Change-Id: Iaca49cc4aad9285e87d869b112b6c2986073f006

8 years agoMerge "Add tron logging for retail demo session counters" into nyc-mr1-dev
Amith Yamasani [Tue, 28 Jun 2016 01:03:16 +0000 (01:03 +0000)]
Merge "Add tron logging for retail demo session counters" into nyc-mr1-dev

8 years agoMerge "Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am...
Android Build Merger (Role) [Tue, 28 Jun 2016 00:52:36 +0000 (00:52 +0000)]
Merge "Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf am: 7878e736f7" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
Svetoslav Ganov [Tue, 28 Jun 2016 00:52:04 +0000 (00:52 +0000)]
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
am: 7878e736f7

Change-Id: If05b82ba029bfce142c42eebd3336ca3d5bded3d

8 years agoMerge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
Svetoslav Ganov [Tue, 28 Jun 2016 00:52:01 +0000 (00:52 +0000)]
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
am: 5f7f3fa7a9

Change-Id: Id4bc3ae0c1d79174a22d669dccab3391c231357d

8 years agoMerge \"Mark app pending intents in notification extras\" into nyc-dev
Svet Ganov [Tue, 28 Jun 2016 00:46:58 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447

8 years agoMerge \"Mark app pending intents in notification extras\" into nyc-dev
Svet Ganov [Tue, 28 Jun 2016 00:46:55 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Idb515255f224c23d60a513713d9e4f93decd7a9c

8 years agoMerge "Mark app pending intents in notification extras" into nyc-dev
Svetoslav Ganov [Tue, 28 Jun 2016 00:42:23 +0000 (00:42 +0000)]
Merge "Mark app pending intents in notification extras" into nyc-dev

8 years agoMark app pending intents in notification extras
Svet Ganov [Fri, 24 Jun 2016 02:55:24 +0000 (19:55 -0700)]
Mark app pending intents in notification extras

We need to make every peniding intent that went in the notification
system to allow special handling of such intents when fired by a
notification listener. If a pending intent from a notification
is sent from a notification listener, we white-list the source app
to run in data saver mode for a short period of time. The problem is
that actions and the notificaion can have extras which bundles may
contain pending intents but the system cannot look into the bundles
as they may contain custom parcelable objects. To address this we
keep a list of all pending intents in the notification allowing
the system to access them without touching the bundle. Currently
the pending intents are written to the parcel twice, once in the
bundle and once as the explicit list. We can come up with a scheme
to optimize this but since pending itents are just a binder pointer
it is not worth the excecise.

bug:29480440

Change-Id: I7328a47017ca226117adf7054900836619f5679b

8 years agoAdd a flag to enable instrumentation of the framework classes.
Allen Hair [Tue, 28 Jun 2016 00:01:50 +0000 (17:01 -0700)]
Add a flag to enable instrumentation of the framework classes.

Bug: 29777843
Change-Id: I0f3639ad1303a9b2cc612f99cde427dedff4874f

8 years agoAdd disable add call during video call extra and carrier config key
Hall Liu [Thu, 16 Jun 2016 00:55:00 +0000 (17:55 -0700)]
Add disable add call during video call extra and carrier config key

Bug: 29047863

Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7

8 years agoMerge "Merge \\"Fix smooth panel deceleration\\" into nyc-dev am: e858432241 am:...
Jorim Jaggi [Tue, 28 Jun 2016 00:04:11 +0000 (00:04 +0000)]
Merge "Merge \\"Fix smooth panel deceleration\\" into nyc-dev am: e858432241 am: f4704889a6" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\"Fix bug where process whitelist manager state would not be correct...
Android Build Merger (Role) [Tue, 28 Jun 2016 00:01:09 +0000 (00:01 +0000)]
Merge "Merge \\"Fix bug where process whitelist manager state would not be correct.\\" into nyc-dev am: a39d380651 am: 91df8559c0" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev...
Android Build Merger (Role) [Tue, 28 Jun 2016 00:00:56 +0000 (00:00 +0000)]
Merge "Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev am: d06f87399b" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
Andre Eisenbach [Tue, 28 Jun 2016 00:00:18 +0000 (00:00 +0000)]
Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
am: 9525331c5e

Change-Id: I670cf48d1aac97dcf26213d7db5627ac7a1ef654

8 years agoMerge \\"Fix bug where process whitelist manager state would not be correct.\\" into...
Dianne Hackborn [Tue, 28 Jun 2016 00:00:17 +0000 (00:00 +0000)]
Merge \\"Fix bug where process whitelist manager state would not be correct.\\" into nyc-dev am: a39d380651
am: 91df8559c0

Change-Id: Ic2fff0bfcc91ba5e791f0a4986fa854e866534e0

8 years agoMerge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
Andreas Gampe [Tue, 28 Jun 2016 00:00:13 +0000 (00:00 +0000)]
Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
am: d06f87399b

Change-Id: Iaefa3414cb7ca7d113e9ac776f8f667d5dc724c8

8 years agoMerge \"Fix bug where process whitelist manager state would not be correct.\" into...
Dianne Hackborn [Mon, 27 Jun 2016 23:57:05 +0000 (23:57 +0000)]
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am: a39d380651

Change-Id: I78f5a67a6b08f1275c66b7543e91b2bd016d621e

8 years agoMerge \"Fix bug where process whitelist manager state would not be correct.\" into...
Dianne Hackborn [Mon, 27 Jun 2016 23:56:58 +0000 (23:56 +0000)]
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am: a39d380651

Change-Id: Ideb81a07d14e1fff71593cec822f3120c4f523f6

8 years agoMerge "Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308...
Android Build Merger (Role) [Mon, 27 Jun 2016 23:56:28 +0000 (23:56 +0000)]
Merge "Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308 am: e7ce279d9a" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
Andre Eisenbach [Mon, 27 Jun 2016 23:56:03 +0000 (23:56 +0000)]
Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
am: e7ce279d9a

Change-Id: Ib20db3e3e8111ca98b586adbcb83b65a5764f860

8 years agoMerge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
Andre Eisenbach [Mon, 27 Jun 2016 23:56:02 +0000 (23:56 +0000)]
Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
am: d09f7d0edc

Change-Id: Ibb19ab5bdf094a250706b2d32de169f61c221a76

8 years agoMerge "Fix bug where process whitelist manager state would not be correct." into...
Dianne Hackborn [Mon, 27 Jun 2016 23:52:00 +0000 (23:52 +0000)]
Merge "Fix bug where process whitelist manager state would not be correct." into nyc-dev

8 years agoMerge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 23:50:36 +0000 (23:50 +0000)]
Merge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev

8 years agoMerge \"Add extra waiting when switching users\" into nyc-dev
Pavlin Radoslavov [Mon, 27 Jun 2016 23:46:30 +0000 (23:46 +0000)]
Merge \"Add extra waiting when switching users\" into nyc-dev
am: 4d6be6b308

Change-Id: I3c54d6666d8327a0915d839ec02715961e62565a

8 years agoMerge \"Add extra waiting when switching users\" into nyc-dev
Pavlin Radoslavov [Mon, 27 Jun 2016 23:46:27 +0000 (23:46 +0000)]
Merge \"Add extra waiting when switching users\" into nyc-dev
am: 4d6be6b308

Change-Id: Ibf3fc8f0176e2d02fe3548146928c9b66986e428

8 years agoMerge "Add extra waiting when switching users" into nyc-dev
Andre Eisenbach [Mon, 27 Jun 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Add extra waiting when switching users" into nyc-dev

8 years agoMerge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev...
Chris Tate [Mon, 27 Jun 2016 23:31:37 +0000 (23:31 +0000)]
Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298
am: defa943074

Change-Id: I8f5f98b47804ade4eabd4f03a0d842ec4553816a

8 years agoMerge "Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into...
Android Build Merger (Role) [Mon, 27 Jun 2016 23:29:15 +0000 (23:29 +0000)]
Merge "Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298 am: 0bdb4cef4a" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev...
Chris Tate [Mon, 27 Jun 2016 23:28:52 +0000 (23:28 +0000)]
Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298
am: 0bdb4cef4a

Change-Id: I8fa6a0c035f52a9e80817eff1e1d42e91620e049

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Mon, 27 Jun 2016 23:27:46 +0000 (23:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 95ad00d115  -s ours

Change-Id: Iba00061506c03e399378f2a74b03028c130bf0a1

8 years agoMerge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
Christopher Tate [Mon, 27 Jun 2016 23:24:03 +0000 (23:24 +0000)]
Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
am: f480698298

Change-Id: I56aa1a6ecb2409b905de4a8419e1b76523120efc

8 years agoMerge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
Christopher Tate [Mon, 27 Jun 2016 23:24:01 +0000 (23:24 +0000)]
Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
am: f480698298

Change-Id: I957ae07c46573f0e6a066cc1cb0a27b8bafe5811

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 27 Jun 2016 23:19:28 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev
Chris Tate [Mon, 27 Jun 2016 23:18:30 +0000 (23:18 +0000)]
Merge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev

8 years agoMerge \"Fix AttributeCache\" into nyc-mr1-dev
Adam Lesinski [Mon, 27 Jun 2016 23:17:48 +0000 (23:17 +0000)]
Merge \"Fix AttributeCache\" into nyc-mr1-dev
am: bdad0ccf3b

Change-Id: I1154b6243c1f972dccc3918964c7243c218749a9

8 years agoFix #29737133 : content-trigger jobs not running properly
Christopher Tate [Mon, 27 Jun 2016 23:12:41 +0000 (16:12 -0700)]
Fix #29737133 : content-trigger jobs not running properly

When removing the ContentObserver wrapper from our internal
bookkeeping we were using the wrong key.  That led to future
re-registrations thinking they were reusing a currently-
registered observers, but instead never getting onChange()
notifications.

Change-Id: Id3111db057ae63194049d7d48d45b75be6bb0000

8 years agoMerge "Fix AttributeCache" into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 23:11:32 +0000 (23:11 +0000)]
Merge "Fix AttributeCache" into nyc-mr1-dev

8 years agoAdd extra waiting when switching users
Pavlin Radoslavov [Mon, 27 Jun 2016 22:25:18 +0000 (15:25 -0700)]
Add extra waiting when switching users

If disabling Bluetooth times out, wait for an additional amount of time
to ensure the process is shut down completely before attempting to restart.

Bug: 29738770
Change-Id: I43dec35a1e03d12cb07863babea97d55baa32528

8 years agoFix bug where process whitelist manager state would not be correct.
Dianne Hackborn [Mon, 27 Jun 2016 22:07:18 +0000 (15:07 -0700)]
Fix bug where process whitelist manager state would not be correct.

We can't update this in updateOomAdjLocked(), because we very
deliberately only iterate through services in there as needed.
The correct thing to do is update the process as services/connections
are associated with it, so do that.

Now basically all of the logic for tracking the state is in
ActiveServices, as we bind and unbind services and add and removing
them from process records.  It's a little messy because we don't
have a central place for removing them from process records, which
should be cleaned up in the future.

Part of fixes for issue #29480440

Change-Id: Iac96f002a5b4e3b0277df244ff7b90f59a6e8440

8 years agoMerge "Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb...
Android Build Merger (Role) [Mon, 27 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge "Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb am: 11858f170a" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb
John Reck [Mon, 27 Jun 2016 22:31:39 +0000 (22:31 +0000)]
Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb
am: aecf607eb6

Change-Id: Iede184ab8942798a932f67d1ece3f7fd5e0f9d66

8 years agoMerge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb
John Reck [Mon, 27 Jun 2016 22:31:39 +0000 (22:31 +0000)]
Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb
am: 11858f170a

Change-Id: Ibb7d608f220a2d244050ee070bc63e959d56d1ec

8 years agoMerge \"Add missing roundOut for layer damage\" into nyc-dev
John Reck [Mon, 27 Jun 2016 22:28:41 +0000 (22:28 +0000)]
Merge \"Add missing roundOut for layer damage\" into nyc-dev
am: 48cde353eb

Change-Id: I99532e6b7992452523c4fb0716a7161c06b92950

8 years agoMerge \"Add missing roundOut for layer damage\" into nyc-dev
John Reck [Mon, 27 Jun 2016 22:28:39 +0000 (22:28 +0000)]
Merge \"Add missing roundOut for layer damage\" into nyc-dev
am: 48cde353eb

Change-Id: If4ca933e218fc33fa78dc063b687e03793635e6c

8 years agoMerge "Add missing roundOut for layer damage" into nyc-dev
John Reck [Mon, 27 Jun 2016 22:22:40 +0000 (22:22 +0000)]
Merge "Add missing roundOut for layer damage" into nyc-dev

8 years agoMerge \"Allow system apps to have disabled QS tiles.\" into nyc-mr1-dev
Will Harmon [Mon, 27 Jun 2016 22:20:47 +0000 (22:20 +0000)]
Merge \"Allow system apps to have disabled QS tiles.\" into nyc-mr1-dev
am: 611093b1a1

Change-Id: Ie3f832621d982f45af7d0e4d1b786f429cef9f2c

8 years agoAdd missing roundOut for layer damage
John Reck [Mon, 27 Jun 2016 22:13:54 +0000 (15:13 -0700)]
Add missing roundOut for layer damage

fixes: 29771171

This is a regression from HWUI_NEW_OPS, a roundOut
was missing in the new path that was in the old one

Change-Id: Ibf223d550bb5525781864dd9b7f7cd6d73adb98b

8 years agoMerge "Allow system apps to have disabled QS tiles." into nyc-mr1-dev
William Harmon [Mon, 27 Jun 2016 22:15:45 +0000 (22:15 +0000)]
Merge "Allow system apps to have disabled QS tiles." into nyc-mr1-dev

8 years agoAllow system apps to have disabled QS tiles.
Will Harmon [Sat, 25 Jun 2016 00:02:34 +0000 (17:02 -0700)]
Allow system apps to have disabled QS tiles.

Otherwise the tile can get removed on bootup if the tile is disabled by
default.

Fixes: 29509725

Change-Id: Icc6b63b6cf9b9cdca367c79c3175896c87041e05

8 years agoFrameworks/base: Add new flow to OtaDexoptService
Andreas Gampe [Fri, 24 Jun 2016 03:27:12 +0000 (20:27 -0700)]
Frameworks/base: Add new flow to OtaDexoptService

Add functionality to capture/intercept installd communication, and
use this to return the full communication for dexopt. These parameters
can be used to drive otapreopt_chroot directly.

Keep the old direct invocation alive until devices have transitioned
to a service that exposes this API.

In preparation for renaming of A/B OTA artifacts to include target
slot names.

Bug: 25612095
Bug: 28069686
Change-Id: I14728ee1266f3882cada8f08dd21891ed5f7a0cb

8 years agoRound unclipped saveLayers am: 45e83338e5
Chris Craik [Mon, 27 Jun 2016 21:52:37 +0000 (21:52 +0000)]
Round unclipped saveLayers am: 45e83338e5
am: 65c0d9d290

Change-Id: I70d75f110a13cf9b0e1d37b79f582e823469142a