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

Commit 1e8d712b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents f4f815c2 65e2ca28

cmds/hid/jni/com_android_commands_hid_Device.cpp

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

#include <jni.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <ScopedUtfChars.h>

#include <nativehelper/ScopedUtfChars.h>

#include <android/looper.h>

#include <android/looper.h>

#include <android/log.h>

#include <android/log.h>

media/jni/android_media_MediaRecorder.cpp

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

#include <media/stagefright/PersistentSurface.h>

#include <utils/threads.h>

#include <utils/threads.h>





#include <ScopedUtfChars.h>

#include <nativehelper/ScopedUtfChars.h>





#include "jni.h"

#include "jni.h"

#include "JNIHelp.h"

#include "JNIHelp.h"