Commit graph

1509 commits

Author SHA1 Message Date
Henrik Baard
78c63c26a7 Migrating data sometimes leaves emulated unmounted
am: 7f52bca485

Change-Id: Id45c7edab0d244dcb17d6bda491ca297ed55c1c0
2016-07-07 01:35:41 +00:00
Jeff Sharkey
b62d9b7be9 Merge "resolve merge conflicts of d254ce4 to master" 2016-07-06 22:27:40 +00:00
Jeff Sharkey
030d7007ad resolve merge conflicts of d254ce4 to master
Change-Id: Ia8dff82cb7648b568006d10bc99e2dd40a2d6e8e
2016-07-06 16:26:43 -06:00
Jeff Sharkey
d254ce4ed1 Fix copy/paste error in benchmark code.
am: f09a89a7d6

Change-Id: I297440d04990226091d724b2282e3fc8421bda58
2016-07-06 22:03:16 +00:00
Henrik Baard
77f156d9f0 Failing to "Migrate data" leaves target unusable
When "migrating" data failes due to insufficient space
at target location, the data copied so far is left in
target location, which in practice is now filled to the
brim.

If copy fails clean up the data copied so far since user
has the data in original location.

Bug: 26322200
Change-Id: Iab29a7f9e653e6857ee0e2723d151dfec81b14dd
2016-07-06 15:42:41 -06:00
Henrik Baard
7f52bca485 Migrating data sometimes leaves emulated unmounted
Sometimes migrating data fails to mount the target
volume after operation is finished.

MoveTask is running in its own thread, copying data
between external card and internal memory.

After copying the data the method "bringOnline" is
run. This method destroys and creates the volumes.

When VolumeBase::create() is run it will notify
MountService, who upon receiving this notification
will send a mount command to mount the new primary
storage.

This command will sometimes run before
setState(State::kUnmounted); is called on the newly
created volume. This will cause the mount command to
fail.

VoldConnector: SND -> {10 volume mount emulated 3 -1}
vold : emulated flags change requires state unmounted or unmountable
vold : emulated user change requires state unmounted or unmountable
vold : emulated mount requires state unmounted or unmountable

Lock bringOnline so no volume commands will be processed
until volumes are (re-)created and have correct state.

Bug: 26322200
Change-Id: I4aba85c226d904c42ae9edcdfec21619218939d6
2016-07-06 15:42:34 -06:00
Jeff Sharkey
f09a89a7d6 Fix copy/paste error in benchmark code.
This had minimal impact on the results, since 95% of the writes were
performed through pwrite(), but it's important to fix this for future
benchmark suites.

Bug: 29759783
Change-Id: Ic628aab98b9f9def78508cc722899afdefed84ae
2016-07-06 14:34:43 -06:00
Yabin Cui
afaebf1b75 Use libbootloader_message. am: 1fb5966fbb
am: 951de915a3

Change-Id: I6a3291a9930b8e173f9ea7bae6c3f1275b3589ad
2016-06-30 23:11:19 +00:00
Yabin Cui
951de915a3 Use libbootloader_message.
am: 1fb5966fbb

Change-Id: Ib97b3be116b704188082a81626a9b5ecdde56726
2016-06-30 22:55:42 +00:00
Yabin Cui
1fb5966fbb Use libbootloader_message.
Bug: 29582118

Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
2016-06-29 16:50:05 -07:00
Paul Lawrence
b79d4687bd Stop dropping caches now we have kernel fix am: 6abe6831b5
am: 1882daee64

Change-Id: I9d10491d3b54e574cf4ece65be4dc8e3cc5f6be3
2016-06-23 20:47:16 +00:00
Paul Lawrence
1882daee64 Stop dropping caches now we have kernel fix
am: 6abe6831b5

