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

Commit 14c4c042 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Revert "zygote: Allow device to append extra whitelisted paths" 

Affected devices should properly close the files they open in their custom init instead.

This reverts commit 6a95e125.

Change-Id: Id45830ba90f45836e0ac824c130526701abb8d45
parent 72d4dcf8

core/jni/fd_utils-inl-extra.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
// Overload this file in your device specific config if you need

// to add extra whitelisted paths.

// A typical file would look like this:

/*

 * Copyright (C) 2016 The CyanogenMod Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

/*

#define PATH_WHITELIST_EXTRA_H \

    "/proc/apid", \

    "/proc/aprf",

*/

core/jni/fd_utils-inl.h

+0 −5
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 
#include "JNIHelp.h"

#include "ScopedPrimitiveArray.h"



#include <fd_utils-inl-extra.h>



// Whitelist of open paths that the zygote is allowed to keep open.

//

// In addition to the paths listed here, all files ending with
@@ -59,9 +57,6 @@ static const char* kPathWhitelist[] = { 
  "/dev/ion",

  "/dev/dri/renderD129", // Fixes b/31172436

  "/system/framework/org.cyanogenmod.platform-res.apk",

#ifdef PATH_WHITELIST_EXTRA_H

PATH_WHITELIST_EXTRA_H

#endif

};



static const char* kFdPath = "/proc/self/fd";