OSDN Git Service

android-x86/system-extras.git
7 years agoMerge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86 cm-13.0-x86
Jaap Jan Meijer [Mon, 8 Aug 2016 14:51:42 +0000 (16:51 +0200)]
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
ext4_utils/mkuserimg.sh

7 years agomkuserimg.sh: set default size according to the $SRC_DIR size
Chih-Wei Huang [Thu, 8 Oct 2015 07:44:11 +0000 (15:44 +0800)]
mkuserimg.sh: set default size according to the $SRC_DIR size

Ensure both 32-bit and 64-bit targets have enough extra size.

7 years agoext4_utils: Fix warning when compiling C++ code
Tom Marshall [Mon, 14 Dec 2015 19:20:47 +0000 (11:20 -0800)]
ext4_utils: Fix warning when compiling C++ code

 * Fixes "#warning: macro min is incompatible with C++.  #undefing min"

Change-Id: I2d7a0fd6c7babd0abd5e4c0ece55432f9ea37e95

7 years agoverity: Split the signer arguments correctly
Ricardo Cerqueira [Mon, 11 Jul 2016 22:59:48 +0000 (23:59 +0100)]
verity: Split the signer arguments correctly

verity_signer can reach the metadata generator with arguments,
which weren't being accounted for when popen'ing the subprocess.

Split the already-existing command string instead of re-generating
the list.

Ref CYNGNOS-3156

Change-Id: Ib8be4312d8e53f00f7378d2eb470de70e8a0495f

7 years agoverity: Let the tools ask for a password if needed
Ricardo Cerqueira [Mon, 4 Jul 2016 15:36:17 +0000 (16:36 +0100)]
verity: Let the tools ask for a password if needed

verity keys can be passworded. Let the password prompts and input
come up in cases of scripted signing, so that the password can
be input. While we're at it, make the password prompt print out
the key that is being requested.

This is roughly equivalent to change Icf69ba1e58bf1f91979eaf1d3b91cb202782e8fd
to signapk in build/

Ref CYNGNOS-3156

Change-Id: I4d9cab891b7c4179198ff3f139d25650ee933e53

7 years agomkuserimg.sh: set default size according to the $SRC_DIR size marshmallow-x86 android-x86-6.0-r1 android-x86-6.0-r2 android-x86-6.0-r3
Chih-Wei Huang [Tue, 8 Mar 2016 09:14:34 +0000 (17:14 +0800)]
mkuserimg.sh: set default size according to the $SRC_DIR size

Add extra size by the $SRC_DIR size plus 10%.

7 years agosu: disable the legacy su completely
Chih-Wei Huang [Mon, 19 May 2014 16:38:35 +0000 (00:38 +0800)]
su: disable the legacy su completely

8 years agof2fs_utils: Update for f2fs-tools 1.6.1
luca020400 [Tue, 12 Apr 2016 12:30:48 +0000 (14:30 +0200)]
f2fs_utils: Update for f2fs-tools 1.6.1

This reverts commit 0c8a8e101ab5927867417083edc45796967a4e84.

Change-Id: Ia18ecde3b9a94920eb849f6d3ccae2f45d02a48a

8 years agof2fs_utils: Alloc f2fs_journal
luca020400 [Mon, 11 Apr 2016 21:58:23 +0000 (23:58 +0200)]
f2fs_utils: Alloc f2fs_journal

* Fixes encryption

Change-Id: I542ae946bdc44d9c2e9c2dcfd50bbbf40f647b4b

8 years agoRevert "f2fs_utils: Update for f2fs-tools 1.6.1"
Ethan Chen [Mon, 11 Apr 2016 20:56:48 +0000 (13:56 -0700)]
Revert "f2fs_utils: Update for f2fs-tools 1.6.1"

This reverts commit 95085beeace4cc3c67ca7b66d74c3f1a5c2e678b.

Change-Id: I362611a342c9febdacfce9a488ba281b9ab284ae

