Merge "Add a static method to get the InputStream of a content URL" into honeycomb (7a8f01ab) · Commits · e / os / android_frameworks_base

core/java/android/webkit/JniUtil.java

+31 −2

Original line number	Diff line number	Diff line
		@@ -74,13 +74,13 @@ class JniUtil {
		return sCacheDirectory;
		}

		private static final String ANDROID_CONTENT = "content:";

		/**
		* Called by JNI. Calculates the size of an input stream by reading it.
		* @return long The size of the stream
		*/
		private static synchronized long contentUrlSize(String url) {
		final String ANDROID_CONTENT = "content:";

		// content://
		if (url.startsWith(ANDROID_CONTENT)) {
		try {
		@@ -114,6 +114,35 @@ class JniUtil {
		}
		}

		/**
		* Called by JNI.
		*
		* @return Opened input stream to content
		* TODO: Make all content loading use this instead of BrowserFrame.java
		*/
		private static synchronized InputStream contentUrlStream(String url) {
		// content://
		if (url.startsWith(ANDROID_CONTENT)) {
		try {
		// Strip off mimetype, for compatibility with ContentLoader.java
		// If we don't do this, we can fail to load Gmail attachments,
		// because the URL being loaded doesn't exactly match the URL we
		// have permission to read.
		int mimeIndex = url.lastIndexOf('?');
		if (mimeIndex != -1) {
		url = url.substring(0, mimeIndex);
		}
		Uri uri = Uri.parse(url);
		return sContext.getContentResolver().openInputStream(uri);
		} catch (Exception e) {
		Log.e(LOGTAG, "Exception: " + url);
		return null;
		}
		} else {
		return null;
		}
		}

		/**
		* Returns true if we're using the Chromium HTTP stack.
		*