Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf3ae38 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "frameworks/base: update perflock path name in Activity Trigger""

parents d4b2ec8f 829bf7ce

core/jni/com_android_internal_app_ActivityTrigger.cpp

+2 −5
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
#include <cutils/properties.h>

#include <utils/Log.h>



#define LIBRARY_PATH_PREFIX_OLD	"/system/lib/"

#define LIBRARY_PATH_PREFIX "/vendor/lib/"

#define LIBRARY_PATH_PREFIX	"/system/lib/"



namespace android

{
@@ -68,9 +67,7 @@ com_android_internal_app_ActivityTrigger_native_at_init() 


    /* Sanity check - ensure */

    buf[PROPERTY_VALUE_MAX-1] = '\0';

    if (((strncmp(buf, LIBRARY_PATH_PREFIX, sizeof(LIBRARY_PATH_PREFIX) - 1) != 0)

	&&

	(strncmp(buf, LIBRARY_PATH_PREFIX_OLD, sizeof(LIBRARY_PATH_PREFIX_OLD) - 1) != 0))

    if ((strncmp(buf, LIBRARY_PATH_PREFIX, sizeof(LIBRARY_PATH_PREFIX) - 1) != 0)

        ||

        (strstr(buf, "..") != NULL)) {

        return;