8 years agof2fs_utils: Update for f2fs-tools 1.6.1
luca020400 [Mon, 4 Apr 2016 17:37:15 +0000 (19:37 +0200)]
f2fs_utils: Update for f2fs-tools 1.6.1

Change-Id: Ief41fb8c502227a40afcac100602b7f99490dc7c

8 years agoMerge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system...
Steve Kondik [Fri, 11 Mar 2016 02:32:22 +0000 (18:32 -0800)]
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/extras into cm-13.0

Android 6.0.1 release 22

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 bug in mkf2fs tool calculation of f2fs filesystem length
lei wang wang [Mon, 24 Aug 2015 07:47:36 +0000 (15:47 +0800)]
fix bug in mkf2fs tool calculation of f2fs filesystem length

Change-Id: Ifb1f5e70da1faf626ddd9af311556c56ca5cff12

8 years agobootsignature: includes dt image size for signed boot image
Ankit Gupta [Wed, 23 Dec 2015 22:16:37 +0000 (14:16 -0800)]
bootsignature: includes dt image size for signed boot image

BootSignature truncates the bootimage since dt image size wasn't
considered while calculating the signable bootimage size and thus
target fails to boot. This patch includes the device tree size in
the boot image and prevents it from truncating it and makes the
target boot fine.

Issue-id: YAM-27
Change-Id: Ieaa396159130875768231602cd58eb865d222872

8 years agoFix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.

Bug: http://b/26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6

8 years agolibrank: fix pm_memusage_t init and layout
Thierry Strudel [Tue, 8 Dec 2015 22:59:46 +0000 (14:59 -0800)]
librank: fix pm_memusage_t init and layout

pm_memusage_t variables must be initialized to 0 or call initializer.

Bug: 26083907
Change-Id: I62882be13de9c546e73bcdc24ec43ed0d5251db1

8 years agoMerge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/system...
Steve Kondik [Tue, 8 Dec 2015 00:26:38 +0000 (16:26 -0800)]
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/system/extras into HEAD

Android 6.0.1 release 3

8 years agoShowmap: show swap.
Martijn Coenen [Fri, 4 Dec 2015 16:22:15 +0000 (17:22 +0100)]
Showmap: show swap.

Bug: 26019993
Change-Id: I50a22a6be958dc336da0a1942989a164bb489937

8 years agoprocrank: add proportional swap accounting
Thierry Strudel [Sat, 21 Nov 2015 02:07:15 +0000 (18:07 -0800)]
procrank: add proportional swap accounting

Shared pages are reported in each of the sharing process swapped pages.
Compute a proportional swap usage to get a meaningful value of what each
process has in swap. Report also process unique pages swapped out.
In case ZRAM is used compute the compression ration and report the
actual RAM use of the swapped pages.

Bug: 25392275
Change-Id: I3a28c7812a09a02e1a604593615f5c6ad0340f9f

8 years agoprocrank: Fix some printf alignements
Thierry Strudel [Fri, 20 Nov 2015 20:45:09 +0000 (12:45 -0800)]
procrank: Fix some printf alignements

Bug: 25392275
Change-Id: I8ea4d01310190c34b68d3f3140ea336ad82df665

8 years agoSwap column in procrank not reported with swap enabled
Yu Liu [Thu, 18 Jun 2015 17:46:29 +0000 (10:46 -0700)]
Swap column in procrank not reported with swap enabled

Bug: 25392275
Change-Id: I6d2a0b03abba555b3667f6ccf12896caeecf27aa

8 years agoext4_utils: ifdef socket loop
bryan2894 [Sat, 24 Oct 2015 16:38:42 +0000 (12:38 -0400)]
ext4_utils: ifdef socket loop

For devices not using logd, socket_local_client is undefined.
Only include if we're using logd.

Change-Id: I88693f906e29f40680675b21fc969284ba473489

8 years agomkimage for OMAP
Koushik Dutta [Sat, 1 Jan 2011 23:58:13 +0000 (15:58 -0800)]
mkimage for OMAP

