Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
  fix return value scale of notifyANR()
This commit is contained in:
Michael Wright
2015-04-15 11:10:58 +00:00
committed by Android Git Automerger
parent 895f3c2726 150e0e87e1
commit 99e2308884
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -148,7 +148,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
if (timeout >= 0) { if (timeout >= 0) {
// The activity manager declined to abort dispatching. // The activity manager declined to abort dispatching.
// Wait a bit longer and timeout again later. // Wait a bit longer and timeout again later.
return timeout; return timeout * 1000000L; // nanoseconds
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
} }