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

Commit 3ca7a67e authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 15d62b81 on remote branch 

Change-Id: I5aeb1407931c2708c4759c471c45e596c8ef4f82
parents 93ee5ab0 15d62b81

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/backup/IRestoreObserver.aidl \

	core/java/android/app/backup/IRestoreSession.aidl \

	core/java/android/bluetooth/IBluetooth.aidl \

	core/java/android/bluetooth/IQBluetooth.aidl \

	core/java/android/bluetooth/IBluetoothA2dp.aidl \

	core/java/android/bluetooth/IBluetoothCallback.aidl \

	core/java/android/bluetooth/IQBluetoothAdapterCallback.aidl \

	core/java/android/bluetooth/IBluetoothHeadset.aidl \

	core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \

	core/java/android/bluetooth/IBluetoothHealth.aidl \
@@ -94,6 +96,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothPan.aidl \

	core/java/android/bluetooth/IBluetoothManager.aidl \

	core/java/android/bluetooth/IBluetoothManagerCallback.aidl \

	core/java/android/bluetooth/IQBluetoothManagerCallback.aidl \

	core/java/android/bluetooth/IBluetoothPbap.aidl \

	core/java/android/bluetooth/IBluetoothMap.aidl \

	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
@@ -391,6 +394,7 @@ aidl_files := \ 
	frameworks/base/core/java/com/android/internal/view/IInputMethodClient.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodManager.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodSession.aidl \

        frameworks/base/core/java/android/bluetooth/BluetoothLEServiceUuid.aidl  \

	frameworks/base/graphics/java/android/graphics/Bitmap.aidl \

	frameworks/base/graphics/java/android/graphics/Rect.aidl \

	frameworks/base/graphics/java/android/graphics/Region.aidl \

cmds/bootanimation/BootAnimation.cpp

+12 −0
Original line number Diff line number Diff line
@@ -223,6 +223,18 @@ status_t BootAnimation::readyToRun() { 
    status_t status = SurfaceComposerClient::getDisplayInfo(dtoken, &dinfo);

    if (status)

        return -1;

    char value[PROPERTY_VALUE_MAX];

    property_get("persist.panel.orientation", value, "0");

    int orient = atoi(value) / 90;



    if(orient == eOrientation90 || orient == eOrientation270) {

        int temp = dinfo.h;

        dinfo.h = dinfo.w;

        dinfo.w = temp;

    }



    Rect destRect(dinfo.w, dinfo.h);

    mSession->setDisplayProjection(dtoken, orient, destRect, destRect);



    // create the native surface

    sp<SurfaceControl> control = session()->createSurface(String8("BootAnimation"),

cmds/bootanimation/BootAnimation.h

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ class SurfaceControl; 
class BootAnimation : public Thread, public IBinder::DeathRecipient

{

public:

    enum {

        eOrientationDefault     = 0,

        eOrientation90          = 1,

        eOrientation180         = 2,

        eOrientation270         = 3,

    };

                BootAnimation();

    virtual     ~BootAnimation();

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED, // OP_NEIGHBORING_CELLS

            AppOpsManager.MODE_ALLOWED, // OP_CALL_PHONE

            AppOpsManager.MODE_ALLOWED, // OP_READ_SMS

            AppOpsManager.MODE_IGNORED, // OP_WRITE_SMS

            AppOpsManager.MODE_ALLOWED, // OP_WRITE_SMS

            AppOpsManager.MODE_ALLOWED, // OP_RECEIVE_SMS

            AppOpsManager.MODE_ALLOWED, // OP_RECEIVE_EMERGECY_SMS

            AppOpsManager.MODE_ALLOWED, // OP_RECEIVE_MMS

core/java/android/bluetooth/BluetoothLEServiceUuid.aidl

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

 *   * Redistributions of source code must retain the above copyright

 *     notice, this list of conditions and the following disclaimer.

 *   * Redistributions in binary form must reproduce the above

 *     copyright notice, this list of conditions and the following

 *     disclaimer in the documentation and/or other materials provided

 *     with the distribution.

 *   * Neither the name of The Linux Foundation nor the names of its

 *     contributors may be used to endorse or promote products derived

 *     from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



package android.bluetooth;

parcelable BluetoothLEServiceUuid;