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

Commit 6d9c75d8 authored by Kyrylo Mikos's avatar Kyrylo Mikos
Browse files

PieService: fix possible race condition. 

onPieActivation declared as a oneway function (call to it will not
block code execution). If client calls back to gainTouchFocus or
restoreListenerState very quickly then race condtiion happens
and mActive might be false in gainTouchFocus/restoreListenerState.

Set mActive before calling onPieActivation to avoid race condition and
drop the flag if exception happens.

Change-Id: Ied12b7dcbdc1bae2ba0c9fd4e5fa04169e8b2d22
parent 02f73a57

services/java/com/android/server/pie/PieService.java

+2 −1
Original line number Diff line number Diff line
@@ -103,10 +103,11 @@ public class PieService extends IPieService.Stub { 
        private boolean notifyPieActivation(int touchX, int touchY, PiePosition position) {

            if ((positions & position.FLAG) != 0) {

                try {

                    listener.onPieActivation(touchX, touchY, position.INDEX, 0);

                    mActive = true;

                    listener.onPieActivation(touchX, touchY, position.INDEX, 0);

                } catch (RemoteException e) {

                    Slog.w(TAG, "Failed to notify process, assuming it died.", e);

                    mActive = false;

                    binderDied();

                }

            }