OSDN Git Service

android-x86/system-extras.git
8 years agoMerge "Fix pagemap_test#maps." am: 5dc5241d77
Elliott Hughes [Tue, 1 Mar 2016 20:09:12 +0000 (20:09 +0000)]
Merge "Fix pagemap_test#maps." am: 5dc5241d77
am: 02235d5d8d

* commit '02235d5d8d8f20559803ac30ed367cb968cfa207':
  Fix pagemap_test#maps.

8 years agoMerge "Fix pagemap_test#maps."
Elliott Hughes [Tue, 1 Mar 2016 20:07:42 +0000 (20:07 +0000)]
Merge "Fix pagemap_test#maps."
am: 5dc5241d77

* commit '5dc5241d7785569a6a4b65df475ac9451cdfe531':
  Fix pagemap_test#maps.

8 years agoMerge "Fix pagemap_test#maps."
Elliott Hughes [Tue, 1 Mar 2016 20:06:55 +0000 (20:06 +0000)]
Merge "Fix pagemap_test#maps."

8 years agoMerge "Fix typo in \'help report\' output." am: 4e6f660ab0
Than McIntosh [Tue, 1 Mar 2016 19:46:36 +0000 (19:46 +0000)]
Merge "Fix typo in \'help report\' output." am: 4e6f660ab0
am: fe4b8f25e2

* commit 'fe4b8f25e275c255f12fe3767d1e2fa4e31a9d2f':
  Fix typo in 'help report' output.

8 years agoFix pagemap_test#maps.
Elliott Hughes [Tue, 1 Mar 2016 16:02:37 +0000 (08:02 -0800)]
Fix pagemap_test#maps.

We don't necessarily have a brk-based heap.

Bug: http://b/27425642
Change-Id: Iac30904ba35c645afe9b056de8df975ebce92a37

8 years agoMerge "Fix typo in \'help report\' output."
Than McIntosh [Tue, 1 Mar 2016 18:31:34 +0000 (18:31 +0000)]
Merge "Fix typo in \'help report\' output."
am: 4e6f660ab0

* commit '4e6f660ab0d58bd375deec17f36532254183d29d':
  Fix typo in 'help report' output.

8 years agoMerge "Fix typo in 'help report' output."
Than McIntosh [Tue, 1 Mar 2016 18:27:45 +0000 (18:27 +0000)]
Merge "Fix typo in 'help report' output."

8 years agoFix typo in 'help report' output.
Than McIntosh [Tue, 1 Mar 2016 17:38:33 +0000 (12:38 -0500)]
Fix typo in 'help report' output.

Was "--pid", should be "--pids".

Change-Id: Icb49a3d7568bd8f339bf0e4e1065fe2367514588

8 years agoMerge "simpleperf: fix mac build." am: 9e0f649ea9
Yabin Cui [Thu, 25 Feb 2016 20:40:10 +0000 (20:40 +0000)]
Merge "simpleperf: fix mac build." am: 9e0f649ea9
am: 99adeea02a

* commit '99adeea02aee4f2887f8dfb325ce919d404aad2f':
  simpleperf: fix mac build.

8 years agoMerge "simpleperf: fix mac build."
Yabin Cui [Thu, 25 Feb 2016 20:38:25 +0000 (20:38 +0000)]
Merge "simpleperf: fix mac build."
am: 9e0f649ea9

* commit '9e0f649ea94cce48df7bfca238fecac1ed1dac98':
  simpleperf: fix mac build.

8 years agoMerge "simpleperf: fix mac build."
Yabin Cui [Thu, 25 Feb 2016 20:36:03 +0000 (20:36 +0000)]
Merge "simpleperf: fix mac build."

