Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS

system-vold: コミット

system/vold


コミットメタ情報

リビジョン9ba27145645ec7865cbedb68d28bd50ecaaf7442 (tree)
日時2018-08-04 04:21:26
作者android-build-team Robot <android-build-team-robot@goog...>
コミッターandroid-build-team Robot

ログメッセージ

Merge cherrypicks of [4691111, 4689862, 4690575, 4690576, 4690577, 4690578, 4689866, 4689868, 4689869, 4689870, 4691132, 4689456, 4689963, 4691133, 4691134, 4691156, 4691157, 4691159, 4691161, 4690581, 4689964, 4689460, 4691112, 4690582, 4690583, 4691165, 4691166, 4691167, 4691168, 4691169, 4691170, 4691211, 4691212, 4691213, 4691214, 4691215, 4691216, 4691217, 4691218, 4691219, 4691232, 4691233, 4691234, 4691235, 4691236, 4691237, 4691238, 4691239, 4691240, 4691241, 4691243, 4691245, 4691247, 4691249, 4691250, 4691291, 4691292, 4691293, 4691294, 4691295, 4691296, 4691255, 4689476, 4689477, 4689478, 4691223, 4691224, 4691136, 4689479, 4689480, 4691137, 4691225, 4691226, 4691227, 4691371, 4691228, 4691328, 4689967, 4691138, 4691139, 4691140, 4691433, 4689968, 4689969, 4691395, 4691230, 4691297, 4691298, 4691299, 4691300, 4691396, 4691397, 4691398, 4691399, 4691400, 4691401, 4691402, 4691403, 4691404, 4691405, 4691406, 4691407, 4691408, 4691409, 4691410, 4691471, 4691472, 4691473, 4691474, 4691475, 4691476, 4691477, 4691478, 4691479, 4691480, 4691481, 4691482, 4691483, 4691484, 4691485, 4691486, 4691487, 4691488, 4691143, 4691144, 4691511, 4691113, 4689482, 4691533, 4691145, 4691146, 4691147, 4691148, 4691536] into sparse-4732991-L01200000196794104

Change-Id: I8fea860a300cbcbb1291d99460f7e8ff282aaa98

変更サマリ

差分

--- a/Utils.cpp
+++ b/Utils.cpp
@@ -213,17 +213,17 @@ static status_t readMetadata(const std::string& path, std::string& fsType,
213213 for (const auto& line : output) {
214214 // Extract values from blkid output, if defined
215215 const char* cline = line.c_str();
216- const char* start = strstr(cline, "TYPE=");
216+ const char* start = strstr(cline, "TYPE=\"");
217217 if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
218218 fsType = value;
219219 }
220220
221- start = strstr(cline, "UUID=");
221+ start = strstr(cline, "UUID=\"");
222222 if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
223223 fsUuid = value;
224224 }
225225
226- start = strstr(cline, "LABEL=");
226+ start = strstr(cline, "LABEL=\"");
227227 if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) {
228228 fsLabel = value;
229229 }
旧リポジトリブラウザで表示