OSDN Git Service

android-x86/system-extras.git
8 years agoMerge "Fix misc-macro-parentheses warnings in libpagemap." am: 36740f5359 am: 209afb497e
Chih-Hung Hsieh [Wed, 18 May 2016 23:00:49 +0000 (23:00 +0000)]
Merge "Fix misc-macro-parentheses warnings in libpagemap." am: 36740f5359 am: 209afb497e
am: cde0d91155

* commit 'cde0d91155ff594477a1378fa4f5b3cf0fe02d2a':
  Fix misc-macro-parentheses warnings in libpagemap.

Change-Id: I08f90c6c586d41480eb1b3c2c6f89dad56da22d7

8 years agoMerge "Fix misc-macro-parentheses warnings in micro_bench." am: d1d00bf1fa am: 70f7b129df
Chih-Hung Hsieh [Wed, 18 May 2016 23:00:49 +0000 (23:00 +0000)]
Merge "Fix misc-macro-parentheses warnings in micro_bench." am: d1d00bf1fa am: 70f7b129df
am: d98553b138

* commit 'd98553b138be5cab7da0e5a12699184e2b57a710':
  Fix misc-macro-parentheses warnings in micro_bench.

Change-Id: Ia72149273ae3054676f2f5d3011bdd293a200304

8 years agoMerge "Fix misc-macro-parentheses warnings in simpleperf." am: dd3a47075f am: 74a683adfd
Chih-Hung Hsieh [Wed, 18 May 2016 23:00:48 +0000 (23:00 +0000)]
Merge "Fix misc-macro-parentheses warnings in simpleperf." am: dd3a47075f am: 74a683adfd
am: 3a80e2d9d9

* commit '3a80e2d9d93a0cc131f62c6c7492e647d75f0238':
  Fix misc-macro-parentheses warnings in simpleperf.

Change-Id: I97f5cb38dfa9e4aed14a0c8c7bdd8f580d9e98f4

8 years agoMerge "Fix misc-macro-parentheses warnings in libpagemap." am: 36740f5359
Chih-Hung Hsieh [Wed, 18 May 2016 22:54:02 +0000 (22:54 +0000)]
Merge "Fix misc-macro-parentheses warnings in libpagemap." am: 36740f5359
am: 209afb497e

* commit '209afb497ef2c35645950253bd4aa728f8110b98':
  Fix misc-macro-parentheses warnings in libpagemap.

Change-Id: Ia2e7aa3beac0530d229426fc3e0804cc6a8f9dfa

8 years agoMerge "Fix misc-macro-parentheses warnings in micro_bench." am: d1d00bf1fa
Chih-Hung Hsieh [Wed, 18 May 2016 22:54:01 +0000 (22:54 +0000)]
Merge "Fix misc-macro-parentheses warnings in micro_bench." am: d1d00bf1fa
am: 70f7b129df

* commit '70f7b129dfd5b6c591b7314b1c00bc118656ede0':
  Fix misc-macro-parentheses warnings in micro_bench.

Change-Id: I0815b97b6b1cf0609a77f82fdcda0f2bb95662bc

8 years agoMerge "Fix misc-macro-parentheses warnings in simpleperf." am: dd3a47075f
Chih-Hung Hsieh [Wed, 18 May 2016 22:54:00 +0000 (22:54 +0000)]
Merge "Fix misc-macro-parentheses warnings in simpleperf." am: dd3a47075f
am: 74a683adfd

* commit '74a683adfd66f2c5ca989e10eecaaae1b508083b':
  Fix misc-macro-parentheses warnings in simpleperf.

Change-Id: Ida4d0d31fd16e5b51fb2585ffc84b482f8f91214

8 years agoMerge "Fix misc-macro-parentheses warnings in libpagemap."
Chih-Hung Hsieh [Wed, 18 May 2016 22:49:22 +0000 (22:49 +0000)]
Merge "Fix misc-macro-parentheses warnings in libpagemap."
am: 36740f5359

* commit '36740f535929efb455423537e97eac7e10f73eee':
  Fix misc-macro-parentheses warnings in libpagemap.

Change-Id: I50f4cb5b79c3d3bed70bf3083503e6c56a615833

8 years agoMerge "Fix misc-macro-parentheses warnings in micro_bench."
Chih-Hung Hsieh [Wed, 18 May 2016 22:49:16 +0000 (22:49 +0000)]
Merge "Fix misc-macro-parentheses warnings in micro_bench."
am: d1d00bf1fa

* commit 'd1d00bf1fab703b8dfc5ab6a5c240e9b433825e0':
  Fix misc-macro-parentheses warnings in micro_bench.

Change-Id: I993e5e50052fd841107f80d73c15f7b605a5313d

8 years agoMerge "Fix misc-macro-parentheses warnings in simpleperf."
Chih-Hung Hsieh [Wed, 18 May 2016 22:49:04 +0000 (22:49 +0000)]
Merge "Fix misc-macro-parentheses warnings in simpleperf."
am: dd3a47075f

* commit 'dd3a47075f253d5abcca0b08fd5919adba237fd9':
  Fix misc-macro-parentheses warnings in simpleperf.

