Upstream version 8.36.161.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_internal / src / org / xwalk / core / internal / XWalkPathHelper.java

diff --git a/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkPathHelper.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkPathHelper.java
similarity index 86%
rename from src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkPathHelper.java
rename to src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkPathHelper.java
index 958dfb7..930ec01 100644 (file)
--- a/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkPathHelper.java
+++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkPathHelper.java
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core.extension;
+package org.xwalk.core.internal.extension;
 
 import android.os.Environment;
 
+import java.io.File;
 import java.util.ArrayList;
 
 import org.chromium.base.CalledByNative;
@@ -43,8 +44,10 @@ public class XWalkPathHelper {
             Environment.DIRECTORY_RINGTONES
         };
         for (int i = 0; i < names.length; ++i) {
-            nativeSetDirectory(names[i],
-                  Environment.getExternalStoragePublicDirectory(dirs[i]).getPath());
+            File dir = Environment.getExternalStoragePublicDirectory(dirs[i]);
+            if (null != dir) {
+                nativeSetDirectory(names[i], dir.getPath());
+            }
         }
     }