summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@gmail.com>2016-10-16 15:19:20 +0800
committerdianlujitao <dianlujitao@gmail.com>2016-10-16 15:19:23 +0800
commit205428f75b90f0b7b34223d64cf0d3568d8dd72f (patch)
treeb75675302daa18df037752a092f13efdafaca3b2
parent3906c6b9e26cb32e4561df4f09ee4b483d587f5a (diff)
parente292eca31c3077dfcf5821e6653fe3de83003b94 (diff)
downloadhardware_qcom_display-205428f75b90f0b7b34223d64cf0d3568d8dd72f.tar.gz
hardware_qcom_display-205428f75b90f0b7b34223d64cf0d3568d8dd72f.tar.bz2
hardware_qcom_display-205428f75b90f0b7b34223d64cf0d3568d8dd72f.zip
Merge tag 'LA.HB.1.3.2-29100-8x96.0' of https://source.codeaurora.org/quic/la/platform/hardware/qcom/display into HEAD
"LA.HB.1.3.2-29100-8x96.0" Change-Id: I3452bc9bd2efdfb2e14136bab16cfc00ce7190fa
-rw-r--r--sdm/libs/hwc/hwc_display_primary.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/sdm/libs/hwc/hwc_display_primary.cpp b/sdm/libs/hwc/hwc_display_primary.cpp
index c0b38469a..4d0188d8f 100644
--- a/sdm/libs/hwc/hwc_display_primary.cpp
+++ b/sdm/libs/hwc/hwc_display_primary.cpp
@@ -117,13 +117,11 @@ void HWCDisplayPrimary::ProcessBootAnimCompleted(hwc_display_contents_1_t *list)
bool isEncrypted = false;
bool main_class_services_started = false;
if (property_get("ro.crypto.state", cryptoState, "unencrypted")) {
- DLOGV("%s: cryptostate= %s", __FUNCTION__, cryptoState);
if (!strcmp(cryptoState, "encrypted")) {
isEncrypted = true;
if (property_get("vold.decrypt", voldDecryptState, "") &&
!strcmp(voldDecryptState, "trigger_restart_framework"))
main_class_services_started = true;
- DLOGV("%s: vold= %s", __FUNCTION__, voldDecryptState);
}
}
if ((!isEncrypted ||(isEncrypted && main_class_services_started)) &&