OSDN Git Service
Lorenzo Colitti [Tue, 27 Oct 2015 06:38:42 +0000 (06:38 +0000)]
Merge "Add support for iif rules." am:
60a057589f
am:
f9e010c6fe
* commit '
f9e010c6fef768a919cdc11df8932131da9ec512':
Add support for iif rules.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:56 +0000 (06:35 +0000)]
Merge "Make host network access optional." am:
021e773593
am:
fb61164cad
* commit '
fb61164cad4d38ecaefc903f81f18a708c2afa62':
Make host network access optional.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:53 +0000 (06:35 +0000)]
Merge "Fix ambiguous commit number." am:
8a6135bb2c
am:
8e20adb810
* commit '
8e20adb810cf3629e8fb12b7eb8fad5845266e6d':
Fix ambiguous commit number.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:49 +0000 (06:35 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once." am:
2e3fb5e458
am:
e572b5a4ae
* commit '
e572b5a4ae5df0023c258381618dbcedf95d805c':
Make tcp_nuke_addr_test pass when run more than once.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:45 +0000 (06:35 +0000)]
Merge "Add support for iif rules."
am:
60a057589f
* commit '
60a057589fa095a7fed16ea52a927916ab153781':
Add support for iif rules.
Lorenzo Colitti [Tue, 27 Oct 2015 06:35:45 +0000 (06:35 +0000)]
Merge "Add some Android-specific kernel options." am:
54f9bd922a
am:
516dd9426e
* commit '
516dd9426e370464aa4b9d19a6cc0b81bced9eb8':
Add some Android-specific kernel options.
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:10 +0000 (06:33 +0000)]
Merge "Add support for iif rules."
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:07 +0000 (06:33 +0000)]
Merge "Make host network access optional."
am:
021e773593
* commit '
021e773593ca2893d66c26882e53f25307c4e96b':
Make host network access optional.
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:04 +0000 (06:33 +0000)]
Merge "Fix ambiguous commit number."
am:
8a6135bb2c
* commit '
8a6135bb2c0e5dd2fd7c53792bc3c992f58ba085':
Fix ambiguous commit number.
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:01 +0000 (06:33 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once."
am:
2e3fb5e458
* commit '
2e3fb5e458b10fecc616bdda08760e9a63de902a':
Make tcp_nuke_addr_test pass when run more than once.
Lorenzo Colitti [Tue, 27 Oct 2015 06:32:57 +0000 (06:32 +0000)]
Merge "Add some Android-specific kernel options."
am:
54f9bd922a
* commit '
54f9bd922ac5d4fcfaa34e5878d6de264a565fde':
Add some Android-specific kernel options.
Lorenzo Colitti [Tue, 27 Oct 2015 06:32:41 +0000 (06:32 +0000)]
Merge "Make host network access optional."
Lorenzo Colitti [Tue, 27 Oct 2015 06:31:03 +0000 (06:31 +0000)]
Merge "Fix ambiguous commit number."
Lorenzo Colitti [Tue, 27 Oct 2015 06:30:53 +0000 (06:30 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once."
Lorenzo Colitti [Tue, 27 Oct 2015 06:30:35 +0000 (06:30 +0000)]
Merge "Add some Android-specific kernel options."
Lorenzo Colitti [Fri, 16 Oct 2015 04:01:35 +0000 (13:01 +0900)]
Add support for iif rules.
On real systems, we use this to set up tethering.
Change-Id: I0896191754c81e385a08b325922ad42230980d9e
Lorenzo Colitti [Fri, 16 Oct 2015 03:57:39 +0000 (12:57 +0900)]
Make host network access optional.
This isn't required to run the tests, so it's an unnecessary
burden - it needs uml_utilities installed, needs root access,
and doesn't even perform a full network setup.
Change-Id: I8b0c3783290526909de9fe7d40ecaf7399891ba8
Yabin Cui [Mon, 26 Oct 2015 21:04:47 +0000 (21:04 +0000)]
Merge "Simpleperf: Don\'t load whole perf.data into memory." am:
c5ca81d0d4
am:
0cf5336622
* commit '
0cf5336622366a85d11c305774c3146023fda5cd':
Simpleperf: Don't load whole perf.data into memory.
Yabin Cui [Mon, 26 Oct 2015 21:01:38 +0000 (21:01 +0000)]
Merge "Simpleperf: Don\'t load whole perf.data into memory."
am:
c5ca81d0d4
* commit '
c5ca81d0d4adc1da4325a89dc958b515691a4e0d':
Simpleperf: Don't load whole perf.data into memory.
Yabin Cui [Mon, 26 Oct 2015 20:57:19 +0000 (20:57 +0000)]
Merge "Simpleperf: Don't load whole perf.data into memory."
Dan Albert [Mon, 26 Oct 2015 18:36:14 +0000 (18:36 +0000)]
Merge "Always use clang for iotop." am:
18bf41fbe2
am:
b87f8f262d
* commit '
b87f8f262d7178307cce84b7832aa4972dab53f3':
Always use clang for iotop.
Dan Albert [Mon, 26 Oct 2015 18:32:49 +0000 (18:32 +0000)]
Merge "Always use clang for iotop."
am:
18bf41fbe2
* commit '
18bf41fbe2cf8af53b3732a68c20d280c86a60e5':
Always use clang for iotop.
Dan Albert [Mon, 26 Oct 2015 18:29:22 +0000 (18:29 +0000)]
Merge "Always use clang for iotop."
Dan Albert [Mon, 26 Oct 2015 18:24:47 +0000 (11:24 -0700)]
Always use clang for iotop.
iotop makes use of a lambda that uses an `auto` typedef parameter.
This is a C++14 feature, and we need to move GCC back to C++11 because
GCC 4.9 doesn't have a correct C++14 ABI.
Bug: http://b/
25022512
Change-Id: I3946bd3d287c99eeee1d570ea46e073828b5c1d2
Than McIntosh [Mon, 26 Oct 2015 12:27:28 +0000 (12:27 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd." am:
5157212f42
am:
ecdaa52106
* commit '
ecdaa52106aa2d77461e491a430d1073222cd42b':
Reduce oom_score_adj to zero for perfprofd.
Than McIntosh [Mon, 26 Oct 2015 12:24:11 +0000 (12:24 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd."
am:
5157212f42
* commit '
5157212f42fcf90a2ce136b795c092bbffd41d54':
Reduce oom_score_adj to zero for perfprofd.
Than McIntosh [Mon, 26 Oct 2015 12:21:01 +0000 (12:21 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd."
Lorenzo Colitti [Thu, 1 Oct 2015 08:35:29 +0000 (17:35 +0900)]
Fix ambiguous commit number.
Change-Id: I5081c360a8ab996d7c77e41c099e4acdd65a8ce2
Yabin Cui [Sat, 24 Oct 2015 02:48:42 +0000 (19:48 -0700)]
Simpleperf: Don't load whole perf.data into memory.
perf.data can be too large to be loaded into memory.
To avoid this, use fread() instead of mmap() to read perf.data,
and always use RecordCache to sort records.
Fix unit tests failure caused by previous change.
Bug:
25194400
Change-Id: If29dc0bb0ed992ba34202c2cb1a204a1d9123b7a
Than McIntosh [Fri, 23 Oct 2015 17:15:07 +0000 (13:15 -0400)]
Reduce oom_score_adj to zero for perfprofd.
Up until this point perfprofd has inherited a
decreased OOM score of -1000 from init -- this
doens't make sense given that perfprofd is not
a critical system service. This fixes perfprofd to
reduce its oom_score_adj to 0.
Bug:
25216630
Change-Id: Ica8a300d8c33016bcbd3b0ecd25393828654878e
Yabin Cui [Fri, 23 Oct 2015 01:18:53 +0000 (01:18 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result." am:
6fea45816a
am:
61017b4731
* commit '
61017b473139fc99bda5537383afcc3bbfc1a989':
Simpleperf: fix some unknown symbols for report result.
Yabin Cui [Fri, 23 Oct 2015 01:16:38 +0000 (01:16 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result."
am:
6fea45816a
* commit '
6fea45816ae5ce22b9f186a1fc4b447a42ece10f':
Simpleperf: fix some unknown symbols for report result.
Yabin Cui [Fri, 23 Oct 2015 01:14:16 +0000 (01:14 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result."
Yabin Cui [Mon, 12 Oct 2015 23:56:05 +0000 (16:56 -0700)]
Simpleperf: fix some unknown symbols for report result.
Using debug shared libraries in /usr/lib/debug on linux host.
Match ip addresses with symbols by symbols' virtual addresses instead of
file offsets in elf file. Because symbols' file offsets in debug shared
libraries are different from those in original shared libraries.
Fix overlapped maps.
Bug:
24716851
Change-Id: I9cb64958c4de5c7a6c77c3febc5f689cf2df650f
Yabin Cui [Fri, 23 Oct 2015 00:24:00 +0000 (00:24 +0000)]
Merge "Simpleperf: do stack unwinding while recording." am:
e7182b0cc4
am:
6cad5f5048
* commit '
6cad5f504898b6ae5b39537d1fb8f15675175183':
Simpleperf: do stack unwinding while recording.
Yabin Cui [Fri, 23 Oct 2015 00:21:14 +0000 (00:21 +0000)]
Merge "Simpleperf: do stack unwinding while recording."
am:
e7182b0cc4
* commit '
e7182b0cc45b447943b51e36aa1feb2d17257875':
Simpleperf: do stack unwinding while recording.
Yabin Cui [Fri, 23 Oct 2015 00:17:29 +0000 (00:17 +0000)]
Merge "Simpleperf: do stack unwinding while recording."
Kenny Root [Thu, 22 Oct 2015 00:13:49 +0000 (00:13 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support." am:
b5ff8a9895
am:
3746ef3d16
* commit '
3746ef3d1662e96e528c30eefcd0504be5d5a2a0':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:11:39 +0000 (00:11 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
am:
b5ff8a9895
* commit '
b5ff8a9895b21da46a7d0c6b082db363e1f9929d':
system/extras: remove BORINGSSL_201509 support.
Kenny Root [Thu, 22 Oct 2015 00:09:39 +0000 (00:09 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
Christopher Ferris [Wed, 21 Oct 2015 20:01:45 +0000 (20:01 +0000)]
Merge "Add timing of allocation functions." am:
3d614a17ef
am:
77b1d6fcf2
* commit '
77b1d6fcf288c3bc06106fc34eca129c8e521c18':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 19:59:35 +0000 (19:59 +0000)]
Merge "Add timing of allocation functions."
am:
3d614a17ef
* commit '
3d614a17efc2661dc491dafa9a18d20bac1ab964':
Add timing of allocation functions.
Christopher Ferris [Wed, 21 Oct 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Add timing of allocation functions."
Christopher Ferris [Wed, 14 Oct 2015 20:25:15 +0000 (13:25 -0700)]
Add timing of allocation functions.
Report the time it takes to execute every different allocation function
during the replay.
Change-Id: I4e8321409357824c10f2f176b02c7c33538d353b
Elliott Hughes [Tue, 20 Oct 2015 20:48:31 +0000 (20:48 +0000)]
Merge "Fix lseek argument order." am:
5321b63ea2
am:
3d9578316f
* commit '
3d9578316f5ea702c455e74aceae0a486986e99a':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:37:10 +0000 (20:37 +0000)]
Merge "Fix lseek argument order."
am:
5321b63ea2
* commit '
5321b63ea2063e4246543009c763584498d1e56d':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:28:29 +0000 (20:28 +0000)]
Merge "Fix lseek argument order."
Mike Frysinger [Tue, 20 Oct 2015 20:18:12 +0000 (20:18 +0000)]
Merge "brillo_config: add missing mkdir for product rules" am:
01e57b832a
am:
5dbfe0ac9e
* commit '
5dbfe0ac9e7ea22cd0cabf94c5d3663980b7254c':
brillo_config: add missing mkdir for product rules
Elliott Hughes [Tue, 20 Oct 2015 20:14:28 +0000 (13:14 -0700)]
Fix lseek argument order.
Change-Id: I782d17a0678d7e74be89c46c42de942129750e55
Mike Frysinger [Tue, 20 Oct 2015 20:11:53 +0000 (20:11 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
am:
01e57b832a
* commit '
01e57b832ab732199824ac6bda0b804eaad62b94':
brillo_config: add missing mkdir for product rules
Mike Frysinger [Tue, 20 Oct 2015 19:25:39 +0000 (19:25 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
Mike Frysinger [Tue, 20 Oct 2015 18:11:47 +0000 (14:11 -0400)]
brillo_config: add missing mkdir for product rules
When doing a clean build, creating this file fails because the dir does
not yet exist:
echo "" > out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id
/bin/bash: out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id: No such file or directory
BUG:
24585672
Change-Id: I9c4a646b8d86cd303b0114f9b64d02896797f720
Sami Tolvanen [Tue, 20 Oct 2015 14:29:16 +0000 (14:29 +0000)]
Merge "libfec: add a function to disable verity" am:
c3788283d7
am:
964746605c
* commit '
964746605c96b8bea882b6ef173bc4b54e1ddd94':
libfec: add a function to disable verity
Sami Tolvanen [Tue, 20 Oct 2015 14:25:41 +0000 (14:25 +0000)]
Merge "libfec: add a function to disable verity"
am:
c3788283d7
* commit '
c3788283d70eb8b0ad5b9a0e224108262beb84b5':
libfec: add a function to disable verity
Sami Tolvanen [Tue, 20 Oct 2015 14:22:42 +0000 (14:22 +0000)]
Merge "libfec: add a function to disable verity"
Sami Tolvanen [Tue, 20 Oct 2015 12:23:19 +0000 (13:23 +0100)]
libfec: add a function to disable verity
Add fec_verity_set_status to allow disabling verity on userdebug
builds by updating metadata magic.
Change-Id: I02f83b0d1d4e7ef5cd5d13a37ff0b84f17e23376
Dan Albert [Tue, 20 Oct 2015 01:13:46 +0000 (01:13 +0000)]
Merge "Include what we use." am:
78ca45c2bb
am:
78371f2edb
* commit '
78371f2edb72f54784d71c8b0f3ddeef00cbd8b5':
Include what we use.
Dan Albert [Tue, 20 Oct 2015 00:34:21 +0000 (00:34 +0000)]
Merge "Include what we use."
am:
78ca45c2bb
* commit '
78ca45c2bb2855243bd262581473b20c63f75460':
Include what we use.
Dan Albert [Mon, 19 Oct 2015 23:59:51 +0000 (23:59 +0000)]
Merge "Include what we use."
Dan Albert [Mon, 19 Oct 2015 22:57:14 +0000 (15:57 -0700)]
Include what we use.
libc++ used to leak unistd.h, causing ioctl and close to be leaked. It
doesn't anymore, so actually include this.
Change-Id: I510301a71ea0d9526a4862a634c7726053baa8f8
Sami Tolvanen [Mon, 19 Oct 2015 09:55:23 +0000 (09:55 +0000)]
am
0d08d778: am
4c033e39: Merge "verity: move metadata after the hash tree"
* commit '
0d08d778ea9751da404a300ca59dd88087cc08c1':
verity: move metadata after the hash tree
Sami Tolvanen [Mon, 19 Oct 2015 09:51:57 +0000 (02:51 -0700)]
am
4c033e39: Merge "verity: move metadata after the hash tree"
* commit '
4c033e392e8b8d92f876b8ab46df14e4268d006b':
verity: move metadata after the hash tree
Sami Tolvanen [Mon, 19 Oct 2015 09:49:18 +0000 (09:49 +0000)]
Merge "verity: move metadata after the hash tree"
Joshua Schwarz [Thu, 15 Oct 2015 21:53:52 +0000 (21:53 +0000)]
am
f7023afa: am
e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am:
3c1f6644bf -s ours
* commit '
f7023afac4595a23e29c7dcb9a6f6a847051551c':
DO NOT MERGE Update rand_emmc_perf makefile.
Joshua Schwarz [Thu, 15 Oct 2015 21:36:52 +0000 (21:36 +0000)]
am
e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am:
3c1f6644bf -s ours
* commit '
e78632961167670b89b797a23426d0c51d4b5592':
DO NOT MERGE Update rand_emmc_perf makefile.
Joshua Schwarz [Thu, 15 Oct 2015 21:31:38 +0000 (21:31 +0000)]
DO NOT MERGE Update rand_emmc_perf makefile.
am:
3c1f6644bf -s ours
* commit '
3c1f6644bfcd810356154670866f7434f986d940':
DO NOT MERGE Update rand_emmc_perf makefile.
Mohamad Ayyash [Thu, 15 Oct 2015 21:13:17 +0000 (21:13 +0000)]
am
0b2f8f6c: am
665ae145: Merge "Setup filesystem for automatic forced repair"
* commit '
0b2f8f6cdd6bc649c633f92e189b886bc94aca99':
Setup filesystem for automatic forced repair
Mohamad Ayyash [Thu, 15 Oct 2015 21:07:08 +0000 (21:07 +0000)]
am
665ae145: Merge "Setup filesystem for automatic forced repair"
* commit '
665ae145b8f117b9dfb2b4149e358cf25685b829':
Setup filesystem for automatic forced repair
Mohamad Ayyash [Thu, 15 Oct 2015 20:16:03 +0000 (20:16 +0000)]
Merge "Setup filesystem for automatic forced repair"
Andriy Naborskyy [Thu, 15 Oct 2015 19:14:43 +0000 (19:14 +0000)]
am
1f55c074: am
d258e0fd: am
83eeed92: emmc test: fix counter overflow
* commit '
1f55c074400d01d24a03e9154fb2613f1ad8daf3':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 19:09:50 +0000 (19:09 +0000)]
am
d258e0fd: am
83eeed92: emmc test: fix counter overflow
* commit '
d258e0fd390ac8536d0405589bd0519327721da3':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 19:04:57 +0000 (19:04 +0000)]
am
83eeed92: emmc test: fix counter overflow
* commit '
83eeed92430fc3f14c21cfc43d11fcecef6e8285':
emmc test: fix counter overflow
Andriy Naborskyy [Thu, 15 Oct 2015 17:33:52 +0000 (10:33 -0700)]
emmc test: fix counter overflow
Fix iops counter overflow that is observed with smaller write size
Bug:
24099467
Change-Id: Ibb1001bde4b68cabf4d0bced6df553f4f772685a
Joshua Schwarz [Thu, 15 Oct 2015 00:21:10 +0000 (17:21 -0700)]
DO NOT MERGE Update rand_emmc_perf makefile.
Change-Id: I4f0416508c3c144e6b44eee4a9dcc78c770dfb8e
Sami Tolvanen [Fri, 25 Sep 2015 13:57:41 +0000 (14:57 +0100)]
verity: move metadata after the hash tree
Move the verity metadata block after the hash tree to make locating
it easier and more reliable.
Needs matching changes from
I6945cbab99e214566a1f9d3702333f2dbbc35816
Change-Id: Ide48f581bbba77aed6132f77b309db71630d81ed
Bertrand Simonnet [Tue, 13 Oct 2015 20:03:05 +0000 (20:03 +0000)]
am
c994a994: Merge "Add an Android.mk to generate build time configuration."
* commit '
c994a994527392760df16ab812cbbbf8cca5f61d':
Add an Android.mk to generate build time configuration.
Bertrand Simonnet [Tue, 13 Oct 2015 19:58:46 +0000 (19:58 +0000)]
Merge "Add an Android.mk to generate build time configuration."
Bertrand SIMONNET [Thu, 8 Oct 2015 20:06:35 +0000 (13:06 -0700)]
Add an Android.mk to generate build time configuration.
Some build time variables need to be installed on the image. Instead of
adding those fields in some system services, create a new Android.mk for
it.
BUG:
24585672
Change-Id: Ia4132ef7a200e7839702fe10f878b70cc4dfff43
Sami Tolvanen [Tue, 13 Oct 2015 13:54:36 +0000 (13:54 +0000)]
am
a43f3854: Merge "slideshow: Switch to android::uptimeMillis"
* commit '
a43f3854c60508e00b05201e91dee7571afd3a95':
slideshow: Switch to android::uptimeMillis
Sami Tolvanen [Tue, 13 Oct 2015 13:54:35 +0000 (13:54 +0000)]
am
004019d7: Merge "slideshow: Filter out non key events"
* commit '
004019d71a6a27c8540b61df2c46383ab26df0f2':
slideshow: Filter out non key events
Sami Tolvanen [Tue, 13 Oct 2015 13:52:11 +0000 (13:52 +0000)]
Merge "slideshow: Switch to android::uptimeMillis"
Sami Tolvanen [Tue, 13 Oct 2015 13:51:45 +0000 (13:51 +0000)]
Merge "slideshow: Filter out non key events"
Yabin Cui [Wed, 7 Oct 2015 22:00:46 +0000 (15:00 -0700)]
Simpleperf: do stack unwinding while recording.
Dumping user's stack consumes lots of disk space, which makes long period recording
impossible. This patch does stack unwinding before writing to perf.data, so it doesn't
need to save user's stack. Previous behavior is still supported with --post-unwind option.
A record cache is used for online record processing.
Bug:
22229391
Change-Id: Idcc6ec46924fff3fcc8c165d62f8af875b173cd4
Johan Redestig [Mon, 12 Oct 2015 08:24:30 +0000 (10:24 +0200)]
slideshow: Switch to android::uptimeMillis
time(2) is not guaranteed to always go forward which makes
it a bit dangerous to use in loops like slideshow does.
switch to uptimeMillis which is based on clock_gettime
CLOCK_MONOTONIC which is is safe.
Change-Id: Ica1b7ee50df00fcc7bc849d7eaebe64f62434a47
Johan Redestig [Fri, 9 Oct 2015 11:25:39 +0000 (13:25 +0200)]
slideshow: Filter out non key events
The driver could send EV_SYN events which need
to be filtered out, otherwise we would change
image too soon.
Change-Id: I954e8a4f228da4165a7af3fa544e95a22390a35b
Yabin Cui [Sat, 10 Oct 2015 05:29:52 +0000 (05:29 +0000)]
am
f7b1a8f3: Merge "Simpleperf: add runtest for callgraph."
* commit '
f7b1a8f34349291589f7c4dd255c838454bb53d4':
Simpleperf: add runtest for callgraph.
Yabin Cui [Sat, 10 Oct 2015 05:24:10 +0000 (05:24 +0000)]
Merge "Simpleperf: add runtest for callgraph."
Yabin Cui [Thu, 8 Oct 2015 18:42:55 +0000 (11:42 -0700)]
Simpleperf: add runtest for callgraph.
Bug:
22885658
Change-Id: Ief8d0f1462f78ceae76a10c3effbbe66e0b3b6c1
Sami Tolvanen [Fri, 9 Oct 2015 09:45:10 +0000 (09:45 +0000)]
am
5ba0af50: Merge "slideshow: Trigger on key down only"
* commit '
5ba0af509c4a9161debcfe38276953ae04f54eeb':
slideshow: Trigger on key down only
Sami Tolvanen [Fri, 9 Oct 2015 09:45:09 +0000 (09:45 +0000)]
am
9ba7a526: Merge "slideshow: Dont crash when -t is used"
* commit '
9ba7a526f61906845c8e9f79b1495f0162fe62a6':
slideshow: Dont crash when -t is used
Sami Tolvanen [Fri, 9 Oct 2015 09:41:02 +0000 (09:41 +0000)]
Merge "slideshow: Trigger on key down only"
Sami Tolvanen [Fri, 9 Oct 2015 09:40:52 +0000 (09:40 +0000)]
Merge "slideshow: Dont crash when -t is used"
Johan Redestig [Fri, 9 Oct 2015 08:37:37 +0000 (10:37 +0200)]
slideshow: Dont crash when -t is used
Change-Id: I68764b86ad05afb3853ed753a28b4a53580cb68c
Johan Redestig [Fri, 9 Oct 2015 07:54:57 +0000 (09:54 +0200)]
slideshow: Trigger on key down only
Currently slideshow reacts to both key down and release
events which makes the last image just flicker very
briefly.
Change-Id: I5b3215eacf127a7c739826af313c6e1fd0732775
Yabin Cui [Thu, 8 Oct 2015 22:08:29 +0000 (22:08 +0000)]
am
cecf6df6: Merge "Simpleperf: add a simple gui interface for report command."
* commit '
cecf6df6f892e3d5ab34b839c3d355cb83c5d692':
Simpleperf: add a simple gui interface for report command.
Yabin Cui [Thu, 8 Oct 2015 21:44:34 +0000 (21:44 +0000)]
Merge "Simpleperf: add a simple gui interface for report command."
Yabin Cui [Tue, 6 Oct 2015 21:14:39 +0000 (14:14 -0700)]
Simpleperf: add a simple gui interface for report command.
Change-Id: Ie3293a3f223117bd2dc2b398d0a96f9df8cf484b
Yabin Cui [Tue, 6 Oct 2015 22:15:35 +0000 (22:15 +0000)]
am
b1f20fa4: Merge "Simpleperf: do dwarf unwinding in record command."
* commit '
b1f20fa48b65b2f03f9303ffa2aa381cd1d3dd6f':
Simpleperf: do dwarf unwinding in record command.
Yabin Cui [Tue, 6 Oct 2015 22:02:30 +0000 (22:02 +0000)]
Merge "Simpleperf: do dwarf unwinding in record command."
Yabin Cui [Tue, 6 Oct 2015 21:21:00 +0000 (21:21 +0000)]
am
d210ccde: Merge "Simpleperf: add runtest."
* commit '
d210ccde345d11dd56f6239e8427d66754b6026c':
Simpleperf: add runtest.