Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev

Browse Source 
am: 8da2bf4946

* commit '8da2bf49467f026da70a94d7cdf01b84d80bd07a':
  TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
This commit is contained in:
Dongwon Kang
2016-02-16 17:32:36 +00:00
committed by android-build-merger
parent 3699e5035c 8da2bf4946
commit 2a94f9b7ea
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -22914,7 +22914,9 @@ package android.media.tv {
method public android.content.pm.ServiceInfo getServiceInfo();
method public int getTunerCount();
method public int getType();
method public boolean isHidden(android.content.Context);
method public boolean isPassthroughInput();
method public java.lang.CharSequence loadCustomLabel(android.content.Context);
method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
method public java.lang.CharSequence loadLabel(android.content.Context);
method public void writeToParcel(android.os.Parcel, int);

2
api/test-current.txt
View File

@@ -22923,7 +22923,9 @@ package android.media.tv {
method public android.content.pm.ServiceInfo getServiceInfo();
method public int getTunerCount();
method public int getType();
method public boolean isHidden(android.content.Context);
method public boolean isPassthroughInput();
method public java.lang.CharSequence loadCustomLabel(android.content.Context);
method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
method public java.lang.CharSequence loadLabel(android.content.Context);
method public void writeToParcel(android.os.Parcel, int);

4
media/java/android/media/tv/TvInputInfo.java
View File

@@ -421,9 +421,7 @@ public final class TvInputInfo implements Parcelable {
* @param context Supplies a {@link Context} used to check if this TV input is hidden.
* @return {@code true} if the user marked this TV input hidden in settings. {@code false}
* otherwise.
* @hide
*/
@SystemApi
public boolean isHidden(Context context) {
return TvInputSettings.isHidden(context, mId, UserHandle.myUserId());
}
@@ -451,9 +449,7 @@ public final class TvInputInfo implements Parcelable {
* @param context Supplies a {@link Context} used to load the custom label.
* @return a CharSequence containing the TV input's custom label. {@code null} if there is no
* custom label.
* @hide
*/
@SystemApi
public CharSequence loadCustomLabel(Context context) {
return TvInputSettings.getCustomLabel(context, mId, UserHandle.myUserId());
}