| commit | 2f79ae98afd895ec1179b38fccb538f64164b9fd | [log] [tgz] |
|---|---|---|
| author | Michal Karpinski <mkarpinski@google.com> | Wed Mar 09 17:01:14 2016 +0000 |
| committer | Michal Karpinski <mkarpinski@google.com> | Thu Mar 10 15:00:08 2016 +0000 |
| tree | ed1490c83316739275949f5844c311a9e5716166 | |
| parent | cb1b27b6f8e728f12a2e8a5c172aa249440d611f [diff] |
Tuning down wtf to warning for setting ro.device_owner property This was logged to often, especially while running CTS hostside tests and looked too scary to people. Bug: 27230864 Change-Id: I9e81d9efe87b4aed18aa473be647c560ff9cfa0d
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 9a75dc9..d218afc 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1642,7 +1642,7 @@ } if (!TextUtils.isEmpty(mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT))) { - Slog.wtf(LOG_TAG, "Trying to set ro.device_owner, but it has already been set?"); + Slog.w(LOG_TAG, "Trying to set ro.device_owner, but it has already been set?"); } else { if (mOwners.hasDeviceOwner()) { mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "true");