Merge "Fix NPE in UriPermission." into main (73c02d9d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/uri/UriPermission.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -223,8 +223,10 @@ final class UriPermission {
	if (mWriteOwners != null && includingOwners) {		if (mWriteOwners != null && includingOwners) {
	ownedModeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;		ownedModeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
	for (UriPermissionOwner r : mWriteOwners) {		for (UriPermissionOwner r : mWriteOwners) {
			if (r != null) {
	r.removeWritePermission(this);		r.removeWritePermission(this);
	}		}
			}
	mWriteOwners = null;		mWriteOwners = null;
	}		}
	}		}
	@@ -348,7 +350,7 @@ final class UriPermission {
	if (mWriteOwners != null) {		if (mWriteOwners != null) {
	pw.print(prefix);		pw.print(prefix);
	pw.println("writeOwners:");		pw.println("writeOwners:");
	for (UriPermissionOwner owner : mReadOwners) {		for (UriPermissionOwner owner : mWriteOwners) {
	pw.print(prefix);		pw.print(prefix);
	pw.println(" * " + owner);		pw.println(" * " + owner);
	}		}