Merge "Use log.wtf on debug devices if property cannot be set" into pi-dev (76372003) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/GlobalSettingsToPropertiesMapper.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.am;
		import android.content.ContentResolver;
		import android.database.ContentObserver;
		import android.net.Uri;
		import android.os.Build;
		import android.os.SystemProperties;
		import android.provider.Settings;
		import android.text.TextUtils;
		@@ -98,9 +99,16 @@ class GlobalSettingsToPropertiesMapper {
		try {
		systemPropertiesSet(key, value);
		} catch (Exception e) {
		// Failure to set a property can be caused by SELinux denial. This usually indicates
		// that the property wasn't whitelisted in sepolicy.
		// No need to report it on all user devices, only on debug builds.
		if (Build.IS_DEBUGGABLE) {
		Slog.wtf(TAG, "Unable to set property " + key + " value '" + value + "'", e);
		} else {
		Slog.e(TAG, "Unable to set property " + key + " value '" + value + "'", e);
		}
		}
		}

		@VisibleForTesting
		protected String systemPropertiesGet(String key) {