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

Commit 310f8da0 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

merge master to master_gl

parents 20f68782 bdbf6b09

NOTICE

+51 −0
Original line number Diff line number Diff line
@@ -220,3 +220,54 @@ the Apache2 License. 


   END OF TERMS AND CONDITIONS







UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE



Unicode Data Files include all data files under the directories

http://www.unicode.org/Public/, http://www.unicode.org/reports/,

and http://www.unicode.org/cldr/data/ . Unicode Software includes any

source code published in the Unicode Standard or under the directories

http://www.unicode.org/Public/, http://www.unicode.org/reports/, and

http://www.unicode.org/cldr/data/.



NOTICE TO USER: Carefully read the following legal agreement. BY

DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA

FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY

ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF

THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY,

DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.



COPYRIGHT AND PERMISSION NOTICE



Copyright © 1991-2008 Unicode, Inc. All rights reserved. Distributed

under the Terms of Use in http://www.unicode.org/copyright.html.



Permission is hereby granted, free of charge, to any person obtaining

a copy of the Unicode data files and any associated documentation (the

"Data Files") or Unicode software and any associated documentation (the

"Software") to deal in the Data Files or Software without restriction,

including without limitation the rights to use, copy, modify, merge,

publish, distribute, and/or sell copies of the Data Files or Software,

and to permit persons to whom the Data Files or Software are furnished to

do so, provided that (a) the above copyright notice(s) and this permission

notice appear with all copies of the Data Files or Software, (b) both the

above copyright notice(s) and this permission notice appear in associated

documentation, and (c) there is clear notice in each modified Data File

or in the Software as well as in the documentation associated with the

Data File(s) or Software that the data or software has been modified.



THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF

ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS

INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT

OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE

OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.



Except as contained in this notice, the name of a copyright holder

shall not be used in advertising or otherwise to promote the sale, use

or other dealings in these Data Files or Software without prior written

authorization of the copyright holder.

camera/libcameraservice/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES:= \

    libui \

    libutils \

    libbinder \

    libcutils \

    libmedia

camera/libcameraservice/CameraHardwareStub.h

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

#include <utils/threads.h>

#include <ui/CameraHardwareInterface.h>

#include <utils/MemoryBase.h>

#include <utils/MemoryHeapBase.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <utils/threads.h>



namespace android {

camera/libcameraservice/CameraService.cpp

+7 −8
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
#define LOG_TAG "CameraService"

#include <utils/Log.h>



#include <utils/IServiceManager.h>

#include <utils/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <binder/IPCThreadState.h>

#include <utils/String16.h>

#include <utils/Errors.h>

#include <utils/MemoryBase.h>

#include <utils/MemoryHeapBase.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <ui/ICameraService.h>



#include <media/mediaplayer.h>
@@ -1052,8 +1052,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) 
}





#if DEBUG_HEAP_LEAKS



#define CHECK_INTERFACE(interface, data, reply) \

        do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \

            LOGW("Call incorrectly routed to " #interface); \
@@ -1085,6 +1083,7 @@ status_t CameraService::onTransact( 


    status_t err = BnCameraService::onTransact(code, data, reply, flags);



#if DEBUG_HEAP_LEAKS

    LOGD("+++ onTransact err %d code %d", err, code);



    if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {
@@ -1120,9 +1119,9 @@ status_t CameraService::onTransact( 
            break;

        }

    }

#endif // DEBUG_HEAP_LEAKS



    return err;

}



#endif // DEBUG_HEAP_LEAKS



}; // namespace android

camera/libcameraservice/CameraService.h

+0 −2
Original line number Diff line number Diff line
@@ -58,10 +58,8 @@ public: 


            void            removeClient(const sp<ICameraClient>& cameraClient);



#if DEBUG_HEAP_LEAKS

    virtual status_t onTransact(

        uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);

#endif



private: