Commits

Anonymous committed c375ac3 Merge

Merge "Use ALOGE rather than SLOGE for mountEmulatedStorage failures."

Comments (0)

Files changed (1)

vm/native/dalvik_system_Zygote.cpp

 
     // Create a second private mount namespace for our process
     if (unshare(CLONE_NEWNS) == -1) {
-        SLOGE("Failed to unshare(): %s", strerror(errno));
+        ALOGE("Failed to unshare(): %s", strerror(errno));
         return -1;
     }
 
         const char* target = getenv("EMULATED_STORAGE_TARGET");
         const char* legacy = getenv("EXTERNAL_STORAGE");
         if (source == NULL || target == NULL || legacy == NULL) {
-            SLOGE("Storage environment undefined; unable to provide external storage");
+            ALOGE("Storage environment undefined; unable to provide external storage");
             return -1;
         }
 
         if (mountMode == MOUNT_EXTERNAL_MULTIUSER_ALL) {
             // Mount entire external storage tree for all users
             if (mount(source, target, NULL, MS_BIND, NULL) == -1) {
-                SLOGE("Failed to mount %s to %s: %s", source, target, strerror(errno));
+                ALOGE("Failed to mount %s to %s: %s", source, target, strerror(errno));
                 return -1;
             }
         } else {
             // Only mount user-specific external storage
             if (mount(source_user, target_user, NULL, MS_BIND, NULL) == -1) {
-                SLOGE("Failed to mount %s to %s: %s", source_user, target_user, strerror(errno));
+                ALOGE("Failed to mount %s to %s: %s", source_user, target_user, strerror(errno));
                 return -1;
             }
         }
             return -1;
         }
         if (mount(source_obb, target_obb, NULL, MS_BIND, NULL) == -1) {
-            SLOGE("Failed to mount %s to %s: %s", source_obb, target_obb, strerror(errno));
+            ALOGE("Failed to mount %s to %s: %s", source_obb, target_obb, strerror(errno));
             return -1;
         }
 
         // Finally, mount user-specific path into place for legacy users
         if (mount(target_user, legacy, NULL, MS_BIND | MS_REC, NULL) == -1) {
-            SLOGE("Failed to mount %s to %s: %s", target_user, legacy, strerror(errno));
+            ALOGE("Failed to mount %s to %s: %s", target_user, legacy, strerror(errno));
             return -1;
         }
 
     } else {
-        SLOGE("Mount mode %d unsupported", mountMode);
+        ALOGE("Mount mode %d unsupported", mountMode);
         return -1;
     }
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.