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

Commit 7e5da5be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed the possibility to report rejected touch events"

parents 51d7925f 1ed5004a

packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -463,4 +463,8 @@ public class DataCollector implements SensorEventListener { 
    public boolean isReportingEnabled() {

    public boolean isReportingEnabled() {

        return mAllowReportRejectedTouch;

        return mAllowReportRejectedTouch;

    }

    }



    public void onFalsingSessionStarted() {

        sessionEntrypoint();

    }

}
 
}

packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -167,6 +167,9 @@ public class FalsingManager implements SensorEventListener { 
        if (mDataCollector.isEnabledFull()) {

        if (mDataCollector.isEnabledFull()) {

            registerSensors(COLLECTOR_SENSORS);

            registerSensors(COLLECTOR_SENSORS);

        }

        }

        if (mDataCollector.isEnabled()) {

            mDataCollector.onFalsingSessionStarted();

        }

    }

    }





    private void registerSensors(int [] sensors) {

    private void registerSensors(int [] sensors) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1704,7 +1704,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if (mReportRejectedTouch == null) {

        if (mReportRejectedTouch == null) {

            return;

            return;

        }

        }

        mReportRejectedTouch.setVisibility(mState == StatusBarState.KEYGUARD

        mReportRejectedTouch.setVisibility(mState == StatusBarState.KEYGUARD && !mDozing

                && mFalsingManager.isReportingEnabled() ? View.VISIBLE : View.INVISIBLE);

                && mFalsingManager.isReportingEnabled() ? View.VISIBLE : View.INVISIBLE);

    }

    }
@@ -4506,6 +4506,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            ((DozeReceiver) mAmbientIndicationContainer).setDozing(mDozing);

            ((DozeReceiver) mAmbientIndicationContainer).setDozing(mDozing);

        }

        }

        updateDozingState();

        updateDozingState();

        updateReportRejectedTouchVisibility();

        Trace.endSection();

        Trace.endSection();

    }

    }