Change-Id: Ic87ca15267c205551e0bbfa087ea086d2ebce089
2016-06-23 20:31:55 +00:00
Chih-hung Hsieh
fbf395a183 Merge \\\\"Fix misc-macro-parentheses warnings in system/vold.\\\\" am: 786c536e84 am: c83c87e681 am: f5e9bc9517
am: efe8b3de96

Change-Id: I157cdbcf2e66ab5e992f653b4a1f9f5fc6520ffd
2016-06-22 21:46:51 +00:00
Chih-Hung Hsieh
efe8b3de96 Merge \\\"Fix misc-macro-parentheses warnings in system/vold.\\\" am: 786c536e84 am: c83c87e681
am: f5e9bc9517

Change-Id: I1a505858b0a0407489e9adcdd894048e66cfc939
2016-06-22 21:36:05 +00:00
Chih-hung Hsieh
f5e9bc9517 Merge \\"Fix misc-macro-parentheses warnings in system/vold.\\" am: 786c536e84
am: c83c87e681

Change-Id: I4b2bc593082ee4179adccd5868696a50d687cb0c
2016-06-22 21:33:37 +00:00
Chih-Hung Hsieh
c83c87e681 Merge \"Fix misc-macro-parentheses warnings in system/vold.\"
am: 786c536e84

Change-Id: Ida8cc5a6d17b526ff4f5af5f2406930333a385c8
2016-06-22 21:31:07 +00:00
Chih-hung Hsieh
786c536e84 Merge "Fix misc-macro-parentheses warnings in system/vold." 2016-06-22 21:21:16 +00:00
Paul Lawrence
6abe6831b5 Stop dropping caches now we have kernel fix
Only merge once

https://partner-android-review.googlesource.com/#/c/619829/1

has been merged into kernel.

Bug: 28779973
Change-Id: Icef78d1e4381e89e07797c36f6f650033d313557
2016-06-22 09:24:51 -07:00
Seigo Nonaka
e2ef0c0da4 Prepare necessary data directory before loading persistent properties.
init reads files in /data/property/ but it is not ready to read when
trigger_load_persist_props is triggered by vold.decrypt.

Bug: 29332975
Change-Id: I14beac8714ff2f722d8b11f666bc7ca693ccd46e
2016-06-20 17:05:40 +09:00
Chih-Hung Hsieh
aae793802b Fix misc-macro-parentheses warnings in system/vold.
Add parentheses around macro arguments used beside operators.
Bug: 28705665

Change-Id: I44e954f15bf6b8279d0f857d5417b7cb457da779
2016-06-10 14:15:18 -07:00
Paul Lawrence
908527a70b Set encryption mode in mode file am: 6e41059734
am: 3560d44f70

* commit '3560d44f709fc11eda978c4c513c24ed805193cc':
  Set encryption mode in mode file

Change-Id: Iadecc7032a2028f496bb128b0a7f33719187733b
2016-05-27 20:55:00 +00:00
Paul Lawrence
0b5f5a51a9 Revert "Add fileencrypted=software/ice to fstab options" am: 3ae29e7740
am: bef3ec859d

* commit 'bef3ec859d71d3eb4992061f7ccf1b4049313fd7':
  Revert "Add fileencrypted=software/ice to fstab options"

Change-Id: I9e80a8ec6cd4f7b11f7a46736fb65df1b6d845aa
2016-05-27 20:51:41 +00:00
Paul Lawrence
3560d44f70 Set encryption mode in mode file
am: 6e41059734

* commit '6e410597343716924ed4943d1eabd3dea614d325':
  Set encryption mode in mode file

Change-Id: Ic143f9cc8a301178416bd76d3ef6d2593df3dbd6
2016-05-27 17:14:36 +00:00
Paul Lawrence
bef3ec859d Revert "Add fileencrypted=software/ice to fstab options"
am: 3ae29e7740

* commit '3ae29e774038b423618a1618c0056108db77759e':
  Revert "Add fileencrypted=software/ice to fstab options"

