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

Commit 350b0ed1 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp 

am: 1e8d712b

Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a
parents ad7e4914 1e8d712b

cmds/hid/jni/com_android_commands_hid_Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <jni.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <ScopedUtfChars.h>

#include <nativehelper/ScopedUtfChars.h>

#include <android/looper.h>

#include <android/log.h>

media/jni/android_media_MediaRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <media/stagefright/PersistentSurface.h>

#include <utils/threads.h>



#include <ScopedUtfChars.h>

#include <nativehelper/ScopedUtfChars.h>



#include "jni.h"

#include "JNIHelp.h"