Change-Id: I72ff818d78a877ee8198904919d51577b9aa0c57

8 years agoMerge tag 'android-6.0.0_r26' into cm-13.0
Ricardo Cerqueira [Thu, 5 Nov 2015 00:50:32 +0000 (00:50 +0000)]
Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

Change-Id: I072667eb865209ae93d17032de032fcbd1bd8b80

8 years agoFix build for static lib and executable
Tom Marshall [Tue, 11 Nov 2014 23:15:43 +0000 (15:15 -0800)]
Fix build for static lib and executable

This seems to have been missed in aad1acc

Change-Id: I9973743dbd91dbf29691118a577f2588da8ec403

8 years agof2fs_utils: Add a static libf2fs_sparseblock for minvold
Ricardo Cerqueira [Fri, 7 Nov 2014 01:21:24 +0000 (01:21 +0000)]
f2fs_utils: Add a static libf2fs_sparseblock for minvold

Change-Id: Id0947eb304cabbe59c21b8c2e2b81a03cceed619

8 years agoext4_utils: add BoardConfig define to suppress EMMC-corrupting wipe command
David Ferguson [Fri, 8 Jun 2012 01:00:41 +0000 (21:00 -0400)]
ext4_utils: add BoardConfig define to suppress EMMC-corrupting wipe command

If BOARD_SUPPRESS_EMMC_WIPE is true, the EMMC wipe command will not be
issued. This works around a bug in some firmware revisions of Samsung EMMC's
that permanently damages the device when the wipe command is issued.

For affected devices with kernel source, MMC_CAP_ERASE should be removed
from the kernel instead.

This is only part of the solution but it does handle the "flashing CM9
for the first time on an unsafe kernel" situation.

Change-Id: Ie4e31f9268a65218e5d344ae3068b021790fc33c

8 years agoAdd darwin support for the host tools
Keith Mok [Thu, 3 Sep 2015 18:36:51 +0000 (11:36 -0700)]
Add darwin support for the host tools

There is some symbol name conflict in the make_f2fs and the library
it loaded which darwin and linux handle that in a different way.
Remove the symbol name conflicts as cannot find a way to set symbol
resolving priority in darwin.

Change-Id: Iabe5c1b594daacd65b9ec2f694a2b5ab5575cfce

8 years agoam e7863296: DO NOT MERGE Update rand_emmc_perf makefile. am: 3c1f6644bf -s ours
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.

8 years agoDO 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.

8 years agoam d258e0fd: am 83eeed92: 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

8 years agoam 83eeed92: 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

8 years agoemmc 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

8 years agoDO NOT MERGE Update rand_emmc_perf makefile.
Joshua Schwarz [Thu, 15 Oct 2015 00:21:10 +0000 (17:21 -0700)]
DO NOT MERGE Update rand_emmc_perf makefile.

Change-Id: I4f0416508c3c144e6b44eee4a9dcc78c770dfb8e

8 years agoextras: remove su, we have our own
Dan Pasanen [Sun, 9 Nov 2014 22:43:22 +0000 (16:43 -0600)]
extras: remove su, we have our own

Change-Id: I18e9819efc3e7aed56e4fb19b0fa4f4bf4bd902e

8 years agoExtras: gitignore su
Matt Mower [Sun, 4 Jan 2015 04:11:46 +0000 (22:11 -0600)]
Extras: gitignore su

Change-Id: Iff5a1a6962ee1633f833f5dd998e62ecf6e5f0af

8 years agoext4_utils: Yet another MMC discard pain in the ass
Steve Kondik [Sat, 16 Nov 2013 15:36:33 +0000 (07:36 -0800)]
ext4_utils: Yet another MMC discard pain in the ass

 * Secure discard on this device is painfully slow. Use regular
   discard until the issue is sorted out.

Change-Id: Ib8ccb12829385aa267253f772e243bef8850f455