Change-Id: I68ba6b70d619aa5ce1e529de759a26919ac75cf3
2016-05-27 17:13:33 +00:00
Paul Lawrence
6e41059734 Set encryption mode in mode file
Bug: 28905864
Change-Id: Ie2a5c3e029075d53a86ef3afb7fe364c16d8d52b
2016-05-27 09:40:37 -07:00
Paul Lawrence
3ae29e7740 Revert "Add fileencrypted=software/ice to fstab options"
This reverts commit 01f1bc7254.

Bug: 28905864
Change-Id: I489f5d073530438829038630af7af6b2a5cbdbbe
2016-05-23 15:05:51 -07:00
Paul Crowley
e0d410fefb Merge "Two phases to set the password for disk encryption am: a363036b44 am: ad4dcc2ff6" into nyc-mr1-dev-plus-aosp
am: 9ecf3d5904

* commit '9ecf3d5904fc7426c71565361e3a1652719a6620':

Change-Id: Ic349ec00115052fa01f00662e77257a545bcf97a
2016-05-18 23:09:15 +00:00
Paul Crowley
e123a437d3 Two phases to set the password for disk encryption am: a363036b44 am: 8fd77a05cc
am: 59fc77e3e3

* commit '59fc77e3e37f8ef052cb0fa74b9b6456750a6c2c':
  Two phases to set the password for disk encryption

Change-Id: I09337fd3a410f190d7a2c0e1cf6505658d2748ed
2016-05-18 23:09:14 +00:00
Android Build Merger (Role)
9ecf3d5904 Merge "Two phases to set the password for disk encryption am: a363036b44 am: ad4dcc2ff6" into nyc-mr1-dev-plus-aosp 2016-05-18 23:02:45 +00:00
Paul Crowley
59fc77e3e3 Two phases to set the password for disk encryption am: a363036b44
am: 8fd77a05cc

* commit '8fd77a05ccccc86be7da7b2f61e6580f0f20eb42':
  Two phases to set the password for disk encryption

Change-Id: I6c6aba077de8a9cb51df7ef55213ea750027278e
2016-05-18 23:02:32 +00:00
Paul Crowley
5844fdb0ea Two phases to set the password for disk encryption am: a363036b44
am: ad4dcc2ff6

* commit 'ad4dcc2ff65363e3c93708f7f713bf73484c59c5':
  Two phases to set the password for disk encryption

Change-Id: Ic4ba913e285ac3583f8c29227532c4c77094763e
2016-05-18 23:02:31 +00:00
Paul Crowley
ad4dcc2ff6 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
2016-05-18 22:59:57 +00:00
Paul Crowley
8fd77a05cc Two phases to set the password for disk encryption
am: a363036b44

* commit 'a363036b44f7f140aa9a943578f56abff5880a60':
  Two phases to set the password for disk encryption

Change-Id: Ia28823079d8c0bda220238339f28095b234a0ae5
2016-05-18 22:59:57 +00:00
Paul Crowley
a363036b44 Two phases to set the password for disk encryption
Revert "Revert "Two phases to set the password for disk encryption""

This reverts commit d402389290.

In addition, fix the bug in the original commit.

Bug: 28154455
Bug: 28694324
Change-Id: I885f1d73e739416347c135d79979941c2bbdbe62
2016-05-17 15:23:06 -07:00
Chih-Hung Hsieh
629a360ace Merge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf am: 4ff367a593 am: 5dc0aa6e41
am: 6e8ebe8f76

* commit '6e8ebe8f763bfcea9b7420e9efa62e61e2260f58':
  Fix misc-macro-parentheses warnings.

Change-Id: I518c580eda89fbc9f987e8ac36001b57c29f7f01
2016-05-12 00:55:30 +00:00
Paul Lawrence
b67768a9ec Add fileencrypted=software/ice to fstab options am: 01f1bc7254
am: 6d22919805

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

