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

Commit 6fb80b70 authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()" 

* commit '99e23088':
  fix return value scale of notifyANR()
parents 1f440cb0 99e23088

services/core/java/com/android/server/wm/InputMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
                if (timeout >= 0) {

                    // The activity manager declined to abort dispatching.

                    // Wait a bit longer and timeout again later.

                    return timeout;

                    return timeout * 1000000L; // nanoseconds

                }

            } catch (RemoteException ex) {

            }