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

Commit 4a7571bc authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "frameworks/base refactoring."

parents 6917e655 b93a03f8

core/jni/android_app_NativeActivity.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <android_runtime/android_util_AssetManager.h>

#include <surfaceflinger/Surface.h>

#include <ui/egl/android_natives.h>

#include <ui/InputTransport.h>

#include <androidfw/InputTransport.h>

#include <utils/Looper.h>



#include "JNIHelp.h"

core/jni/android_bluetooth_BluetoothAudioGateway.cpp

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

core/jni/android_bluetooth_c.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

core/jni/android_view_InputChannel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android_runtime/AndroidRuntime.h>

#include <binder/Parcel.h>

#include <utils/Log.h>

#include <ui/InputTransport.h>

#include <androidfw/InputTransport.h>

#include "android_view_InputChannel.h"

#include "android_util_Binder.h"

core/jni/android_view_InputChannel.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "jni.h"



#include <ui/InputTransport.h>

#include <androidfw/InputTransport.h>



namespace android {