Snap for 9191496 from daeeefa207ca53241f18ea99abaf79d5dcf913f0 to android10-tests-release
Change-Id: I59b8ccf1943b616d1df3528c534f342d89e7d7f3
diff --git a/src/com/android/tradefed/device/NativeDevice.java b/src/com/android/tradefed/device/NativeDevice.java
index cb1c915..5850ebc 100644
--- a/src/com/android/tradefed/device/NativeDevice.java
+++ b/src/com/android/tradefed/device/NativeDevice.java
@@ -470,12 +470,14 @@
CLog.e("setProperty requires adb root = true.");
return false;
}
- CommandResult result =
- executeShellV2Command(String.format("setprop \"%s\" \"%s\"", propKey, propValue));
+ String setPropCmd = String.format("\"setprop %s '%s'\"", propKey, propValue);
+ CommandResult result = executeShellV2Command(setPropCmd);
if (CommandStatus.SUCCESS.equals(result.getStatus())) {
return true;
}
- CLog.e("Something went wrong went setting property %s: %s", propKey, result.getStderr());
+ CLog.e(
+ "Something went wrong went setting property %s (command: %s): %s",
+ propKey, setPropCmd, result.getStderr());
return false;
}
diff --git a/tests/src/com/android/tradefed/device/NativeDeviceTest.java b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
index 27d5ce6..430434e 100644
--- a/tests/src/com/android/tradefed/device/NativeDeviceTest.java
+++ b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
@@ -2471,8 +2471,14 @@
res.setStatus(CommandStatus.SUCCESS);
EasyMock.expect(
mMockRunUtil.runTimedCmd(
- 120000, stdout, stderr, "adb", "-s", "serial", "shell", "setprop",
- "test", "value"))
+ 120000,
+ stdout,
+ stderr,
+ "adb",
+ "-s",
+ "serial",
+ "shell",
+ "setprop test 'value'"))
.andReturn(res);
EasyMock.replay(mMockRunUtil, mMockIDevice);
assertTrue(mTestDevice.setProperty("test", "value"));