summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-03-01 19:11:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-03-01 19:11:22 +0000
commit1e121b25b51f41c082ed49024d65dfcb45576bcf (patch)
treedf95f466f5190440e6b84e09de6588a5d3c5027c
parent195bbc6d5e4e01000eed1ab80a0b7c146c1062ac (diff)
parentb6c47cd1b443abcfcf4849a0209d4c729589ff67 (diff)
Merge "Pinned animation: Avoid expensive defensive programming."
-rw-r--r--services/core/java/com/android/server/wm/TaskStack.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 34e99a6e64c5..b79ea71f3619 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -1425,16 +1425,6 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
}
public boolean setPinnedStackSize(Rect bounds, Rect tempTaskBounds) {
- synchronized (mService.mWindowMap) {
- if (mDisplayContent == null) {
- return false;
- }
- if (mStackId != PINNED_STACK_ID) {
- Slog.w(TAG_WM, "Attempt to use pinned stack resize animation helper on"
- + "non pinned stack");
- return false;
- }
- }
try {
mService.mActivityManager.resizePinnedStack(bounds, tempTaskBounds);
} catch (RemoteException e) {