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

Commit d544f659 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "android_os_SELinux : Use empty array to instead of NULL to avoid the... 

Merge "android_os_SELinux : Use empty array to instead of NULL to avoid the DevicePolicyManagerService cannot start when the SELinux is disabled." into cm-10.1
parents 68a1c87c a7ff8525

core/jni/android_os_SELinux.cpp

+9 −11
Original line number Diff line number Diff line
@@ -335,19 +335,20 @@ namespace android { 
   * Exceptions: None

   */

  static jobjectArray getBooleanNames(JNIEnv *env, JNIEnv clazz) {

#ifdef HAVE_SELINUX

    if (isSELinuxDisabled)

      return NULL;

    jclass stringClass = env->FindClass("java/lang/String");

    jobjectArray stringArray = env->NewObjectArray(0, stringClass, NULL);



#ifdef HAVE_SELINUX

    char **list;

    int i, len, ret;

    jclass stringClass;

    jobjectArray stringArray = NULL;



    if (isSELinuxDisabled)

      return stringArray;



    if (security_get_boolean_names(&list, &len) == -1)

      return NULL;

      return stringArray;



    stringClass = env->FindClass("java/lang/String");

    env->DeleteLocalRef(stringArray);

    stringArray = env->NewObjectArray(len, stringClass, env->NewStringUTF(""));

    for (i = 0; i < len; i++) {

      jstring obj;
@@ -357,11 +358,8 @@ namespace android { 
      free(list[i]);

    }

    free(list);



    return stringArray;

#else

    return NULL;

#endif

    return stringArray;

  }



  /*