Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ScopedUtfChars: use proper nativehelper headers"

Browse Source 
am: 75c9e4d594

Change-Id: I170b5846981683eacee1081587c7149bab454d91
This commit is contained in:
Steven Moreland
2017-08-11 21:07:06 +00:00
committed by android-build-merger
parent 3f378940c2 75c9e4d594
commit e04a0bf5c7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/hid/jni/com_android_commands_hid_Device.cpp
View File

@@ -33,7 +33,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 <utils/Log.h> #include <utils/Log.h>
#include <utils/Looper.h> #include <utils/Looper.h>
#include <utils/StrongPointer.h> #include <utils/StrongPointer.h>

2
media/jni/android_media_MediaRecorder.cpp
View File

@@ -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"