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

Commit fb67d41a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24761638',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24761638', 'googleplex-android-review.googlesource.com/25104249'] into udc-qpr1-release.

Change-Id: Ibeb1c29d07194732bf7f2494c3a3e988aa1cb524
parents e38d01f4 022c18e4

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+8 −0
Original line number Diff line number Diff line
@@ -388,11 +388,19 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
    @Override

    public void onMotionEvent(MotionEvent transformedEvent, MotionEvent rawEvent,

            int policyFlags) {

        if (!mInstalled) {

            Slog.w(TAG, "onMotionEvent called before input filter installed!");

            return;

        }

        sendInputEvent(transformedEvent, policyFlags);

    }



    @Override

    public void onKeyEvent(KeyEvent event, int policyFlags) {

        if (!mInstalled) {

            Slog.w(TAG, "onKeyEvent called before input filter installed!");

            return;

        }

        sendInputEvent(event, policyFlags);

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    static final int PROC_START_TIMEOUT = 10 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;















    // How long we wait for a launched process to complete its app startup before we ANR.













    static final int BIND_APPLICATION_TIMEOUT = 10 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;













    static final int BIND_APPLICATION_TIMEOUT = 20 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;





























    // How long we wait to kill an application zygote, after the last process using















    // it has gone away.