From f66c4d611b64b72489216c5a34d1f850106e5ed5 Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Mon, 28 Mar 2022 05:24:25 +0000
Subject: [PATCH] Deprecate Activity#onBackPressed and Dialog#onBackPressed.

Test: m -j update-api
Bug: 195946584
Change-Id: I680884520074751e1c5fd0c7bd906a5f11f30236
---
 core/api/current.txt                | 5 +++--
 core/java/android/app/Activity.java | 4 ++++
 core/java/android/app/Dialog.java   | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 317d46ea1b84b..46c45f0de7258 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -4159,7 +4159,7 @@ package android.app {
     method protected void onActivityResult(int, int, android.content.Intent);
     method @Deprecated public void onAttachFragment(android.app.Fragment);
     method public void onAttachedToWindow();
-    method public void onBackPressed();
+    method @Deprecated public void onBackPressed();
     method protected void onChildTitleChanged(android.app.Activity, CharSequence);
     method public void onConfigurationChanged(@NonNull android.content.res.Configuration);
     method public void onContentChanged();
@@ -5051,7 +5051,7 @@ package android.app {
     method @CallSuper public void onActionModeFinished(android.view.ActionMode);
     method @CallSuper public void onActionModeStarted(android.view.ActionMode);
     method public void onAttachedToWindow();
-    method public void onBackPressed();
+    method @Deprecated public void onBackPressed();
     method public void onContentChanged();
     method public boolean onContextItemSelected(@NonNull android.view.MenuItem);
     method public void onContextMenuClosed(@NonNull android.view.Menu);
@@ -32947,6 +32947,7 @@ package android.preference {
     method @Deprecated public boolean isMultiPane();
     method @Deprecated protected boolean isValidFragment(String);
     method @Deprecated public void loadHeadersFromResource(@XmlRes int, java.util.List<android.preference.PreferenceActivity.Header>);
+    method @Deprecated public void onBackPressed();
     method @Deprecated public void onBuildHeaders(java.util.List<android.preference.PreferenceActivity.Header>);
     method @Deprecated public android.content.Intent onBuildStartFragmentIntent(String, android.os.Bundle, @StringRes int, int);
     method @Deprecated public android.preference.PreferenceActivity.Header onGetInitialHeader();
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index a28b3e9fc5457..27381790dc38b 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -3938,7 +3938,11 @@ public class Activity extends ContextThemeWrapper
      * </ul>
      *
      * @see #moveTaskToBack(boolean)
+     *
+     * @deprecated Use {@link OnBackInvokedCallback} or
+     * {@code androidx.activity.OnBackPressedCallback} to handle back navigation instead.
      */
+    @Deprecated
     public void onBackPressed() {
         if (mActionBar != null && mActionBar.collapseActionView()) {
             return;
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index a763b1464b6de..72c7fe4c5b403 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -726,7 +726,11 @@ public class Dialog implements DialogInterface, Window.Callback,
      * Called when the dialog has detected the user's press of the back
      * key.  The default implementation simply cancels the dialog (only if
      * it is cancelable), but you can override this to do whatever you want.
+     *
+     * @deprecated Use {@link OnBackInvokedCallback} or
+     * {@code androidx.activity.OnBackPressedCallback} to handle back navigation instead.
      */
+    @Deprecated
     public void onBackPressed() {
         if (mCancelable) {
             cancel();