diff --git a/api/removed.txt b/api/removed.txt index 74de9b86bdbe9..6128e49aa443d 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -234,19 +234,10 @@ package android.graphics.drawable { package android.hardware { - public final class HardwareBuffer implements java.lang.AutoCloseable android.os.Parcelable { - method @Deprecated public void destroy(); - method @Deprecated public boolean isDestroyed(); - } - public final class SensorDirectChannel implements java.nio.channels.Channel { method @Deprecated public boolean isValid(); } - public abstract class SensorManager { - method @Deprecated public int configureDirectChannel(android.hardware.SensorDirectChannel, android.hardware.Sensor, int); - } - } package android.icu.util { diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index c569e05112a38..5b25f5a14a524 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -310,18 +310,6 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { return nGetUsage(mNativeObject); } - /** @removed replaced by {@link #close()} */ - @Deprecated - public void destroy() { - close(); - } - - /** @removed replaced by {@link #isClosed()} */ - @Deprecated - public boolean isDestroyed() { - return isClosed(); - } - /** * Destroys this buffer immediately. Calling this method frees up any * underlying native resources. After calling this method, this buffer diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 32504282d98f3..524a0c4b96208 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -943,12 +943,6 @@ public abstract class SensorManager { /** @hide */ protected abstract void destroyDirectChannelImpl(SensorDirectChannel channel); - /** @removed */ - @Deprecated - public int configureDirectChannel(SensorDirectChannel channel, Sensor sensor, int rateLevel) { - return configureDirectChannelImpl(channel, sensor, rateLevel); - } - /** @hide */ protected abstract int configureDirectChannelImpl( SensorDirectChannel channel, Sensor s, int rate);