OSDN Git Service

android-x86/frameworks-native.git
8 years agoMerge \"Otapreopt: Send progress updates to update_engine\" into nyc-mr1-dev
Andreas Gampe [Mon, 13 Jun 2016 16:58:14 +0000 (16:58 +0000)]
Merge \"Otapreopt: Send progress updates to update_engine\" into nyc-mr1-dev
am: 62f2016b12

Change-Id: I64f3c3ee44b30b0c1dc7e60e7bb0a6a3af3b9a3f

8 years agoMerge \\"Fix assignment of 565 format when creating native client buffers.\\" into...
Craig Donner [Mon, 13 Jun 2016 16:58:13 +0000 (16:58 +0000)]
Merge \\"Fix assignment of 565 format when creating native client buffers.\\" into nyc-dev am: 518e336d3f
am: 4c119fc0d5

Change-Id: I7a1e6e525f38bf782bf475e739cc93d004e3989f

8 years agoMerge \\"Fix assignment of 565 format when creating native client buffers.\\" into...
Craig Donner [Mon, 13 Jun 2016 16:53:21 +0000 (16:53 +0000)]
Merge \\"Fix assignment of 565 format when creating native client buffers.\\" into nyc-dev am: 518e336d3f
am: 55f13007ef

Change-Id: Iab698e3da2b53570913cdbbc0b0504d4c7267ae4

8 years agoMerge "Otapreopt: Send progress updates to update_engine" into nyc-mr1-dev
TreeHugger Robot [Mon, 13 Jun 2016 16:52:17 +0000 (16:52 +0000)]
Merge "Otapreopt: Send progress updates to update_engine" into nyc-mr1-dev

8 years agoMerge \"Fix assignment of 565 format when creating native client buffers.\" into...
Craig Donner [Mon, 13 Jun 2016 16:49:25 +0000 (16:49 +0000)]
Merge \"Fix assignment of 565 format when creating native client buffers.\" into nyc-dev
am: 518e336d3f

Change-Id: I3ff59132bd91b02a62beddc78713e2cea7798db2

8 years agoMerge \"Fix assignment of 565 format when creating native client buffers.\" into...
Craig Donner [Mon, 13 Jun 2016 16:49:25 +0000 (16:49 +0000)]
Merge \"Fix assignment of 565 format when creating native client buffers.\" into nyc-dev
am: 518e336d3f

Change-Id: Ib6d83268fed9c3bbd6e4819cb89c5381f0d3d0f8

8 years agoMerge "Fix assignment of 565 format when creating native client buffers." into nyc-dev
Craig Donner [Mon, 13 Jun 2016 16:36:51 +0000 (16:36 +0000)]
Merge "Fix assignment of 565 format when creating native client buffers." into nyc-dev

8 years agoFix assignment of 565 format when creating native client buffers.
Craig Donner [Sat, 11 Jun 2016 00:20:15 +0000 (17:20 -0700)]
Fix assignment of 565 format when creating native client buffers.

Change-Id: Ia379f469a6e18e1f31748dc97aa596d03e507f84
Fixes: 29279664

8 years agoMerge "Fixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0 am: 076e8e37b3...
Android Build Merger (Role) [Sat, 11 Jun 2016 00:16:27 +0000 (00:16 +0000)]
Merge "Fixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0 am: 076e8e37b3" into nyc-mr1-dev-plus-aosp

8 years agoFixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0
Felipe Leme [Sat, 11 Jun 2016 00:16:20 +0000 (00:16 +0000)]
Fixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0
am: 076e8e37b3

Change-Id: I1a74332f5cfb4df817e34e3228c54af7ee1aa014

8 years agoFixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0
Felipe Leme [Sat, 11 Jun 2016 00:16:16 +0000 (00:16 +0000)]
Fixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0
am: 17421c5fa9

Change-Id: Id589d84697885e683020312f570a14b940611753

8 years agoFixed -t order (should be *after* dumpsys :-)
Felipe Leme [Sat, 11 Jun 2016 00:12:34 +0000 (00:12 +0000)]
Fixed -t order (should be *after* dumpsys :-)
am: 3f83dbe2e0

Change-Id: Ia1d5d06884a35a8a586e0620ee75c54181e6b945

8 years agoFixed -t order (should be *after* dumpsys :-)
Felipe Leme [Sat, 11 Jun 2016 00:12:30 +0000 (00:12 +0000)]
Fixed -t order (should be *after* dumpsys :-)
am: 3f83dbe2e0

