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

Commit 59d646bc authored by Vince Leung's avatar Vince Leung Committed by Linux Build Service Account
Browse files

frameworks/base: update library path name in Activity Trigger 

Change path from /system/lib to /vendor/lib
since it is no longer needed.

Change-Id: I5fa7a367b21d4128c92ab7190944c176a1f4dae6
(cherry picked from commit 7abea046455c1c8fc99126ae6cf9a6d4823ca50f)
(cherry picked from commit 5aadc3f081bef5b26b13e0bb4955354e3be0bcd7)
(cherry picked from commit 133db12892589a21865a900c3709073ed86eaf8a)
parent 5b1c05d9

core/jni/com_android_internal_app_ActivityTrigger.cpp

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

#include <utils/Log.h>



#define LIBRARY_PATH_PREFIX_OLD	"/system/lib/"

#define LIBRARY_PATH_PREFIX	"/vendor/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;