diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2018-06-05 04:46:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-05 04:46:46 -0700 |
| commit | 6d79f4578377f0aaa34556fb9b45ccff7f809647 (patch) | |
| tree | 0b69884e521c6263a94a6af231b793fe49af4f18 /core/java/android | |
| parent | 32ea362e1169132313f5eef190377c6cee37c73e (diff) | |
| parent | 44121059dce0713c4dd82fbd3c04ab9051eb0cdc (diff) | |
Merge "Crashing can not override Keyguard transit" into pi-dev
am: 44121059dc
Change-Id: Ieb020e920e1417d501f12bf7b5c2c57437685d9c
Diffstat (limited to 'core/java/android')
| -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 37aca260c937..fc34a25cabc9 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 {} |