Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9206c74 authored Feb 01, 2016 by Jeff Sharkey Committed by Android (Google) Code Review Feb 01, 2016

Merge "File paths to system partition are okay-ish."

parents a6939e26 ac3be9a2

core/java/android/app/NotificationManager.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -231,12 +231,7 @@ public class NotificationManager
		if (notification.sound != null) {
		notification.sound = notification.sound.getCanonicalUri();
		if (StrictMode.vmFileUriExposureEnabled()) {
		//notification.sound.checkFileUriExposed("Notification.sound");
		if ("file".equals(notification.sound.getScheme())) {
		Log.w(TAG, "notify: warning: file:// Uri exposed through Notification.sound: "
		+ notification.sound,
		new Throwable());
		}
		notification.sound.checkFileUriExposed("Notification.sound");
		}
		}
		fixLegacySmallIcon(notification, pkg);

core/java/android/net/Uri.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2342,7 +2342,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
		* @hide
		*/
		public void checkFileUriExposed(String location) {
		if ("file".equals(getScheme())) {
		if ("file".equals(getScheme()) && !getPath().startsWith("/system/")) {
		StrictMode.onFileUriExposed(this, location);
		}
		}