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

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

Merge "Document that SystemProperties.set() can throw RuntimeException" am: 6265eea8 

am: 14a2b65e

Change-Id: I2bd65693f397c89970ac89187d3206c22b3af5ac
parents f32be08a 14a2b65e

core/java/android/os/SystemProperties.java

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ public class SystemProperties { 
     * Set the value for the given {@code key} to {@code val}.

     *

     * @throws IllegalArgumentException if the {@code val} exceeds 91 characters

     * @throws RuntimeException if the property cannot be set, for example, if it was blocked by

     * SELinux. libc will log the underlying reason.

     * @hide

     */

    @UnsupportedAppUsage

core/jni/android_os_SystemProperties.cpp

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void SystemProperties_set(JNIEnv *env, jobject clazz, jstring keyJ, 
    if (!ConvertKeyAndForward(env, keyJ, true, handler)) {

        // Must have been a failure in SetProperty.

        jniThrowException(env, "java/lang/RuntimeException",

                          "failed to set system property");

                          "failed to set system property (check logcat for reason)");

    }

}