Merge "Address const issues in preparation for libcxx rebase." am: e6f184d

am: 32f71e4

* commit '32f71e4f81299f8e044cebff85d3cbd191674506':
  Address const issues in preparation for libcxx rebase.

Change-Id: If139b64389fb7b0ef8c6364823668df49f61a047
This commit is contained in:
Dan Austin 2016-04-23 05:57:57 +00:00 committed by android-build-merger
commit 406694c145
1 changed files with 2 additions and 2 deletions

View File

@ -72,7 +72,7 @@ static bool getPanelResetStatus(hwc_context_t* ctx, const char* strUdata, int le
const char* iter_str = strUdata;
if (strcasestr("change@/devices/virtual/graphics/fb0", strUdata)) {
while(((iter_str - strUdata) <= len) && (*iter_str)) {
char* pstr = strstr(iter_str, "PANEL_ALIVE=0");
const char* pstr = strstr(iter_str, "PANEL_ALIVE=0");
if (pstr != NULL) {
ALOGI("%s: got change event in fb0 with PANEL_ALIVE=0",
__FUNCTION__);
@ -90,7 +90,7 @@ static int getConnectedState(const char* strUdata, int len)
{
const char* iter_str = strUdata;
while(((iter_str - strUdata) <= len) && (*iter_str)) {
char* pstr = strstr(iter_str, "SWITCH_STATE=");
const char* pstr = strstr(iter_str, "SWITCH_STATE=");
if (pstr != NULL) {
return (atoi(pstr + strlen("SWITCH_STATE=")));
}