Changes imported from Live Channels

  - 186014614 Sync more make files with master by nchalko <nchalko@google.com>
  - 186013553 FIX: safely parse URI from intents. by nchalko <nchalko@google.com>
  - 186010488 Add missing license header by nchalko <nchalko@google.com>
  - 186009400 Sync all make files with master by nchalko <nchalko@google.com>
  - 185891159 Extract a Channel interface by nchalko <nchalko@google.com>
  - 185885678 Make recording history available by shubang <shubang@google.com>
  - 185725900 Extract an interface for TunableTvView by nchalko <nchalko@google.com>
  - 185724604 CLEANUP: Move ImageLoader to a separate package by nchalko <nchalko@google.com>
  - 185722979 CLEANUP: Fix amiguous method reference by renaming static... by nchalko <nchalko@google.com>
  - 185721563 CLEANUP: create a seperate top level target for resources by nchalko <nchalko@google.com>
  - 185720102 CLEANUP: fix comparison using reference equality instead ... by nchalko <nchalko@google.com>
  - 185717674 CLEANUP: Move MemoryManageable to a separate package by nchalko <nchalko@google.com>
  - 185609615 FIX: Improve Program Guide description for talkback by nchalko <nchalko@google.com>
  - 185607602 PARTIAL: Speak the channel number for each item in the pr... by nchalko <nchalko@google.com>
  - 185552957 CLEANUP: Move TestUtils to tests/common by nchalko <nchalko@google.com>
  - 185549529 PARTIAL: Add program description to the content discripti... by nchalko <nchalko@google.com>
  - 185521822 Use robolectric 3.6.1 in android.mk by nchalko <nchalko@google.com>
  - 185521733 Add recording info to ProgramItemView content description by nchalko <nchalko@google.com>
  - 185459218 Add time to ProgramItemView content description by nchalko <nchalko@google.com>
  - 185449505 Add clock to the Utils.getDurationString by nchalko <nchalko@google.com>
  - 185435931 Inject the clock in ProgramItemView for testing by nchalko <nchalko@google.com>
  - 185435648 Fix link-type warnings by nchalko <nchalko@google.com>
  - 185435488 Migrate to AAPT2 by nchalko <nchalko@google.com>
  - 185434148 Add uptimeMillis to the Clock interface by nchalko <nchalko@google.com>

PiperOrigin-RevId: 186014614
Change-Id: I583af9ac3e56161736504024b62d1fd62e31c15a
Test: tested in google3

2 files changed, 3 insertions, 3 deletions

diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java
index c765818d..15e90437 100644
--- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java
+++ b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.media.tv.TvContract;
 import com.android.tv.common.BaseApplication;
-import com.android.tv.common.CommonConstants;
+import com.android.tv.common.actions.InputSetupActionUtils;
 import com.android.tv.common.config.DefaultConfigManager;
 import com.android.tv.common.config.api.RemoteConfig;
 import com.android.tv.common.util.CommonUtils;
@@ -39,7 +39,7 @@ public class SampleDvbTuner extends BaseApplication {
         Intent intent =
                 CommonUtils.createSetupIntent(
                         new Intent(context, LiveTvTunerSetupActivity.class), mEmbeddedInputId);
-        intent.putExtra(CommonConstants.EXTRA_INPUT_ID, mEmbeddedInputId);
+        intent.putExtra(InputSetupActionUtils.EXTRA_INPUT_ID, mEmbeddedInputId);
         return intent;
     }
 
diff --git a/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/AndroidManifest.xml b/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/AndroidManifest.xml
index c3192c37..3e6946a9 100644
--- a/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/AndroidManifest.xml
+++ b/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.tv.tuner"
     android:versionCode="1">
-  <uses-sdk android:targetSdkVersion="26" android:minSdkVersion="21"/>
+  <uses-sdk android:targetSdkVersion="26" android:minSdkVersion="23"/>
   <application android:label="TunerTvInputLayoutTests" >
     <activity android:name="com.android.tv.tuner.layout.tests.ScaledLayoutActivity"
               android:label="ScaledLayout Test" />