Merge "Include what you use: <fcntl.h>" am: 6ed4be3ab4 (7d0c3abc) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+6 −4

Original line number	Diff line number	Diff line
		#define LOG_TAG "BitmapFactory"

		#include <fcntl.h>
		#include <netinet/in.h>
		#include <stdio.h>
		#include <sys/mman.h>
		#include <sys/stat.h>

		#include "BitmapFactory.h"
		#include "CreateJavaOutputStreamAdaptor.h"
		#include "GraphicsJNI.h"
		@@ -21,10 +27,6 @@
		#include <androidfw/ResourceTypes.h>
		#include <cutils/compiler.h>
		#include <memory>
		#include <netinet/in.h>
		#include <stdio.h>
		#include <sys/mman.h>
		#include <sys/stat.h>

		jfieldID gOptions_justBoundsFieldID;
		jfieldID gOptions_sampleSizeFieldID;

+3 −1

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

		#include <fcntl.h>
		#include <sys/stat.h>

		#include "Bitmap.h"
		#include "BitmapFactory.h"
		#include "ByteBufferStreamAdaptor.h"
		@@ -33,7 +36,6 @@

		#include <androidfw/Asset.h>
		#include <jni.h>
		#include <sys/stat.h>

		using namespace android;

+4 −1

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

		#define LOG_TAG "SELinuxJNI"

		#include <fcntl.h>
		#include <errno.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>

+1 −0

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

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

+2 −0

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

		#include <fcntl.h>

		#include <nativehelper/ScopedUtfChars.h>
		#include "jni.h"