Merge "resolve merge conflicts of 7d0c3abcf40152af6529b26a91c04428bf066ade to... (c11ada4e) · Commits · e / os / android_frameworks_base

core/jni/android_os_SELinux.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,10 @@
		*/

		#define LOG_TAG "SELinuxJNI"

		#include <errno.h>
		#include <fcntl.h>

		#include <utils/Log.h>

		#include <nativehelper/JNIHelp.h>
		@@ -22,7 +26,6 @@
		#include "core_jni_helpers.h"
		#include "selinux/selinux.h"
		#include "selinux/android.h"
		#include <errno.h>
		#include <memory>
		#include <atomic>
		#include <nativehelper/ScopedLocalRef.h>

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@
		* limitations under the License.
		*/

		#include <fcntl.h>
		#include <sys/mman.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <sys/types.h>
		#include <unistd.h>

		#include <algorithm>

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		#include <jni.h>

		#include <fcntl.h>
		#include <unistd.h>

		#include <android/sharedmem.h>
		#include <android/sharedmem_jni.h>
		#include <cutils/ashmem.h>
		@@ -23,7 +26,6 @@
		#include <utils/Errors.h>

		#include <mutex>
		#include <unistd.h>

		static struct {
		jclass clazz;