8 years agoPrepare for BoringSSL update.
Adam Langley [Wed, 2 Sep 2015 22:45:12 +0000 (15:45 -0700)]
Prepare for BoringSSL update.

This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.

In this case, we backed off on removing |ERR_print_errors|, despite it
being a wart in the layering of the code.

(cherry picked from commit 7a688f6e8774920cb8cfc52bf2e3c16976e8ff23)

Change-Id: I2f2f567cfc37fe2d5a69742302c5a92d289b814f

8 years ago64bit emmc fix
Gopinath [Tue, 15 Sep 2015 18:27:13 +0000 (11:27 -0700)]
64bit emmc fix

Generating both 32bit and 64bit varaints for emmc

Change-Id: Iefb38576fc6a2c516b13f10e24828b373410d942

8 years agoam 79e1e6bf: am dafe7076: 64bit emmc fix
Gopinath [Tue, 15 Sep 2015 21:22:52 +0000 (21:22 +0000)]
am 79e1e6bf: am dafe7076: 64bit emmc fix

* commit '79e1e6bf42638eade36ea6ce95240b74af19487a':
  64bit emmc fix

8 years agoam dafe7076: 64bit emmc fix
Gopinath [Tue, 15 Sep 2015 20:05:35 +0000 (20:05 +0000)]
am dafe7076: 64bit emmc fix

* commit 'dafe707664786ff0dd5961424f4fe7f4c8ba24f7':
  64bit emmc fix

8 years ago64bit emmc fix
Gopinath [Tue, 15 Sep 2015 18:27:13 +0000 (11:27 -0700)]
64bit emmc fix

Generating both 32bit and 64bit varaints for emmc

Change-Id: Iefb38576fc6a2c516b13f10e24828b373410d942

8 years agomerge in mnc-dr-release history after reset to mnc-dr-dev
The Android Automerger [Thu, 27 Aug 2015 08:08:52 +0000 (01:08 -0700)]
merge in mnc-dr-release history after reset to mnc-dr-dev

8 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Thu, 27 Aug 2015 08:07:57 +0000 (01:07 -0700)]
merge in mnc-release history after reset to mnc-dev

8 years agoam 58cd4204: am c7d19e4d: Adding 64 bit emmc_rand_perf
Gopinath [Wed, 26 Aug 2015 17:48:32 +0000 (17:48 +0000)]
am 58cd4204: am c7d19e4d: Adding 64 bit emmc_rand_perf

* commit '58cd4204135501f59059763e699ea3df6430c828':
  Adding 64 bit emmc_rand_perf

8 years agoam c7d19e4d: Adding 64 bit emmc_rand_perf
Gopinath [Wed, 26 Aug 2015 17:40:34 +0000 (17:40 +0000)]
am c7d19e4d: Adding 64 bit emmc_rand_perf

* commit 'c7d19e4da5e54231a54abf31afdc4531114a184b':
  Adding 64 bit emmc_rand_perf

8 years agoAdding 64 bit emmc_rand_perf
Gopinath [Tue, 25 Aug 2015 23:16:09 +0000 (16:16 -0700)]
Adding 64 bit emmc_rand_perf

Genrating 32bit and 64bit variant in local/tmp

Change-Id: Ia9a640eab5bfc428d00af4ae0ada6184d946108a

8 years agoActually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 14:54:52 +0000 (07:54 -0700)]
Actually encrypt stuff

Fix really dumb error in checkin
https://googleplex-android-review.git.corp.google.com/#/c/728542

This did the opposite of what I want

Bug: 22502319
Change-Id: I502c9b62d127e6221bbc5ff1a209cb0312ec943f

8 years agoam dd22cb33: Actually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 15:59:01 +0000 (15:59 +0000)]
am dd22cb33: Actually encrypt stuff

* commit 'dd22cb338ad59a4766e9ee47936f1e10b386e128':
  Actually encrypt stuff

8 years agoActually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 14:54:52 +0000 (07:54 -0700)]
Actually encrypt stuff