Change-Id: Idcd285e1461b6ad691b234ff13406169fe8d6ccc

8 years agoMerge "Fix misc-macro-parentheses warnings in libpagemap."
Treehugger Robot [Wed, 18 May 2016 22:42:08 +0000 (22:42 +0000)]
Merge "Fix misc-macro-parentheses warnings in libpagemap."

8 years agoMerge "Fix misc-macro-parentheses warnings in micro_bench."
Treehugger Robot [Wed, 18 May 2016 22:40:28 +0000 (22:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in micro_bench."

8 years agoMerge "Fix misc-macro-parentheses warnings in simpleperf."
Treehugger Robot [Wed, 18 May 2016 22:24:21 +0000 (22:24 +0000)]
Merge "Fix misc-macro-parentheses warnings in simpleperf."

8 years agoFix misc-macro-parentheses warnings in libpagemap.
Chih-Hung Hsieh [Wed, 18 May 2016 21:49:08 +0000 (14:49 -0700)]
Fix misc-macro-parentheses warnings in libpagemap.

Bug: 28705665
Change-Id: I3a40229aeba12b3fb643770c92039a2af1e4a441

8 years agoFix misc-macro-parentheses warnings in micro_bench.
Chih-Hung Hsieh [Wed, 18 May 2016 21:46:31 +0000 (14:46 -0700)]
Fix misc-macro-parentheses warnings in micro_bench.

Bug: 28705665
Change-Id: I04d393ae608a7b803001f763c544fc13e8f2e9e6

8 years agoFix misc-macro-parentheses warnings in simpleperf.
Chih-Hung Hsieh [Wed, 18 May 2016 21:36:58 +0000 (14:36 -0700)]
Fix misc-macro-parentheses warnings in simpleperf.

Bug: 28705665
Change-Id: I0521602cbca7eb3d2e242771da697dfab3fc727f

8 years agoMerge "pagingtest: test both with prefetching enabled and disabled" am: 517567d189...
Rom Lemarchand [Tue, 17 May 2016 18:45:55 +0000 (18:45 +0000)]
Merge "pagingtest: test both with prefetching enabled and disabled" am: 517567d189 am: 6f5e9b117c
am: a666b6cdbd

* commit 'a666b6cdbdc789177a504442da8d5a1a5267ecf4':
  pagingtest: test both with prefetching enabled and disabled

Change-Id: Iac26da59548f9389cb1ec899544c8639416a32bd

8 years agoMerge "pagingtest: switch to advising random accesses" am: 5263409f21 am: 682242bc44
Rom Lemarchand [Tue, 17 May 2016 18:45:54 +0000 (18:45 +0000)]
Merge "pagingtest: switch to advising random accesses" am: 5263409f21 am: 682242bc44
am: f1d3010875

* commit 'f1d30108758cf6396fbaaa3890ed1c333717e59d':
  pagingtest: switch to advising random accesses

Change-Id: I7513992a555fcf236ed725cc9d6918966821c7a9

8 years agoMerge "pagingtest: test both with prefetching enabled and disabled" am: 517567d189
Rom Lemarchand [Tue, 17 May 2016 18:37:44 +0000 (18:37 +0000)]
Merge "pagingtest: test both with prefetching enabled and disabled" am: 517567d189
am: 6f5e9b117c

* commit '6f5e9b117c173358397acdac87dd501a84ae6861':
  pagingtest: test both with prefetching enabled and disabled

Change-Id: I3608c8bf05f144742d34402fbb9109ae3a3dd26b

8 years agoMerge "pagingtest: switch to advising random accesses" am: 5263409f21
Rom Lemarchand [Tue, 17 May 2016 18:37:44 +0000 (18:37 +0000)]
Merge "pagingtest: switch to advising random accesses" am: 5263409f21
am: 682242bc44

* commit '682242bc4491f75168b8c7469a4bbba59d24f99b':
  pagingtest: switch to advising random accesses

Change-Id: Ib916350d037aed877d95820b864d5fdf66f8ef4d

8 years agoMerge "pagingtest: test both with prefetching enabled and disabled"
Rom Lemarchand [Tue, 17 May 2016 18:34:59 +0000 (18:34 +0000)]
Merge "pagingtest: test both with prefetching enabled and disabled"
am: 517567d189

* commit '517567d1893ee5542ab5de1675fb13a6ad3c194e':
  pagingtest: test both with prefetching enabled and disabled

Change-Id: I36b56e29dc40850311f555163dbade8a1cc6270d

8 years agoMerge "pagingtest: switch to advising random accesses"
Rom Lemarchand [Tue, 17 May 2016 18:34:58 +0000 (18:34 +0000)]
Merge "pagingtest: switch to advising random accesses"
am: 5263409f21

* commit '5263409f213c63366a1cd6a2af9307eab65f6fbf':
  pagingtest: switch to advising random accesses

Change-Id: Ib6e335f9614d1cfdfa9c2794b17d0b30b62e8a3f

8 years agoMerge "pagingtest: test both with prefetching enabled and disabled"
Rom Lemarchand [Tue, 17 May 2016 18:18:27 +0000 (18:18 +0000)]
Merge "pagingtest: test both with prefetching enabled and disabled"

8 years agoMerge "pagingtest: switch to advising random accesses"
Rom Lemarchand [Tue, 17 May 2016 18:17:38 +0000 (18:17 +0000)]
Merge "pagingtest: switch to advising random accesses"

8 years agopagingtest: test both with prefetching enabled and disabled
Rom Lemarchand [Tue, 17 May 2016 17:10:18 +0000 (10:10 -0700)]
pagingtest: test both with prefetching enabled and disabled

Run the same tests with page cache prefetching both enabled and disabled.

Change-Id: Ica253781a17fa0a66c07d0f5658c6c7d8b047a16

8 years agoMerge "simpleperf: fix stat scale output." am: 5767273e98 am: c6a9228f27
Yabin Cui [Tue, 17 May 2016 16:51:27 +0000 (16:51 +0000)]
Merge "simpleperf: fix stat scale output." am: 5767273e98 am: c6a9228f27
am: 1d5085905d

* commit '1d5085905d21c6d1bbd99012100a0aa51c3fe051':
  simpleperf: fix stat scale output.

Change-Id: I999793e6337d33596c442805836f441b2e6ee005

8 years agoMerge "simpleperf: fix stat scale output." am: 5767273e98
Yabin Cui [Tue, 17 May 2016 16:48:56 +0000 (16:48 +0000)]
Merge "simpleperf: fix stat scale output." am: 5767273e98
am: c6a9228f27

* commit 'c6a9228f276736d69905facff4c5068317c33c6e':
  simpleperf: fix stat scale output.

Change-Id: Ia5baf75dd3d20330f09a4029dae5b7ae477cc72c

8 years agoMerge "simpleperf: fix stat scale output."
Yabin Cui [Tue, 17 May 2016 16:46:33 +0000 (16:46 +0000)]
Merge "simpleperf: fix stat scale output."
am: 5767273e98

* commit '5767273e98eb1a17827f0eb95612fb3fb4d6f12c':
  simpleperf: fix stat scale output.

Change-Id: I7fbd77aa36046827b81e866c2eb1ecc53e4a60ba

8 years agoMerge "simpleperf: fix stat scale output."
Yabin Cui [Tue, 17 May 2016 16:39:03 +0000 (16:39 +0000)]
Merge "simpleperf: fix stat scale output."

8 years agopagingtest: switch to advising random accesses
Rom Lemarchand [Tue, 17 May 2016 03:17:41 +0000 (20:17 -0700)]
pagingtest: switch to advising random accesses

Switch to using madvise(MADV_RANDOM) and posix_fadvise(POSIX_FADV_RANDOM)
to disable caching as opposed to reading the file backwards, which still
went through some caching.

Measured a 80% drop in worst case performance after switching.

Change-Id: I03115dfb94ae7dfc58e0e187af3936c4e371817f

8 years agosimpleperf: fix stat scale output.
Yabin Cui [Tue, 17 May 2016 03:07:26 +0000 (20:07 -0700)]
simpleperf: fix stat scale output.

Currently simpleperf stat command create an event file for each cpu and
scale the result by summarizing counters on each cpu. But one thread only
runs on one cpu at a time, so it results in wrongly scaled numbers.

Fix this by three changes:
1. For non system-wide stat, Create only one event file for all cpus.
2. When summarizing counters, omit counters having 0 running time.
3. Print real value instead of scaled value.

Run command:
$simpleperf stat ./empty_program

Before the change:
Performance counter statistics:

     33,540,176  cpu-cycles                # 54.812986 GHz                     (2%)
     28,233,348  stalled-cycles-frontend   # 46.140 G/sec                      (2%)

After the change:
Performance counter statistics:

       625,335  cpu-cycles                # 1.404496 GHz                      (100%)
       507,200  stalled-cycles-frontend   # 1.139 G/sec                       (100%)

Change-Id: I76bc3e220df4f149ab365e960295b24fde8ae2fc

8 years agoresolve merge conflicts of 2107558 to nyc-dev-plus-aosp
Mohamad Ayyash [Fri, 13 May 2016 20:31:15 +0000 (20:31 +0000)]
resolve merge conflicts of 2107558 to nyc-dev-plus-aosp
am: 98a47b842c

* commit '98a47b842cb23669ba747d1b0e40f85745d2f330':
  Remove canned_fs_config from ext4_utils

Change-Id: I3dd87e5304fa8f52e794de60c94086973f473a4b

8 years agoresolve merge conflicts of 2107558 to nyc-dev-plus-aosp
Xin Li [Fri, 13 May 2016 20:22:03 +0000 (13:22 -0700)]
resolve merge conflicts of 2107558 to nyc-dev-plus-aosp

Change-Id: Icdabd960bfab6d6d683b1dc01bc2795ccfb5bcde

8 years agoMerge "Remove canned_fs_config from ext4_utils"
Mohamad Ayyash [Fri, 13 May 2016 18:22:59 +0000 (18:22 +0000)]
Merge "Remove canned_fs_config from ext4_utils"
am: b1b964214b

* commit 'b1b964214babaddd0f0bd758c54f7fac4fbe4bf7':
  Remove canned_fs_config from ext4_utils

Change-Id: Ied3b2507e6462f2e64a135c4ceca2a4c18320253

8 years agoMerge "Remove canned_fs_config from ext4_utils"
Treehugger Robot [Fri, 13 May 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Remove canned_fs_config from ext4_utils"

8 years agoMerge "lockdep_chains: graph visualization" am: bfe42baeae am: b50ec7f672
Mark Salyzyn [Fri, 13 May 2016 16:52:13 +0000 (16:52 +0000)]
Merge "lockdep_chains: graph visualization" am: bfe42baeae am: b50ec7f672
am: 9a4de94fe1

* commit '9a4de94fe123ce522061def772d1abab5125ba55':
  lockdep_chains: graph visualization

Change-Id: Icaaf4a2b18c528456506e9293d0d7f86fcf84f6e

8 years agoMerge "lockdep_chains: graph visualization" am: bfe42baeae
Mark Salyzyn [Fri, 13 May 2016 16:49:26 +0000 (16:49 +0000)]
Merge "lockdep_chains: graph visualization" am: bfe42baeae
am: b50ec7f672

* commit 'b50ec7f672ab8d54a5f10e09db3d3e190b9bb6a8':
  lockdep_chains: graph visualization

Change-Id: I35bdaa5a8993b7c67f267952354fa8f8cffedb65

8 years agoMerge "lockdep_chains: graph visualization"
Mark Salyzyn [Fri, 13 May 2016 16:46:55 +0000 (16:46 +0000)]
Merge "lockdep_chains: graph visualization"
am: bfe42baeae

* commit 'bfe42baeaea18fd633b047a2464b482d1660bdf4':
  lockdep_chains: graph visualization

Change-Id: I6d9ce11582e0e3e3e045c89dde50238477945aeb

8 years agoMerge "lockdep_chains: graph visualization"
Mark Salyzyn [Fri, 13 May 2016 16:42:33 +0000 (16:42 +0000)]
Merge "lockdep_chains: graph visualization"

8 years agolockdep_chains: graph visualization
Mark Salyzyn [Thu, 12 May 2016 17:48:25 +0000 (10:48 -0700)]
lockdep_chains: graph visualization

Create the system/extras/tools directory for simple analysis helpers.

Publish a host tool helper script that aids visualization of kernel
runtime collected lock dependencies. Helpful to look for circular
locks, or to get a handle on locking order used in a driver.

Bug: 28310683
Change-Id: Ib52c23f4cdefb37882232eff11b943eeb1b2abfa

8 years agoRemove canned_fs_config from ext4_utils
Mohamad Ayyash [Fri, 8 Apr 2016 05:15:57 +0000 (22:15 -0700)]
Remove canned_fs_config from ext4_utils

It is now also used in mksquashfs so it was added to libcutils

BUG: 27467028
Change-Id: I81c87938d5b6b200a8ad817f0c64c5ca699f451c
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG: 28704419

8 years agoAdd fileencrypted=software/ice to fstab options
Paul Lawrence [Wed, 11 May 2016 22:20:40 +0000 (22:20 +0000)]
Add fileencrypted=software/ice to fstab options
am: e8299d81a1

* commit 'e8299d81a18d16b006019f37ec9d84921d5ff845':
  Add fileencrypted=software/ice to fstab options

Change-Id: I29a1b2f0f3c1382e412c2e8f51bd644bd5301ff4

8 years agoAdd fileencrypted=software/ice to fstab options
Paul Lawrence [Thu, 5 May 2016 18:01:42 +0000 (11:01 -0700)]
Add fileencrypted=software/ice to fstab options

Bug: 28616054
Change-Id: I34257870d388993d168f6541ef51ee2ce1067a7e

8 years agoMerge "Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b...
Android Build Merger (Role) [Tue, 10 May 2016 22:20:08 +0000 (22:20 +0000)]
Merge "Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b am: fa85e9f0c4" into nyc-mr1-dev-plus-aosp

8 years agoFail with an error if we can\'t read the policy for encryption am: 8d53b9619b
Paul Crowley [Tue, 10 May 2016 22:19:59 +0000 (22:19 +0000)]
Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b
am: fa85e9f0c4

* commit 'fa85e9f0c45f29d4d2c724f11b3db3019e486999':
  Fail with an error if we can't read the policy for encryption

Change-Id: Ib530c0e2a67e65dcc8c4b54739a689de38058116

8 years agoFail with an error if we can\'t read the policy for encryption am: 8d53b9619b
Paul Crowley [Tue, 10 May 2016 22:19:57 +0000 (22:19 +0000)]
Fail with an error if we can\'t read the policy for encryption am: 8d53b9619b
am: a698367412

* commit 'a69836741263a7f8f48a5884123151e0d98238c6':
  Fail with an error if we can't read the policy for encryption

Change-Id: I47a4f4320fe45016eaede8e33ffd4241aa64e0a4

8 years agoFail with an error if we can\'t read the policy for encryption
Paul Crowley [Tue, 10 May 2016 22:17:23 +0000 (22:17 +0000)]
Fail with an error if we can\'t read the policy for encryption
am: 8d53b9619b

* commit '8d53b9619ba913354ffdb23acf0108f7445bb8bc':
  Fail with an error if we can't read the policy for encryption

Change-Id: I56e185bc0ee583d3a966e072dc34ed24af21ed39

8 years agoFail with an error if we can\'t read the policy for encryption
Paul Crowley [Tue, 10 May 2016 22:17:21 +0000 (22:17 +0000)]
Fail with an error if we can\'t read the policy for encryption
am: 8d53b9619b

* commit '8d53b9619ba913354ffdb23acf0108f7445bb8bc':
  Fail with an error if we can't read the policy for encryption

Change-Id: I2c77a648bf5ef8b5d208662c4deb28e593e52be1

8 years agoFail with an error if we can't read the policy for encryption
Paul Crowley [Wed, 27 Apr 2016 17:24:40 +0000 (10:24 -0700)]
Fail with an error if we can't read the policy for encryption

The absence of a policy reference in the unencrypted directory now
causes e4crypt_set_directory_policy to fail with an error. Callers
should call e4crypt_is_native (now moved into here) before calling this.

Bug: 28318405
Change-Id: I209292aba3abad3b19105c9afe2b84e8b3dd6874

8 years agoFix LOCAL_CPP_EXTENSION.
Ying Wang [Fri, 6 May 2016 22:32:38 +0000 (22:32 +0000)]
Fix LOCAL_CPP_EXTENSION.
am: 421efce14c

* commit '421efce14c802c76c384ff6265c907e006628b77':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: I11fe7d6c2c88f0b250ba46b2ec0fdfbc3a5e38fd

8 years agoFix LOCAL_CPP_EXTENSION.
Ying Wang [Fri, 6 May 2016 02:41:11 +0000 (19:41 -0700)]
Fix LOCAL_CPP_EXTENSION.

Bug: 28622149
Change-Id: I785b9bdf90f77ed87c41542f3bd010c6b7356069
(cherry picked from commit 070b6199012eaf0c962f2ff4313551b13735198d)

8 years agoMerge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e am: abe624c78e
Ying Wang [Fri, 6 May 2016 20:39:54 +0000 (20:39 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e am: abe624c78e
am: 52d8960892

* commit '52d896089282a7b651cd2eb4adac719b63e14c8a':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: Ie190a5d2b689d7e655b3955a64095b4f2ea45cfb

8 years agoMerge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e
Ying Wang [Fri, 6 May 2016 20:34:06 +0000 (20:34 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e
am: abe624c78e

* commit 'abe624c78e1a0c24581fd10cddf450369293576c':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: I564c7020ee90c1d46a21ff908592b41bbc94d4c8

8 years agoMerge "Fix LOCAL_CPP_EXTENSION."
Ying Wang [Fri, 6 May 2016 20:29:33 +0000 (20:29 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION."
am: 2597f3521e

* commit '2597f3521efd5e6f999ad9aa1e0e3dd6304ba3e4':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: I572c5c6810b888b2580c01db31ee2a0eecb7c9b6

8 years agoMerge "Fix LOCAL_CPP_EXTENSION."
Treehugger Robot [Fri, 6 May 2016 20:16:40 +0000 (20:16 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION."

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea7e4f7cbc am: c3aa198a1d
Chih-Hung Hsieh [Fri, 6 May 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Fix google-explicit-constructor warnings." am: ea7e4f7cbc am: c3aa198a1d
am: dc979ddf26

* commit 'dc979ddf26c33b4105fe7d18fc4336315020eef4':
  Fix google-explicit-constructor warnings.

Change-Id: Id21fe372cb6b1f21ff91c2034314ceceaa0ec140

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea7e4f7cbc
Chih-hung Hsieh [Fri, 6 May 2016 19:08:08 +0000 (19:08 +0000)]
Merge "Fix google-explicit-constructor warnings." am: ea7e4f7cbc
am: c3aa198a1d

* commit 'c3aa198a1d972780cfa719099d08edfabb57aacf':
  Fix google-explicit-constructor warnings.

Change-Id: I57c7856998a157bef4b2da37418618a00757c590

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Fri, 6 May 2016 19:03:21 +0000 (19:03 +0000)]
Merge "Fix google-explicit-constructor warnings."
am: ea7e4f7cbc

* commit 'ea7e4f7cbc86e8363b1771cc848d026e0faa6400':
  Fix google-explicit-constructor warnings.

Change-Id: Ie8972db88d6ad1e009e27bfb4ad99d890d37ec5b

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Fri, 6 May 2016 18:46:10 +0000 (18:46 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoFix LOCAL_CPP_EXTENSION.
Ying Wang [Fri, 6 May 2016 02:41:11 +0000 (19:41 -0700)]
Fix LOCAL_CPP_EXTENSION.

Bug: 28622149
Change-Id: I785b9bdf90f77ed87c41542f3bd010c6b7356069

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Fri, 6 May 2016 17:41:04 +0000 (10:41 -0700)]
Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I420d23cc1f7ed44e1d9a215ee6815afab365046e

8 years agoMerge "Incr Ext4: Properly merge block_allocation lists am: f7124d6c95 am: 821577708c...
Android Build Merger (Role) [Fri, 29 Apr 2016 19:21:22 +0000 (19:21 +0000)]
Merge "Incr Ext4: Properly merge block_allocation lists am: f7124d6c95 am: 821577708c" into nyc-mr1-dev-plus-aosp

8 years agoIncr Ext4: Properly merge block_allocation lists am: f7124d6c95
Mohamad Ayyash [Fri, 29 Apr 2016 19:21:13 +0000 (19:21 +0000)]
Incr Ext4: Properly merge block_allocation lists am: f7124d6c95
am: 821577708c

* commit '821577708ced07714ebae35b2df4b9fe94de8b8b':
  Incr Ext4: Properly merge block_allocation lists

Change-Id: I3e12122a8c392b4fc78e0a33208a18efc4fccfde

8 years agoIncr Ext4: Properly merge block_allocation lists am: f7124d6c95
Mohamad Ayyash [Fri, 29 Apr 2016 19:21:12 +0000 (19:21 +0000)]
Incr Ext4: Properly merge block_allocation lists am: f7124d6c95
am: d0b885aac2

* commit 'd0b885aac219c7bef2ffb631fa4ccf8b6f7b289f':
  Incr Ext4: Properly merge block_allocation lists

Change-Id: I9243ffcd7a6283382023a95b5bb9b57196d88f5d

8 years agoIncr Ext4: Properly merge block_allocation lists
Mohamad Ayyash [Fri, 29 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Incr Ext4: Properly merge block_allocation lists
am: f7124d6c95

* commit 'f7124d6c955c0453361b0ff47c5c94619e68087f':
  Incr Ext4: Properly merge block_allocation lists

Change-Id: I9d343f1762c183aaf4cacd9f7fd613af174896e3

8 years agoIncr Ext4: Properly merge block_allocation lists
Mohamad Ayyash [Fri, 29 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Incr Ext4: Properly merge block_allocation lists
am: f7124d6c95

* commit 'f7124d6c955c0453361b0ff47c5c94619e68087f':
  Incr Ext4: Properly merge block_allocation lists

Change-Id: Ie6e931abfe5744d17496dac823a6c2605b35fa5d

8 years agoIncremental Ext4 Bug: prevent out of bound boundary allocations am: d2ed02a940
Mohamad Ayyash [Fri, 29 Apr 2016 18:21:52 +0000 (18:21 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations am: d2ed02a940
am: 8f2325882f

* commit '8f2325882fa8d6613184b7fe31562f727264e611':

Change-Id: Ib4a577f4d99d74f1d0b12878de571617826b4719

8 years agoIncremental Ext4 Bug: prevent out of bound boundary allocations am: d2ed02a940
Mohamad Ayyash [Fri, 29 Apr 2016 18:20:42 +0000 (18:20 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations am: d2ed02a940
am: 2592d45099

* commit '2592d45099fecb384753d3fb9a3bc88a25c56296':
  Incremental Ext4 Bug: prevent out of bound boundary allocations

Change-Id: I1894ee81c58c593ca4ea87a877483afeec74024a

8 years agoIncremental Ext4 Bug: prevent out of bound boundary allocations
Mohamad Ayyash [Fri, 29 Apr 2016 18:18:27 +0000 (18:18 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
am: d2ed02a940

* commit 'd2ed02a94086e1221041bc59825add3d0a657e19':
  Incremental Ext4 Bug: prevent out of bound boundary allocations

Change-Id: Ic521ccfd6402e3419e9471edd5996b05596c12bc

8 years agoIncremental Ext4 Bug: prevent out of bound boundary allocations
Mohamad Ayyash [Fri, 29 Apr 2016 18:18:24 +0000 (18:18 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
am: d2ed02a940

* commit 'd2ed02a94086e1221041bc59825add3d0a657e19':
  Incremental Ext4 Bug: prevent out of bound boundary allocations

Change-Id: I25c596b4db090b92ad475fb211e4b43a7dd2856b

8 years agoIncr Ext4: Properly merge block_allocation lists
Mohamad Ayyash [Fri, 29 Apr 2016 18:14:02 +0000 (11:14 -0700)]
Incr Ext4: Properly merge block_allocation lists

BUG: 27698960
Change-Id: Ia31b8319e0d1c8644ae1798116007a4b35c39e9b
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoIncremental Ext4 Bug: prevent out of bound boundary allocations
Mohamad Ayyash [Fri, 29 Apr 2016 04:49:01 +0000 (21:49 -0700)]
Incremental Ext4 Bug: prevent out of bound boundary allocations

This happens around the boundary of block groups where a slightly
different block boundary is set based on size of filesystem which means
allocations based on a previous filesystem layout need to verify they're
not crossing that new bounday

BUG: 27698960
Change-Id: I45d444b4477f14f71e8f17144523505a7525b4e2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoMerge "Fix google-explicit-constructor warnings." am: b1304be am: c4515b5
Chih-Hung Hsieh [Wed, 27 Apr 2016 21:40:02 +0000 (21:40 +0000)]
Merge "Fix google-explicit-constructor warnings." am: b1304be am: c4515b5
am: ff0c7e0

* commit 'ff0c7e070707735c7534b8a2ab820f9f49057ce7':
  Fix google-explicit-constructor warnings.

Change-Id: I29ba498a61291bfed87e5af615ef662aae7fc41a

8 years agoMerge "Fix google-explicit-constructor warnings." am: b1304be
Treehugger Robot [Wed, 27 Apr 2016 21:25:25 +0000 (21:25 +0000)]
Merge "Fix google-explicit-constructor warnings." am: b1304be
am: c4515b5

* commit 'c4515b505123815839f0ee672741e82423aa72e6':
  Fix google-explicit-constructor warnings.

Change-Id: I39d53b09a735a6e0604ce153e4f6e8f4257473ce

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Wed, 27 Apr 2016 21:22:56 +0000 (21:22 +0000)]
Merge "Fix google-explicit-constructor warnings."
am: b1304be

* commit 'b1304be7031f83401561c469c7f8624f76a2f007':
  Fix google-explicit-constructor warnings.

Change-Id: I3ba62da5bbe74437c3ec0ddc9c7a68557b4e1e0d

8 years agoMerge "Fix google-explicit-constructor warnings."
Treehugger Robot [Wed, 27 Apr 2016 21:09:34 +0000 (21:09 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoMerge "simpleperf: improve cpu_hotplug tests." am: 75726c6 am: 9499f0e
Yabin Cui [Tue, 26 Apr 2016 18:18:03 +0000 (18:18 +0000)]
Merge "simpleperf: improve cpu_hotplug tests." am: 75726c6 am: 9499f0e
am: 06558af

* commit '06558af7730d9f11ac4a6061a59941026213e44e':
  simpleperf: improve cpu_hotplug tests.

Change-Id: I4a94ab4063bd7d358808ec7900e8169dab94ad38

8 years agoMerge "simpleperf: improve cpu_hotplug tests." am: 75726c6
Yabin Cui [Tue, 26 Apr 2016 18:14:55 +0000 (18:14 +0000)]
Merge "simpleperf: improve cpu_hotplug tests." am: 75726c6
am: 9499f0e

* commit '9499f0e9f3d87a59e473bdd55e5582c8402db845':
  simpleperf: improve cpu_hotplug tests.

Change-Id: Ide267393ce6095ec9b1733704af25bb5a0854553

8 years agoMerge "simpleperf: improve cpu_hotplug tests."
Yabin Cui [Tue, 26 Apr 2016 18:11:41 +0000 (18:11 +0000)]
Merge "simpleperf: improve cpu_hotplug tests."
am: 75726c6

* commit '75726c65d973cd9ab139221a0c8a60a0fab98f6b':
  simpleperf: improve cpu_hotplug tests.

Change-Id: I76aee490bb5dc9d68d6038b5888a10554d20a65c

8 years agoMerge "simpleperf: improve cpu_hotplug tests."
Yabin Cui [Tue, 26 Apr 2016 17:55:49 +0000 (17:55 +0000)]
Merge "simpleperf: improve cpu_hotplug tests."

8 years agosimpleperf: improve cpu_hotplug tests.
Yabin Cui [Mon, 18 Apr 2016 20:43:20 +0000 (13:43 -0700)]
simpleperf: improve cpu_hotplug tests.

Add cpu hotplug test for ioctl(PERF_EVENT_IOC_ENABLE),
and improve cpu_hotplug tests by removing sleep calls.

Bug: 28384580

Change-Id: I5869cd9bb3086b6f3a73cf7dce4ffd720326c3c6

8 years agoMerge "Fix google-explicit-constructor warnings." am: 7ec2e36 am: 1ce5f21
Chih-Hung Hsieh [Tue, 26 Apr 2016 16:24:09 +0000 (16:24 +0000)]
Merge "Fix google-explicit-constructor warnings." am: 7ec2e36 am: 1ce5f21
am: 78a73fa

* commit '78a73fa7d54981b33c281bbdbd6bbb45b0c73a04':
  Fix google-explicit-constructor warnings.

Change-Id: Icea693feaa98b21cd529c4ef1deab454d73a3432

8 years agoMerge "Fix google-explicit-constructor warnings." am: 7ec2e36
Chih-hung Hsieh [Tue, 26 Apr 2016 16:21:09 +0000 (16:21 +0000)]
Merge "Fix google-explicit-constructor warnings." am: 7ec2e36
am: 1ce5f21

* commit '1ce5f21453f7132537bb684933cfc37cccef8c42':
  Fix google-explicit-constructor warnings.

Change-Id: I49921e86b37c68a53825b91a0515a93eaf416193

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Tue, 26 Apr 2016 16:17:49 +0000 (16:17 +0000)]
Merge "Fix google-explicit-constructor warnings."
am: 7ec2e36

* commit '7ec2e36c128a0f83aed3addbcf8a672f5dda9966':
  Fix google-explicit-constructor warnings.

Change-Id: I3539bfe25d634b34fe1700abb0df183ac880ba17

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Tue, 26 Apr 2016 16:14:44 +0000 (16:14 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoresolve merge conflicts of acc275a to nyc-dev-plus-aosp
Chih-Hung Hsieh [Mon, 25 Apr 2016 23:15:55 +0000 (23:15 +0000)]
resolve merge conflicts of acc275a to nyc-dev-plus-aosp
am: 2f94665

* commit '2f94665879231866f0395bc2d9df369a4562e0db':
  Fix google-explicit-constructor warnings.

Change-Id: I03bf59b672bbf33bb88da7e475f63a5f8eadc65a

8 years agoMerge "Fix google-explicit-constructor warnings." am: a8bbf56 am: 6ed77d3
Chih-Hung Hsieh [Mon, 25 Apr 2016 23:00:19 +0000 (23:00 +0000)]
Merge "Fix google-explicit-constructor warnings." am: a8bbf56 am: 6ed77d3
am: e1d4c71

* commit 'e1d4c714b382b29130f3737e5382bd57a700d4b3':
  Fix google-explicit-constructor warnings.

Change-Id: Icc0efafe84364a481ea6578e78f05222febd43e6

8 years agoresolve merge conflicts of acc275a to nyc-dev-plus-aosp
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)]
resolve merge conflicts of acc275a to nyc-dev-plus-aosp

Change-Id: Ia8f82614a3501d631c074667dfebc5e56e142752

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:38:52 +0000 (22:38 +0000)]
Merge "Fix google-explicit-constructor warnings."
am: 84a6923

* commit '84a692306714a11873879242fdadcf956234ad7e':
  Fix google-explicit-constructor warnings.

Change-Id: Ib5ab8226bc8235cababee5773f7f6bb9959986fd

8 years agoMerge "Fix google-explicit-constructor warnings." am: a8bbf56
Chih-hung Hsieh [Mon, 25 Apr 2016 22:38:37 +0000 (22:38 +0000)]
Merge "Fix google-explicit-constructor warnings." am: a8bbf56
am: 6ed77d3

* commit '6ed77d30d5a077bafa0cba78d61bb6a60d8695d0':
  Fix google-explicit-constructor warnings.

Change-Id: Ib8105abcdf0638e3c15dbf7cc7c67768b4a09d17

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:32:40 +0000 (22:32 +0000)]
Merge "Fix google-explicit-constructor warnings."
am: a8bbf56

* commit 'a8bbf56210501d3cb724bd4f2709a9c3feb5d205':
  Fix google-explicit-constructor warnings.

Change-Id: I4ebf442e2a709d906784170f62c56302e5057f09

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Mon, 25 Apr 2016 22:30:17 +0000 (22:30 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Mon, 25 Apr 2016 22:21:09 +0000 (22:21 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:17:14 +0000 (14:17 -0700)]
Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I9f388006f5593b9f224e98e93deca7da35c5618a

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:12:26 +0000 (14:12 -0700)]
Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I1825b4e58c7c82e247a3be9cbe1139fa2b79f151

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:08:08 +0000 (14:08 -0700)]
Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: Ie9d9c33b48b179917f084e59a4e595c6eb972adf

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:01:30 +0000 (14:01 -0700)]
Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I871beda49b122df7680ab712f7116469d343ad8f

8 years agoMerge "simpleperf: always build static binary on device." am: 7035e8f am: 00f5b93
Yabin Cui [Mon, 25 Apr 2016 19:34:53 +0000 (19:34 +0000)]
Merge "simpleperf: always build static binary on device." am: 7035e8f am: 00f5b93
am: 9d66645

* commit '9d66645a017780daab86776a14c37c1ba2ad832b':
  simpleperf: always build static binary on device.

Change-Id: Ifd3a82960d10801fed3d63eb38e72285f8d46cfe

8 years agoMerge "simpleperf: always build static binary on device." am: 7035e8f
Yabin Cui [Mon, 25 Apr 2016 19:23:24 +0000 (19:23 +0000)]
Merge "simpleperf: always build static binary on device." am: 7035e8f
am: 00f5b93

* commit '00f5b939f6055fbdc6452194046202653605b06e':
  simpleperf: always build static binary on device.

Change-Id: Ic5dae793c72dd1b7539a4e1a9c0ff6e5ad7ffbd3

8 years agoMerge "simpleperf: always build static binary on device."
Yabin Cui [Mon, 25 Apr 2016 19:17:58 +0000 (19:17 +0000)]
Merge "simpleperf: always build static binary on device."
am: 7035e8f

* commit '7035e8f0cf0a952d58f867839cd96794d59ae50a':
  simpleperf: always build static binary on device.

Change-Id: I7177d294d3dfdc682fae876a56592dd5339b56a4

8 years agoMerge "simpleperf: always build static binary on device."
Yabin Cui [Mon, 25 Apr 2016 19:02:42 +0000 (19:02 +0000)]
Merge "simpleperf: always build static binary on device."