Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a78e64d authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496c am:... 

Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496c am: b72c0626 am: 16e676be
am: 3b01d0a0

Change-Id: Icdc349598538e7cb2740e0829e797ec02ff0209a
parents 872a5966 3b01d0a0

core/java/android/os/SystemProperties.java

+0 −6
Original line number Diff line number Diff line
@@ -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