diff options
author | Keun-young Park <keunyoung@google.com> | 2016-11-03 19:33:22 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-11-04 14:26:21 -0700 |
commit | 84596fb793fe47874e8cfdbf621c6807e3328006 (patch) | |
tree | d98fefe5eee3c063e97efd4715705a184819eec9 | |
parent | 60e2ab3c8e7d200d6f25b8359a910c1ecba7d4bd (diff) | |
download | Car-nougat-mr1.3-release.tar.gz |
fix buildandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-cts-release
- doclava has changed signature for generic types
Test: build
Change-Id: I5309bcbcd160ae900ab07edbcee91332e01677dc
(cherry picked from commit 69bc432bacb8609fbe518988c1783839209593b9)
-rw-r--r-- | car-lib/api/system-current.txt | 12 | ||||
-rw-r--r-- | car-support-lib/api/current.txt | 6 |
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>); |