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

Commit ad5740a7 authored by Bryce Lee's avatar Bryce Lee
Browse files

Revert "Marshal dream overlay connection logic with Handler." 

This reverts commit c34a64d0.

Reason for revert: Found root cause which is not a threading issue as
addressed here.

Change-Id: I88f36641357e9a9bc350e74b70078db0d289972d
parent c34a64d0

core/java/android/service/dreams/DreamService.java

+23 −35
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ public class DreamService extends Service implements Window.Callback { 
        // A Queue of pending requests to execute on the overlay.

        private final ArrayDeque<Consumer<IDreamOverlay>> mRequests;



        private Handler mHandler = new Handler(Looper.getMainLooper());



        private boolean mBound;



        OverlayConnection() {
@@ -261,7 +259,6 @@ public class DreamService extends Service implements Window.Callback { 


        public void bind(Context context, @Nullable ComponentName overlayService,

                ComponentName dreamService) {

            mHandler.post(() -> {

            if (overlayService == null) {

                return;

            }
@@ -276,25 +273,20 @@ public class DreamService extends Service implements Window.Callback { 
            context.bindService(overlayIntent,

                    this, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE);

            mBound = true;

            });

        }



        public void unbind(Context context) {

            mHandler.post(() -> {

            if (!mBound) {

                return;

            }



            context.unbindService(this);

            mBound = false;

            });

        }



        public void request(Consumer<IDreamOverlay> request) {

            mHandler.post(() -> {

            mRequests.push(request);

            evaluate();

            });

        }



        private void evaluate() {
@@ -312,19 +304,15 @@ public class DreamService extends Service implements Window.Callback { 


        @Override

        public void onServiceConnected(ComponentName name, IBinder service) {

            mHandler.post(() -> {

            // Store Overlay and execute pending requests.

            mOverlay = IDreamOverlay.Stub.asInterface(service);

            evaluate();

            });

        }



        @Override

        public void onServiceDisconnected(ComponentName name) {

            mHandler.post(() -> {

            // Clear Overlay binder to prevent further request processing.

            mOverlay = null;

            });

        }

    }