8 years agoMerge "simpleperf: port cmd_report_test to nonlinux." am: ec2bf27cb9
Yabin Cui [Thu, 25 Feb 2016 19:25:33 +0000 (19:25 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux." am: ec2bf27cb9
am: bfbf46b8fe

* commit 'bfbf46b8fe5f55abfbb0c55d248a73259d51655f':
  simpleperf: port cmd_report_test to nonlinux.

8 years agoMerge "simpleperf: port cmd_report_test to nonlinux."
Yabin Cui [Thu, 25 Feb 2016 19:09:44 +0000 (19:09 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux."
am: ec2bf27cb9

* commit 'ec2bf27cb962e55cfa25116ba5880ecb19910a07':
  simpleperf: port cmd_report_test to nonlinux.

8 years agoMerge "simpleperf: port cmd_report_test to nonlinux."
Yabin Cui [Thu, 25 Feb 2016 19:08:07 +0000 (19:08 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux."

8 years agosimpleperf: fix mac build.
Yabin Cui [Thu, 25 Feb 2016 19:02:30 +0000 (11:02 -0800)]
simpleperf: fix mac build.

I forgot that mac doesn't support whole static library. Change to static library
to avoid hiting the same problem in the future.

Bug: 26962895
Change-Id: Ia8e26c2e1cf7621391e00e100b22b7ed451dfa32

8 years agosimpleperf: port cmd_report_test to nonlinux.
Yabin Cui [Wed, 24 Feb 2016 05:41:03 +0000 (21:41 -0800)]
simpleperf: port cmd_report_test to nonlinux.

And fix one build_id bug introduced by previous patch.

Bug: 26962895

Change-Id: Ibb8bd6ec77ee862bb01c26342d3b3024468e75b2

8 years agoMerge "Cite more kernel commits." am: e090897280
Lorenzo Colitti [Thu, 25 Feb 2016 13:21:42 +0000 (13:21 +0000)]
Merge "Cite more kernel commits." am: e090897280
am: 013f143ed8

* commit '013f143ed8352a8d7274df783ad07945c872fdd8':
  Cite more kernel commits.

8 years agoMerge "Cite more kernel commits."
Lorenzo Colitti [Thu, 25 Feb 2016 13:18:08 +0000 (13:18 +0000)]
Merge "Cite more kernel commits."
am: e090897280

* commit 'e0908972807e5366aba6af130a53803333f94145':
  Cite more kernel commits.

8 years agoMerge "Cite more kernel commits."
Lorenzo Colitti [Thu, 25 Feb 2016 13:13:19 +0000 (13:13 +0000)]
Merge "Cite more kernel commits."

8 years agoDon\'t define incremental ext4 for windows
Mohamad Ayyash [Wed, 24 Feb 2016 04:22:22 +0000 (04:22 +0000)]
Don\'t define incremental ext4 for windows
am: ef24424e32

* commit 'ef24424e32921f509f98aae429b6efd9b0e4eae6':
  Don't define incremental ext4 for windows

8 years agoDon't define incremental ext4 for windows
Mohamad Ayyash [Wed, 24 Feb 2016 04:13:02 +0000 (20:13 -0800)]
Don't define incremental ext4 for windows

Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Change-Id: I1eba14f7f4db2174de8feaa9d8e5e41524ac1d32

8 years agoRedesign make_ext4fs to incrementally generate ext4 images
Mohamad Ayyash [Tue, 23 Feb 2016 23:13:40 +0000 (23:13 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images
am: 9579198cd7

* commit '9579198cd7d5b88b3508f1b00ddd77bd8da60682':
  Redesign make_ext4fs to incrementally generate ext4 images

8 years agoRedesign make_ext4fs to incrementally generate ext4 images
Mohamad Ayyash [Sat, 20 Feb 2016 03:46:00 +0000 (03:46 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images

Allows passing a base fs mapping file through -d which preserves the
location of those mapping in existing files

Internal Design Doc: go/incremental-ext4
BUG: 26839493
Change-Id: I05e296693429d39466d257d1d0a3daf00510dc26
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoCite more kernel commits.
Lorenzo Colitti [Tue, 23 Feb 2016 14:42:10 +0000 (23:42 +0900)]
Cite more kernel commits.

Change-Id: Ia335d5c8461e7dfb41211977df74422e00012be8

8 years agoMerge "Teach iproute how to dump IP addresses as well." am: 9e73f5af39
Lorenzo Colitti [Mon, 22 Feb 2016 01:41:25 +0000 (01:41 +0000)]
Merge "Teach iproute how to dump IP addresses as well." am: 9e73f5af39
am: 8660fb3ed4

* commit '8660fb3ed4b26884d59e49cb9254a9bfee8a7b83':
  Teach iproute how to dump IP addresses as well.

8 years agoMerge "Teach iproute how to dump IP addresses as well."
Lorenzo Colitti [Mon, 22 Feb 2016 01:38:07 +0000 (01:38 +0000)]
Merge "Teach iproute how to dump IP addresses as well."
am: 9e73f5af39

* commit '9e73f5af39c035f25b0ac081e999907865789f9e':
  Teach iproute how to dump IP addresses as well.

8 years agoMerge "Teach iproute how to dump IP addresses as well."
Lorenzo Colitti [Mon, 22 Feb 2016 01:33:06 +0000 (01:33 +0000)]
Merge "Teach iproute how to dump IP addresses as well."

8 years agoTeach iproute how to dump IP addresses as well.
Lorenzo Colitti [Sun, 21 Feb 2016 13:45:09 +0000 (22:45 +0900)]
Teach iproute how to dump IP addresses as well.

Change-Id: I38b5182d9110d72758c48da4d0edc7cf0fb84283

8 years agoRevert "Redesign make_ext4fs to incrementally generate ext4 images"
Mohamad Ayyash [Fri, 19 Feb 2016 21:23:41 +0000 (21:23 +0000)]
Revert "Redesign make_ext4fs to incrementally generate ext4 images"
am: 18785a86a3

* commit '18785a86a30135ac65b88db9886bfc22d6608849':
  Revert "Redesign make_ext4fs to incrementally generate ext4 images"

8 years agoRevert "Redesign make_ext4fs to incrementally generate ext4 images"
Mohamad Ayyash [Fri, 19 Feb 2016 21:16:34 +0000 (21:16 +0000)]
Revert "Redesign make_ext4fs to incrementally generate ext4 images"

This reverts commit 3d960843a2260a98c8df5cc39ca0dbf3d675f1a2.

Change-Id: I0fb7d65f094feb4013924685270fc847693b6889

8 years agoRedesign make_ext4fs to incrementally generate ext4 images
Mohamad Ayyash [Fri, 19 Feb 2016 19:39:28 +0000 (19:39 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images
am: 3d960843a2

* commit '3d960843a2260a98c8df5cc39ca0dbf3d675f1a2':
  Redesign make_ext4fs to incrementally generate ext4 images

8 years agoRedesign make_ext4fs to incrementally generate ext4 images
Mohamad Ayyash [Sat, 13 Feb 2016 05:40:52 +0000 (21:40 -0800)]
Redesign make_ext4fs to incrementally generate ext4 images

Allows passing a blk mapping file through -Z which preserves the
location of those mapping in existing files

Internal Design Doc: go/incremental-ext4
BUG: 26839493
Change-Id: I447873bf65ae66dab9923e5a11c497f0722750df
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoMerge "simpleperf: fix build by removing off64_t." am: 21ac023d8e
Yabin Cui [Thu, 18 Feb 2016 20:42:22 +0000 (20:42 +0000)]
Merge "simpleperf: fix build by removing off64_t." am: 21ac023d8e
am: 9a1b2a7509

* commit '9a1b2a7509d0d6fce954f18e9441088d77a851de':
  simpleperf: fix build by removing off64_t.

8 years agoMerge "simpleperf: fix build by removing off64_t."
Yabin Cui [Thu, 18 Feb 2016 20:35:28 +0000 (20:35 +0000)]
Merge "simpleperf: fix build by removing off64_t."
am: 21ac023d8e

* commit '21ac023d8e90b61f4e82e3952a2f706f7db1038a':
  simpleperf: fix build by removing off64_t.

8 years agoMerge "simpleperf: fix build by removing off64_t."
Yabin Cui [Thu, 18 Feb 2016 20:26:56 +0000 (20:26 +0000)]
Merge "simpleperf: fix build by removing off64_t."

8 years agosimpleperf: fix build by removing off64_t.
Yabin Cui [Thu, 18 Feb 2016 20:11:40 +0000 (12:11 -0800)]
simpleperf: fix build by removing off64_t.

Bug: 26962895
Change-Id: I211bacc22c2f6b6b24c639365c706e93d66ce4ac

8 years agoMerge "simpleperf: report symbols of native libraries in apk file." am: 88a0a38c86
Yabin Cui [Thu, 18 Feb 2016 18:40:36 +0000 (18:40 +0000)]
Merge "simpleperf: report symbols of native libraries in apk file." am: 88a0a38c86
am: dcf41e35f3

* commit 'dcf41e35f315f2fd07bcae5808bb2a7ec4b7c456':
  simpleperf: report symbols of native libraries in apk file.

8 years agoMerge "simpleperf: report symbols of native libraries in apk file."
Yabin Cui [Thu, 18 Feb 2016 18:33:34 +0000 (18:33 +0000)]
Merge "simpleperf: report symbols of native libraries in apk file."
am: 88a0a38c86

* commit '88a0a38c86f34d1169fee5a66cc98bc3cc5ac30e':
  simpleperf: report symbols of native libraries in apk file.

8 years agoMerge "simpleperf: report symbols of native libraries in apk file."
Yabin Cui [Thu, 18 Feb 2016 18:22:51 +0000 (18:22 +0000)]
Merge "simpleperf: report symbols of native libraries in apk file."

8 years agosimpleperf: report symbols of native libraries in apk file.
Yabin Cui [Mon, 15 Feb 2016 03:18:02 +0000 (19:18 -0800)]
simpleperf: report symbols of native libraries in apk file.

Changes included:
1. provide interface in read_apk.h to read build id and symbols.
2. report symbols of native libraries in apk file.
3. refactor code in read_elf.cpp and read_apk.cpp.
4. add verbose log.
5. add -o report_file_name option for report command.
6. add corresponding unit tests.

Bug: 26962895
Change-Id: I0d5398996e0c29dba4a6f5226692b758ca096bbd

8 years agoMerge commit \'4258431621ef3cd32d3cec9604fa17324299cc42\' into HEAD
Bill Yi [Wed, 17 Feb 2016 20:46:08 +0000 (20:46 +0000)]
Merge commit \'4258431621ef3cd32d3cec9604fa17324299cc42\' into HEAD
am: 0ebf764baf

* commit '0ebf764baff1723e5217d083b2fa4457b8f23e5f':

8 years agoMerge commit '4258431621ef3cd32d3cec9604fa17324299cc42' into HEAD
Bill Yi [Wed, 17 Feb 2016 17:51:16 +0000 (09:51 -0800)]
Merge commit '4258431621ef3cd32d3cec9604fa17324299cc42' into HEAD

8 years agoMerge changes I871eb6a2,Ied6f5aae,I226a41e7
Lorenzo Colitti [Wed, 17 Feb 2016 06:11:24 +0000 (06:11 +0000)]
Merge changes I871eb6a2,Ied6f5aae,I226a41e7
am: 64e447eb40

* commit '64e447eb40d5edd86b415e252c584802608fae26':
  Add a test for the behaviour of FIN_WAIT sockets.
  Make the bytecode tests a bit more robust.
  Rename DisableLinger to DisableFinWait, and add an EnableFinWait.

8 years agoMerge changes I871eb6a2,Ied6f5aae,I226a41e7
Lorenzo Colitti [Wed, 17 Feb 2016 06:03:08 +0000 (06:03 +0000)]
Merge changes I871eb6a2,Ied6f5aae,I226a41e7

* changes:
  Add a test for the behaviour of FIN_WAIT sockets.
  Make the bytecode tests a bit more robust.
  Rename DisableLinger to DisableFinWait, and add an EnableFinWait.

8 years agoMerge "simpleperf: accept different perf_attr sizes."
Yabin Cui [Tue, 16 Feb 2016 21:52:11 +0000 (21:52 +0000)]
Merge "simpleperf: accept different perf_attr sizes."
am: 1d06628497

* commit '1d06628497bcf090cbb749c73d89f22167fe1281':
  simpleperf: accept different perf_attr sizes.

8 years agoMerge "simpleperf: accept different perf_attr sizes."
Yabin Cui [Tue, 16 Feb 2016 21:28:16 +0000 (21:28 +0000)]
Merge "simpleperf: accept different perf_attr sizes."

8 years agosimpleperf: accept different perf_attr sizes.
Yabin Cui [Tue, 16 Feb 2016 20:15:31 +0000 (12:15 -0800)]
simpleperf: accept different perf_attr sizes.

The size of perf_attr can be increased as new features are added. And
we can accept different perf_attr sizes in perf.data, and ignore
unknown features.

Change-Id: Ia42617f92acb3ab6ae56eb91aa0d7b73efc0b8af

8 years agoMerge "Improve sock_diag debugging code."
Lorenzo Colitti [Tue, 16 Feb 2016 16:17:10 +0000 (16:17 +0000)]
Merge "Improve sock_diag debugging code."
am: b1180e2c76

* commit 'b1180e2c76bed73f2ea2e7fbd3c02adc7eea9bcf':
  Improve sock_diag debugging code.

8 years agoAdd a test for the behaviour of FIN_WAIT sockets.
Lorenzo Colitti [Tue, 16 Feb 2016 16:07:15 +0000 (01:07 +0900)]
Add a test for the behaviour of FIN_WAIT sockets.

Change-Id: I871eb6a2d3ff889417e6ed02661c8d9a41980e61

8 years agoMake the bytecode tests a bit more robust.
Lorenzo Colitti [Tue, 16 Feb 2016 16:05:54 +0000 (01:05 +0900)]
Make the bytecode tests a bit more robust.

They used to require that there were no TCP sockets on the system
at all. Now they only require that there be no established
sockets. Not a huge improvement, but it does make it possible to
write tests that leave-non established sockets around after they
terminate.

Change-Id: Ied6f5aae3b6cf4a5bd25aa4fbeac637010e1f0e8

8 years agoRename DisableLinger to DisableFinWait, and add an EnableFinWait.
Lorenzo Colitti [Tue, 16 Feb 2016 15:42:58 +0000 (00:42 +0900)]
Rename DisableLinger to DisableFinWait, and add an EnableFinWait.

Change-Id: I226a41e7eed6cc5bda04f1fb3a0f1889a10408c0

8 years agoMerge "Improve sock_diag debugging code."
Lorenzo Colitti [Tue, 16 Feb 2016 16:08:28 +0000 (16:08 +0000)]
Merge "Improve sock_diag debugging code."

8 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 04:53:22 +0000 (04:53 +0000)]
Merge "Add missing liblog dependency"
am: 4b99605a60

* commit '4b99605a6057326ced14eda85c0851f306ce062f':
  Add missing liblog dependency

8 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 04:44:24 +0000 (04:44 +0000)]
Merge "Add missing liblog dependency"

8 years agoAdd missing liblog dependency
Dimitry Ivanov [Sat, 13 Feb 2016 02:43:40 +0000 (18:43 -0800)]
Add missing liblog dependency

Bug: http://b/27171986
Change-Id: I508d3cfbcb9e026b0f4a086fc6dd1adeffbffcc3

8 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 01:31:55 +0000 (01:31 +0000)]
Merge "Add missing liblog dependency"
am: aa068b31a6

* commit 'aa068b31a600d645e81f847df88a04b8547a957a':
  Add missing liblog dependency

8 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 00:31:18 +0000 (00:31 +0000)]
Merge "Add missing liblog dependency"

8 years agoAdd missing liblog dependency
Dimitry Ivanov [Sat, 13 Feb 2016 00:28:49 +0000 (16:28 -0800)]
Add missing liblog dependency

Bug: http://b/27171986
Change-Id: Ifef160cce7f64cd95ceb121e1c311e52352174c4

8 years agoMerge "Fix clang warnings and leak of full_stats_file ."
Chih-hung Hsieh [Fri, 12 Feb 2016 20:08:59 +0000 (20:08 +0000)]
Merge "Fix clang warnings and leak of full_stats_file ."
am: a72dd92554

* commit 'a72dd92554fd9fbadbddbf1ad2dcd308f6de7fff':
  Fix clang warnings and leak of full_stats_file .

8 years agoMerge "Fix memory leak of dirbuf."
Chih-hung Hsieh [Fri, 12 Feb 2016 20:08:47 +0000 (20:08 +0000)]
Merge "Fix memory leak of dirbuf."
am: dc0cfc06df

* commit 'dc0cfc06dfb1824851a5be66e60ece97d4a012b8':
  Fix memory leak of dirbuf.

8 years agoMerge "Fix clang warnings and leak of full_stats_file ."
Chih-hung Hsieh [Fri, 12 Feb 2016 20:02:48 +0000 (20:02 +0000)]
Merge "Fix clang warnings and leak of full_stats_file ."

8 years agoMerge "Fix memory leak of dirbuf."
Chih-hung Hsieh [Fri, 12 Feb 2016 19:56:41 +0000 (19:56 +0000)]
Merge "Fix memory leak of dirbuf."

8 years agoFix memory leak of dirbuf.
Chih-Hung Hsieh [Fri, 12 Feb 2016 19:16:19 +0000 (11:16 -0800)]
Fix memory leak of dirbuf.

BUG: 26962062
Change-Id: I5fae9eed5b154205a6780fb28c59fccf0b5b16ec

8 years agoFix clang warnings and leak of full_stats_file .
Chih-Hung Hsieh [Fri, 12 Feb 2016 19:32:33 +0000 (11:32 -0800)]
Fix clang warnings and leak of full_stats_file .

BUG: 27121040
Change-Id: I33a218c7746509278e1222cd5dbd6d4876405b28

8 years agoMerge "rtc_time: test agent timeouts"
Mark Salyzyn [Thu, 11 Feb 2016 23:59:28 +0000 (23:59 +0000)]
Merge "rtc_time: test agent timeouts"
am: f3a337aa9f

* commit 'f3a337aa9ffab5da6133f0ace06701559c4fde58':
  rtc_time: test agent timeouts

8 years agortc_time: test agent timeouts
Mark Salyzyn [Thu, 11 Feb 2016 23:54:10 +0000 (23:54 +0000)]
rtc_time: test agent timeouts
am: 2b2efb53fa

* commit '2b2efb53fa6b0f8cb3e41d13c665d88181a5cd4e':
  rtc_time: test agent timeouts

8 years agortc_time: test agent timeouts
Mark Salyzyn [Thu, 11 Feb 2016 23:04:35 +0000 (15:04 -0800)]
rtc_time: test agent timeouts

(cherry pick from commit 9258225ece5d6816ddf9a45e45fb694142c32761)

Break the test up into four, keeping each well below the 60 second
timeout for the test agents. Overhead for the splitting up is an
additional 10 seconds in order to complete all four of the tests
instead of one. typical single test completion is 22.5 seconds.

Change-Id: If8e9a6c7dfd505a9fbc73e9248be4eb2b61521e5

8 years agoMerge "rtc_time: test agent timeouts"
Mark Salyzyn [Thu, 11 Feb 2016 23:45:46 +0000 (23:45 +0000)]
Merge "rtc_time: test agent timeouts"

8 years agortc_time: test agent timeouts
Mark Salyzyn [Thu, 11 Feb 2016 23:04:35 +0000 (15:04 -0800)]
rtc_time: test agent timeouts

Break the test up into four, keeping each well below the 60 second
timeout for the test agents. Overhead for the splitting up is an
additional 10 seconds in order to complete all four of the tests
instead of one. typical single test completion is 22.5 seconds.

Change-Id: If8e9a6c7dfd505a9fbc73e9248be4eb2b61521e5

8 years agoChanges for mtp8996
Todd Kjos [Thu, 11 Feb 2016 23:03:21 +0000 (23:03 +0000)]
Changes for mtp8996
am: 33e78d360e

* commit '33e78d360ed3cfc1267fc893942082e5d27d0aa9':
  Changes for mtp8996

8 years agoChanges for mtp8996
Todd Kjos [Thu, 11 Feb 2016 00:52:36 +0000 (16:52 -0800)]
Changes for mtp8996

Change-Id: I5fe5c365226087af47aaf7c5a576b7f2622f804d

8 years agoMerge "simpleperf: support building static binary on target."
Yabin Cui [Thu, 11 Feb 2016 18:35:42 +0000 (18:35 +0000)]
Merge "simpleperf: support building static binary on target."
am: ec255673dc

* commit 'ec255673dc853bcf9a829ea0f476d4fd2f1d4a67':
  simpleperf: support building static binary on target.

8 years agoMerge "simpleperf: support building static binary on target."
Yabin Cui [Thu, 11 Feb 2016 18:29:30 +0000 (18:29 +0000)]
Merge "simpleperf: support building static binary on target."

8 years agoTrack update to bouncycastle 1.54
Kenny Root [Thu, 11 Feb 2016 12:44:20 +0000 (12:44 +0000)]
Track update to bouncycastle 1.54
am: 8474f49bc8

* commit '8474f49bc8f9d4c72ca53e99fc41dc8e434f5a5b':
  Track update to bouncycastle 1.54

8 years agoTrack update to bouncycastle 1.54
Kenny Root [Wed, 10 Feb 2016 23:30:56 +0000 (15:30 -0800)]
Track update to bouncycastle 1.54

(cherry-picked from ab9a0c802d88ff47f3467fd66415a27f8f141b19)

Change-Id: I87252e179e191c6210d26e4055bee03fb43d8ba7

8 years agosimpleperf: support building static binary on target.
Yabin Cui [Wed, 10 Feb 2016 19:29:51 +0000 (11:29 -0800)]
simpleperf: support building static binary on target.

Bug: 27125711

Change-Id: I7e951c9ffb3e056d05a2b3567f482c6862a3a5b3

8 years agoMerge "Track update to bouncycastle 1.54"
Sergio Giro [Wed, 10 Feb 2016 23:38:59 +0000 (23:38 +0000)]
Merge "Track update to bouncycastle 1.54"
am: 7a71552b86

* commit '7a71552b8691ee6e3722744a49832d7e08defb1f':
  Track update to bouncycastle 1.54

8 years agoMerge "Track update to bouncycastle 1.54"
Sergio Giro [Wed, 10 Feb 2016 23:34:49 +0000 (23:34 +0000)]
Merge "Track update to bouncycastle 1.54"

8 years agoMerge "Add kernel config tests" into nyc-dev
Mark Salyzyn [Wed, 10 Feb 2016 23:32:23 +0000 (23:32 +0000)]
Merge "Add kernel config tests" into nyc-dev
am: 13781df2a4

* commit '13781df2a4d308904d9207f6465fa953f706242e':
  Add kernel config tests

8 years agoTrack update to bouncycastle 1.54
Kenny Root [Wed, 10 Feb 2016 23:30:56 +0000 (15:30 -0800)]
Track update to bouncycastle 1.54

Change-Id: I87252e179e191c6210d26e4055bee03fb43d8ba7

8 years agoMerge "Add kernel config tests" into nyc-dev
Mark Salyzyn [Wed, 10 Feb 2016 23:29:52 +0000 (23:29 +0000)]
Merge "Add kernel config tests" into nyc-dev

8 years agoAdd kernel config tests
Mark Salyzyn [Wed, 10 Feb 2016 22:00:14 +0000 (14:00 -0800)]
Add kernel config tests

(cherry pick from commit 7129c7dcd20bf57cf3a64ec224e4ebac81c8cd88)

A simple start to simple day. Check for evidence of following CONFIGs:

CONFIG_MMC_BLOCK_MAX_SPEED=y
CONFIG_IPV6=y
CONFIG_IP_MULTICAST=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_PMSG=y
CONFIG_SYSVIPC is not set

ToDo: Evidence for all configs in android/configs/android-base.cfg
      and android/configs/android-recommended.cfg. Most are not
      possible to directly discover, this is performed on a best
      effort basis.

Bug: 19173869
Bug: 26559308
Change-Id: I0447334fab7781579fab10610d2f7ac1d34e6044

8 years agoMerge "Add kernel config tests"
Mark Salyzyn [Wed, 10 Feb 2016 23:26:32 +0000 (23:26 +0000)]
Merge "Add kernel config tests"
am: 1de27a8b66

* commit '1de27a8b66fb5f417d475dccd5d97910c7411866':
  Add kernel config tests

8 years agoMerge "Add kernel config tests"
Mark Salyzyn [Wed, 10 Feb 2016 23:20:17 +0000 (23:20 +0000)]
Merge "Add kernel config tests"

8 years agoAdd kernel config tests
Mark Salyzyn [Wed, 10 Feb 2016 22:00:14 +0000 (14:00 -0800)]
Add kernel config tests

A simple start to simple day. Check for evidence of following CONFIGs:

CONFIG_MMC_BLOCK_MAX_SPEED=y
CONFIG_IPV6=y
CONFIG_IP_MULTICAST=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_PMSG=y
CONFIG_SYSVIPC is not set

ToDo: Evidence for all configs in android/configs/android-base.cfg
      and android/configs/android-recommended.cfg. Most are not
      possible to directly discover, this is performed on a best
      effort basis.

Bug: 19173869
Bug: 26559308
Change-Id: I0447334fab7781579fab10610d2f7ac1d34e6044

8 years agoMerge "simpleperf: port read_apk and read_apk/read_elf tests to nonlinux."
Yabin Cui [Wed, 10 Feb 2016 20:03:32 +0000 (20:03 +0000)]
Merge "simpleperf: port read_apk and read_apk/read_elf tests to nonlinux."
am: 796b070487

* commit '796b0704878a54eabf7a90df507d3442ddb47833':
  simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.

8 years agoMerge "simpleperf: port read_apk and read_apk/read_elf tests to nonlinux."
Yabin Cui [Wed, 10 Feb 2016 19:21:54 +0000 (19:21 +0000)]
Merge "simpleperf: port read_apk and read_apk/read_elf tests to nonlinux."

8 years agoEncrypt /data/misc
Paul Lawrence [Tue, 9 Feb 2016 22:33:41 +0000 (22:33 +0000)]
Encrypt /data/misc
am: 8b11474652

* commit '8b11474652db4f2b7b5c979259619764842175b8':
  Encrypt /data/misc

8 years agoEncrypt /data/misc
Paul Lawrence [Tue, 9 Feb 2016 22:23:52 +0000 (14:23 -0800)]
Encrypt /data/misc

Now we have a workaround for 26989796 (we don't touch /data/misc/vold
thanks to:
    https://googleplex-android-review.git.corp.google.com/#/c/862867
) we can check this in and remove the need for a data wipe when we land
the proper kernel fix for this issue (stop caching negative file lookups
through a key change)

Bug: 26989796
Change-Id: I83e6b8395b2c6a607b692dc9cf71183b13680071

8 years agosimpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
Yabin Cui [Sat, 6 Feb 2016 01:32:08 +0000 (17:32 -0800)]
simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.

Also make following small changes:
1. Manage testdata files like libziparchive.
2. Replace StringToPid() with android::base::ParseInt().
3. Add tests in read_elf_test.

Bug: 26962895

Change-Id: I6603e9f3cea3a013e2618ea003790d102739f843

8 years agoMerge "libfec: fix thread count calculation"
Sami Tolvanen [Mon, 8 Feb 2016 19:10:49 +0000 (19:10 +0000)]
Merge "libfec: fix thread count calculation"
am: 7c7c508ffc

* commit '7c7c508ffce4240eb11fc6a3f09edbe8916aef3a':
  libfec: fix thread count calculation

8 years agoMerge "libfec: fix thread count calculation"
Sami Tolvanen [Mon, 8 Feb 2016 19:00:57 +0000 (19:00 +0000)]
Merge "libfec: fix thread count calculation"

8 years agolibfec: fix thread count calculation
Sami Tolvanen [Mon, 8 Feb 2016 18:54:27 +0000 (10:54 -0800)]
libfec: fix thread count calculation

On systems with a large number of cores, smallish reads may not be
able to utilize all the cores. Correctly compute the number of threads
we should use.

Change-Id: I7a05c144c2b83a2f6083c33a686ced32cce576c4

8 years agoMerge "Add __s32 define." am: 9d63018815
Christopher Ferris [Sat, 6 Feb 2016 01:02:29 +0000 (01:02 +0000)]
Merge "Add __s32 define." am: 9d63018815
am: 7991c03404

* commit '7991c034048ee5b376a16fb71f9f4b0a3354623d':
  Add __s32 define.

8 years agoMerge "Add __s32 define."
Christopher Ferris [Sat, 6 Feb 2016 01:00:24 +0000 (01:00 +0000)]
Merge "Add __s32 define."
am: 9d63018815

* commit '9d630188159868589992116dd5d67cecf17bf257':
  Add __s32 define.

8 years agoMerge "Add __s32 define."
Christopher Ferris [Sat, 6 Feb 2016 00:55:51 +0000 (00:55 +0000)]
Merge "Add __s32 define."

8 years agoAdd __s32 define.
Christopher Ferris [Sat, 6 Feb 2016 00:53:13 +0000 (16:53 -0800)]
Add __s32 define.

This is needed for the new v4.4.1 kernel headers.

Bug: 23789423
Change-Id: I3053cdf895793c38ff1af41ebb560c13fda23215

8 years agoAdd methods to get and ensure encryption policy.
Jeff Sharkey [Wed, 3 Feb 2016 22:30:33 +0000 (15:30 -0700)]
Add methods to get and ensure encryption policy.

The ensure call will either assign an encryption policy, or verify
that an existing policy matches the expected value.  Uses the new
logging library so that customers can pivot logs into whatever
location they want: vold into logcat and init into dmesg.

Also add new directories that will have user-specific encryption
policy set on them so we avoid setting the default policy.

Bug: 25796509
Change-Id: Ia535630092822c80cde0939d8e46e6b47d9be2d8

8 years agoImprove sock_diag debugging code.
Lorenzo Colitti [Fri, 5 Feb 2016 03:58:07 +0000 (12:58 +0900)]
Improve sock_diag debugging code.

- Unbreak GetConstantName on modules that contain constants whose
  names start with "INET_DIAG_BC".
- Honour NL_DEBUG when sending dump requests.
- Decode sock_diag messages differently depending on whether
  they are requests or responses.
- Print sock_diag bytecode hex-encoded instead of raw.

Change-Id: I3cc20ab635d1ff4f137aa0f9ff0ff88b1a37ce72

8 years agoRemove unencrypted properties
Paul Lawrence [Thu, 4 Feb 2016 18:37:13 +0000 (10:37 -0800)]
Remove unencrypted properties

Change-Id: I59596be7c7df9151f4966a5051f06bcb087345dd