Fix really dumb error in checkin
https://googleplex-android-review.git.corp.google.com/#/c/728542

This did the opposite of what I want

Bug: 22502319
Change-Id: I502c9b62d127e6221bbc5ff1a209cb0312ec943f

8 years agoDon't encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 22:22:03 +0000 (15:22 -0700)]
Don't encrypt lost+found

ext4 encryption doesn't like it, and the kernel crashes.
Also fix a formatting error in logs.

Bug: 22478103
Change-Id: Ia25f4b0c1c9eeb20e39b795c7827c5bd1a11cb6a

8 years agoam 65df483a: Don\'t encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 23:13:24 +0000 (23:13 +0000)]
am 65df483a: Don\'t encrypt lost+found

* commit '65df483af2efcb2ab9fd82ae53f9aeaa55f0cebd':
  Don't encrypt lost+found

8 years agoDon't encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 22:22:03 +0000 (15:22 -0700)]
Don't encrypt lost+found

ext4 encryption doesn't like it, and the kernel crashes.
Also fix a formatting error in logs.

Bug: 22478103
Change-Id: Ia25f4b0c1c9eeb20e39b795c7827c5bd1a11cb6a

8 years agomerge in mnc-dr-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 14 Jul 2015 08:06:40 +0000 (01:06 -0700)]
merge in mnc-dr-release history after reset to mnc-dr-dev

8 years agoam 96f2bc51: am e7da7e9b: Simpleperf: remove abort in child process.
Yabin Cui [Mon, 13 Jul 2015 23:34:11 +0000 (23:34 +0000)]
am 96f2bc51: am e7da7e9b: Simpleperf: remove abort in child process.

* commit '96f2bc51002a59fb77711a2a38e014cf13ac010c':
  Simpleperf: remove abort in child process.

8 years agoam fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-dev
Paul Crowley [Mon, 13 Jul 2015 22:35:00 +0000 (22:35 +0000)]
am fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-dev

* commit 'fa584713c935572966cf86529bbba9e011e001e9':
  Add keyctl_revoke
  Improve error logging.

8 years agoam d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopoli...
Paul Crowley [Mon, 13 Jul 2015 22:34:54 +0000 (22:34 +0000)]
am d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev

* commit 'd3548a38a524f6f5ccddd87f806054fbb71da434':
  Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies

8 years agoam e7da7e9b: Simpleperf: remove abort in child process.
Yabin Cui [Mon, 13 Jul 2015 22:30:39 +0000 (22:30 +0000)]
am e7da7e9b: Simpleperf: remove abort in child process.

* commit 'e7da7e9b27ca050a12efa36207ea6b9218cc684d':
  Simpleperf: remove abort in child process.

8 years agoMerge changes If63f439d,I697ec4ef into mnc-dr-dev
Paul Crowley [Mon, 13 Jul 2015 21:11:20 +0000 (21:11 +0000)]
Merge changes If63f439d,I697ec4ef into mnc-dr-dev

* changes:
  Add keyctl_revoke
  Improve error logging.

8 years agoMerge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into...
Paul Crowley [Mon, 13 Jul 2015 20:52:27 +0000 (20:52 +0000)]
Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev

8 years agoam ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get...
Paul Crowley [Mon, 13 Jul 2015 15:11:35 +0000 (15:11 +0000)]
am ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev

* commit 'ccaca5cb8971837afe96f5b2940d266a95efd564':
  Don't apply default encryption to /data/user, it should get per-user encryption.

8 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Mon, 13 Jul 2015 08:11:42 +0000 (01:11 -0700)]
merge in mnc-release history after reset to mnc-dev

8 years agomerge in mnc-dr-release history after reset to mnc-dr-dev
The Android Automerger [Mon, 13 Jul 2015 08:02:34 +0000 (01:02 -0700)]
merge in mnc-dr-release history after reset to mnc-dr-dev