Change-Id: I047fe3a0f3990eb6827484124889f0052536bcd1

8 years agoFixed -t order (should be *after* dumpsys :-)
Felipe Leme [Fri, 10 Jun 2016 23:56:33 +0000 (16:56 -0700)]
Fixed -t order (should be *after* dumpsys :-)

BUG: 29042642
Change-Id: I1b88634b0152f849a57f8e82adc82bdc5e609db7

8 years agoOtapreopt: Send progress updates to update_engine
Andreas Gampe [Fri, 10 Jun 2016 22:08:53 +0000 (15:08 -0700)]
Otapreopt: Send progress updates to update_engine

Use the new OtaDexoptService progress API to send updates back
to update_engine.

Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd

8 years agoMerge "Merge \\"Set version to 1.0\\" into nyc-dev am: 6ab3c01d18 am: fab4f5126e...
Android Build Merger (Role) [Fri, 10 Jun 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Merge \\"Set version to 1.0\\" into nyc-dev am: 6ab3c01d18 am: fab4f5126e" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Set version to 1.0\\" into nyc-dev am: 6ab3c01d18
Felipe Leme [Fri, 10 Jun 2016 21:01:53 +0000 (21:01 +0000)]
Merge \\"Set version to 1.0\\" into nyc-dev am: 6ab3c01d18
am: fab4f5126e

Change-Id: I22c11fd546bbac42c1f0b841df23cf755afa3672

8 years agoMerge \\"Set version to 1.0\\" into nyc-dev am: 6ab3c01d18
Felipe Leme [Fri, 10 Jun 2016 21:01:47 +0000 (21:01 +0000)]
Merge \\"Set version to 1.0\\" into nyc-dev am: 6ab3c01d18
am: 33168c51ed

Change-Id: Ic360ba18ba0187bb458015e288256478063ed95f

8 years agoMerge \"Set version to 1.0\" into nyc-dev
Felipe Leme [Fri, 10 Jun 2016 20:58:08 +0000 (20:58 +0000)]
Merge \"Set version to 1.0\" into nyc-dev
am: 6ab3c01d18

Change-Id: I8b950e7b4395272e57b2a62af40854ad76ff71ae

8 years agoMerge \"Set version to 1.0\" into nyc-dev
Felipe Leme [Fri, 10 Jun 2016 20:58:08 +0000 (20:58 +0000)]
Merge \"Set version to 1.0\" into nyc-dev
am: 6ab3c01d18

Change-Id: Id05c75208093eaaab3e0732bf9c1767535e6d230

8 years agoMerge "Set version to 1.0" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 20:40:20 +0000 (20:40 +0000)]
Merge "Set version to 1.0" into nyc-dev

8 years agoMerge \\"Expose more useful functions that can be used by dumpstate_board().\\" into...
Felipe Leme [Fri, 10 Jun 2016 00:29:39 +0000 (00:29 +0000)]
Merge \\"Expose more useful functions that can be used by dumpstate_board().\\" into nyc-dev am: f678562fa4
am: 7599fb5687

Change-Id: Id626662eadfc9b08ba565880c137fe8e8d0d1b2c

8 years agoMerge \\"Expose more useful functions that can be used by dumpstate_board().\\" into...
Felipe Leme [Fri, 10 Jun 2016 00:29:22 +0000 (00:29 +0000)]
Merge \\"Expose more useful functions that can be used by dumpstate_board().\\" into nyc-dev am: f678562fa4
am: 61b343b6ec

Change-Id: Ie9f588d6cb98834e7048686281b7a7e266780f37

8 years agoMerge \"Expose more useful functions that can be used by dumpstate_board().\" into...
Calvin On [Fri, 10 Jun 2016 00:26:47 +0000 (00:26 +0000)]
Merge \"Expose more useful functions that can be used by dumpstate_board().\" into nyc-dev
am: f678562fa4

Change-Id: I4a598f406bbbb9cd546a0e2f59dd085622b95b30

8 years agoMerge \"Expose more useful functions that can be used by dumpstate_board().\" into...
Calvin On [Fri, 10 Jun 2016 00:26:47 +0000 (00:26 +0000)]
Merge \"Expose more useful functions that can be used by dumpstate_board().\" into nyc-dev
am: f678562fa4

Change-Id: Iafc8e259139f11a21ce3104df52fe6a74366bcfa

