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

Merge "TIF: Notify of visibility or label changes of TvInputInfo" into nyc-dev

Browse Source 
am: d26ee11

* commit 'd26ee111720aebcad486dd1a37b5338040a4f915':
  TIF: Notify of visibility or label changes of TvInputInfo
This commit is contained in:
Jae Seo
2016-03-25 23:37:46 +00:00
committed by android-build-merger
parent d5e3a93dfe d26ee11172
commit ffcb3acb90
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1039,6 +1039,15 @@ public final class TvInputInfo implements Parcelable {
} }
Settings.Secure.putStringForUser(context.getContentResolver(), Settings.Secure.putStringForUser(context.getContentResolver(),
Settings.Secure.TV_INPUT_HIDDEN_INPUTS, builder.toString(), userId); Settings.Secure.TV_INPUT_HIDDEN_INPUTS, builder.toString(), userId);
// Notify of the TvInputInfo changes.
TvInputManager tm = (TvInputManager) context.getSystemService(Context.TV_INPUT_SERVICE);
for (String inputId : hiddenInputIds) {
TvInputInfo info = tm.getTvInputInfo(inputId);
if (info != null) {
tm.updateTvInputInfo(info);
}
}
} }
/** /**
@@ -1069,6 +1078,15 @@ public final class TvInputInfo implements Parcelable {
} }
Settings.Secure.putStringForUser(context.getContentResolver(), Settings.Secure.putStringForUser(context.getContentResolver(),
Settings.Secure.TV_INPUT_CUSTOM_LABELS, builder.toString(), userId); Settings.Secure.TV_INPUT_CUSTOM_LABELS, builder.toString(), userId);
// Notify of the TvInputInfo changes.
TvInputManager tm = (TvInputManager) context.getSystemService(Context.TV_INPUT_SERVICE);
for (String inputId : customLabels.keySet()) {
TvInputInfo info = tm.getTvInputInfo(inputId);
if (info != null) {
tm.updateTvInputInfo(info);
}
}
} }
private static void ensureValidField(String value) { private static void ensureValidField(String value) {