diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-09 19:19:21 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-09 19:19:21 +0000 |
commit | 411c4a576a92253a386784dddb646a2671b5d6f9 (patch) | |
tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /tests/unit/src/com/android/tv/util/TestUtils.java | |
parent | bc7f430decab0bc34a533811efe457d4615f28aa (diff) | |
parent | bb2e798ef4d546dd54cd9e95796403062b860c15 (diff) | |
download | TV-411c4a576a92253a386784dddb646a2671b5d6f9.tar.gz |
Snap for 4384531 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: I06099c50eb5f4c5791fab1e6055cca20fb367c6d
Diffstat (limited to 'tests/unit/src/com/android/tv/util/TestUtils.java')
-rw-r--r-- | tests/unit/src/com/android/tv/util/TestUtils.java | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/tests/unit/src/com/android/tv/util/TestUtils.java b/tests/unit/src/com/android/tv/util/TestUtils.java index e3bda138..d200733d 100644 --- a/tests/unit/src/com/android/tv/util/TestUtils.java +++ b/tests/unit/src/com/android/tv/util/TestUtils.java @@ -21,8 +21,8 @@ import android.content.pm.ServiceInfo; import android.graphics.drawable.Icon; import android.hardware.hdmi.HdmiDeviceInfo; import android.media.tv.TvInputInfo; +import android.os.Build; import android.os.Bundle; -import android.support.v4.os.BuildCompat; import java.lang.reflect.Constructor; @@ -47,7 +47,11 @@ public class TestUtils { int type, boolean isHardwareInput, boolean canRecord, int tunerCount) throws Exception { // Create a mock TvInputInfo by using private constructor // Note that mockito doesn't support mock/spy on final object. - if (BuildCompat.isAtLeastN()) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + return createTvInputInfoForO(service, id, parentId, type, isHardwareInput, canRecord, + tunerCount); + + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { return createTvInputInfoForNyc(service, id, parentId, type, isHardwareInput, canRecord, tunerCount); } @@ -57,6 +61,24 @@ public class TestUtils { /** * private TvInputInfo(ResolveInfo service, String id, int type, boolean isHardwareInput, * CharSequence label, int labelResId, Icon icon, Icon iconStandby, Icon iconDisconnected, + * String setupActivity, boolean canRecord, int tunerCount, HdmiDeviceInfo hdmiDeviceInfo, + * boolean isConnectedToHdmiSwitch, String parentId, Bundle extras) { + */ + private static TvInputInfo createTvInputInfoForO(ResolveInfo service, String id, + String parentId, int type, boolean isHardwareInput, boolean canRecord, int tunerCount) + throws Exception { + Constructor<TvInputInfo> constructor = TvInputInfo.class.getDeclaredConstructor( + ResolveInfo.class, String.class, int.class, boolean.class, CharSequence.class, + int.class, Icon.class, Icon.class, Icon.class, String.class, boolean.class, + int.class, HdmiDeviceInfo.class, boolean.class, String.class, Bundle.class); + constructor.setAccessible(true); + return constructor.newInstance(service, id, type, isHardwareInput, null, 0, null, null, + null, null, canRecord, tunerCount, null, false, parentId, null); + } + + /** + * private TvInputInfo(ResolveInfo service, String id, int type, boolean isHardwareInput, + * CharSequence label, int labelResId, Icon icon, Icon iconStandby, Icon iconDisconnected, * String setupActivity, String settingsActivity, boolean canRecord, int tunerCount, * HdmiDeviceInfo hdmiDeviceInfo, boolean isConnectedToHdmiSwitch, String parentId, * Bundle extras) { @@ -87,6 +109,7 @@ public class TestUtils { resolveInfo.serviceInfo = new ServiceInfo(); resolveInfo.serviceInfo.packageName = packageName; resolveInfo.serviceInfo.name = name; + resolveInfo.serviceInfo.metaData = new Bundle(); return resolveInfo; } } |