8 years agoMerge "Expose more useful functions that can be used by dumpstate_board()." into...
Felipe Leme [Fri, 10 Jun 2016 00:19:18 +0000 (00:19 +0000)]
Merge "Expose more useful functions that can be used by dumpstate_board()." into nyc-dev

8 years agoMerge \"Plumbing for getting FenceTracker timestamps\" into nyc-mr1-dev
Pablo Ceballos [Thu, 9 Jun 2016 21:15:39 +0000 (21:15 +0000)]
Merge \"Plumbing for getting FenceTracker timestamps\" into nyc-mr1-dev
am: 9e8143ec78

Change-Id: Ife1f3e19cc0bde26960c5a480d4fe81188c4c8f3

8 years agoMerge "Plumbing for getting FenceTracker timestamps" into nyc-mr1-dev
Pablo Ceballos [Thu, 9 Jun 2016 21:10:16 +0000 (21:10 +0000)]
Merge "Plumbing for getting FenceTracker timestamps" into nyc-mr1-dev

8 years agoOtapreopt: Filter preopted system apps
Andreas Gampe [Thu, 9 Jun 2016 19:02:12 +0000 (19:02 +0000)]
Otapreopt: Filter preopted system apps
am: 1409090c0a

Change-Id: I49929843bd263770e6bd643e8d8d1d6770e0cf35

8 years agoOtapreopt: Filter preopted system apps
Andreas Gampe [Wed, 8 Jun 2016 22:11:37 +0000 (15:11 -0700)]
Otapreopt: Filter preopted system apps

The tool will receive requests to compile preopted system apps, as
we can't detect changes right now and need to be conservative. As
some apps cannot be stripped (signed before being preopted), they
can be re-compiled on device, producing stale files that won't be
cleaned up.

Add code to detect this situation and avoid a compile.

Bug: 25612095
Change-Id: I5f489e61b8d4e5b619cbaa01f6c59880479a46cd

8 years agofixing const/non-const issues in preparation for libcxx rebase
Dan Austin [Thu, 9 Jun 2016 16:02:13 +0000 (16:02 +0000)]
fixing const/non-const issues in preparation for libcxx rebase
am: 9c8f93a2a6  -s ours

Change-Id: Ibc845ffd06bb03d910f505b2a581d2f729a1ae2b

8 years agofixing const/non-const issues in preparation for libcxx rebase
Dan Austin [Fri, 3 Jun 2016 23:15:54 +0000 (16:15 -0700)]
fixing const/non-const issues in preparation for libcxx rebase

Change-Id: I8528edd3af4a801f29c17f1f54c44be1a1a0b563

8 years agoAddress const/non-const issues in preparation for libcxx rebase
Dan Austin [Thu, 9 Jun 2016 06:33:33 +0000 (06:33 +0000)]
Address const/non-const issues in preparation for libcxx rebase
am: 497951caa6

Change-Id: I0a06ecb541f59296f4d39496abb22f07d1a38bc4

8 years agoAddress const/non-const issues in preparation for libcxx rebase
Dan Austin [Tue, 31 May 2016 20:27:03 +0000 (13:27 -0700)]
Address const/non-const issues in preparation for libcxx rebase

Change-Id: I7ab9f65b41cbd2a8272810427529f46c6fbf2a0d
(cherry picked from commit 09a7987fb59ed6843d51acf0161d66ed3eb2252f)
(cherry picked from commit d1a8fe69ec033b59b56c171ac5fa9d90b886a8c5)

8 years agoAddress const/non-const issues in preparation for libcxx rebase
Dan Austin [Tue, 31 May 2016 20:27:03 +0000 (13:27 -0700)]
Address const/non-const issues in preparation for libcxx rebase

Change-Id: I7ab9f65b41cbd2a8272810427529f46c6fbf2a0d
(cherry picked from commit 09a7987fb59ed6843d51acf0161d66ed3eb2252f)

8 years agoMerge "Merge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac am: 86d648e0f...
Android Build Merger (Role) [Wed, 8 Jun 2016 23:44:21 +0000 (23:44 +0000)]
Merge "Merge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac am: 86d648e0f7" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac
Felipe Leme [Wed, 8 Jun 2016 23:43:56 +0000 (23:43 +0000)]
Merge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac
am: 75e6dde051

Change-Id: Iae7f0a7c3f66545a98de7d3901ac71622acc1c4a

