Merge "Add TvProvider methods to block or unblock package, get blocked packages"...

diff --cc api/system-current.txt
index 1f059f4,52fc8db..bf7e2f2
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -26489,14 -26486,13 +26489,15 @@@ package android.media.tv 
      method public static boolean isChannelUriForPassthroughInput(android.net.Uri);
      method public static boolean isChannelUriForTunerInput(android.net.Uri);
      method public static boolean isProgramUri(android.net.Uri);
 +    method public static void requestChannelBrowsable(android.content.Context, long);
 +    field public static final java.lang.String ACTION_CHANNEL_BROWSABLE_REQUESTED = "android.media.tv.action.CHANNEL_BROWSABLE_REQUESTED";
      field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";
 -    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";
      field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";
      field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";
 +    field public static final java.lang.String ACTION_REQUEST_CHANNEL_BROWSABLE = "android.media.tv.action.REQUEST_CHANNEL_BROWSABLE";
      field public static final java.lang.String ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED";
      field public static final java.lang.String AUTHORITY = "android.media.tv";
+     field public static final java.lang.String EXTRA_BLOCKED_PACKAGES = "android.media.tv.extra.BLOCKED_PACKAGES";
      field public static final java.lang.String EXTRA_CHANNEL_ID = "android.media.tv.extra.CHANNEL_ID";
      field public static final java.lang.String EXTRA_COLUMN_NAME = "android.media.tv.extra.COLUMN_NAME";
      field public static final java.lang.String EXTRA_DATA_TYPE = "android.media.tv.extra.DATA_TYPE";

diff --cc media/java/android/media/tv/TvContract.java
Simple merge