commit 6f3a75e13b86a3f40fe34e3ebd17b118791a73a4
author Brad Fitzpatrick <bradfitz@android.com> Mon Mar 14 09:27:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 14 09:27:58 2011 -0700
tree 28b1e8a19a93a81379ee2d60d90e06c7a6f30967
parent 0c5820ad8eafd3828ab0dea4794945b4f0637e13
parent 06f367437c88f0960ea093c99388a16d0292121d

Merge "Throw errors on failures to set system properties."

core/jni/android_os_SystemProperties.cpp

diff --git a/core/jni/android_os_SystemProperties.cpp b/core/jni/android_os_SystemProperties.cpp
index 406884b..3c4d2bf 100644
--- a/core/jni/android_os_SystemProperties.cpp
+++ b/core/jni/android_os_SystemProperties.cpp
@@ -164,7 +164,7 @@
 
     if (keyJ == NULL) {
         jniThrowException(env, "java/lang/NullPointerException",
-                                "key must not be null.");
+                          "key must not be null.");
         return ;
     }
     key = env->GetStringUTFChars(keyJ, NULL);
@@ -174,15 +174,20 @@
     } else {
         val = env->GetStringUTFChars(valJ, NULL);
     }
-    
+
     err = property_set(key, val);
-    
+
     env->ReleaseStringUTFChars(keyJ, key);
-    
+
     if (valJ != NULL) {
-    	env->ReleaseStringUTFChars(valJ, val);
+        env->ReleaseStringUTFChars(valJ, val);
     }
-} 
+
+    if (err < 0) {
+        jniThrowException(env, "java/lang/RuntimeException",
+                          "failed to set system property");
+    }
+}
 
 static JNINativeMethod method_table[] = {
     { "native_get", "(Ljava/lang/String;)Ljava/lang/String;",