Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 7c24739c48 am: 43f77e46d3

Change-Id: I6b787056c585403e9740defce01c35039424a32b
2020-04-29 23:48:36 +00:00
parent 54e4624133 43f77e46d3
commit 4b2b93ed5d
2 changed files with 1 additions and 17 deletions
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -200,20 +200,6 @@ public class NotificationHistoryActivity extends Activity {
        super.onDestroy();
    }

-    @Override
-    public void onBackPressed() {
-        handleBackPressed();
-    }
-
-    private void handleBackPressed() {
-        if (getFragmentManager().getBackStackEntryCount() > 1) {
-            super.onBackPressed();
-        } else {
-            startActivity(new Intent(Settings.ACTION_NOTIFICATION_SETTINGS));
-            finish();
-        }
-    }
-
    private void bindSwitch() {
        if (mSwitchBar != null) {
            mSwitchBar.setSwitchBarText(R.string.notification_history_toggle,