summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tom Cherry <tomcherry@google.com> 2017-10-17 19:28:07 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-10-17 19:28:07 +0000
commitc589496ce928ba49c60eea542296b0abb6142759 (patch)
tree1653f10bb0133c282e7114502884859251baf3a7
parent4627c01ee481ae7c1a4649ef1c9e7ce9535dd914 (diff)
parent95dd3cef213a360d0f1b63555c1ca0e22ee8f9f2 (diff)
Merge "Frameworks: Remove warning for SystemProperties.get"
-rw-r--r--core/java/android/os/SystemProperties.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index 560b4b31cdc6..84111fbf7f93 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -84,9 +84,6 @@ public class SystemProperties {
/**
* Get the String value for the given {@code key}.
*
- * <b>WARNING:</b> Do not use this method if the value may not be a valid UTF string! This
- * method will crash in native code.
- *
* @param key the key to lookup
* @return an empty string if the {@code key} isn't found
*/
@@ -99,9 +96,6 @@ public class SystemProperties {
/**
* Get the String value for the given {@code key}.
*
- * <b>WARNING:</b> Do not use this method if the value may not be a valid UTF string! This
- * method will crash in native code.
- *
* @param key the key to lookup
* @param def the default value in case the property is not set or empty
* @return if the {@code key} isn't found, return {@code def} if it isn't null, or an empty