diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-08-21 23:04:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-21 23:04:09 +0000 |
| commit | e6c64508aba566b5bd4ac9cd87a07358b13f5a06 (patch) | |
| tree | 31c5a4ea7e1f4396a19676276ab61908ae77bad3 | |
| parent | 74d9c2aad1bcd52933a8dba7752b28e9aef1902d (diff) | |
| parent | 7d35fc389890347eed9588092842386bf07cf8b7 (diff) | |
| download | frameworks_base-e6c64508aba566b5bd4ac9cd87a07358b13f5a06.zip frameworks_base-e6c64508aba566b5bd4ac9cd87a07358b13f5a06.tar.gz frameworks_base-e6c64508aba566b5bd4ac9cd87a07358b13f5a06.tar.bz2 | |
Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
| -rw-r--r-- | core/java/android/content/RestrictionsManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/RestrictionsManager.java b/core/java/android/content/RestrictionsManager.java index 1fac06e..a7744e7 100644 --- a/core/java/android/content/RestrictionsManager.java +++ b/core/java/android/content/RestrictionsManager.java @@ -677,7 +677,8 @@ public class RestrictionsManager { * <table> * <tr><th>RestrictionEntry</th><th>Bundle</th></tr> * <tr><td>{@link RestrictionEntry#TYPE_BOOLEAN}</td><td>{@link Bundle#putBoolean}</td></tr> - * <tr><td>{@link RestrictionEntry#TYPE_CHOICE}, {@link RestrictionEntry#TYPE_CHOICE}</td> + * <tr><td>{@link RestrictionEntry#TYPE_CHOICE}, + * {@link RestrictionEntry#TYPE_MULTI_SELECT}</td> * <td>{@link Bundle#putStringArray}</td></tr> * <tr><td>{@link RestrictionEntry#TYPE_INTEGER}</td><td>{@link Bundle#putInt}</td></tr> * <tr><td>{@link RestrictionEntry#TYPE_STRING}</td><td>{@link Bundle#putString}</td></tr> |