| author | Lei Qian <lei.qian@amlogic.com> | 2017-06-29 08:02:23 (GMT) |
|---|---|---|
| committer | Lei <lei.qian@amlogic.com> | 2017-06-29 13:29:45 (GMT) |
| commit | 7ccfb2fe96eb4cfb201d6ae5ce6047e479150ae6 (patch) | |
| tree | bf3ddc597aeab9364172668d51d14ee81419c2fd | |
| parent | 9f69e25c233ac6f390bdd3f0c0667b4b88548a6a (diff) | |
| download | MboxLauncher2-7ccfb2fe96eb4cfb201d6ae5ce6047e479150ae6.zip MboxLauncher2-7ccfb2fe96eb4cfb201d6ae5ce6047e479150ae6.tar.gz MboxLauncher2-7ccfb2fe96eb4cfb201d6ae5ce6047e479150ae6.tar.bz2 | |
pd#146746: change tvapp link to LiveTv
Change-Id: Ia057597b6a3ce5e7e8f7c5d89671b1683dc890c9
Signed-off-by: Lei <lei.qian@amlogic.com>
| -rw-r--r-- | src/com/droidlogic/mboxlauncher/Launcher.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/droidlogic/mboxlauncher/Launcher.java b/src/com/droidlogic/mboxlauncher/Launcher.java index 63fdef3..e5529f8 100644 --- a/src/com/droidlogic/mboxlauncher/Launcher.java +++ b/src/com/droidlogic/mboxlauncher/Launcher.java @@ -22,6 +22,7 @@ import android.media.tv.TvView; import android.media.tv.TvInputInfo; import android.media.tv.TvInputManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; @@ -60,6 +61,7 @@ public class Launcher extends Activity{ private final String outputmode_change_action = "android.amlogic.settings.CHANGE_OUTPUT_MODE"; public static String COMPONENT_TV_APP = "com.droidlogic.tvsource/com.droidlogic.tvsource.DroidLogicTv"; + public static String COMPONENT_LIVE_TV = "com.android.tv/com.android.tv.MainActivity"; public static String COMPONENT_TV_SETTINGS = "com.android.tv.settings/com.android.tv.settings.MainSettings"; public static String DEFAULT_INPUT_ID = "com.droidlogic.tvinput/.services.ATVInputService/HW0"; public static final String PROP_TV_PREVIEW = "tv.is.preview.window"; @@ -169,6 +171,10 @@ public class Launcher extends Activity{ Log.d(TAG, "------onCreate"); mSystemControlManager = new SystemControlManager(this); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + COMPONENT_TV_APP = COMPONENT_LIVE_TV; + } if (TextUtils.equals(mSystemControlManager.getProperty("ro.platform.has.tvuimode"), "true") && !TextUtils.equals(mSystemControlManager.getProperty("tv.launcher.firsttime.launch"), "false") && Settings.System.getInt(getContentResolver(), "tv_start_up_enter_app", 0) > 0) { |