fix build am: 69bc432bacandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-dev

am: 495d02fdd6

Change-Id: I9e9bec7e21b3846360d3370983c003f47c0e65f3

2 files changed, 9 insertions, 9 deletions

diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index b6fdd907b1..0a2eaec1e7 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -348,7 +348,7 @@ package android.car.content.pm {
 
 package android.car.hardware {
 
-  public class CarPropertyConfig implements android.os.Parcelable {
+  public class CarPropertyConfig<T> implements android.os.Parcelable {
     method public int describeContents();
     method public int getAreaCount();
     method public int[] getAreaIds();
@@ -362,13 +362,13 @@ package android.car.hardware {
     method public java.lang.Class<T> getPropertyType();
     method public boolean hasArea(int);
     method public boolean isGlobalProperty();
-    method public static android.car.hardware.CarPropertyConfig.Builder<T> newBuilder(java.lang.Class<T>, int, int, int);
-    method public static android.car.hardware.CarPropertyConfig.Builder<T> newBuilder(java.lang.Class<T>, int, int);
+    method public static <T> android.car.hardware.CarPropertyConfig.Builder<T> newBuilder(java.lang.Class<T>, int, int, int);
+    method public static <T> android.car.hardware.CarPropertyConfig.Builder<T> newBuilder(java.lang.Class<T>, int, int);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.car.hardware.CarPropertyConfig> CREATOR;
   }
 
-  public static class CarPropertyConfig.AreaConfig implements android.os.Parcelable {
+  public static class CarPropertyConfig.AreaConfig<T> implements android.os.Parcelable {
     method public int describeContents();
     method public T getMaxValue();
     method public T getMinValue();
@@ -376,14 +376,14 @@ package android.car.hardware {
     field public static final android.os.Parcelable.Creator<android.car.hardware.CarPropertyConfig.AreaConfig<java.lang.Object>> CREATOR;
   }
 
-  public static class CarPropertyConfig.Builder {
+  public static class CarPropertyConfig.Builder<T> {
     method public android.car.hardware.CarPropertyConfig.Builder<T> addArea(int);
     method public android.car.hardware.CarPropertyConfig.Builder<T> addAreaConfig(int, T, T);
     method public android.car.hardware.CarPropertyConfig.Builder<T> addAreas(int[]);
     method public android.car.hardware.CarPropertyConfig<T> build();
   }
 
-  public class CarPropertyValue implements android.os.Parcelable {
+  public class CarPropertyValue<T> implements android.os.Parcelable {
     ctor public CarPropertyValue(int, T);
     ctor public CarPropertyValue(int, int, T);
     ctor public CarPropertyValue(android.os.Parcel);
diff --git a/car-support-lib/api/current.txt b/car-support-lib/api/current.txt
index 1256f7f09b..9baf200b59 100644
--- a/car-support-lib/api/current.txt
+++ b/car-support-lib/api/current.txt
@@ -829,7 +829,7 @@ package android.support.car.ui {
     method public static int getTintColor(double, int, int...);
   }
 
-  public abstract class CursorRecyclerViewAdapter extends android.support.v7.widget.RecyclerView.Adapter {
+  public abstract class CursorRecyclerViewAdapter<VH extends android.support.v7.widget.RecyclerView.ViewHolder> extends android.support.v7.widget.RecyclerView.Adapter {
     ctor public CursorRecyclerViewAdapter(android.content.Context, android.database.Cursor);
     method public void changeCursor(android.database.Cursor);
     method public android.database.Cursor getCursor();
@@ -869,7 +869,7 @@ package android.support.car.ui {
     method public void setStrokeColor(int);
   }
 
-  public abstract class GroupingCursorRecyclerViewAdapter extends android.support.car.ui.CursorRecyclerViewAdapter {
+  public abstract class GroupingCursorRecyclerViewAdapter<VH extends android.support.v7.widget.RecyclerView.ViewHolder> extends android.support.car.ui.CursorRecyclerViewAdapter {
     ctor public GroupingCursorRecyclerViewAdapter(android.content.Context, android.database.Cursor);
     method protected void addGroup(int, int, boolean);
     method protected abstract void buildGroups(android.database.Cursor);
@@ -898,7 +898,7 @@ package android.support.car.ui {
     ctor public GroupingCursorRecyclerViewAdapter.PositionMetadata(int, int, android.support.car.ui.GroupingCursorRecyclerViewAdapter.GroupMetadata);
   }
 
-  public abstract class GroupingRecyclerViewAdapter extends android.support.v7.widget.RecyclerView.Adapter {
+  public abstract class GroupingRecyclerViewAdapter<E, VH extends android.support.v7.widget.RecyclerView.ViewHolder> extends android.support.v7.widget.RecyclerView.Adapter {
     ctor public GroupingRecyclerViewAdapter(android.content.Context);
     method protected void addGroup(int, int, boolean);
     method protected abstract void buildGroups(java.util.List<E>);