From 95dd3cef213a360d0f1b63555c1ca0e22ee8f9f2 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Tue, 17 Oct 2017 09:20:01 -0700 Subject: [PATCH] Frameworks: Remove warning for SystemProperties.get We now disallow non-UTF8 property values directly in property_service, so there is no need for this warning. This partially reverts 33aea8d40e6cc99f7968a6c6605a81a4587b85e7. Bug: 63177684 Test: make Change-Id: I61f49f635c6095013f55b906e00925a8cbd1ea8c --- core/java/android/os/SystemProperties.java | 6 ------ 1 file changed, 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}. * - * WARNING: 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}. * - * WARNING: 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 -- 2.11.0