From 0bde67ab00d3ab196772abed4deaefeae5e39425 Mon Sep 17 00:00:00 2001 From: Ioannis Ilkos Date: Mon, 20 Dec 2021 17:27:52 +0000 Subject: [PATCH] Change close guard logged messages Unless we are looking at stack traces (e.g. from strict mode) it's not possible to identify which type of object is not being closed (most methods are 'close' or 'release). Change the logged text to clarify. Change-Id: Ib90eac716f43c2c2caf8d8c6fb64a7bd90562da9 Test: manual --- core/java/android/app/prediction/AppPredictor.java | 2 +- core/java/android/app/search/SearchSession.java | 2 +- core/java/android/app/smartspace/SmartspaceSession.java | 2 +- core/java/android/content/ContentProviderClient.java | 4 ++-- core/java/android/content/ContentResolver.java | 2 +- core/java/android/database/AbstractCursor.java | 2 +- core/java/android/database/CursorWindow.java | 4 ++-- core/java/android/database/sqlite/SQLiteConnection.java | 2 +- core/java/android/database/sqlite/SQLiteConnectionPool.java | 2 +- core/java/android/hardware/HardwareBuffer.java | 2 +- core/java/android/hardware/SystemSensorManager.java | 2 +- .../java/android/hardware/input/InputDeviceLightsManager.java | 2 +- core/java/android/hardware/lights/SystemLightsManager.java | 2 +- core/java/android/hardware/location/ContextHubClient.java | 2 +- core/java/android/hardware/usb/UsbDeviceConnection.java | 2 +- core/java/android/hardware/usb/UsbRequest.java | 2 +- core/java/android/util/MemoryIntArray.java | 4 ++-- core/java/android/view/InputEventReceiver.java | 2 +- core/java/android/view/InputEventSender.java | 2 +- core/java/android/view/InputQueue.java | 2 +- core/java/android/view/ScrollCaptureConnection.java | 2 +- core/java/android/view/Surface.java | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/core/java/android/app/prediction/AppPredictor.java b/core/java/android/app/prediction/AppPredictor.java index fd1b9e3bede2e..db3a1921c1ba1 100644 --- a/core/java/android/app/prediction/AppPredictor.java +++ b/core/java/android/app/prediction/AppPredictor.java @@ -105,7 +105,7 @@ public final class AppPredictor { e.rethrowAsRuntimeException(); } - mCloseGuard.open("close"); + mCloseGuard.open("AppPredictor.close"); } /** diff --git a/core/java/android/app/search/SearchSession.java b/core/java/android/app/search/SearchSession.java index a5425a20655a3..2cd1d96190b07 100644 --- a/core/java/android/app/search/SearchSession.java +++ b/core/java/android/app/search/SearchSession.java @@ -106,7 +106,7 @@ public final class SearchSession implements AutoCloseable{ e.rethrowFromSystemServer(); } - mCloseGuard.open("close"); + mCloseGuard.open("SearchSession.close"); } /** diff --git a/core/java/android/app/smartspace/SmartspaceSession.java b/core/java/android/app/smartspace/SmartspaceSession.java index 9199581c31497..b523be2cc7e91 100644 --- a/core/java/android/app/smartspace/SmartspaceSession.java +++ b/core/java/android/app/smartspace/SmartspaceSession.java @@ -107,7 +107,7 @@ public final class SmartspaceSession implements AutoCloseable { e.rethrowFromSystemServer(); } - mCloseGuard.open("close"); + mCloseGuard.open("SmartspaceSession.close"); } /** diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java index 518e7534d5127..cc3c01241c661 100644 --- a/core/java/android/content/ContentProviderClient.java +++ b/core/java/android/content/ContentProviderClient.java @@ -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 diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 184acb1a81ef5..01d231c517515 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -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 diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java index cf25c3c56208e..69d573f84975e 100644 --- a/core/java/android/database/AbstractCursor.java +++ b/core/java/android/database/AbstractCursor.java @@ -224,7 +224,7 @@ public abstract class AbstractCursor implements CrossProcessCursor { /* Implementation */ public AbstractCursor() { mPos = -1; - mCloseGuard.open("close"); + mCloseGuard.open("AbstractCursor.close"); } @Override diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java index ccb7cf19d0b14..f13c79587a283 100644 --- a/core/java/android/database/CursorWindow.java +++ b/core/java/android/database/CursorWindow.java @@ -142,7 +142,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { if (mWindowPtr == 0) { throw new AssertionError(); // Not possible, the native code won't return it. } - mCloseGuard.open("close"); + mCloseGuard.open("CursorWindow.close"); } /** @@ -170,7 +170,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { throw new AssertionError(); // Not possible, the native code won't return it. } mName = nativeGetName(mWindowPtr); - mCloseGuard.open("close"); + mCloseGuard.open("CursorWindow.close"); } @Override diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java index 328858b260acb..6d6ec06182d65 100644 --- a/core/java/android/database/sqlite/SQLiteConnection.java +++ b/core/java/android/database/sqlite/SQLiteConnection.java @@ -179,7 +179,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen mIsReadOnlyConnection = mConfiguration.isReadOnlyDatabase(); mPreparedStatementCache = new PreparedStatementCache( mConfiguration.maxSqlCacheSize); - mCloseGuard.open("close"); + mCloseGuard.open("SQLiteConnection.close"); } @Override diff --git a/core/java/android/database/sqlite/SQLiteConnectionPool.java b/core/java/android/database/sqlite/SQLiteConnectionPool.java index d3ad6bb27b3cf..216c9c26424da 100644 --- a/core/java/android/database/sqlite/SQLiteConnectionPool.java +++ b/core/java/android/database/sqlite/SQLiteConnectionPool.java @@ -218,7 +218,7 @@ public final class SQLiteConnectionPool implements Closeable { // Mark the pool as being open for business. mIsOpen = true; - mCloseGuard.open("close"); + mCloseGuard.open("SQLiteConnectionPool.close"); } /** diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index a4a8f313e3bad..4683d252b68af 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -253,7 +253,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { NativeAllocationRegistry registry = new NativeAllocationRegistry( loader, nGetNativeFinalizer(), bufferSize); mCleaner = registry.registerNativeAllocation(this, mNativeObject); - mCloseGuard.open("close"); + mCloseGuard.open("HardwareBuffer.close"); } @Override diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index e9fffa30ae578..282f1d3439595 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -687,7 +687,7 @@ public class SystemSensorManager extends SensorManager { new WeakReference<>(this), looper.getQueue(), packageName, mode, manager.mContext.getOpPackageName(), manager.mContext.getAttributionTag()); - mCloseGuard.open("dispose"); + mCloseGuard.open("BaseEventQueue.dispose"); mManager = manager; } diff --git a/core/java/android/hardware/input/InputDeviceLightsManager.java b/core/java/android/hardware/input/InputDeviceLightsManager.java index 885df7be25100..802e6dde497a4 100644 --- a/core/java/android/hardware/input/InputDeviceLightsManager.java +++ b/core/java/android/hardware/input/InputDeviceLightsManager.java @@ -100,7 +100,7 @@ class InputDeviceLightsManager extends LightsManager { * Instantiated by {@link LightsManager#openSession()}. */ private InputDeviceLightsSession() { - mCloseGuard.open("close"); + mCloseGuard.open("InputDeviceLightsSession.close"); } /** diff --git a/core/java/android/hardware/lights/SystemLightsManager.java b/core/java/android/hardware/lights/SystemLightsManager.java index d0df611e78423..055a7f43f9ed4 100644 --- a/core/java/android/hardware/lights/SystemLightsManager.java +++ b/core/java/android/hardware/lights/SystemLightsManager.java @@ -145,7 +145,7 @@ public final class SystemLightsManager extends LightsManager { */ @RequiresPermission(Manifest.permission.CONTROL_DEVICE_LIGHTS) private SystemLightsSession() { - mCloseGuard.open("close"); + mCloseGuard.open("SystemLightsSession.close"); } /** diff --git a/core/java/android/hardware/location/ContextHubClient.java b/core/java/android/hardware/location/ContextHubClient.java index a525f58371f5b..3b50f0faf45b8 100644 --- a/core/java/android/hardware/location/ContextHubClient.java +++ b/core/java/android/hardware/location/ContextHubClient.java @@ -69,7 +69,7 @@ public class ContextHubClient implements Closeable { mCloseGuard = null; } else { mCloseGuard = CloseGuard.get(); - mCloseGuard.open("close"); + mCloseGuard.open("ContextHubClient.close"); } } diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 1c35cb66ada8f..60d8cacd19be7 100644 --- a/core/java/android/hardware/usb/UsbDeviceConnection.java +++ b/core/java/android/hardware/usb/UsbDeviceConnection.java @@ -69,7 +69,7 @@ public class UsbDeviceConnection { boolean wasOpened = native_open(name, pfd.getFileDescriptor()); if (wasOpened) { - mCloseGuard.open("close"); + mCloseGuard.open("UsbDeviceConnection.close"); } return wasOpened; diff --git a/core/java/android/hardware/usb/UsbRequest.java b/core/java/android/hardware/usb/UsbRequest.java index d1c6465d62c85..6ac5e8de8fa7d 100644 --- a/core/java/android/hardware/usb/UsbRequest.java +++ b/core/java/android/hardware/usb/UsbRequest.java @@ -103,7 +103,7 @@ public class UsbRequest { endpoint.getAttributes(), endpoint.getMaxPacketSize(), endpoint.getInterval()); if (wasInitialized) { - mCloseGuard.open("close"); + mCloseGuard.open("UsbRequest.close"); } return wasInitialized; diff --git a/core/java/android/util/MemoryIntArray.java b/core/java/android/util/MemoryIntArray.java index 6da38c2c2acb9..5cbbbef2cf884 100644 --- a/core/java/android/util/MemoryIntArray.java +++ b/core/java/android/util/MemoryIntArray.java @@ -75,7 +75,7 @@ public final class MemoryIntArray implements Parcelable, Closeable { final String name = UUID.randomUUID().toString(); mFd = nativeCreate(name, size); mMemoryAddr = nativeOpen(mFd, mIsOwner); - mCloseGuard.open("close"); + mCloseGuard.open("MemoryIntArray.close"); } private MemoryIntArray(Parcel parcel) throws IOException { @@ -86,7 +86,7 @@ public final class MemoryIntArray implements Parcelable, Closeable { } mFd = pfd.detachFd(); mMemoryAddr = nativeOpen(mFd, mIsOwner); - mCloseGuard.open("close"); + mCloseGuard.open("MemoryIntArray.close"); } /** diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java index c9abec989cd1c..a24c1f95b0c09 100644 --- a/core/java/android/view/InputEventReceiver.java +++ b/core/java/android/view/InputEventReceiver.java @@ -79,7 +79,7 @@ public abstract class InputEventReceiver { mReceiverPtr = nativeInit(new WeakReference(this), inputChannel, mMessageQueue); - mCloseGuard.open("dispose"); + mCloseGuard.open("InputEventReceiver.dispose"); } @Override diff --git a/core/java/android/view/InputEventSender.java b/core/java/android/view/InputEventSender.java index d144218978605..9035f3f7a0d4c 100644 --- a/core/java/android/view/InputEventSender.java +++ b/core/java/android/view/InputEventSender.java @@ -67,7 +67,7 @@ public abstract class InputEventSender { mSenderPtr = nativeInit(new WeakReference(this), inputChannel, mMessageQueue); - mCloseGuard.open("dispose"); + mCloseGuard.open("InputEventSender.dispose"); } @Override diff --git a/core/java/android/view/InputQueue.java b/core/java/android/view/InputQueue.java index 7accb66aa3aaa..ff51ebcca08e3 100644 --- a/core/java/android/view/InputQueue.java +++ b/core/java/android/view/InputQueue.java @@ -52,7 +52,7 @@ public final class InputQueue { public InputQueue() { mPtr = nativeInit(new WeakReference(this), Looper.myQueue()); - mCloseGuard.open("dispose"); + mCloseGuard.open("InputQueue.dispose"); } @Override diff --git a/core/java/android/view/ScrollCaptureConnection.java b/core/java/android/view/ScrollCaptureConnection.java index 278b2fcc36781..cba0e970d3894 100644 --- a/core/java/android/view/ScrollCaptureConnection.java +++ b/core/java/android/view/ScrollCaptureConnection.java @@ -86,7 +86,7 @@ public class ScrollCaptureConnection extends IScrollCaptureConnection.Stub imple @Override public ICancellationSignal startCapture(@NonNull Surface surface, @NonNull IScrollCaptureCallbacks remote) throws RemoteException { - mCloseGuard.open("close"); + mCloseGuard.open("ScrollCaptureConnection.close"); if (!surface.isValid()) { throw new RemoteException(new IllegalArgumentException("surface must be valid")); diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 904aa73f6ac46..e5ec260907df6 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -755,7 +755,7 @@ public class Surface implements Parcelable { private void setNativeObjectLocked(long ptr) { if (mNativeObject != ptr) { if (mNativeObject == 0 && ptr != 0) { - mCloseGuard.open("release"); + mCloseGuard.open("Surface.release"); } else if (mNativeObject != 0 && ptr == 0) { mCloseGuard.close(); }