diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2018-06-05 04:58:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-05 04:58:49 -0700 |
| commit | 33ac22827f46ce26b242a26ae2d0bcf2dfeeb968 (patch) | |
| tree | 8ca2b295e7898b46bd18bbef36e848f19522987b /core/java | |
| parent | af92336eedc51f64dc744ca79cf5a2399e4f47c4 (diff) | |
| parent | 6d79f4578377f0aaa34556fb9b45ccff7f809647 (diff) | |
Merge "Crashing can not override Keyguard transit" into pi-dev am: 44121059dc
am: 6d79f45783
Change-Id: I6d4daa349f03891fee1901fb5f5ff96096665f42
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 2090be426753..4d7b73cb7c08 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -278,7 +278,8 @@ public interface WindowManager extends ViewManager { TRANSIT_KEYGUARD_OCCLUDE, TRANSIT_KEYGUARD_UNOCCLUDE, TRANSIT_TRANSLUCENT_ACTIVITY_OPEN, - TRANSIT_TRANSLUCENT_ACTIVITY_CLOSE + TRANSIT_TRANSLUCENT_ACTIVITY_CLOSE, + TRANSIT_CRASHING_ACTIVITY_CLOSE }) @Retention(RetentionPolicy.SOURCE) @interface TransitionType {} |