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

Commit c0b275d9 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Unbreak merge failures 

Change-Id: Ifc0141f1d594e1f5e04ee8532c985e6b3d480fb3
parent 932be7c6

data/etc/platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 


    <permission name="android.permission.LOOP_RADIO" >

        <group gid="loop_radio" />

    </permission>



    <!-- Permissions to read DRM-protected theme resources. -->

    <permission name="com.tmobile.permission.ACCESS_DRM_THEME" >

libs/hwui/OpenGLRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ void OpenGLRenderer::setupFrameState(float left, float top, 
    mSaveCount = 1;



    mSnapshot->setClip(left, top, right, bottom);

    mTilingClip.set(left, top, right, bottom);

}



status_t OpenGLRenderer::startFrame() {

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
            mCameraDisabled = dpm.getCameraDisabled(null);

        }



        cleanupAppWidgetIds();

        mSafeModeEnabled = LockPatternUtils.isSafeModeEnabled();



        // These need to be created with the user context...