Many API council fixes.

bug: 31913591
Change-Id: I3a0f9a57ecdccdae6c0b3b98b5bbf9b31733933b

1 files changed, 30 insertions, 30 deletions

diff --git a/car-lib/api/current.txt b/car-lib/api/current.txt
index 8a386751e6..ec156b0e8a 100644
--- a/car-lib/api/current.txt
+++ b/car-lib/api/current.txt
@@ -23,25 +23,25 @@ package android.car {
   }
 
   public final class CarAppFocusManager {
-    method public void abandonAppFocus(android.car.CarAppFocusManager.AppFocusOwnershipChangeListener, int) throws android.car.CarNotConnectedException;
-    method public void abandonAppFocus(android.car.CarAppFocusManager.AppFocusOwnershipChangeListener) throws android.car.CarNotConnectedException;
-    method public boolean isOwningFocus(android.car.CarAppFocusManager.AppFocusOwnershipChangeListener, int) throws android.car.CarNotConnectedException;
-    method public void registerFocusListener(android.car.CarAppFocusManager.AppFocusChangeListener, int) throws android.car.CarNotConnectedException;
-    method public int requestAppFocus(int, android.car.CarAppFocusManager.AppFocusOwnershipChangeListener) throws android.car.CarNotConnectedException, java.lang.SecurityException;
-    method public void unregisterFocusListener(android.car.CarAppFocusManager.AppFocusChangeListener, int) throws android.car.CarNotConnectedException;
-    method public void unregisterFocusListener(android.car.CarAppFocusManager.AppFocusChangeListener) throws android.car.CarNotConnectedException;
+    method public void abandonAppFocus(android.car.CarAppFocusManager.OnAppFocusOwnershipLostListener, int) throws android.car.CarNotConnectedException;
+    method public void abandonAppFocus(android.car.CarAppFocusManager.OnAppFocusOwnershipLostListener) throws android.car.CarNotConnectedException;
+    method public void addFocusListener(android.car.CarAppFocusManager.OnAppFocusChangedListener, int) throws android.car.CarNotConnectedException;
+    method public boolean isOwningFocus(android.car.CarAppFocusManager.OnAppFocusOwnershipLostListener, int) throws android.car.CarNotConnectedException;
+    method public void removeFocusListener(android.car.CarAppFocusManager.OnAppFocusChangedListener, int) throws android.car.CarNotConnectedException;
+    method public void removeFocusListener(android.car.CarAppFocusManager.OnAppFocusChangedListener) throws android.car.CarNotConnectedException;
+    method public int requestAppFocus(int, android.car.CarAppFocusManager.OnAppFocusOwnershipLostListener) throws android.car.CarNotConnectedException, java.lang.SecurityException;
     field public static final int APP_FOCUS_REQUEST_FAILED = 0; // 0x0
     field public static final int APP_FOCUS_REQUEST_GRANTED = 1; // 0x1
     field public static final int APP_FOCUS_TYPE_NAVIGATION = 1; // 0x1
     field public static final int APP_FOCUS_TYPE_VOICE_COMMAND = 2; // 0x2
   }
 
-  public static abstract interface CarAppFocusManager.AppFocusChangeListener {
-    method public abstract void onAppFocusChange(int, boolean);
+  public static abstract interface CarAppFocusManager.OnAppFocusChangedListener {
+    method public abstract void onAppFocusChanged(int, boolean);
   }
 
-  public static abstract interface CarAppFocusManager.AppFocusOwnershipChangeListener {
-    method public abstract void onAppFocusOwnershipLoss(int);
+  public static abstract interface CarAppFocusManager.OnAppFocusOwnershipLostListener {
+    method public abstract void onAppFocusOwnershipLost(int);
   }
 
   public class CarInfoManager {
@@ -62,11 +62,11 @@ package android.car {
     ctor public CarNotConnectedException(java.lang.Exception);
   }
 
-  public class CarNotSupportedException extends java.lang.Exception {
-    ctor public CarNotSupportedException();
-    ctor public CarNotSupportedException(java.lang.String);
-    ctor public CarNotSupportedException(java.lang.String, java.lang.Throwable);
-    ctor public CarNotSupportedException(java.lang.Exception);
+  public class CarOperationNotSupportedException extends java.lang.Exception {
+    ctor public CarOperationNotSupportedException();
+    ctor public CarOperationNotSupportedException(java.lang.String);
+    ctor public CarOperationNotSupportedException(java.lang.String, java.lang.Throwable);
+    ctor public CarOperationNotSupportedException(java.lang.Exception);
   }
 
 }
@@ -238,26 +238,26 @@ package android.car.hardware {
     field public final float[] floatValues;
     field public final int[] intValues;
     field public int sensorType;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.CarSpeedData {
     ctor public CarSensorEvent.CarSpeedData();
     field public float carSpeed;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.DrivingStatusData {
     ctor public CarSensorEvent.DrivingStatusData();
     field public int status;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.EnvironmentData {
     ctor public CarSensorEvent.EnvironmentData();
     field public float pressure;
     field public float temperature;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.FuelLevelData {
@@ -265,37 +265,37 @@ package android.car.hardware {
     field public int level;
     field public boolean lowFuelWarning;
     field public float range;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.GearData {
     ctor public CarSensorEvent.GearData();
     field public int gear;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.NightData {
     ctor public CarSensorEvent.NightData();
     field public boolean isNightMode;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.OdometerData {
     ctor public CarSensorEvent.OdometerData();
     field public float kms;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.ParkingBrakeData {
     ctor public CarSensorEvent.ParkingBrakeData();
     field public boolean isEngaged;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public static class CarSensorEvent.RpmData {
     ctor public CarSensorEvent.RpmData();
     field public float rpm;
-    field public long timeStampNs;
+    field public long timestamp;
   }
 
   public class CarSensorManager {
@@ -303,9 +303,9 @@ package android.car.hardware {
     method public int[] getSupportedSensors() throws android.car.CarNotConnectedException;
     method public boolean isSensorSupported(int) throws android.car.CarNotConnectedException;
     method public static boolean isSensorSupported(int[], int);
-    method public boolean registerListener(android.car.hardware.CarSensorManager.CarSensorEventListener, int, int) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
-    method public void unregisterListener(android.car.hardware.CarSensorManager.CarSensorEventListener) throws android.car.CarNotConnectedException;
-    method public void unregisterListener(android.car.hardware.CarSensorManager.CarSensorEventListener, int) throws android.car.CarNotConnectedException;
+    method public boolean registerListener(android.car.hardware.CarSensorManager.OnSensorChangedListener, int, int) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
+    method public void unregisterListener(android.car.hardware.CarSensorManager.OnSensorChangedListener) throws android.car.CarNotConnectedException;
+    method public void unregisterListener(android.car.hardware.CarSensorManager.OnSensorChangedListener, int) throws android.car.CarNotConnectedException;
     field public static final int SENSOR_RATE_FAST = 1; // 0x1
     field public static final int SENSOR_RATE_FASTEST = 0; // 0x0
     field public static final int SENSOR_RATE_NORMAL = 3; // 0x3
@@ -322,7 +322,7 @@ package android.car.hardware {
     field public static final int SENSOR_TYPE_VENDOR_EXTENSION_END = 1879048191; // 0x6fffffff
   }
 
-  public static abstract interface CarSensorManager.CarSensorEventListener {
+  public static abstract interface CarSensorManager.OnSensorChangedListener {
     method public abstract void onSensorChanged(android.car.hardware.CarSensorEvent);
   }