Merge branch 'upstream'

Author: developernotes

sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SQLiteOpenHelper.java

@@ -324,6 +324,10 @@ private SQLiteDatabase getDatabaseLocked(boolean writable) {
             } else if (mName == null) {
                 db = SQLiteDatabase.create(null);
             } else {
+                String path = mName;
+                if (!path.startsWith("file:")) {
+                  path = mContext.getDatabasePath(path).getPath();
+                }
                 try {
                     final File filePath = mContext.getDatabasePath(mName);
                     final String path = filePath.getPath();