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

Commit 4e753e08 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "frameworks/base refactoring."

parents e8585b17 b13b9bda

cmds/backup/backup.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <utils/BackupHelpers.h>

#include <androidfw/BackupHelpers.h>

#include <utils/String8.h>



#include <fcntl.h>

cmds/bootanimation/BootAnimation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ 


#include <cutils/properties.h>



#include <androidfw/AssetManager.h>

#include <binder/IPCThreadState.h>

#include <utils/threads.h>

#include <utils/Atomic.h>

#include <utils/Errors.h>

#include <utils/Log.h>

#include <utils/AssetManager.h>

#include <utils/threads.h>



#include <ui/PixelFormat.h>

#include <ui/Rect.h>

cmds/bootanimation/BootAnimation.h

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <stdint.h>

#include <sys/types.h>



#include <androidfw/AssetManager.h>

#include <utils/threads.h>

#include <utils/AssetManager.h>



#include <surfaceflinger/ISurfaceComposer.h>

#include <surfaceflinger/SurfaceComposerClient.h>

core/jni/android/graphics/BitmapFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#include "JNIHelp.h"



#include <android_runtime/AndroidRuntime.h>

#include <utils/Asset.h>

#include <utils/ResourceTypes.h>

#include <androidfw/Asset.h>

#include <androidfw/ResourceTypes.h>

#include <netinet/in.h>

#include <sys/mman.h>

#include <sys/stat.h>

core/jni/android/graphics/BitmapRegionDecoder.cpp

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


#include <binder/Parcel.h>

#include <jni.h>

#include <utils/Asset.h>

#include <androidfw/Asset.h>

#include <sys/stat.h>



#if 0