8 years agoMerge "Don't apply default encryption to /data/user, it should get per-user encryptio...
Paul Crowley [Sun, 12 Jul 2015 18:47:58 +0000 (18:47 +0000)]
Merge "Don't apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev

8 years agomerge in mnc-dr-release history after reset to mnc-dr-dev
The Android Automerger [Sat, 11 Jul 2015 08:04:32 +0000 (01:04 -0700)]
merge in mnc-dr-release history after reset to mnc-dr-dev

8 years agoSimpleperf: remove abort in child process.
Yabin Cui [Sat, 11 Jul 2015 01:02:01 +0000 (18:02 -0700)]
Simpleperf: remove abort in child process.

Bug: 22328419
Change-Id: I3521a246929c10dc1eb9c9dac75240197b5b0a40

8 years agoam b89e81dc: fs_config: align with new explicit fs_config target_out parameter
Thierry Strudel [Fri, 10 Jul 2015 18:57:34 +0000 (18:57 +0000)]
am b89e81dc: fs_config: align with new explicit fs_config target_out parameter

* commit 'b89e81dcb9bfa707912d9e370949b250367b0998':
  fs_config: align with new explicit fs_config target_out parameter

8 years agofs_config: align with new explicit fs_config target_out parameter
Thierry Strudel [Thu, 9 Jul 2015 23:31:39 +0000 (16:31 -0700)]
fs_config: align with new explicit fs_config target_out parameter

Bug: 21989305
Bug: 22048934
Change-Id: I82c16c70a776e13b3365672b2820ee965525de9a
Signed-off-by: Thierry Strudel <tstrudel@google.com>
8 years agoAdd keyctl_revoke
Paul Crowley [Mon, 6 Jul 2015 15:54:28 +0000 (16:54 +0100)]
Add keyctl_revoke

Change-Id: If63f439d831aa384acd45fde98312923f9c2e561

8 years agoAdd e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
Paul Crowley [Thu, 28 May 2015 15:45:52 +0000 (16:45 +0100)]
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies

Bug: 19704432
(cherry picked from commit 09d3fdffad0ccbed36f0ece966e85aed23c626d7)

Change-Id: Ib7ef9365063ed69774169b22071f2a42d2f5ef21

8 years agoImprove error logging.
Paul Crowley [Thu, 28 May 2015 15:45:52 +0000 (16:45 +0100)]
Improve error logging.

Bug: 19704432
Change-Id: I697ec4ef879b522d073e5eacc49665479f082ae9

8 years agoDon't apply default encryption to /data/user, it should get per-user
Paul Crowley [Wed, 6 May 2015 14:28:35 +0000 (15:28 +0100)]
Don't apply default encryption to /data/user, it should get per-user
encryption.

Bug: 19704432

(cherry-picked from commit 0050336a0a19019a68374b9eef51e00d6b242f57)

Change-Id: I646f3408ccc06f580d62a2f90f7b895288585396

8 years agoam b1f954d1: Merge "Add a system tool - ANRdaemon" into cw-d-mr1-dev
Zhengyin Qian [Tue, 7 Jul 2015 17:57:25 +0000 (17:57 +0000)]
am b1f954d1: Merge "Add a system tool - ANRdaemon" into cw-d-mr1-dev

* commit 'b1f954d105a4604487194be94233dd7b8d049d51':
  Add a system tool - ANRdaemon

8 years agoMerge "Add a system tool - ANRdaemon" into cw-d-mr1-dev
Zhengyin Qian [Tue, 7 Jul 2015 17:19:34 +0000 (17:19 +0000)]
Merge "Add a system tool - ANRdaemon" into cw-d-mr1-dev

8 years agoAdd a system tool - ANRdaemon
Zhengyin Qian [Fri, 19 Jun 2015 04:37:41 +0000 (21:37 -0700)]
Add a system tool - ANRdaemon

This is a daemon to help analyze ANR due to CPU starvation by logging system activity before such an event happens. The daemon uses debugfs underlying for logging.

