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

Commit 85639b48 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[DeviceConfig] true/false should be wrapped in @code tags" am:... 

Merge "[DeviceConfig] true/false should be wrapped in @code tags" am: d47a35e3 am: 0a426efb am: 278068b3 am: 5c341457

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2053134



Change-Id: I3691c851035052a7d5f3d93ef31824492193f0b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f721cec8 5c341457

core/java/android/provider/DeviceConfig.java

+5 −4
Original line number Diff line number Diff line
@@ -915,7 +915,8 @@ public final class DeviceConfig { 
     * @param name        The name of the property to create or update.

     * @param value       The value to store for the property.

     * @param makeDefault Whether to make the new value the default one.

     * @return True if the value was set, false if the storage implementation throws errors.

     * @return {@code true} if the value was set, {@code false} if the storage implementation throws

     * errors.

     * @hide

     * @see #resetToDefaults(int, String).

     */
@@ -939,7 +940,7 @@ public final class DeviceConfig { 
     *

     * @param properties the complete set of properties to set for a specific namespace.

     * @throws BadConfigException if the provided properties are banned by RescueParty.

     * @return True if the values were set, false otherwise.

     * @return {@code true} if the values were set, {@code false} otherwise.

     * @hide

     */

    @SystemApi
@@ -955,8 +956,8 @@ public final class DeviceConfig { 
     *

     * @param namespace   The namespace containing the property to delete.

     * @param name        The name of the property to delete.

     * @return True if the property was deleted or it did not exist in the first place.

     * False if the storage implementation throws errors.

     * @return {@code true} if the property was deleted or it did not exist in the first place.

     * Return {@code false} if the storage implementation throws errors.

     * @hide

     */

    @SystemApi