8 years agoMerge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac
Felipe Leme [Wed, 8 Jun 2016 23:43:56 +0000 (23:43 +0000)]
Merge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac
am: 86d648e0f7

Change-Id: Ic121ada8b651bad3054ad187423ee9fa4f3ce53f

8 years agoMerge \"Improved error handling.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 23:41:18 +0000 (23:41 +0000)]
Merge \"Improved error handling.\" into nyc-dev
am: bbd27419ac

Change-Id: I55a0eb324d18c7081acb6387b51c2fdf4f7b2a62

8 years agoMerge \"Improved error handling.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 23:41:17 +0000 (23:41 +0000)]
Merge \"Improved error handling.\" into nyc-dev
am: bbd27419ac

Change-Id: I1cdfd89997adee7d68191b66bab9e437a8be7800

8 years agoMerge "Improved error handling." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 23:35:11 +0000 (23:35 +0000)]
Merge "Improved error handling." into nyc-dev

8 years agoMerge \"Installd: Move app image A/B artifact\" into nyc-mr1-dev
Andreas Gampe [Wed, 8 Jun 2016 22:40:41 +0000 (22:40 +0000)]
Merge \"Installd: Move app image A/B artifact\" into nyc-mr1-dev
am: e4ad0055a8

Change-Id: Ib43de7c04404f716e15211934eb1695f399d7fd5

8 years agoMerge "Installd: Move app image A/B artifact" into nyc-mr1-dev
Andreas Gampe [Wed, 8 Jun 2016 22:34:32 +0000 (22:34 +0000)]
Merge "Installd: Move app image A/B artifact" into nyc-mr1-dev

8 years agoImproved error handling.
Felipe Leme [Wed, 8 Jun 2016 18:11:01 +0000 (11:11 -0700)]
Improved error handling.

adb bugreport now properly handles stderr.

BUG: 29161586
Change-Id: I7a59d1feadda3d160eae6fe447a7a3c7e0843cbb

8 years agoMerge \\"Explicitly sets dumpsys timeout.\\" into nyc-dev am: 12af7d51a1
Felipe Leme [Wed, 8 Jun 2016 18:38:38 +0000 (18:38 +0000)]
Merge \\"Explicitly sets dumpsys timeout.\\" into nyc-dev am: 12af7d51a1
am: 6a43a90aaa

Change-Id: I052d3b3420e757bfd6ca023f9f0da8605df38d40

8 years agoMerge \\"Explicitly sets dumpsys timeout.\\" into nyc-dev am: 12af7d51a1
Felipe Leme [Wed, 8 Jun 2016 18:38:02 +0000 (18:38 +0000)]
Merge \\"Explicitly sets dumpsys timeout.\\" into nyc-dev am: 12af7d51a1
am: 76614b0120

Change-Id: I635605c043a2435382ac93fb56b6ec57d7a98778

8 years agoMerge \"Explicitly sets dumpsys timeout.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 18:35:11 +0000 (18:35 +0000)]
Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
am: 12af7d51a1

Change-Id: Ieab6b2ad648ff58b3bee7ffc8d4fbc3cfb516225

8 years agoMerge \"Explicitly sets dumpsys timeout.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 18:25:36 +0000 (18:25 +0000)]
Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
am: 12af7d51a1

Change-Id: I1cdc06fdb732e893ea4829a780efe2a931c74598

8 years agoMerge \"Installd: Change app image name computation\" into nyc-mr1-dev
Andreas Gampe [Wed, 8 Jun 2016 18:16:21 +0000 (18:16 +0000)]
Merge \"Installd: Change app image name computation\" into nyc-mr1-dev
am: 2fc9381a2a

Change-Id: I7f30bb31f4271e508996d83cec7d727d499fd76f

8 years agoMerge "Explicitly sets dumpsys timeout." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 18:14:00 +0000 (18:14 +0000)]
Merge "Explicitly sets dumpsys timeout." into nyc-dev

8 years agoInstalld: Move app image A/B artifact
Andreas Gampe [Mon, 6 Jun 2016 22:36:18 +0000 (15:36 -0700)]
Installd: Move app image A/B artifact

In addition to odex, also move art file.

Bug: 25612095
Change-Id: I69f4c2b1e7283c9a9c361f57f5233e66679c5c28

