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

Commit 0ddf0df2 authored by Xin Qi's avatar Xin Qi
Browse files

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

This reverts commit 7abea046455c1c8fc99126ae6cf9a6d4823ca50f.
parent bd4d4e09

core/jni/com_android_internal_app_ActivityTrigger.cpp

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

#include <utils/Log.h>



#define LIBRARY_PATH_PREFIX_OLD	"/system/lib/"

#define LIBRARY_PATH_PREFIX "/vendor/lib/"



namespace android
@@ -67,7 +68,9 @@ 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)

    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)) {

        return;