From f60a4af04779174b39b7d3d277de88ed1204d024 Mon Sep 17 00:00:00 2001 From: Winson Date: Sat, 21 May 2016 10:39:53 -0700 Subject: [PATCH] Catching all exceptions when docking. - Catch all exceptions thrown when docking an activity (similar to when we start an activity) to allow us to gracefully handle the failure and animate the task back into the stack. Bug: 28867188 Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e --- .../src/com/android/systemui/recents/misc/SystemServicesProxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index 64f83a938928..1a944ce71796 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -417,8 +417,8 @@ public class SystemServicesProxy { options.setLaunchStackId(DOCKED_STACK_ID); mIam.startActivityFromRecents(taskId, options.toBundle()); return true; - } catch (RemoteException | IllegalArgumentException e) { - e.printStackTrace(); + } catch (Exception e) { + Log.e(TAG, "Failed to dock task: " + taskId + " with createMode: " + createMode, e); } return false; } -- 2.11.0