1 files changed, 13 insertions, 3 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/ReviewOngoingUsageFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/ReviewOngoingUsageFragment.java
index 6e3a72715..4273a2fd8 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/ReviewOngoingUsageFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/ReviewOngoingUsageFragment.java
@@ -68,9 +68,19 @@ public class ReviewOngoingUsageFragment extends PreferenceFragmentCompat {
     public static final String VIDEO_CALL = "android:phone_call_camera";
 
     private @Nullable AlertDialog mDialog;
-
     private ReviewOngoingUsageViewModel mViewModel;
 
+    /**
+     * @return A new {@link ReviewOngoingUsageFragment}
+     */
+    public static ReviewOngoingUsageFragment newInstance(long numMillis) {
+        ReviewOngoingUsageFragment fragment = new ReviewOngoingUsageFragment();
+        Bundle arguments = new Bundle();
+        arguments.putLong(Intent.EXTRA_DURATION_MILLIS, numMillis);
+        fragment.setArguments(arguments);
+        return fragment;
+    }
+
     // create new ViewModel in onStart, because viewModel is sometimes persisting after finish()
     // TODO: determine why viewModel is doing this.
     @Override
@@ -88,7 +98,7 @@ public class ReviewOngoingUsageFragment extends PreferenceFragmentCompat {
                 return;
             }
             if (usages == null) {
-                getActivity().finishAfterTransition();
+                getActivity().finish();
                 return;
             }
 
@@ -98,7 +108,7 @@ public class ReviewOngoingUsageFragment extends PreferenceFragmentCompat {
                         .setPositiveButton(R.string.ongoing_usage_dialog_ok, (dialog, which) ->
                                 PermissionControllerStatsLog.write(PRIVACY_INDICATORS_INTERACTED,
                                         PRIVACY_INDICATORS_INTERACTED__TYPE__DIALOG_DISMISS))
-                        .setOnDismissListener((dialog) -> getActivity().finishAfterTransition());
+                        .setOnDismissListener((dialog) -> getActivity().finish());
                 mDialog = builder.create();
                 mDialog.show();
             } else {