Change-Id: I5c7c78e88e1dda9c392502f2a41d1e47f06bb89b

8 years agomerge in mnc-dr-release history after reset to mnc-dr-dev
The Android Automerger [Mon, 6 Jul 2015 23:07:30 +0000 (16:07 -0700)]
merge in mnc-dr-release history after reset to mnc-dr-dev

8 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Thu, 25 Jun 2015 08:03:48 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev

8 years agoam c05f5e7a: am cc919ca1: mksquashfsimage.sh: Add forward slash for SRC_DIR
Mohamad Ayyash [Wed, 24 Jun 2015 23:30:30 +0000 (23:30 +0000)]
am c05f5e7a: am cc919ca1: mksquashfsimage.sh: Add forward slash for SRC_DIR

* commit 'c05f5e7a8fa5de4224b34534ac41cee19d8939a3':
  mksquashfsimage.sh: Add forward slash for SRC_DIR

8 years agoam 61cde7e4: am eefe2f9e: mksquashfsimge.sh: Support creating a sparse image
Mohamad Ayyash [Wed, 24 Jun 2015 23:30:29 +0000 (23:30 +0000)]
am 61cde7e4: am eefe2f9e: mksquashfsimge.sh: Support creating a sparse image

* commit '61cde7e4843af7590e5ea06a80d67ca5a6dfc616':
  mksquashfsimge.sh: Support creating a sparse image

8 years agoresolved conflicts for merge of ee3d4d49 to mnc-dev
Simon Wilson [Wed, 24 Jun 2015 23:22:44 +0000 (16:22 -0700)]
resolved conflicts for merge of ee3d4d49 to mnc-dev

Change-Id: Ibfa043e2a7400e659f0355bcd139352b02a058e9

8 years agoMerge "mksquashfsimge.sh: Support creating a sparse image" into mnc-dev
Mohamad Ayyash [Wed, 24 Jun 2015 23:14:28 +0000 (23:14 +0000)]
Merge "mksquashfsimge.sh: Support creating a sparse image" into mnc-dev

8 years agoMerge "mksquashfsimage.sh: Add forward slash for SRC_DIR" into mnc-dev
Mohamad Ayyash [Wed, 24 Jun 2015 23:13:59 +0000 (23:13 +0000)]
Merge "mksquashfsimage.sh: Add forward slash for SRC_DIR" into mnc-dev

8 years agoam cc919ca1: mksquashfsimage.sh: Add forward slash for SRC_DIR
Mohamad Ayyash [Wed, 24 Jun 2015 22:52:13 +0000 (22:52 +0000)]
am cc919ca1: mksquashfsimage.sh: Add forward slash for SRC_DIR

* commit 'cc919ca13a0c076a75faef80f6b1a7636801aab3':
  mksquashfsimage.sh: Add forward slash for SRC_DIR

8 years agoam eefe2f9e: mksquashfsimge.sh: Support creating a sparse image
Mohamad Ayyash [Wed, 24 Jun 2015 22:52:11 +0000 (22:52 +0000)]
am eefe2f9e: mksquashfsimge.sh: Support creating a sparse image

* commit 'eefe2f9eb99eac4d2e2195a42a146f899516e874':
  mksquashfsimge.sh: Support creating a sparse image

8 years agoam b4cf7b30: Add switches for compressor
Simon Wilson [Wed, 24 Jun 2015 22:48:03 +0000 (22:48 +0000)]
am b4cf7b30: Add switches for compressor

* commit 'b4cf7b309e8d8dc2ebbc6501ef205091322ab659':
  Add switches for compressor

8 years agomksquashfsimage.sh: Add forward slash for SRC_DIR
Mohamad Ayyash [Wed, 24 Jun 2015 20:04:29 +0000 (13:04 -0700)]
mksquashfsimage.sh: Add forward slash for SRC_DIR

There is a bug in mksquashfs that fails to interpret symlink dirs unless
they have a forward slash

