diff options
| author | Jaewan Kim <jaewan@google.com> | 2014-08-21 16:13:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 16:13:25 +0000 |
| commit | edaece1f30290ac51b478908c80ce24211614ec6 (patch) | |
| tree | d3154d92fdb916758ce74fb799efd4a5fe90c473 /core/java/android/provider | |
| parent | a945c352730b2e43d0d6ea3af4c14994a340b3e8 (diff) | |
| parent | f0e530e4eb1d4af7df76fa8d8e75e6783d6e7c29 (diff) | |
| download | frameworks_base-edaece1f30290ac51b478908c80ce24211614ec6.zip frameworks_base-edaece1f30290ac51b478908c80ce24211614ec6.tar.gz frameworks_base-edaece1f30290ac51b478908c80ce24211614ec6.tar.bz2 | |
Merge "TIF: Accept any character for custom label." into lmp-dev
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 33e9087..2241716 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4740,17 +4740,16 @@ public final class Settings { /** * List of TV inputs that are currently hidden. This is a string - * containing the IDs of all hidden TV inputs. Each ID is separated by ':'. - * + * containing the IDs of all hidden TV inputs. Each ID is encoded by + * {@link android.net.Uri#encode(String)} and separated by ':'. * @hide */ public static final String TV_INPUT_HIDDEN_INPUTS = "tv_input_hidden_inputs"; /** * List of custom TV input labels. This is a string containing <TV input id, custom name> - * pairs. Each pair is separated by ':' and TV input id and custom name are separated by - * ','. - * + * pairs. TV input id and custom name are encoded by {@link android.net.Uri#encode(String)} + * and separated by ','. Each pair is separated by ':'. * @hide */ public static final String TV_INPUT_CUSTOM_LABELS = "tv_input_custom_labels"; |