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

Commit 70004dd1 authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge "Address review suggestions for sensor direct report related APIs" into oc-dev

am: 5ebb159a

Change-Id: I39838189ba70cd74e726d4332e1c2adfb5b269d6
parents efda6390 5ebb159a
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -14852,15 +14852,16 @@ package android.hardware {
    field public final int type;
  }
  public final class SensorDirectChannel implements java.lang.AutoCloseable {
  public final class SensorDirectChannel implements java.nio.channels.Channel {
    method public void close();
    method public boolean isValid();
    method public int configure(android.hardware.Sensor, int);
    method public boolean isOpen();
    field public static final int RATE_FAST = 2; // 0x2
    field public static final int RATE_NORMAL = 1; // 0x1
    field public static final int RATE_STOP = 0; // 0x0
    field public static final int RATE_VERY_FAST = 3; // 0x3
    field public static final int TYPE_ASHMEM = 1; // 0x1
    field public static final int TYPE_HARDWARE_BUFFER = 2; // 0x2
    field public static final int TYPE_MEMORY_FILE = 1; // 0x1
  }
  public class SensorEvent {
@@ -14894,7 +14895,6 @@ package android.hardware {
  public abstract class SensorManager {
    method public boolean cancelTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
    method public int configureDirectChannel(android.hardware.SensorDirectChannel, android.hardware.Sensor, int);
    method public android.hardware.SensorDirectChannel createDirectChannel(android.os.MemoryFile);
    method public android.hardware.SensorDirectChannel createDirectChannel(android.hardware.HardwareBuffer);
    method public boolean flush(android.hardware.SensorEventListener);
+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,18 @@ package android.graphics {

}

package android.hardware {

  public final class SensorDirectChannel implements java.nio.channels.Channel {
    method public deprecated boolean isValid();
  }

  public abstract class SensorManager {
    method public deprecated int configureDirectChannel(android.hardware.SensorDirectChannel, android.hardware.Sensor, int);
  }

}

package android.media {

  public final class AudioFormat implements android.os.Parcelable {
+4 −4
Original line number Diff line number Diff line
@@ -15625,15 +15625,16 @@ package android.hardware {
    field public final int type;
  }
  public final class SensorDirectChannel implements java.lang.AutoCloseable {
  public final class SensorDirectChannel implements java.nio.channels.Channel {
    method public void close();
    method public boolean isValid();
    method public int configure(android.hardware.Sensor, int);
    method public boolean isOpen();
    field public static final int RATE_FAST = 2; // 0x2
    field public static final int RATE_NORMAL = 1; // 0x1
    field public static final int RATE_STOP = 0; // 0x0
    field public static final int RATE_VERY_FAST = 3; // 0x3
    field public static final int TYPE_ASHMEM = 1; // 0x1
    field public static final int TYPE_HARDWARE_BUFFER = 2; // 0x2
    field public static final int TYPE_MEMORY_FILE = 1; // 0x1
  }
  public class SensorEvent {
@@ -15667,7 +15668,6 @@ package android.hardware {
  public abstract class SensorManager {
    method public boolean cancelTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
    method public int configureDirectChannel(android.hardware.SensorDirectChannel, android.hardware.Sensor, int);
    method public android.hardware.SensorDirectChannel createDirectChannel(android.os.MemoryFile);
    method public android.hardware.SensorDirectChannel createDirectChannel(android.hardware.HardwareBuffer);
    method public boolean flush(android.hardware.SensorEventListener);
+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,18 @@ package android.graphics {

}

package android.hardware {

  public final class SensorDirectChannel implements java.nio.channels.Channel {
    method public deprecated boolean isValid();
  }

  public abstract class SensorManager {
    method public deprecated int configureDirectChannel(android.hardware.SensorDirectChannel, android.hardware.Sensor, int);
  }

}

package android.media {

  public final class AudioFormat implements android.os.Parcelable {
+4 −4
Original line number Diff line number Diff line
@@ -14897,15 +14897,16 @@ package android.hardware {
    field public final int type;
  }
  public final class SensorDirectChannel implements java.lang.AutoCloseable {
  public final class SensorDirectChannel implements java.nio.channels.Channel {
    method public void close();
    method public boolean isValid();
    method public int configure(android.hardware.Sensor, int);
    method public boolean isOpen();
    field public static final int RATE_FAST = 2; // 0x2
    field public static final int RATE_NORMAL = 1; // 0x1
    field public static final int RATE_STOP = 0; // 0x0
    field public static final int RATE_VERY_FAST = 3; // 0x3
    field public static final int TYPE_ASHMEM = 1; // 0x1
    field public static final int TYPE_HARDWARE_BUFFER = 2; // 0x2
    field public static final int TYPE_MEMORY_FILE = 1; // 0x1
  }
  public class SensorEvent {
@@ -14939,7 +14940,6 @@ package android.hardware {
  public abstract class SensorManager {
    method public boolean cancelTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
    method public int configureDirectChannel(android.hardware.SensorDirectChannel, android.hardware.Sensor, int);
    method public android.hardware.SensorDirectChannel createDirectChannel(android.os.MemoryFile);
    method public android.hardware.SensorDirectChannel createDirectChannel(android.hardware.HardwareBuffer);
    method public boolean flush(android.hardware.SensorEventListener);
Loading