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

Commit b19da5a9 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents c48013e8 22c9c67a

core/jni/android_view_SurfaceControl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ static jobject nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerHandl 
                                       buffer->getHeight(),

                                       buffer->getPixelFormat(),

                                       (jint)buffer->getUsage(),

                                       (jlong)buffer.get());

                                       (jlong)buffer.get(),

                                       false);

}



static void nativeApplyTransaction(JNIEnv* env, jclass clazz, jlong transactionObj, jboolean sync) {

packages/SystemUI/src/com/android/systemui/qs/tiles/ProfilesTile.java

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ public class ProfilesTile extends QSTileImpl<State> { 


    @Override

    protected void handleClick() {

        if (mKeyguardMonitor.isSecure() && mKeyguardMonitor.isShowing()) {

            mActivityStarter.postQSRunnableDismissingKeyguard(() -> {

                setProfilesEnabled(!profilesEnabled());

            });

            return;

        }

        setProfilesEnabled(!profilesEnabled());

    }