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

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

Merge "ScopedUtfChars: use proper nativehelper headers" 

am: 75c9e4d5

Change-Id: I170b5846981683eacee1081587c7149bab454d91
parents 3f378940 75c9e4d5

cmds/hid/jni/com_android_commands_hid_Device.cpp

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

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <ScopedUtfChars.h>

#include <nativehelper/ScopedUtfChars.h>

#include <utils/Log.h>

#include <utils/Looper.h>

#include <utils/StrongPointer.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"