commit 6265eea819e005594d7e529d1fd2346c407bbe5b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 20 05:53:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 20 05:53:03 2019 +0000
tree f51708ae2d09805d0136c87fd2a2d4882a54693a
parent 134fe7616bd9a9544d200fa661c4ec1ddc6eb5b4
parent 39373b2e8124f48354e0116f356b3d140b16338f

Merge "Document that SystemProperties.set() can throw RuntimeException"

core/java/android/os/SystemProperties.java

diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index 4538410..7bf1c4b 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -184,6 +184,8 @@
      * 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

diff --git a/core/jni/android_os_SystemProperties.cpp b/core/jni/android_os_SystemProperties.cpp
index 9ec7517..87f498a 100644
--- a/core/jni/android_os_SystemProperties.cpp
+++ b/core/jni/android_os_SystemProperties.cpp
@@ -109,7 +109,7 @@
     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)");
     }
 }