OSDN Git Service

android-x86/system-extras.git
7 years agoMerge "simpleperf: add --start_profiling_fd option for record cmd." am: faa89a17fd...
Yabin Cui [Wed, 19 Apr 2017 18:08:29 +0000 (18:08 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd." am: faa89a17fd am: ad46983ee8 am: e0e4e2c085
am: 78743343eb

Change-Id: I43032d31b1ae56453bd8dcc9c73c9fac36dda92f

7 years agoMerge "simpleperf: add --start_profiling_fd option for record cmd." am: faa89a17fd...
Yabin Cui [Wed, 19 Apr 2017 17:59:58 +0000 (17:59 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd." am: faa89a17fd am: ad46983ee8
am: e0e4e2c085

Change-Id: I0f2f8d07c6fce17e52e744c2cc90edcfc5fb2e95

7 years agoMerge "simpleperf: add --start_profiling_fd option for record cmd." am: faa89a17fd
Yabin Cui [Wed, 19 Apr 2017 17:48:18 +0000 (17:48 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd." am: faa89a17fd
am: ad46983ee8

Change-Id: Ife0a346b79bb89be325d439476f0cd993e9994a3

7 years agoMerge "simpleperf: add --start_profiling_fd option for record cmd."
Yabin Cui [Wed, 19 Apr 2017 17:46:49 +0000 (17:46 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd."
am: faa89a17fd

Change-Id: I856f7a8a58b0332efa2d3dff6ff46cfd185cbca9

7 years agoMerge "simpleperf: add --start_profiling_fd option for record cmd."
Treehugger Robot [Wed, 19 Apr 2017 17:41:40 +0000 (17:41 +0000)]
Merge "simpleperf: add --start_profiling_fd option for record cmd."

7 years agosimpleperf: add --start_profiling_fd option for record cmd.
Yabin Cui [Tue, 18 Apr 2017 23:54:11 +0000 (16:54 -0700)]
simpleperf: add --start_profiling_fd option for record cmd.

Bug: http://b/37480722
Test: run simpleperf_unit_test.
Change-Id: Ie6a742b986d79c70d3b6ab8e470eae42af34c9ef

7 years agoMerge "simpleperf: add warning for `--call-graph fp` option on arm." am: 05af0c8c65...
Yabin Cui [Tue, 18 Apr 2017 22:59:13 +0000 (22:59 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm." am: 05af0c8c65 am: e6a0a81106 am: 13fe8a113f
am: 7cc4c3bf60

Change-Id: Ie997e425764ea8b883ffe6f5e3b1124a34b3517b

7 years agoMerge "simpleperf: add warning for `--call-graph fp` option on arm." am: 05af0c8c65...
Yabin Cui [Tue, 18 Apr 2017 22:43:28 +0000 (22:43 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm." am: 05af0c8c65 am: e6a0a81106
am: 13fe8a113f

Change-Id: Ic12b48f48b00319f47c5b2439e305439fe0ffe5a

7 years agoMerge "simpleperf: add warning for `--call-graph fp` option on arm." am: 05af0c8c65
Yabin Cui [Tue, 18 Apr 2017 22:38:52 +0000 (22:38 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm." am: 05af0c8c65
am: e6a0a81106

Change-Id: Ic4ea049897257b78ffc389b8e79c4da8d978ad8c

7 years agoMerge "simpleperf: add warning for `--call-graph fp` option on arm."
Yabin Cui [Tue, 18 Apr 2017 22:33:52 +0000 (22:33 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm."
am: 05af0c8c65

Change-Id: I542f29d75c69d57a40a9143afd3288167b57bc79

7 years agoMerge "simpleperf: add warning for `--call-graph fp` option on arm."
Treehugger Robot [Tue, 18 Apr 2017 22:27:34 +0000 (22:27 +0000)]
Merge "simpleperf: add warning for `--call-graph fp` option on arm."

7 years agosimpleperf: add warning for `--call-graph fp` option on arm.
Yabin Cui [Tue, 18 Apr 2017 19:41:46 +0000 (12:41 -0700)]
simpleperf: add warning for `--call-graph fp` option on arm.

Bug: http://b/37443666
Test: run simpleperf_unit_test.
Change-Id: Ie376babab1aa5ec887c8d640266fbce9a0928290

7 years agoext4_utils: update default conf from e2fsprogs am: cdc4f9bed9
Jin Qian [Mon, 17 Apr 2017 19:38:16 +0000 (19:38 +0000)]
ext4_utils: update default conf from e2fsprogs am: cdc4f9bed9
am: 1090a6a1e2

Change-Id: I9776fb8ce17e7ee6dc5cafcb4297e01aa619f725

7 years agoext4_utils: update default conf from e2fsprogs
Jin Qian [Mon, 17 Apr 2017 19:10:59 +0000 (19:10 +0000)]
ext4_utils: update default conf from e2fsprogs
am: cdc4f9bed9

Change-Id: Ia426461edd9301e60cf63d09ede5585bcbdf5486

7 years agoext4_utils: update default conf from e2fsprogs
Jin Qian [Sat, 15 Apr 2017 00:55:45 +0000 (17:55 -0700)]
ext4_utils: update default conf from e2fsprogs

Build server machines are using a conf file optimized for google
data center. We should use the default version from upstream
e2fsprogs.

Keep reserved_ratio at 1% to get more free space.

Bug: 37361511
Change-Id: I2638df72cfd3b9404981ef227651d38025a8053c

7 years agoMerge "perfprofd: Use testdata in Android.bp." am: 30257fab6d am: 9f559bc6c7 am:...
Yabin Cui [Fri, 14 Apr 2017 18:51:26 +0000 (18:51 +0000)]
Merge "perfprofd: Use testdata in Android.bp." am: 30257fab6d am: 9f559bc6c7 am: b91608dead
am: a4180d8e26

Change-Id: I6f359f2de3e309182fad4be999c858042a49964d

7 years agoMerge "perfprofd: Use testdata in Android.bp." am: 30257fab6d am: 9f559bc6c7
Yabin Cui [Fri, 14 Apr 2017 16:20:22 +0000 (16:20 +0000)]
Merge "perfprofd: Use testdata in Android.bp." am: 30257fab6d am: 9f559bc6c7
am: b91608dead

Change-Id: I5a4126514616eafaf5f1d5431b6d3eb28ffb34a3

7 years agoMerge "perfprofd: Use testdata in Android.bp." am: 30257fab6d
Yabin Cui [Fri, 14 Apr 2017 16:13:48 +0000 (16:13 +0000)]
Merge "perfprofd: Use testdata in Android.bp." am: 30257fab6d
am: 9f559bc6c7

Change-Id: If7b5882deac65c90eb0e4a53ea15ccd3b6045321

7 years agoMerge "perfprofd: Use testdata in Android.bp."
Yabin Cui [Fri, 14 Apr 2017 16:07:19 +0000 (16:07 +0000)]
Merge "perfprofd: Use testdata in Android.bp."
am: 30257fab6d

Change-Id: Ia53aa7e61ddc727e745af42243277c425d881b38

7 years agoMerge "perfprofd: Use testdata in Android.bp."
Treehugger Robot [Fri, 14 Apr 2017 15:58:31 +0000 (15:58 +0000)]
Merge "perfprofd: Use testdata in Android.bp."

7 years agoMerge "simpleperf: fix pprof proto generator." am: d2b7f6afe5 am: d4f4c4518e am:...
Yabin Cui [Thu, 13 Apr 2017 23:26:00 +0000 (23:26 +0000)]
Merge "simpleperf: fix pprof proto generator." am: d2b7f6afe5 am: d4f4c4518e am: 9db43ebe0e
am: 925b66e787

Change-Id: I0c8e25d9ca388d1d09bd3567a1a06dd96b482569

7 years agoMerge "simpleperf: fix pprof proto generator." am: d2b7f6afe5 am: d4f4c4518e
Yabin Cui [Thu, 13 Apr 2017 22:45:13 +0000 (22:45 +0000)]
Merge "simpleperf: fix pprof proto generator." am: d2b7f6afe5 am: d4f4c4518e
am: 9db43ebe0e

Change-Id: I10fa5f40ccbdee997aa43b318c49e7c3c0e19f55

7 years agoMerge "simpleperf: fix pprof proto generator." am: d2b7f6afe5
Yabin Cui [Thu, 13 Apr 2017 22:39:05 +0000 (22:39 +0000)]
Merge "simpleperf: fix pprof proto generator." am: d2b7f6afe5
am: d4f4c4518e

Change-Id: I354bfdb2977382d2bd98898cf079d777f55198e7

7 years agoMerge "simpleperf: fix pprof proto generator."
Yabin Cui [Thu, 13 Apr 2017 22:33:04 +0000 (22:33 +0000)]
Merge "simpleperf: fix pprof proto generator."
am: d2b7f6afe5

Change-Id: Ife8a2d885ed454537b8ebde08516351ac41156a6

7 years agoMerge "simpleperf: fix pprof proto generator."
Yabin Cui [Thu, 13 Apr 2017 22:19:15 +0000 (22:19 +0000)]
Merge "simpleperf: fix pprof proto generator."

7 years agoperfprofd: Use testdata in Android.bp.
Yabin Cui [Thu, 13 Apr 2017 19:13:02 +0000 (12:13 -0700)]
perfprofd: Use testdata in Android.bp.

Bug: http://b/33846452
Test: run perfprofd_tests.
Change-Id: I90b3808f0a45b8158acd0ab8ebe53c3df9531b5f

7 years agosimpleperf: fix pprof proto generator.
Yabin Cui [Thu, 13 Apr 2017 20:44:15 +0000 (13:44 -0700)]
simpleperf: fix pprof proto generator.

Bug: http://b/36988814
Test: run pprof_proto_generator.py and no function_id == 0.
Change-Id: I42bead12818e2d9396c4e52afc2dca84558d7731

7 years agoMerge changes I127a22ae,I8b469b41 am: 248a0baefe am: 306393bd52 am: 956463031a
Mohan Srinivasan [Wed, 5 Apr 2017 04:31:45 +0000 (04:31 +0000)]
Merge changes I127a22ae,I8b469b41 am: 248a0baefe am: 306393bd52 am: 956463031a
am: e066676c19

Change-Id: I2efcb98585e25983313f55f3900ffbf0e58ec7c2

7 years agoMerge changes I127a22ae,I8b469b41 am: 248a0baefe am: 306393bd52
Mohan Srinivasan [Wed, 5 Apr 2017 04:29:17 +0000 (04:29 +0000)]
Merge changes I127a22ae,I8b469b41 am: 248a0baefe am: 306393bd52
am: 956463031a

Change-Id: I95edd08fcdbc2e3cf905fce6607081c935084872

7 years agoMerge changes I127a22ae,I8b469b41 am: 248a0baefe
Mohan Srinivasan [Wed, 5 Apr 2017 04:27:17 +0000 (04:27 +0000)]
Merge changes I127a22ae,I8b469b41 am: 248a0baefe
am: 306393bd52

Change-Id: Id4ae588ba4d5e2201fc7af6e949e76195915fc15

7 years agoMerge changes I127a22ae,I8b469b41
Mohan Srinivasan [Wed, 5 Apr 2017 04:25:22 +0000 (04:25 +0000)]
Merge changes I127a22ae,I8b469b41
am: 248a0baefe

Change-Id: Ie659ff8a16ba113369ff7635159868e78ce44d35

7 years agoMerge changes I127a22ae,I8b469b41
Treehugger Robot [Wed, 5 Apr 2017 04:20:44 +0000 (04:20 +0000)]
Merge changes I127a22ae,I8b469b41

* changes:
  Use TotalTime instead of ThisTime as app launch latency metric
  app-launcher is a App Launch Perf Analysis tool.

7 years agoUse TotalTime instead of ThisTime as app launch latency metric
Mohan Srinivasan [Wed, 1 Feb 2017 00:06:32 +0000 (16:06 -0800)]
Use TotalTime instead of ThisTime as app launch latency metric

Use TotalTime instead of ThisTime (both reported by am) as our
activity launch latency metric. TotalTime is more representative
of user perceived latency. Also add back YouTube to the list of
apps we launch test by default.

Test: Time app launches manually for the various apps, and check
that TotalTime better represents the launch latency.

Change-Id: I127a22ae409ee0141d847e711e09f7873dbb420f
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
7 years agoapp-launcher is a App Launch Perf Analysis tool.
Mohan Srinivasan [Thu, 26 Jan 2017 19:07:14 +0000 (11:07 -0800)]
app-launcher is a App Launch Perf Analysis tool.

app-launcher is an automated tool that automates the launching of
selected Apps (hundreds of times each) and collects system metrics
like CPU util, storage device util, launch times, context switches,
branch mispredicts etc. This is very useful for A/B compares of system
changes in how they impact App Launch. This code was under
google_experimental and was used by various members who found it very
useful, so moving it under system/extras (under userdebug).

Test: I (and others) have used app launcher on multiple occasions over
several months. And comparison of metrics reported by app-launcher are
consistent with metrics reported by other tools, for these tests.

Change-Id: I8b469b4165035a958b155cfffc93341cddcc444c
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
7 years agoMerge "Add test config to memory_replay_tests" am: a88b7b14ec am: 621cc04f04 am:...
Dan Shi [Wed, 5 Apr 2017 00:34:10 +0000 (00:34 +0000)]
Merge "Add test config to memory_replay_tests" am: a88b7b14ec am: 621cc04f04 am: a16fa61ec8
am: 895ae99335

Change-Id: Icfb635818b1a9e908f9109af62631940c75369ae

7 years agoext4_utils: define keyctl_unlink() am: 512904129a
Eric Biggers [Wed, 5 Apr 2017 00:33:49 +0000 (00:33 +0000)]
ext4_utils: define keyctl_unlink() am: 512904129a
am: 2edbb8c96d

Change-Id: I4a567e59fe04eac13a167c8d584b9365062ac740

7 years agoMerge "Add test config to memory_replay_tests" am: a88b7b14ec am: 621cc04f04
Dan Shi [Wed, 5 Apr 2017 00:33:27 +0000 (00:33 +0000)]
Merge "Add test config to memory_replay_tests" am: a88b7b14ec am: 621cc04f04
am: a16fa61ec8

Change-Id: Ic455b7621122709e009b62c258513b666c5d947f

7 years agoext4_utils: define keyctl_unlink()
Eric Biggers [Wed, 5 Apr 2017 00:31:48 +0000 (00:31 +0000)]
ext4_utils: define keyctl_unlink()
am: 512904129a

Change-Id: I796c67f4ba14f13a99408ad9f54e9a9151ed986f

7 years agoMerge "Add test config to memory_replay_tests" am: a88b7b14ec
Dan Shi [Wed, 5 Apr 2017 00:24:38 +0000 (00:24 +0000)]
Merge "Add test config to memory_replay_tests" am: a88b7b14ec
am: 621cc04f04

Change-Id: I741f766efdd480a18082f073aea30c8c681f0494

7 years agoMerge "Add test config to memory_replay_tests"
Dan Shi [Wed, 5 Apr 2017 00:22:38 +0000 (00:22 +0000)]
Merge "Add test config to memory_replay_tests"
am: a88b7b14ec

Change-Id: If4ea7e3f04dd88552c4023fee018ce1b96f03300

7 years agoMerge "Add test config to memory_replay_tests"
Treehugger Robot [Wed, 5 Apr 2017 00:16:56 +0000 (00:16 +0000)]
Merge "Add test config to memory_replay_tests"

7 years agoext4_utils: define keyctl_unlink()
Eric Biggers [Mon, 3 Apr 2017 22:46:31 +0000 (15:46 -0700)]
ext4_utils: define keyctl_unlink()

This will allow vold to unlink keys rather than revoking them.

This also removes the keyctl_revoke() definition for now, to discourage
any further (mis)use in the context of ext4 encryption.

Bug: 35988361
Change-Id: Ic94329040f77ffbe2415287fe1202fa61e8a006b
(cherry picked from commit 3f062383deb3e5ba7b16d4728f5dbc44f40bc178)

7 years agoMerge "ext4_utils: define keyctl_unlink()"
Eric Biggers [Tue, 4 Apr 2017 22:16:50 +0000 (22:16 +0000)]
Merge "ext4_utils: define keyctl_unlink()"

7 years agoMerge "ext4_utils: add default mke2fs.conf" into oc-dev am: 1cf3416564
Jin Qian [Tue, 4 Apr 2017 22:08:07 +0000 (22:08 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev am: 1cf3416564
am: ffb5dd7abc

Change-Id: I7e3014eef33ce62ee905ed8b2b1cc905e0963c59

7 years agoMerge "ext4_utils: add default mke2fs.conf" into oc-dev
Jin Qian [Tue, 4 Apr 2017 21:58:04 +0000 (21:58 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev
am: 1cf3416564

Change-Id: I9bf06099b929b00a3255724affdfacba7307c59b

7 years agoMerge "ext4_utils: add default mke2fs.conf" into oc-dev
Jin Qian [Tue, 4 Apr 2017 21:54:28 +0000 (21:54 +0000)]
Merge "ext4_utils: add default mke2fs.conf" into oc-dev

7 years agoFix cts alsr failure. am: f92a38e36b
Dan Cashman [Tue, 4 Apr 2017 21:49:44 +0000 (21:49 +0000)]
Fix cts alsr failure. am: f92a38e36b
am: c8f8354ba2

Change-Id: I222bc9be86b752c8731ace65c5073c2291074709

7 years agoFix cts alsr failure.
Dan Cashman [Tue, 4 Apr 2017 21:40:37 +0000 (21:40 +0000)]
Fix cts alsr failure.
am: f92a38e36b

Change-Id: Ifc5148825fdd368c323975fad90f95175ebe491b

7 years agoext4_utils: add default mke2fs.conf
Jin Qian [Fri, 10 Mar 2017 20:14:54 +0000 (12:14 -0800)]
ext4_utils: add default mke2fs.conf

Copy default configs from borg build machine and enable ext_attr.

Bug: 34947454
Test: make systemimage
Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0
(cherry picked from commit 87eb12642f68f5a8594893618cfab128da82ebd8)

7 years agoFix cts alsr failure.
Dan Cashman [Tue, 4 Apr 2017 17:44:05 +0000 (10:44 -0700)]
Fix cts alsr failure.

/data/nativetest is not present on user builds, so remove tests
depending on that from CTS inclusion.

Bug: 36888825
Bug: 36484285
Test: cts builds and runs (test no longer present)
Change-Id: I7134a1dca6df03fdfa9c0cc7488abd4570a95e33

7 years agoAdd test config to memory_replay_tests
Dan Shi [Tue, 4 Apr 2017 17:23:43 +0000 (10:23 -0700)]
Add test config to memory_replay_tests

This change allows TradeFederation to run the test directly.
Refer to b/35882476 for design and discussion of this change.

Bug: 35882476
Test: local test
tradefed.sh run template/local --template:map test=memory_replay_tests

Change-Id: Ibce3758f999e3f85624e5c6ca48f21f6e496b356

7 years agoMerge "ext4_utils: add default mke2fs.conf"
TreeHugger Robot [Tue, 4 Apr 2017 02:24:45 +0000 (02:24 +0000)]
Merge "ext4_utils: add default mke2fs.conf"

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 02:02:38 +0000 (02:02 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am: f0deb9a4dd am: c99398e65d am: 5aa626a936
am: 8abcae0577

Change-Id: I7d736e7059ce649bb45f88be6ce565fc76c5f9e4

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 01:44:50 +0000 (01:44 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am: f0deb9a4dd am: c99398e65d
am: 5aa626a936

Change-Id: Ibe459b552845ae784e1b72e45a5805c556d49eed

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 01:37:03 +0000 (01:37 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases" am: f0deb9a4dd
am: c99398e65d

Change-Id: I6f91eeb0640c734ac3679d6095a63c1eb1c11642

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Dan Shi [Tue, 4 Apr 2017 01:30:57 +0000 (01:30 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases"
am: f0deb9a4dd

Change-Id: I3f5a34c752e4094f27145deae243d93f210d30d3

7 years agoMerge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host...
Treehugger Robot [Tue, 4 Apr 2017 01:26:55 +0000 (01:26 +0000)]
Merge "Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases"

7 years agoDo not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases
Dan Shi [Mon, 3 Apr 2017 23:46:27 +0000 (16:46 -0700)]
Do not build simpleperf_unit_test and simpleperf_cpu_hotplug_test for host test cases

These two tests may not support host side test yet, don't output the test binary
to testcases folder for now.

Test: make -j simpleperf_unit_test
Bug: 36820939
Change-Id: Ibffdf6a842e1cfabe8aa38dd75a79416a8bd0b23

7 years agoext4_utils: define keyctl_unlink()
Eric Biggers [Mon, 3 Apr 2017 22:46:31 +0000 (15:46 -0700)]
ext4_utils: define keyctl_unlink()

This will allow vold to unlink keys rather than revoking them.

This also removes the keyctl_revoke() definition for now, to discourage
any further (mis)use in the context of ext4 encryption.

Change-Id: Ic94329040f77ffbe2415287fe1202fa61e8a006b

7 years agoMerge "Removed e4crypt_create_device_key" into oc-dev am: 2fbc9b893f
Tom Cherry [Mon, 3 Apr 2017 22:12:44 +0000 (22:12 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev am: 2fbc9b893f
am: cf9ee55f29

Change-Id: Id46907d84d0224a43192396b07629b278862315f

7 years agoMerge "Removed e4crypt_create_device_key" into oc-dev
Tom Cherry [Mon, 3 Apr 2017 22:06:02 +0000 (22:06 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev
am: 2fbc9b893f

Change-Id: I52922052fc3d1d618f9332bd46b583f7e288112b

7 years agoMerge "Removed e4crypt_create_device_key" into oc-dev
Tom Cherry [Mon, 3 Apr 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Removed e4crypt_create_device_key" into oc-dev

7 years agoext4_utils: add default mke2fs.conf
Jin Qian [Fri, 10 Mar 2017 20:14:54 +0000 (12:14 -0800)]
ext4_utils: add default mke2fs.conf

Copy default configs from borg build machine and enable ext_attr.

Bug: 34947454
Test: make systemimage
Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd052...
Dan Shi [Fri, 31 Mar 2017 17:24:30 +0000 (17:24 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205 am: c76a993f79 am: bf837ea212
am: 44d8d8876a

Change-Id: I9b71583490cbde95669fce55ed47bad37579f898

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd052...
Dan Shi [Fri, 31 Mar 2017 17:19:19 +0000 (17:19 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205 am: c76a993f79
am: bf837ea212

Change-Id: I201f349f32fd18b5a94c9e907115d9f1fd37819d

7 years agoMerge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2 am: 8288531a14
Dan Shi [Fri, 31 Mar 2017 17:18:56 +0000 (17:18 +0000)]
Merge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2 am: 8288531a14
am: 10b7168795

Change-Id: I1bd2267510a8b0f5819c29dbef35dd170cdfa8f7

7 years agoMerge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096 am: 7a3d4d7556
Dan Shi [Fri, 31 Mar 2017 17:18:47 +0000 (17:18 +0000)]
Merge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096 am: 7a3d4d7556
am: fd2e1af29a

Change-Id: I5b0018f769c8289af396bf5c3a5cad9bdc8640c0

7 years agoMerge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a am: 0f92671105
Dan Shi [Fri, 31 Mar 2017 17:18:37 +0000 (17:18 +0000)]
Merge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a am: 0f92671105
am: 7d587036fc

Change-Id: I10579c66beba811c03dac6640b50d28583b4999a

7 years agoMerge "Add test config to perfprofd_test" am: e0d790c82c am: 53011202e2 am: f1868180cc
Dan Shi [Fri, 31 Mar 2017 17:18:28 +0000 (17:18 +0000)]
Merge "Add test config to perfprofd_test" am: e0d790c82c am: 53011202e2 am: f1868180cc
am: 3b7af2d593

Change-Id: I8b67c6167d1d70f6a9806069f705a2e7f4b8ac47

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205
Dan Shi [Fri, 31 Mar 2017 17:16:43 +0000 (17:16 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205
am: c76a993f79

Change-Id: I8d879ae8f88199c3a479619f446a8facfa1ce194

7 years agoMerge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2
Dan Shi [Fri, 31 Mar 2017 17:16:24 +0000 (17:16 +0000)]
Merge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2
am: 8288531a14

Change-Id: I00dfaece3d4178fa99edba39496887d20941190e

7 years agoMerge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096
Dan Shi [Fri, 31 Mar 2017 17:16:15 +0000 (17:16 +0000)]
Merge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096
am: 7a3d4d7556

Change-Id: Ia6d8802579ff2f71d015a2a00dbc84d401509675

7 years agoMerge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a
Dan Shi [Fri, 31 Mar 2017 17:16:06 +0000 (17:16 +0000)]
Merge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a
am: 0f92671105

Change-Id: I26f9f900840de08aab544b36a4af1d93dabe3221

7 years agoMerge "Add test config to perfprofd_test" am: e0d790c82c am: 53011202e2
Dan Shi [Fri, 31 Mar 2017 17:15:58 +0000 (17:15 +0000)]
Merge "Add test config to perfprofd_test" am: e0d790c82c am: 53011202e2
am: f1868180cc

Change-Id: I784fc52414555fe0391e37d9a300bf2913487997

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test"
Dan Shi [Fri, 31 Mar 2017 17:14:11 +0000 (17:14 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test"
am: 4f6fd05205

Change-Id: If83c79fa1e72b043af12ea67d09e738cd6c95bd3

7 years agoMerge "Add test config to binderAddInts" am: d89f0cb87b
Dan Shi [Fri, 31 Mar 2017 17:13:53 +0000 (17:13 +0000)]
Merge "Add test config to binderAddInts" am: d89f0cb87b
am: 33e29525e2

Change-Id: Ibb463f005f18790c34dbcc0c53b8a663f718d514

7 years agoMerge "Add test config to time-unit-tests" am: f8289b9e88
Dan Shi [Fri, 31 Mar 2017 17:13:43 +0000 (17:13 +0000)]
Merge "Add test config to time-unit-tests" am: f8289b9e88
am: d48cc6e096

Change-Id: I1318a1ea96f5652309dd481ea8b59ce54c95668d

7 years agoMerge "Add test config to mmapPerf" am: a2f6b2fe17
Dan Shi [Fri, 31 Mar 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Add test config to mmapPerf" am: a2f6b2fe17
am: e988c3ee6a

Change-Id: I33354a1899d4206387f08e7ced39d5717a0ee090

7 years agoMerge "Add test config to perfprofd_test" am: e0d790c82c
Dan Shi [Fri, 31 Mar 2017 17:13:26 +0000 (17:13 +0000)]
Merge "Add test config to perfprofd_test" am: e0d790c82c
am: 53011202e2

Change-Id: I958abbc2add81e44bc1bde40beb47c18ef98e399

7 years agoMerge "Add test config to binderAddInts"
Dan Shi [Fri, 31 Mar 2017 17:11:53 +0000 (17:11 +0000)]
Merge "Add test config to binderAddInts"
am: d89f0cb87b

Change-Id: I9b629df0aebd2cbde27a1192addd1581ac405e6a

7 years agoMerge "Add test config to time-unit-tests"
Dan Shi [Fri, 31 Mar 2017 17:11:45 +0000 (17:11 +0000)]
Merge "Add test config to time-unit-tests"
am: f8289b9e88

Change-Id: I9e14a76af68fccc187f2f6adf41b8a08e0a73609

7 years agoMerge "Add test config to mmapPerf"
Dan Shi [Fri, 31 Mar 2017 17:11:36 +0000 (17:11 +0000)]
Merge "Add test config to mmapPerf"
am: a2f6b2fe17

Change-Id: I8273d4b05e3db03f20dc3d05d45d309283abf559

7 years agoMerge "Add test config to perfprofd_test"
Dan Shi [Fri, 31 Mar 2017 17:11:27 +0000 (17:11 +0000)]
Merge "Add test config to perfprofd_test"
am: e0d790c82c

Change-Id: I3e4a8f2b22870bd7ed3ad473a4b7135ff1a2d3c1

7 years agoMerge "Add test config to simpleperf_unit_test and simpleperf_unit_test"
Treehugger Robot [Fri, 31 Mar 2017 17:07:49 +0000 (17:07 +0000)]
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test"

7 years agoMerge "Add test config to binderAddInts"
Treehugger Robot [Fri, 31 Mar 2017 17:07:35 +0000 (17:07 +0000)]
Merge "Add test config to binderAddInts"

7 years agoMerge "Add test config to time-unit-tests"
Treehugger Robot [Fri, 31 Mar 2017 17:07:28 +0000 (17:07 +0000)]
Merge "Add test config to time-unit-tests"

7 years agoMerge "Add test config to mmapPerf"
Treehugger Robot [Fri, 31 Mar 2017 17:07:11 +0000 (17:07 +0000)]
Merge "Add test config to mmapPerf"

7 years agoMerge "Add test config to perfprofd_test"
Treehugger Robot [Fri, 31 Mar 2017 17:06:57 +0000 (17:06 +0000)]
Merge "Add test config to perfprofd_test"

7 years agoRemoved e4crypt_create_device_key
Janis Danisevskis [Wed, 29 Mar 2017 22:19:23 +0000 (15:19 -0700)]
Removed e4crypt_create_device_key

Init was the only user of e4crypt_create_device_key and
it is not using it any more.

Bug: 36278706
Test: Removed unused code, and codebase still builds.

(cherry picked from commit d151a583479f475fcfb5d016d7d39dadec97ee72)

Change-Id: I5033dc5d315ea6be84fa9d286615c94a057dc1f0

7 years agoMerge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f am: ad48884579
Tom Cherry [Fri, 31 Mar 2017 16:55:16 +0000 (16:55 +0000)]
Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f am: ad48884579
am: b110b5450e

Change-Id: I7fde3ecb4f48abfb0107f08960833c5ac38e7137

7 years agoMerge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
Tom Cherry [Fri, 31 Mar 2017 16:47:41 +0000 (16:47 +0000)]
Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
am: ad48884579

Change-Id: I4326d686edb8b0e7bbd27f260597a5c6b8f131c3

7 years agoMerge "Removed e4crypt_create_device_key" am: 582a79634a
Tom Cherry [Fri, 31 Mar 2017 16:45:09 +0000 (16:45 +0000)]
Merge "Removed e4crypt_create_device_key" am: 582a79634a
am: 6cf3d8775f

Change-Id: Icb460a36cabc6181af15f8c8beaf4877934d6a31

7 years agoMerge "Removed e4crypt_create_device_key"
Tom Cherry [Fri, 31 Mar 2017 16:43:08 +0000 (16:43 +0000)]
Merge "Removed e4crypt_create_device_key"
am: 582a79634a

Change-Id: I23e8519eaf880d9d9f76ee651d2af966d1271e8e

7 years agoMerge "Removed e4crypt_create_device_key"
Tom Cherry [Fri, 31 Mar 2017 16:41:00 +0000 (16:41 +0000)]
Merge "Removed e4crypt_create_device_key"

7 years agoSwitch to fs_mgr_read_fstab("/fstab.device") am: 4708f734e5
Bowgo Tsai [Fri, 31 Mar 2017 05:40:44 +0000 (05:40 +0000)]
Switch to fs_mgr_read_fstab("/fstab.device") am: 4708f734e5
am: fcc14632bd

Change-Id: Ie90ef64a6439d34fbff208686312449f95cfd09a

7 years agoSwitch to fs_mgr_read_fstab("/fstab.device")
Bowgo Tsai [Fri, 31 Mar 2017 05:37:44 +0000 (05:37 +0000)]
Switch to fs_mgr_read_fstab("/fstab.device")
am: 4708f734e5

Change-Id: I990ec2207cc50cbf4ca13132b116510546d85f76

7 years agoSwitch to fs_mgr_read_fstab("/fstab.device")
Bowgo Tsai [Wed, 29 Mar 2017 08:07:12 +0000 (16:07 +0800)]
Switch to fs_mgr_read_fstab("/fstab.device")

fstab.device is for backward compatibility in legacy devices.
As it doesn't have fstab entries in device tree (for early mount) so we
can just use the ordinary fs_mgr_read_fstab().

For new devices having early mount, it should use
fs_mgr_read_fstab_default() instead.

Bug: 35811655
Test: boot sailfish
Change-Id: I70b64787e600d6e338e57f2a31bad188a39d433d
(cherry picked from commit 732b20936d9875c06fab847b7f7e255859e7859f)

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3...
Bowgo Tsai [Fri, 31 Mar 2017 02:39:50 +0000 (02:39 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3 am: 2b0eed2d9c
am: 9f4346aeb5

Change-Id: I0fbc57eb51278d6129bce75b60cab8c35869408c

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3
Bowgo Tsai [Fri, 31 Mar 2017 02:37:52 +0000 (02:37 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d am: 8ecb417ce3
am: 2b0eed2d9c

Change-Id: I27bc2721d1a69c1464fd4984570cdcf270e7fc77

7 years agoMerge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d
Bowgo Tsai [Fri, 31 Mar 2017 02:35:19 +0000 (02:35 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am: 4485a7b47d
am: 8ecb417ce3

Change-Id: I5f223563408bc3133e91238ee34894ab13ff4103