Merge "Fix NPEs in UriPermission." into main (e8193686) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -269,8 +269,9 @@ final class UriPermission {
		* Remove given read owner, updating {@Link #modeFlags} as needed.
		*/
		void removeReadOwner(UriPermissionOwner owner) {
		if (!mReadOwners.remove(owner)) {
		if (mReadOwners == null \|\| !mReadOwners.remove(owner)) {
		Slog.wtf(TAG, "Unknown read owner " + owner + " in " + this);
		return;
		}
		if (mReadOwners.size() == 0) {
		mReadOwners = null;
		@@ -294,8 +295,9 @@ final class UriPermission {
		* Remove given write owner, updating {@Link #modeFlags} as needed.
		*/
		void removeWriteOwner(UriPermissionOwner owner) {
		if (!mWriteOwners.remove(owner)) {
		if (mWriteOwners == null \|\| !mWriteOwners.remove(owner)) {
		Slog.wtf(TAG, "Unknown write owner " + owner + " in " + this);
		return;
		}
		if (mWriteOwners.size() == 0) {
		mWriteOwners = null;