8 years agoMerge "Installd: Change app image name computation" into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 17:35:43 +0000 (17:35 +0000)]
Merge "Installd: Change app image name computation" into nyc-mr1-dev

8 years agoExplicitly sets dumpsys timeout.
Felipe Leme [Wed, 8 Jun 2016 16:51:29 +0000 (09:51 -0700)]
Explicitly sets dumpsys timeout.

The run_command() function takes a timeout as argument, and dumpsys can
also optionally takes a timeout with the -t argument, hence it makes
sense to pass the same value for both (otherwise dumpsys will timeout in
10s).

BUG: 29042642
Change-Id: Ib6e987d94e966686bab71223d7f910af9e549814

8 years agoMerge \"libagl: Switch from gralloc to GraphicBufferMapper\" into nyc-mr1-dev
Dan Stoza [Wed, 8 Jun 2016 16:51:10 +0000 (16:51 +0000)]
Merge \"libagl: Switch from gralloc to GraphicBufferMapper\" into nyc-mr1-dev
am: b3a83a4814

Change-Id: Ia91469306fd9f7cc5565ffedbf48fa877339f072

8 years agoMerge "libagl: Switch from gralloc to GraphicBufferMapper" into nyc-mr1-dev
Dan Stoza [Wed, 8 Jun 2016 16:31:30 +0000 (16:31 +0000)]
Merge "libagl: Switch from gralloc to GraphicBufferMapper" into nyc-mr1-dev

8 years agoMerge "Merge \\"Attach profiles to bug reports\\" into nyc-dev am: 6d98bac4ab am...
Android Build Merger (Role) [Wed, 8 Jun 2016 15:52:29 +0000 (15:52 +0000)]
Merge "Merge \\"Attach profiles to bug reports\\" into nyc-dev am: 6d98bac4ab am: 3f7009c380" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Attach profiles to bug reports\\" into nyc-dev am: 6d98bac4ab
David Brazdil [Wed, 8 Jun 2016 15:52:13 +0000 (15:52 +0000)]
Merge \\"Attach profiles to bug reports\\" into nyc-dev am: 6d98bac4ab
am: 3f7009c380

Change-Id: Ia9184dde3122a9099c7a7ad27f2358227f58744f

8 years agoMerge \\"Attach profiles to bug reports\\" into nyc-dev am: 6d98bac4ab
David Brazdil [Wed, 8 Jun 2016 15:52:08 +0000 (15:52 +0000)]
Merge \\"Attach profiles to bug reports\\" into nyc-dev am: 6d98bac4ab
am: 1188e01847

Change-Id: I739f299d94a7ccd86c15ec15eb065d26ca48bfe8

8 years agoMerge \"Attach profiles to bug reports\" into nyc-dev
David Brazdil [Wed, 8 Jun 2016 15:47:03 +0000 (15:47 +0000)]
Merge \"Attach profiles to bug reports\" into nyc-dev
am: 6d98bac4ab

Change-Id: I30cb48eb317312e153c8936989e43e3acb3c0e14

8 years agoMerge \"Attach profiles to bug reports\" into nyc-dev
David Brazdil [Wed, 8 Jun 2016 15:47:02 +0000 (15:47 +0000)]
Merge \"Attach profiles to bug reports\" into nyc-dev
am: 6d98bac4ab

Change-Id: I14404b7188e7be6c426bd550868badc3a8a91a07

8 years agoMerge "Attach profiles to bug reports" into nyc-dev
David Brazdil [Wed, 8 Jun 2016 15:36:45 +0000 (15:36 +0000)]
Merge "Attach profiles to bug reports" into nyc-dev

8 years agoAttach profiles to bug reports
David Brazdil [Fri, 3 Jun 2016 13:40:44 +0000 (14:40 +0100)]
Attach profiles to bug reports

Includes the entire '/data/misc/profiles' folder in the bug report
ZIP file if not user build.

Bug: 28610953
Change-Id: I99d46f024e5557cf94e6045a51c46a605a00c52b

8 years agoInstalld: Fix bad merge
Andreas Gampe [Wed, 8 Jun 2016 06:59:24 +0000 (06:59 +0000)]
Installd: Fix bad merge
am: f065032f53

Change-Id: Iad40f585d16aa6bc1fdc96e4bad8aa7e013120b7

8 years agoInstalld: Fix bad merge
Andreas Gampe [Wed, 8 Jun 2016 06:16:46 +0000 (23:16 -0700)]
Installd: Fix bad merge

