Merge "Warn if we see a class whose behavior has changed because of https://android-review.googlesource.com/#/c/32480/."
diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index 8fbe857..28d8d2d 100644
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@ -413,7 +413,7 @@
if (seInfoObj) {
seInfo = dvmCreateCstrFromString(seInfoObj);
if (!seInfo) {
- LOGE("seInfo dvmCreateCstrFromString failed");
+ ALOGE("seInfo dvmCreateCstrFromString failed");
dvmAbort();
}
}
@@ -421,7 +421,7 @@
if (niceNameObj) {
niceName = dvmCreateCstrFromString(niceNameObj);
if (!niceName) {
- LOGE("niceName dvmCreateCstrFromString failed");
+ ALOGE("niceName dvmCreateCstrFromString failed");
dvmAbort();
}
}
@@ -513,7 +513,7 @@
#ifdef HAVE_SELINUX
err = setSELinuxContext(uid, isSystemServer, seInfo, niceName);
if (err < 0) {
- LOGE("cannot set SELinux context: %s\n", strerror(errno));
+ ALOGE("cannot set SELinux context: %s\n", strerror(errno));
dvmAbort();
}
// These free(3) calls are safe because we know we're only ever forking