From 983294596e65a0226aa69e42bda9db322727fee5 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 13 Jul 2015 10:25:31 -0700 Subject: Better handling of storage paths. Give more details about why we failed to create storage paths, and search for underlying volumes using canonical paths. Bug: 22135060 Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6 --- core/java/android/app/ContextImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'core/java/android/app/ContextImpl.java') diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6639486..75dd35c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1925,13 +1925,14 @@ class ContextImpl extends Context { // enough permissions; ask vold to create on our behalf. final IMountService mount = IMountService.Stub.asInterface( ServiceManager.getService("mount")); - int res = -1; try { - res = mount.mkdirs(getPackageName(), dir.getAbsolutePath()); - } catch (Exception ignored) { - } - if (res != 0) { - Log.w(TAG, "Failed to ensure directory: " + dir); + final int res = mount.mkdirs(getPackageName(), dir.getAbsolutePath()); + if (res != 0) { + Log.w(TAG, "Failed to ensure " + dir + ": " + res); + dir = null; + } + } catch (Exception e) { + Log.w(TAG, "Failed to ensure " + dir + ": " + e); dir = null; } } -- cgit v1.1