Change-Id: I64df07d99858a792e1d7af5d11234fe8b75f91ae
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agomksquashfsimage.sh: Add forward slash for SRC_DIR
Mohamad Ayyash [Wed, 24 Jun 2015 20:04:29 +0000 (13:04 -0700)]
mksquashfsimage.sh: Add forward slash for SRC_DIR

There is a bug in mksquashfs that fails to interpret symlink dirs unless
they have a forward slash

Change-Id: I64df07d99858a792e1d7af5d11234fe8b75f91ae
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agomksquashfsimge.sh: Support creating a sparse image
Mohamad Ayyash [Wed, 24 Jun 2015 17:36:40 +0000 (10:36 -0700)]
mksquashfsimge.sh: Support creating a sparse image

Change-Id: Idc28996028e666f929c032e5380312b7b28faa91
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agomksquashfsimge.sh: Support creating a sparse image
Mohamad Ayyash [Wed, 24 Jun 2015 17:36:40 +0000 (10:36 -0700)]
mksquashfsimge.sh: Support creating a sparse image

Change-Id: Idc28996028e666f929c032e5380312b7b28faa91
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoam 720fd497: am 01e42b24: Introduce squashfs-utils that includes helper functions
Mohamad Ayyash [Thu, 18 Jun 2015 23:29:02 +0000 (23:29 +0000)]
am 720fd497: am 01e42b24: Introduce squashfs-utils that includes helper functions

* commit '720fd497f2fa1ea9c2621b5632ccf999dc8ed086':
  Introduce squashfs-utils that includes helper functions

8 years agoam 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev
Mohamad Ayyash [Thu, 18 Jun 2015 23:29:01 +0000 (23:29 +0000)]
am 802cb097: resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev

* commit '802cb097b4d8cfcb7681808026307d07eec93ba5':
  Introduce mksquashfsimage.sh

8 years agoam 01e42b24: Introduce squashfs-utils that includes helper functions
Mohamad Ayyash [Thu, 18 Jun 2015 23:24:34 +0000 (23:24 +0000)]
am 01e42b24: Introduce squashfs-utils that includes helper functions

* commit '01e42b24c9b56b3ca88a2cf563a8c695d5a74534':
  Introduce squashfs-utils that includes helper functions

8 years agoresolved conflicts for merge of eca016eb to lmp-mr1-ub-dev
Mohamad Ayyash [Thu, 18 Jun 2015 23:19:06 +0000 (16:19 -0700)]
resolved conflicts for merge of eca016eb to lmp-mr1-ub-dev

8 years agoAdd switches for compressor
Simon Wilson [Wed, 17 Jun 2015 19:36:53 +0000 (12:36 -0700)]
Add switches for compressor

Change-Id: I297321db3996d07e9eba3edc0b2837c8d221ab1a

8 years agoIntroduce squashfs-utils that includes helper functions
Mohamad Ayyash [Thu, 2 Apr 2015 02:25:28 +0000 (19:25 -0700)]
Introduce squashfs-utils that includes helper functions

For example: extracting filesystem size from superblock

Change-Id: I97c79d80ebb767a977c8ca27f7e0877b5ead8fdc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoIntroduce mksquashfsimage.sh
Mohamad Ayyash [Tue, 3 Mar 2015 20:33:48 +0000 (12:33 -0800)]
Introduce mksquashfsimage.sh

Change-Id: I2b916ef3ef60b40f506e1f1be59482f7b071cdb2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 16 Jun 2015 08:06:20 +0000 (01:06 -0700)]
merge in mnc-release history after reset to mnc-dev

8 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Mon, 15 Jun 2015 18:58:51 +0000 (11:58 -0700)]
merge in mnc-release history after reset to mnc-dev

8 years agoRetry polling to prevent failures
Paul Lawrence [Fri, 12 Jun 2015 20:06:21 +0000 (13:06 -0700)]
Retry polling to prevent failures

Change-Id: I182ee7f70c5a96bbcdb0fc9e35df67c45a937757