commit dac8c28bde28df4454c79418354056099844fda7
author Tony Mantler <nicoya@google.com> Thu Sep 01 13:35:49 2016 -0700
committer Tony Mantler <nicoya@google.com> Thu Sep 01 13:50:24 2016 -0700
tree d8e284c94c287765a9b57d4739c26f110b444489
parent 99d44bfb6b0a3481e85f3f28841ff990edf03c67

Make cancel button kill the activity

b/31019574

Change-Id: I27c7417a0bfec5ad5a9e9247f6ea8ff6c3131361

Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java

diff --git a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
index 1214a13..0e63a49 100644
--- a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
@@ -185,7 +185,9 @@
             final long id = action.getId();
 
             if (id == GuidedAction.ACTION_ID_CANCEL) {
-                getFragmentManager().popBackStack();
+                if (!getFragmentManager().popBackStackImmediate()) {
+                    getActivity().finish();
+                }
             } else if (id == ACTION_ID_UNMOUNT) {
                 ((UnmountActivity) getActivity()).onRequestUnmount();
             }