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

am 1e90ab54: merge from open-source master

Browse Source 
Merge commit '1e90ab542d675616e9370ab7e5add99d7af12587'

* commit '1e90ab542d675616e9370ab7e5add99d7af12587':
  Fixs the incorrect message for SecurityException
  Default RotateDrawable's pivot set to (50%, 50%)
This commit is contained in:
The Android Open Source Project
2010-02-11 11:20:40 -08:00
committed by Android Git Automerger
parent 777db0c08a 1e90ab542d
commit 3941411a21
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/WindowManagerService.java
View File

@@ -5355,7 +5355,7 @@ public class WindowManagerService extends IWindowManager.Stub
switch (result) {
case INJECT_NO_PERMISSION:
throw new SecurityException(
"Injecting to another application requires INJECT_EVENT permission");
"Injecting to another application requires INJECT_EVENTS permission");
case INJECT_SUCCEEDED:
return true;
}
@@ -5383,7 +5383,7 @@ public class WindowManagerService extends IWindowManager.Stub
switch (result) {
case INJECT_NO_PERMISSION:
throw new SecurityException(
"Injecting to another application requires INJECT_EVENT permission");
"Injecting to another application requires INJECT_EVENTS permission");
case INJECT_SUCCEEDED:
return true;
}
@@ -5411,7 +5411,7 @@ public class WindowManagerService extends IWindowManager.Stub
switch (result) {
case INJECT_NO_PERMISSION:
throw new SecurityException(
"Injecting to another application requires INJECT_EVENT permission");
"Injecting to another application requires INJECT_EVENTS permission");
case INJECT_SUCCEEDED:
return true;
}