diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-01-12 22:22:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-12 22:22:05 +0000 |
| commit | 00c8565614d3555e723ff3d8dad3af92d69d81ea (patch) | |
| tree | 6d3e8aa66f85d174272eefdd21e3837ca9c13c29 /policy/src | |
| parent | e3c10bf96c93672831a1126dea66b81eb52f7a43 (diff) | |
| parent | 42b0d10a83dae285a3d3af9911aa35a90db203d0 (diff) | |
| download | frameworks_base-00c8565614d3555e723ff3d8dad3af92d69d81ea.zip frameworks_base-00c8565614d3555e723ff3d8dad3af92d69d81ea.tar.gz frameworks_base-00c8565614d3555e723ff3d8dad3af92d69d81ea.tar.bz2 | |
am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev
* commit '42b0d10a83dae285a3d3af9911aa35a90db203d0':
Don't allow windows with invalid types to be added.
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index f8c630e..7124e5b 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1641,8 +1641,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { outAppOp[0] = AppOpsManager.OP_NONE; - if (type < WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW - || type > WindowManager.LayoutParams.LAST_SYSTEM_WINDOW) { + if (!((type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW) + || (type >= FIRST_SUB_WINDOW && type <= LAST_SUB_WINDOW) + || (type >= FIRST_SYSTEM_WINDOW && type <= LAST_SYSTEM_WINDOW))) { + return WindowManagerGlobal.ADD_INVALID_TYPE; + } + + if (type < FIRST_SYSTEM_WINDOW || type > LAST_SYSTEM_WINDOW) { + // Window manager will make sure these are okay. return WindowManagerGlobal.ADD_OKAY; } String permission = null; |