Don't cut off the leading dex location character.

Bug: 25612095
Change-Id: Iad556a0bb48c57f3c68ee75ee41f14e88d96b1a8

8 years agoInstalld: Refactor dexopt to scoped file descriptor
Andreas Gampe [Wed, 8 Jun 2016 05:57:29 +0000 (05:57 +0000)]
Installd: Refactor dexopt to scoped file descriptor
am: afa58d175c

Change-Id: I9fdb0748330846240114c43eb11c7d40fe36ff46

8 years agoInstalld: Change app image name computation
Andreas Gampe [Sat, 4 Jun 2016 04:13:50 +0000 (21:13 -0700)]
Installd: Change app image name computation

Refactor computation to take A/B OTAs into account.

Fix a const issue.

Bug: 25612095
Change-Id: I5cf79def532d1eeec4b35bb80014376959083a83

8 years agoInstalld: Refactor dexopt to scoped file descriptor
Andreas Gampe [Fri, 3 Jun 2016 23:09:32 +0000 (16:09 -0700)]
Installd: Refactor dexopt to scoped file descriptor

Refactor the goto-fail cleanup to a unique_fd-like wrapper that
includes a potential cleanup step. In preparation for changes for
A/B OTA.

Bug: 25612095
Change-Id: If6cca85c12e0951bc468cb4f212b2f2d288c6041

8 years agoPlumbing for getting FenceTracker timestamps
Pablo Ceballos [Fri, 5 Feb 2016 03:10:51 +0000 (19:10 -0800)]
Plumbing for getting FenceTracker timestamps

Change-Id: I1ebee9e42e28658bd3a2b161fdaabb7da756d8f3

8 years agoMerge "Installd: Remove string-helpers" into nyc-mr1-dev
Andreas Gampe [Tue, 7 Jun 2016 21:15:07 +0000 (21:15 +0000)]
Merge "Installd: Remove string-helpers" into nyc-mr1-dev
am: eccc933e00

* commit 'eccc933e00e45cf73664ff5acd7d1ec84e0b48d4':
  Installd: Remove string-helpers

Change-Id: Ie879886553c991234875bfde4afffcdde812a311

8 years agoMerge "Installd: Remove string-helpers" into nyc-mr1-dev
Andreas Gampe [Tue, 7 Jun 2016 21:06:56 +0000 (21:06 +0000)]
Merge "Installd: Remove string-helpers" into nyc-mr1-dev

8 years agoMerge "Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev...
Android Build Merger (Role) [Tue, 7 Jun 2016 20:49:59 +0000 (20:49 +0000)]
Merge "Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am: c3da482bb8 am: 34703b94e1" into nyc-mr1-dev-plus-aosp

