OSDN Git Service
Dan Albert [Wed, 21 Sep 2016 23:42:36 +0000 (23:42 +0000)]
Merge "Add missing include." am:
45b09e9144
am:
2ab88f0a77
Change-Id: I84171fb41e8cd0040da34891d9b527400ff49b3f
Dan Albert [Wed, 21 Sep 2016 23:22:29 +0000 (23:22 +0000)]
Merge "Add missing include."
am:
45b09e9144
Change-Id: I97b57690ed9cccd71b0c3d9b83fb1fd0f2e3d835
Treehugger Robot [Wed, 21 Sep 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Add missing include."
Dan Albert [Wed, 21 Sep 2016 20:57:53 +0000 (13:57 -0700)]
Add missing include.
Test: mm
Bug: None
Change-Id: If3cbe642292016fdac603cce83f3ef252dda7481
Wei Wang [Tue, 6 Sep 2016 20:18:06 +0000 (20:18 +0000)]
Merge "Update fs_mgr_mount_all function" am:
1d58bcf6d4
am:
554d8679e7
Change-Id: Id6a99695c437c37b60e8e03eff9ff60eb91707a0
Wei Wang [Tue, 6 Sep 2016 20:14:37 +0000 (20:14 +0000)]
Merge "Update fs_mgr_mount_all function"
am:
1d58bcf6d4
Change-Id: Ic0c4c94cc6432d42229b9f66d95ea64cd49fa5f6
Wei Wang [Tue, 6 Sep 2016 20:05:57 +0000 (20:05 +0000)]
Merge "Update fs_mgr_mount_all function"
Wei Wang [Fri, 26 Aug 2016 03:58:37 +0000 (20:58 -0700)]
Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt
(cherry picked from commit
1d6476c3c848ebc8fbdfa6945e1c3be447beb5a3)
Bug:
30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
Chih-Hung Hsieh [Tue, 2 Aug 2016 20:34:51 +0000 (20:34 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold." am:
a3bcf26d93
am:
9bf2a320e7
Change-Id: I8e1288bd16b8a1c968d890412b5d1bdf03e9ae7a
Chih-Hung Hsieh [Tue, 2 Aug 2016 20:32:22 +0000 (20:32 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold."
am:
a3bcf26d93
Change-Id: I109b4e68954de019827eddca2001f4bcac91130d
Treehugger Robot [Tue, 2 Aug 2016 20:20:57 +0000 (20:20 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold."
Chih-Hung Hsieh [Tue, 2 Aug 2016 18:41:54 +0000 (11:41 -0700)]
Fix google-explicit-constructor warnings in system/vold.
Bug:
28341362
Change-Id: I14344b0cba134570bf87e7d61aa03503735dd794
Test: build with WITH_TIDY=1
Chih-hung Hsieh [Wed, 27 Jul 2016 23:20:23 +0000 (23:20 +0000)]
Merge \\"Fix clang-tidy performance warnings in system/vold.\\" am:
e24d4eef9b
am:
aa668f3d13
Change-Id: I7f175785ab17ad9107bd11e9cd4ff0a9a7cbd460
Chih-Hung Hsieh [Wed, 27 Jul 2016 23:17:57 +0000 (23:17 +0000)]
Merge \"Fix clang-tidy performance warnings in system/vold.\"
am:
e24d4eef9b
Change-Id: I8e882391fb343a5dd8b5cd32b2e7c087219334dc
Chih-hung Hsieh [Wed, 27 Jul 2016 22:42:50 +0000 (22:42 +0000)]
Merge "Fix clang-tidy performance warnings in system/vold."
Chih-Hung Hsieh [Wed, 27 Jul 2016 21:11:02 +0000 (14:11 -0700)]
Fix clang-tidy performance warnings in system/vold.
* Use const reference type for for-loop index variables
to avoid unnecessary copy.
Bug:
30413223
Change-Id: Id4d980ae8afec1374fc3be0b23f1c6a39bff86e0
Test: build with WITH_TIDY=1
Chih-hung Hsieh [Wed, 22 Jun 2016 21:33:37 +0000 (21:33 +0000)]
Merge \\"Fix misc-macro-parentheses warnings in system/vold.\\" am:
786c536e84
am:
c83c87e681
Change-Id: I4b2bc593082ee4179adccd5868696a50d687cb0c
Chih-Hung Hsieh [Wed, 22 Jun 2016 21:31:07 +0000 (21:31 +0000)]
Merge \"Fix misc-macro-parentheses warnings in system/vold.\"
am:
786c536e84
Change-Id: Ida8cc5a6d17b526ff4f5af5f2406930333a385c8
Chih-hung Hsieh [Wed, 22 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge "Fix misc-macro-parentheses warnings in system/vold."
Chih-Hung Hsieh [Fri, 10 Jun 2016 21:13:59 +0000 (14:13 -0700)]
Fix misc-macro-parentheses warnings in system/vold.
Add parentheses around macro arguments used beside operators.
Bug:
28705665
Change-Id: I44e954f15bf6b8279d0f857d5417b7cb457da779
Paul Crowley [Wed, 18 May 2016 22:59:57 +0000 (22:59 +0000)]
Two phases to set the password for disk encryption
am:
a363036b44
* commit '
a363036b44f7f140aa9a943578f56abff5880a60':
Two phases to set the password for disk encryption
Change-Id: I37368c698abcf4b541f924cb18927f4645edcb3f
Paul Crowley [Tue, 17 May 2016 21:17:56 +0000 (14:17 -0700)]
Two phases to set the password for disk encryption
Revert "Revert "Two phases to set the password for disk encryption""
This reverts commit
d402389290eeef86be7eb9241e20fdd125d44eb1.
In addition, fix the bug in the original commit.
Bug:
28154455
Bug:
28694324
Change-Id: I885f1d73e739416347c135d79979941c2bbdbe62
Chih-Hung Hsieh [Wed, 11 May 2016 23:03:58 +0000 (23:03 +0000)]
Merge "Fix misc-macro-parentheses warnings." am:
0c0f9228cf
am:
4ff367a593
* commit '
4ff367a5934a906ba2008e530efca220deb96af7':
Fix misc-macro-parentheses warnings.
Change-Id: I67d525e6f78b1d4e5854d40c30ad0bb96a3490dc
Chih-Hung Hsieh [Wed, 11 May 2016 23:00:48 +0000 (23:00 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
0c0f9228cf
* commit '
0c0f9228cf1cd0f39ecb56f643ce7e3b050bb143':
Fix misc-macro-parentheses warnings.
Change-Id: I9fa6dc832ca4920c1f9f85a4fb85e61cd62fdeb5
Treehugger Robot [Wed, 11 May 2016 22:52:30 +0000 (22:52 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Chih-Hung Hsieh [Wed, 11 May 2016 22:05:05 +0000 (15:05 -0700)]
Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.
Bug:
28705665
Change-Id: I0731cb8b22b3a9bdadac6414473d90e8398a8e89
Paul Crowley [Tue, 10 May 2016 22:17:33 +0000 (22:17 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
am:
cfa03d4a4c
* commit '
cfa03d4a4c53acf41dca2c41a2efd00de06043bb':
e4crypt_is_native has been moved into system/extras.
Change-Id: Id199621d0e5544acadc4a4d4308a80c47b9ea3c8
Paul Crowley [Tue, 10 May 2016 22:12:49 +0000 (22:12 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
Paul Crowley [Tue, 10 May 2016 21:19:51 +0000 (21:19 +0000)]
Revert "Two phases to set the password for disk encryption"
am:
d402389290
* commit '
d402389290eeef86be7eb9241e20fdd125d44eb1':
Revert "Two phases to set the password for disk encryption"
Change-Id: I09735798116dd4e37dda60651dc085a09090a99d
Paul Crowley [Tue, 10 May 2016 20:36:43 +0000 (20:36 +0000)]
Revert "Two phases to set the password for disk encryption"
This reverts commit
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4.
Bug:
28694324
Change-Id: Ibbbaff287f4dd28f4a13e122a3617987a8875a44
Paul Crowley [Wed, 27 Apr 2016 17:25:12 +0000 (10:25 -0700)]
e4crypt_is_native has been moved into system/extras.
Bug:
28318405
Change-Id: Id962764cf7fb5f58b769bf99aeb6d3d69cb66991
Paul Crowley [Mon, 9 May 2016 21:53:23 +0000 (21:53 +0000)]
Two phases to set the password for disk encryption
am:
92c5eeb467
* commit '
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4':
Two phases to set the password for disk encryption
Change-Id: Ie10cfc91d59f38359560682ca5e4133dc8700c12
Paul Crowley [Fri, 22 Apr 2016 19:09:54 +0000 (12:09 -0700)]
Two phases to set the password for disk encryption
In one phase, we make the new password work, and in the second we make
it the only one which works ("fixation"). This means that we can set
the password in Gatekeeper between these two phases, and a crash
doesn't break things. Unlocking a user automatically fixates the
presented credential.
Bug:
28154455
Change-Id: I54623c8652f0c9f72dd60388a7dc0ab2d48e81c7
Paul Crowley [Wed, 27 Apr 2016 23:45:26 +0000 (23:45 +0000)]
Use a longer timeout on the disk encryption keys
am:
b3de337
* commit '
b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
Use a longer timeout on the disk encryption keys
Change-Id: Ie66bea62ccc5d8066a12b9a7acf26dafa4b2eaa3
Paul Crowley [Wed, 27 Apr 2016 19:58:41 +0000 (12:58 -0700)]
Use a longer timeout on the disk encryption keys
Avoid a timeout error by extending the time allowed between getting
the auth token and decrypting the key from five to thirty seconds.
Bug:
28398766
Change-Id: I1dbb9e0e33707e7de4c1720ad1b8e153c77094b2
John Cormie [Mon, 25 Apr 2016 23:57:06 +0000 (23:57 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
am:
a4330be
* commit '
a4330beb482c3b5decf6a6fc966e5589210130eb':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: If9f7acd5bc77ee4ecf9eed7375881b5554e85b9a
John Cormie [Mon, 25 Apr 2016 23:49:28 +0000 (23:49 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
Martijn Coenen [Mon, 25 Apr 2016 18:03:49 +0000 (18:03 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
am:
47ff14a
* commit '
47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: Iad30255947ff204325736b361e883aaeaa31a473
Martijn Coenen [Mon, 25 Apr 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
John Cormie [Mon, 18 Apr 2016 21:23:29 +0000 (14:23 -0700)]
Unmount public sdcard filesystems before killing the fuse process.
Avoids ENOTCONN during eject for sdcard users.
Change-Id: I7b89ccaad4bb7af3639dc0b702168030a2f88366
Bug:
28268676
Paul Lawrence [Tue, 19 Apr 2016 14:47:08 +0000 (14:47 +0000)]
Merge "Don\'t start defaultcrypto twice" into nyc-dev
am:
0264d8f
* commit '
0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
Don't start defaultcrypto twice
Change-Id: Ief95c3bf7798cf6090f68fb2eac124677d448187
Paul Lawrence [Tue, 19 Apr 2016 14:44:26 +0000 (14:44 +0000)]
Merge "Don't start defaultcrypto twice" into nyc-dev
Paul Lawrence [Fri, 15 Apr 2016 22:41:33 +0000 (15:41 -0700)]
Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.
Bug:
27452459
Change-Id: I715d5441f8ae0b820b680f6a75f51694c4420992
Jeff Sharkey [Mon, 18 Apr 2016 19:59:50 +0000 (19:59 +0000)]
Consistent creation/destruction of user data.
am:
be70c9a
* commit '
be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
Consistent creation/destruction of user data.
Change-Id: Iddb906f6df0587faf95198446c376b2e8d550bec
Jeff Sharkey [Fri, 15 Apr 2016 02:45:16 +0000 (20:45 -0600)]
Consistent creation/destruction of user data.
Preparing and destroying users currently needs to be split across
installd, system_server, and vold, since no single party has all the
required SELinux permissions.
Bug:
27896918,
25861755
Change-Id: Ieec14ccacfc7a3a5ab00df47ace7318feb900c38
Martijn Coenen [Fri, 15 Apr 2016 12:30:40 +0000 (14:30 +0200)]
Move vold (and sdcard childs) to foreground cpuset.
Bug:
24949295
Change-Id: I7118a374db90ede517a92f72763d624b9a234ea7
Elliott Hughes [Tue, 12 Apr 2016 23:44:04 +0000 (16:44 -0700)]
resolve merge conflicts of
81fd991 to nyc-dev-plus-aosp
Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
Mattias Nissler [Tue, 12 Apr 2016 23:27:37 +0000 (23:27 +0000)]
Merge "Switch to BoringSSL crypto."
am:
af458c4
* commit '
af458c478a9f333fa39bdddb9a7aa097a2196b64':
Switch to BoringSSL crypto.
Change-Id: Ie3c9a05bfd05dfa9b1a79fe42b59d0dfb3346843
Elliott Hughes [Tue, 12 Apr 2016 23:12:35 +0000 (23:12 +0000)]
Merge "Switch to BoringSSL crypto."
Dan Austin [Tue, 12 Apr 2016 22:35:50 +0000 (22:35 +0000)]
Merge "Address const issues in preparation for libcxx rebase." am:
a4f7dad
am:
3cc69fa
* commit '
3cc69faa6797ae0cfe43f4243d564fbe14f4cfe4':
Address const issues in preparation for libcxx rebase.
Change-Id: I58f814d71e5d5c067ade613d0bf8a88911d53424
Dan Austin [Tue, 12 Apr 2016 22:33:13 +0000 (22:33 +0000)]
Merge "Address const issues in preparation for libcxx rebase."
am:
a4f7dad
* commit '
a4f7dadd389e25d2b5749d1edf65081b3a4e6961':
Address const issues in preparation for libcxx rebase.
Change-Id: I63c3a205db98d956c3c02a4f4f6fd87fd4e052e8
Dan Austin [Tue, 12 Apr 2016 22:21:17 +0000 (22:21 +0000)]
Merge "Address const issues in preparation for libcxx rebase."
Yabin Cui [Sat, 9 Apr 2016 01:09:55 +0000 (01:09 +0000)]
Merge "vold: write bootloader message directly." into nyc-dev
am:
cbedcc3
* commit '
cbedcc30b32d79d77d89f23074da4dc76bf5e26d':
vold: write bootloader message directly.
Change-Id: Ib8f63a49a86c0e9e7a231cb5d22f6bb9a14e820f
Yabin Cui [Fri, 8 Apr 2016 21:03:42 +0000 (21:03 +0000)]
Merge "vold: write bootloader message directly." into nyc-dev
Daichi Hirono [Thu, 7 Apr 2016 08:16:07 +0000 (08:16 +0000)]
Add log flag for verbose AppFuse log for nyc-dev.
am:
2d6555f
* commit '
2d6555f33a5b0fd1e9f0db87e3a2146c3c26add0':
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I8a2325c0dfd70888e635994f8aa5901fbf57efac
Daichi Hirono [Thu, 7 Apr 2016 05:59:32 +0000 (14:59 +0900)]
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I60ca596e32f8668ae5895e671d92c4978ede6314
Fixed:
28055420
Yabin Cui [Thu, 7 Apr 2016 00:21:38 +0000 (17:21 -0700)]
vold: write bootloader message directly.
Bug:
27176738
Change-Id: I09bfe777e383325809d7ecc2dcb9129fe234053f
Mattias Nissler [Thu, 31 Mar 2016 14:32:59 +0000 (16:32 +0200)]
Switch to BoringSSL crypto.
This replaces the libmincrypt dependency with libcrypto_utils, which
is needed due to libfec and fs_mgr switching to BoringSSL.
Change-Id: I4f6f4d8cc5e200679331a9bcdf2cc3bad1082dd6
Jeff Sharkey [Thu, 31 Mar 2016 03:47:49 +0000 (03:47 +0000)]
Kill apps using PublicVolume when unmounting.
am:
8aff854
* commit '
8aff854b940039cce5fa2a227b19e39de6787b20':
Kill apps using PublicVolume when unmounting.
Change-Id: I12332ee8d416eb2bba0f940a5f8bf64c5766c774
Jeff Sharkey [Thu, 31 Mar 2016 02:37:28 +0000 (20:37 -0600)]
Kill apps using PublicVolume when unmounting.
Bug:
24863778
Change-Id: I86a482c6de78afe2e09ca91165000e1b10a42058
Paul Crowley [Tue, 29 Mar 2016 20:30:13 +0000 (20:30 +0000)]
Don\'t fail if the CE key isn\'t loaded in destroy_user_key
am:
71ee662
* commit '
71ee662ec3f82db66f1a34579aff75cc27d4b205':
Don't fail if the CE key isn't loaded in destroy_user_key
Change-Id: I7700f07dfa3421e57149aacf1a98b0a5eb8bf917
Paul Crowley [Fri, 25 Mar 2016 22:50:01 +0000 (15:50 -0700)]
Don't fail if the CE key isn't loaded in destroy_user_key
Users don't have to be unlocked to be deleted, so don't worry if we
don't have their key to evict.
Bug:
26847403
Bug:
27441228
Change-Id: Ifd93f620926630aa102a3bb4a5d2d45d34f9b75d
Dan Austin [Thu, 24 Mar 2016 19:26:39 +0000 (12:26 -0700)]
Address const issues in preparation for libcxx rebase.
Change-Id: I5199c1eb4e874fd354beefa1232707949483e88d
Paul Crowley [Thu, 17 Mar 2016 19:57:36 +0000 (19:57 +0000)]
Support Keymaster2 with lots of clever template logic :)
am:
0323afd
* commit '
0323afd69d82ce900d520f4611f56e6c06fc08a1':
Support Keymaster2 with lots of clever template logic :)
Paul Crowley [Wed, 16 Mar 2016 00:04:39 +0000 (17:04 -0700)]
Support Keymaster2 with lots of clever template logic :)
Bug:
27718275
Change-Id: I0b2aa74f45fd07a121ce0c342b27426a3fe593ce
Paul Lawrence [Fri, 11 Mar 2016 23:45:29 +0000 (23:45 +0000)]
Fix some static analyser issues
am:
300dae7c38
* commit '
300dae7c38e6853148a998dfc1030b2be40490b5':
Fix some static analyser issues
Paul Lawrence [Fri, 11 Mar 2016 19:02:52 +0000 (11:02 -0800)]
Fix some static analyser issues
Bug:
27099772
Change-Id: Ic96777edf4ea282be2b8f53525226396c01e023c
Paul Lawrence [Fri, 11 Mar 2016 01:51:11 +0000 (01:51 +0000)]
Merge "Make sure encryption type is set on first boot" into nyc-dev
am:
439034b8cc
* commit '
439034b8cc510a95d25c53c8606f88a40ddcbb0b':
Make sure encryption type is set on first boot
Paul Lawrence [Fri, 11 Mar 2016 01:42:55 +0000 (01:42 +0000)]
Merge "Make sure encryption type is set on first boot" into nyc-dev
Jeff Sharkey [Fri, 11 Mar 2016 00:19:11 +0000 (00:19 +0000)]
Merge "Print size as unsigned when sending to framework." into nyc-dev
am:
f84fe90714
* commit '
f84fe907141bcdb76425d5ba42913576f018a11c':
Print size as unsigned when sending to framework.
Jeff Sharkey [Fri, 11 Mar 2016 00:07:25 +0000 (00:07 +0000)]
Merge "Print size as unsigned when sending to framework." into nyc-dev
Paul Lawrence [Thu, 10 Mar 2016 23:44:21 +0000 (15:44 -0800)]
Make sure encryption type is set on first boot
Bug:
27599622
Change-Id: I2f38c03941ac8cdba40baf7421132f572866e296
Jeff Sharkey [Thu, 10 Mar 2016 19:11:09 +0000 (12:11 -0700)]
Print size as unsigned when sending to framework.
Otherwise we might output negative numbers that confuse the rest
of the recovery stack.
Bug:
26007445
Change-Id: Ic99b49360732e5389c6330be065e1222e25b60ca
Yu Ning [Thu, 10 Mar 2016 17:16:57 +0000 (17:16 +0000)]
Merge "Support emulator\'s virtio-blk based SD card" into nyc-dev
am:
828d386c7d
* commit '
828d386c7de04c6f33c1e998fd9d4630f90d5be4':
Support emulator's virtio-blk based SD card
Prathmesh Prabhu [Thu, 10 Mar 2016 17:12:59 +0000 (17:12 +0000)]
Merge "Support emulator's virtio-blk based SD card" into nyc-dev
Daniel Rosenberg [Thu, 10 Mar 2016 00:05:52 +0000 (00:05 +0000)]
Merge "Add information to error message" into nyc-dev
am:
19d76fda3a
* commit '
19d76fda3ada9bce91ac95110b10b6e075bc6726':
Add information to error message
Daniel Rosenberg [Wed, 9 Mar 2016 23:58:12 +0000 (23:58 +0000)]
Merge "Add information to error message" into nyc-dev
Paul Crowley [Wed, 9 Mar 2016 22:11:05 +0000 (22:11 +0000)]
Run clang-format over ext4crypt related code
am:
df528a7011
* commit '
df528a7011b302c91579898c4a37361214ab05bb':
Run clang-format over ext4crypt related code
Paul Crowley [Wed, 9 Mar 2016 22:11:05 +0000 (22:11 +0000)]
Use pointers not references for out arguments
am:
a051eb7a22
* commit '
a051eb7a22b7cd97e66d2f22b64884f8ebc73952':
Use pointers not references for out arguments
Paul Crowley [Wed, 9 Mar 2016 22:11:05 +0000 (22:11 +0000)]
Require the auth token for decryption.
am:
320e5e15b6
* commit '
320e5e15b621da57a947adc896f7bb8357038bee':
Require the auth token for decryption.
Daniel Rosenberg [Sat, 27 Feb 2016 00:44:36 +0000 (16:44 -0800)]
Add information to error message
Bug:
27452459
Change-Id: I89e813755da0946de4effd827799681df7e12d82
Paul Crowley [Wed, 9 Mar 2016 19:26:02 +0000 (19:26 +0000)]
Fix memory leak in generate_key wrapper. Other fixes.
am:
d9b9295b8c
* commit '
d9b9295b8c2f17448f4eb3ea2c6f7d4a5c207c3f':
Fix memory leak in generate_key wrapper. Other fixes.
Paul Crowley [Wed, 9 Mar 2016 17:31:37 +0000 (09:31 -0800)]
Run clang-format over ext4crypt related code
The formatting here is inconsistent with Android house style; use
clang-format to bring it back into line.
Change-Id: Id1fe6ff54e9b668ca88c3fc021ae0a5bdd1327eb
Paul Crowley [Wed, 9 Mar 2016 00:08:32 +0000 (16:08 -0800)]
Use pointers not references for out arguments
Google/Android C++ style requires that arguments passed in for writing
should be pointers, not references, so that it's visible in the caller
that they'll be written to.
Bug:
27566014
Change-Id: I5cd55906cc4b2f61c8b97b223786be0b3ce28862
Paul Crowley [Fri, 4 Mar 2016 22:07:05 +0000 (14:07 -0800)]
Require the auth token for decryption.
A bug meant that the auth token wasn't being used; it turns out that
in order to use it we need to do things slightly differently.
Bug:
27496553
Change-Id: I0f0ab77fed31b92a79eba4acf488cb098691b4be
Paul Crowley [Fri, 4 Mar 2016 21:45:00 +0000 (13:45 -0800)]
Fix memory leak in generate_key wrapper. Other fixes.
- catch errors in looking for the keyring
- static_assert to prevent a buffer overrun
- remove obsolete, misleading comment
- dial down priority of some log messages
- explain why we ignore some errors
- idiomatic C++11
Bug:
27552432
Change-Id: Ic3ee05b41eae45e7c6b571a459b326a483663526
Yu Ning [Fri, 8 Jan 2016 09:36:47 +0000 (17:36 +0800)]
Support emulator's virtio-blk based SD card
Currently, vold only supports MMC (for SD cards) and SCSI (for USB
drives) devices. It does not recognize any device whose major number is
not one of those used by MMC and SCSI. Unfortunately, virtio-blk is one
such device. It is used by the new Android emulator (a.k.a. qemu2,
featuring the "ranchu" virtual board) for SD card emulation.
In order to make this virtio-blk based SD card device appear in Android
and appear as an SD card (rather than a USB drive), changes have to be
made to both vold (wherever the device major number is checked) and
ranchu's storage configuration. This CL implements former.
This is a stop-gap solution for emulator in nyc.
A longer term solution in-tune with upstream kernel is in the pipes.
Updated from aosp/master version.
BUG:
27431753
Change-Id: I5014edec73be7c5b565d91542464c82cbe58992c
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit
5b1d1c7dfa13b4dca75213581dc8351b841b76c8)
Paul Crowley [Wed, 2 Mar 2016 19:09:01 +0000 (19:09 +0000)]
Merge "Use a proper key length for the mode." into nyc-dev
am:
ad8e26297b
* commit '
ad8e26297b07f26376bd3125b11ae280304c22e8':
Use a proper key length for the mode.
Calin Juravle [Wed, 2 Mar 2016 19:08:54 +0000 (19:08 +0000)]
Prepare profile directories only for the internal storage
am:
d1ee944f08
* commit '
d1ee944f0839d60b014722c7facbb4a66bd4f2c3':
Prepare profile directories only for the internal storage
Paul Crowley [Wed, 2 Mar 2016 18:59:58 +0000 (18:59 +0000)]
Merge "Use a proper key length for the mode." into nyc-dev
Paul Crowley [Wed, 2 Mar 2016 17:15:07 +0000 (09:15 -0800)]
Use a proper key length for the mode.
Bug:
27440526
Change-Id: I818450252dcd39f21948fc2e70856659eba5f50f
Calin Juravle [Wed, 2 Mar 2016 18:36:50 +0000 (18:36 +0000)]
Prepare profile directories only for the internal storage
Bug:
27444691
Change-Id: I0d30e8883fe655c90cda47ab167a878764ea0802
Calin Juravle [Tue, 1 Mar 2016 21:43:43 +0000 (21:43 +0000)]
Create profile folder for foreign dex markers.
am:
493f5aa160
* commit '
493f5aa16075eec6948f476b3fe0d29de063ee85':
Create profile folder for foreign dex markers.
Calin Juravle [Wed, 24 Feb 2016 16:27:19 +0000 (16:27 +0000)]
Create profile folder for foreign dex markers.
This is a special profile folder where apps will leave profile markers
for the dex files they load and don't own. System server will read the
markers and decide if the apks should be fully compiled instead of
profile guide compiled.
Bug:
27334750
Bug:
26080105
Change-Id: Ib18f20cf78a8dbfc465610ec6ceec52699c5420a
Calin Juravle [Mon, 22 Feb 2016 11:49:06 +0000 (11:49 +0000)]
Prepare user profile folder
am:
79f55a461f
* commit '
79f55a461f1edf90b769824c6a69dcb520614d83':
Prepare user profile folder
Calin Juravle [Wed, 17 Feb 2016 20:14:46 +0000 (20:14 +0000)]
Prepare user profile folder
Bug:
26719109
Bug:
26563023
Change-Id: I4737b7f73df74b2b787a62db2e231f136115b359
Bill Yi [Wed, 17 Feb 2016 20:46:47 +0000 (20:46 +0000)]
Bill Yi [Wed, 17 Feb 2016 17:51:20 +0000 (09:51 -0800)]
Dimitry Ivanov [Sat, 13 Feb 2016 01:31:49 +0000 (01:31 +0000)]
Merge "Add missing liblog dependency"
am:
6e8a931d54 -s ours
* commit '
6e8a931d54c4d67e39cf0a22bf496bd4ab9822f7':
Add missing liblog dependency
Dimitry Ivanov [Sat, 13 Feb 2016 00:37:26 +0000 (00:37 +0000)]
Merge "Add missing liblog dependency"