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

Commit 66eca70a authored Dec 21, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Dec 21, 2021

Merge "Change close guard logged messages"

parents 15e53331 0bde67ab

core/java/android/app/prediction/AppPredictor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ public final class AppPredictor {
		e.rethrowAsRuntimeException();
		}

		mCloseGuard.open("close");
		mCloseGuard.open("AppPredictor.close");
		}

		/**

core/java/android/app/search/SearchSession.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ public final class SearchSession implements AutoCloseable{
		e.rethrowFromSystemServer();
		}

		mCloseGuard.open("close");
		mCloseGuard.open("SearchSession.close");
		}

		/**

core/java/android/app/smartspace/SmartspaceSession.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public final class SmartspaceSession implements AutoCloseable {
		e.rethrowFromSystemServer();
		}

		mCloseGuard.open("close");
		mCloseGuard.open("SmartspaceSession.close");
		}

		/**

core/java/android/content/ContentProviderClient.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ public class ContentProviderClient implements ContentInterface, AutoCloseable {
		mAuthority = authority;
		mStable = stable;

		mCloseGuard.open("close");
		mCloseGuard.open("ContentProviderClient.close");
		}

		/**
		@@ -695,7 +695,7 @@ public class ContentProviderClient implements ContentInterface, AutoCloseable {

		CursorWrapperInner(Cursor cursor) {
		super(cursor);
		mCloseGuard.open("close");
		mCloseGuard.open("CursorWrapperInner.close");
		}

		@Override

core/java/android/content/ContentResolver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3858,7 +3858,7 @@ public abstract class ContentResolver implements ContentInterface {
		CursorWrapperInner(Cursor cursor, IContentProvider contentProvider) {
		super(cursor);
		mContentProvider = contentProvider;
		mCloseGuard.open("close");
		mCloseGuard.open("CursorWrapperInner.close");
		}

		@Override