8 years agoMerge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am:...
Robert Carr [Tue, 7 Jun 2016 20:49:50 +0000 (20:49 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am: c3da482bb8
am: 34703b94e1

* commit '34703b94e1a9f97f5b225c1b35433a90f8686e38':
  SurfaceFlinger: Add mode to apply position with resize.

Change-Id: I403895e6e6367377c88b5767e10703d3cb6a5d05

8 years agoMerge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am:...
Robert Carr [Tue, 7 Jun 2016 20:49:47 +0000 (20:49 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am: c3da482bb8
am: 3fee6ca1d9

* commit '3fee6ca1d93c1d4b822d2dcd36c61f9722dd88b9':
  SurfaceFlinger: Add mode to apply position with resize.

Change-Id: I91f64e194199f1277a9b4e76c68faddcc7ef6660

8 years agoMerge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
Robert Carr [Tue, 7 Jun 2016 20:47:02 +0000 (20:47 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
am: c3da482bb8

* commit 'c3da482bb8081ee2c19b5965585267b8e21cfc7e':
  SurfaceFlinger: Add mode to apply position with resize.

Change-Id: Icedb7a6e37da9338b1194edaa32a67257640969f

8 years agoMerge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
Robert Carr [Tue, 7 Jun 2016 20:47:01 +0000 (20:47 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
am: c3da482bb8

* commit 'c3da482bb8081ee2c19b5965585267b8e21cfc7e':
  SurfaceFlinger: Add mode to apply position with resize.

Change-Id: Ic185f162bdb765dfdd19ce35f3dd94e29bb8dea3

8 years agoMerge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
TreeHugger Robot [Tue, 7 Jun 2016 20:42:03 +0000 (20:42 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev

8 years agoMerge "Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20...
Android Build Merger (Role) [Tue, 7 Jun 2016 19:31:01 +0000 (19:31 +0000)]
Merge "Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20 am: eaaa9ae321" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20
Janis Danisevskis [Tue, 7 Jun 2016 19:30:49 +0000 (19:30 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20
am: 2781021734

* commit '2781021734fe254bedca87adb90c2313459ecf6a':
  Fix Parcelable::readParcelableVector<T>

Change-Id: I06a0508bfa9e12b0559caa9986eb111c649676b4

8 years agoMerge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20
Janis Danisevskis [Tue, 7 Jun 2016 19:30:49 +0000 (19:30 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20
am: eaaa9ae321

* commit 'eaaa9ae3212ebe9b3d2b9a592a7958afb15bf7d7':
  Fix Parcelable::readParcelableVector<T>

Change-Id: I254056ea16b3ffdb16bf0d9f46fb046f4e563dec

8 years agoMerge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
Janis Danisevskis [Tue, 7 Jun 2016 19:28:25 +0000 (19:28 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
am: 0950fb3d20

* commit '0950fb3d20d100f62961db1cc3eff51b51f9ca6b':
  Fix Parcelable::readParcelableVector<T>

Change-Id: I892d88cfe9fe2df69bf390ce0618c03980b52753

8 years agoMerge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
Janis Danisevskis [Tue, 7 Jun 2016 19:28:25 +0000 (19:28 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
am: 0950fb3d20

* commit '0950fb3d20d100f62961db1cc3eff51b51f9ca6b':
  Fix Parcelable::readParcelableVector<T>

Change-Id: I4fd443663515eec05d992bf42263fea7d9bdc7c4

8 years agoMerge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
Janis Danisevskis [Tue, 7 Jun 2016 19:23:45 +0000 (19:23 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev

8 years agoSurfaceFlinger: Add mode to apply position with resize.
Robert Carr [Sun, 15 May 2016 18:27:47 +0000 (11:27 -0700)]
SurfaceFlinger: Add mode to apply position with resize.

For some cases, like scaled windows with shadows,
we need to be able to apply the position concurrent with
window resize. This is because the scaling of the shadows causes
the top left coordinate of the non shadow surface content
to change before and after the resize.

Bug: 28899837
Change-Id: I522eacfbbcd79707dc1e5ab71901a263b3004ba9

8 years agoInstalld: Remove string-helpers
Andreas Gampe [Fri, 3 Jun 2016 17:22:19 +0000 (10:22 -0700)]
Installd: Remove string-helpers

Replace string-helpers with equivalent functions from android::base.

Bug: 25612095
Change-Id: I186461b94dffe3590c16455d4dee0c2cbe921bf4

8 years agoExpose more useful functions that can be used by dumpstate_board().
Calvin On [Fri, 3 Jun 2016 22:17:07 +0000 (15:17 -0700)]
Expose more useful functions that can be used by dumpstate_board().

BUG: 28640932
Fixes: 28867848
Change-Id: I38123e5b348f4560212559176eb60dbad4f22364

8 years agoMerge "Merge "Enable profman pretty printing" into nyc-dev am: 572e23d761 am: 09c6c75...
Android Build Merger (Role) [Mon, 6 Jun 2016 20:24:15 +0000 (20:24 +0000)]
Merge "Merge "Enable profman pretty printing" into nyc-dev am: 572e23d761 am: 09c6c75d24" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Enable profman pretty printing" into nyc-dev am: 572e23d761
David Sehr [Mon, 6 Jun 2016 20:23:50 +0000 (20:23 +0000)]
Merge "Enable profman pretty printing" into nyc-dev am: 572e23d761
am: 09c6c75d24

* commit '09c6c75d24994fff62252e98b7d27e5ef0df9158':
  Enable profman pretty printing

Change-Id: I41a489fea66d05299acb1a22391ff8c2fed69fe2

8 years agoMerge "Enable profman pretty printing" into nyc-dev am: 572e23d761
David Sehr [Mon, 6 Jun 2016 20:23:49 +0000 (20:23 +0000)]
Merge "Enable profman pretty printing" into nyc-dev am: 572e23d761
am: 1ddf4d8d51

* commit '1ddf4d8d51ba79b4efa6fe2575c6813fd619c04f':
  Enable profman pretty printing

Change-Id: I401f2db6b29f66b27c71591f6335a297b3bd01cb

8 years agoMerge "Enable profman pretty printing" into nyc-dev
David Sehr [Mon, 6 Jun 2016 20:21:16 +0000 (20:21 +0000)]
Merge "Enable profman pretty printing" into nyc-dev
am: 572e23d761

* commit '572e23d7614485a06102b00667d003b21b874bf9':
  Enable profman pretty printing

Change-Id: Ib2e450b89b2805de265c44b670ab414af1b8e6ac

8 years agoMerge "Enable profman pretty printing" into nyc-dev
David Sehr [Mon, 6 Jun 2016 20:21:15 +0000 (20:21 +0000)]
Merge "Enable profman pretty printing" into nyc-dev
am: 572e23d761

* commit '572e23d7614485a06102b00667d003b21b874bf9':
  Enable profman pretty printing

Change-Id: I9ab3bbb8b940b83b3d5911932776cbdcb47f7cff

8 years agoMerge "Enable profman pretty printing" into nyc-dev
David Sehr [Mon, 6 Jun 2016 20:16:10 +0000 (20:16 +0000)]
Merge "Enable profman pretty printing" into nyc-dev

8 years agoMerge "Merge "SF: Also edit currentState in doTransaction" into nyc-dev am: d224e6111...
Android Build Merger (Role) [Mon, 6 Jun 2016 19:42:47 +0000 (19:42 +0000)]
Merge "Merge "SF: Also edit currentState in doTransaction" into nyc-dev am: d224e6111b am: d21cb6d2d9" into nyc-mr1-dev-plus-aosp

8 years agoMerge "SF: Also edit currentState in doTransaction" into nyc-dev am: d224e6111b
Pablo Ceballos [Mon, 6 Jun 2016 19:42:36 +0000 (19:42 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev am: d224e6111b
am: 12863b2a1d

* commit '12863b2a1d7c97e99b7201ae6209f5c861fd46a7':
  SF: Also edit currentState in doTransaction

Change-Id: Ia1367baa3da6415e46caccc1ec75c8ac9026d131

8 years agoMerge "SF: Also edit currentState in doTransaction" into nyc-dev am: d224e6111b
Pablo Ceballos [Mon, 6 Jun 2016 19:42:36 +0000 (19:42 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev am: d224e6111b
am: d21cb6d2d9

* commit 'd21cb6d2d9a5819c3427df1be4470bcc8baf3c6a':
  SF: Also edit currentState in doTransaction

Change-Id: Ibdd0b9d5ca307c0bbc59b5be5d1f47cf51e67e5f

8 years agoMerge "SF: Also edit currentState in doTransaction" into nyc-dev
Pablo Ceballos [Mon, 6 Jun 2016 19:37:38 +0000 (19:37 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am: d224e6111b

* commit 'd224e6111bf4532fb1c1fc021c20285b38bc80ec':
  SF: Also edit currentState in doTransaction

Change-Id: I6bcd675d033cc1ef46d3498174b2bc52a0072f99

8 years agoMerge "SF: Also edit currentState in doTransaction" into nyc-dev
Pablo Ceballos [Mon, 6 Jun 2016 19:37:38 +0000 (19:37 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am: d224e6111b

* commit 'd224e6111bf4532fb1c1fc021c20285b38bc80ec':
  SF: Also edit currentState in doTransaction

Change-Id: I30b6170c8f41a7e330511ad70abd2257a34bdee2

8 years agoMerge "SF: Also edit currentState in doTransaction" into nyc-dev
Pablo Ceballos [Mon, 6 Jun 2016 19:32:15 +0000 (19:32 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev

8 years agoEnable profman pretty printing
David Sehr [Thu, 2 Jun 2016 17:42:12 +0000 (10:42 -0700)]
Enable profman pretty printing

Bug: 28748264
Change-Id: Ia625a7976d9b95ec3b7e1d03af39af9f39015f3b

8 years agoMerge "Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev...
Android Build Merger (Role) [Mon, 6 Jun 2016 16:35:13 +0000 (16:35 +0000)]
Merge "Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev am: 09e5f59bc9 am: fc06a1a55b" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev...
Android Build Merger (Role) [Mon, 6 Jun 2016 16:35:12 +0000 (16:35 +0000)]
Merge "Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev am: 09e5f59bc9 am: fbcc332c85" into nyc-mr1-dev-plus-aosp