Change-Id: I1784e8c98fead7f0444c0014686cb6fd60e48466
2016-05-12 00:55:24 +00:00
Chih-Hung Hsieh
6e8ebe8f76 Merge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf am: 4ff367a593
am: 5dc0aa6e41

* commit '5dc0aa6e41fbd961ecefaa3fc6fe4ac720e53bc3':
  Fix misc-macro-parentheses warnings.

Change-Id: I2acf395df99305784d1ada44897b1df26e0f5791
2016-05-11 23:07:08 +00:00
Chih-Hung Hsieh
5dc0aa6e41 Merge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf
am: 4ff367a593

* commit '4ff367a5934a906ba2008e530efca220deb96af7':
  Fix misc-macro-parentheses warnings.

Change-Id: I67d525e6f78b1d4e5854d40c30ad0bb96a3490dc
2016-05-11 23:03:58 +00:00
Chih-Hung Hsieh
4ff367a593 Merge "Fix misc-macro-parentheses warnings."
am: 0c0f9228cf

* commit '0c0f9228cf1cd0f39ecb56f643ce7e3b050bb143':
  Fix misc-macro-parentheses warnings.

Change-Id: I9fa6dc832ca4920c1f9f85a4fb85e61cd62fdeb5
2016-05-11 23:00:48 +00:00
Treehugger Robot
0c0f9228cf Merge "Fix misc-macro-parentheses warnings." 2016-05-11 22:52:30 +00:00
Paul Lawrence
6d22919805 Add fileencrypted=software/ice to fstab options
am: 01f1bc7254

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

Change-Id: I1c8b38e1b448cf7c41fd537880a0dd2d1f1d9218
2016-05-11 22:20:44 +00:00
Chih-Hung Hsieh
cc5d580858 Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.

Bug: 28705665
Change-Id: I0731cb8b22b3a9bdadac6414473d90e8398a8e89
2016-05-11 15:05:05 -07:00
Paul Lawrence
01f1bc7254 Add fileencrypted=software/ice to fstab options
Bug: 28616054
Change-Id: If3fddd62f069c7e3e8369a1db68e69c390059d63
2016-05-11 08:56:31 -07:00
Paul Crowley
7e01619bfe Merge "Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 44ddebaac0" into nyc-mr1-dev-plus-aosp
am: fc592066a7

* commit 'fc592066a7f9a15b39a2184bd8f919ff14bfca2b':

Change-Id: Icbdbc5adda30a28f65f7f1a7a6719bdb5ff99dd5
2016-05-10 22:22:46 +00:00
Paul Crowley
421ffeca7c Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 269bdbcab1
am: b0f2d02d49

* commit 'b0f2d02d49dcb526426b2b590a53b80ff47c785d':
  e4crypt_is_native has been moved into system/extras.

Change-Id: Ib6e4a66c0081439670b6b03fd8939d911faf14d3
2016-05-10 22:22:46 +00:00
Android Build Merger (Role)
fc592066a7 Merge "Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 44ddebaac0" into nyc-mr1-dev-plus-aosp 2016-05-10 22:20:17 +00:00
Paul Crowley
b0f2d02d49 Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c
am: 269bdbcab1

* commit '269bdbcab18aa8c24a637937d885c045f408a12e':
  e4crypt_is_native has been moved into system/extras.

Change-Id: I7f08893a1e21891d35578180cbb66a4db2d91c15
2016-05-10 22:20:11 +00:00
Paul Crowley
7678f7e8e9 Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c
am: 44ddebaac0

* commit '44ddebaac0465a9a88b68ca04bbb69b576a0d067':
  e4crypt_is_native has been moved into system/extras.

Change-Id: I02d14adeed72858771b5838e618b1fa8735ca7b1
2016-05-10 22:20:05 +00:00
Paul Crowley
44ddebaac0 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: I345475c44fb2d8812a25c9f2195c748cddc55bfe
2016-05-10 22:17:38 +00:00
Paul Crowley
269bdbcab1 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
2016-05-10 22:17:33 +00:00