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

Commit b36560f3 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Mass merge from gingerbread - do not merge 

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
parents ce94d2db e2acfbeb

NOTICE

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ the Apache2 License. 


Media Codecs

These files are Copyright 1998 - 2009 PacketVideo, but released under

the Apache2 License.



   =========================================================================

   ==  NOTICE file corresponding to the section 4 d of                    ==

   ==  the Apache License, Version 2.0,                                   ==

   ==  in this case for Additional Codecs code.                           ==

   =========================================================================



Additional Codecs

These files are Copyright 2003-2010 VisualOn, but released under

the Apache2 License.



   =========================================================================

libs/surfaceflinger_client/ISurfaceComposer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -266,13 +266,13 @@ status_t BnSurfaceComposer::onTransact( 
            int32_t mode = data.readInt32();

            status_t res = turnElectronBeamOff(mode);

            reply->writeInt32(res);

        }

        } break;

        case TURN_ELECTRON_BEAM_ON: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            int32_t mode = data.readInt32();

            status_t res = turnElectronBeamOn(mode);

            reply->writeInt32(res);

        }

        } break;

        default:

            return BBinder::onTransact(code, data, reply, flags);

    }