Merge "[MTE] Fix app_default property." (c842a651) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1718,17 +1718,18 @@ public final class ProcessList {
	return Zygote.MEMORY_TAG_LEVEL_NONE;		return Zygote.MEMORY_TAG_LEVEL_NONE;
	}		}

	// Check to see that the compat feature for TBI is enabled.
	if (mPlatformCompat.isChangeEnabled(NATIVE_HEAP_POINTER_TAGGING, app.info)) {
	return Zygote.MEMORY_TAG_LEVEL_TBI;
	}

	String defaultLevel = SystemProperties.get("persist.arm64.memtag.app_default");		String defaultLevel = SystemProperties.get("persist.arm64.memtag.app_default");
	if ("sync".equals(defaultLevel)) {		if ("sync".equals(defaultLevel)) {
	return Zygote.MEMORY_TAG_LEVEL_SYNC;		return Zygote.MEMORY_TAG_LEVEL_SYNC;
	} else if ("async".equals(defaultLevel)) {		} else if ("async".equals(defaultLevel)) {
	return Zygote.MEMORY_TAG_LEVEL_ASYNC;		return Zygote.MEMORY_TAG_LEVEL_ASYNC;
	}		}

			// Check to see that the compat feature for TBI is enabled.
			if (mPlatformCompat.isChangeEnabled(NATIVE_HEAP_POINTER_TAGGING, app.info)) {
			return Zygote.MEMORY_TAG_LEVEL_TBI;
			}

	return Zygote.MEMORY_TAG_LEVEL_NONE;		return Zygote.MEMORY_TAG_LEVEL_NONE;
	}		}