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

Commit d4b2ec8f 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 library path name in Activity Trigger""

parents 591a4001 0ddf0df2

core/jni/com_android_internal_app_ActivityTrigger.cpp

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

#include <cutils/properties.h>

#include <utils/Log.h>

#include <utils/Log.h>





#define LIBRARY_PATH_PREFIX_OLD	"/system/lib/"

#define LIBRARY_PATH_PREFIX "/vendor/lib/"

#define LIBRARY_PATH_PREFIX "/vendor/lib/"





namespace android

namespace android
@@ -67,7 +68,9 @@ com_android_internal_app_ActivityTrigger_native_at_init() 




    /* Sanity check - ensure */

    /* Sanity check - ensure */

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

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

    if ((strncmp(buf, LIBRARY_PATH_PREFIX, sizeof(LIBRARY_PATH_PREFIX) - 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))

        ||

        ||

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

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

        return;

        return;