From 0e01ea41b215941128a4ea8dee454e6b35a4e798 Mon Sep 17 00:00:00 2001
From: Bjorn Bringert <bringert@android.com>
Date: Wed, 8 Jul 2009 22:01:29 +0100
Subject: [PATCH] Deprecate DialogInterface methods in SearchManager

android.app.SearchManager implements
DialogInterface.OnDismissListener and DialogInterface.OnCancelListener
and thus exposes the methods onCancel(DialogInterface dialog) and
onDismiss(DialogInterface dialog). This was used by the SearchManager
to register itself as a listener on the search dialog, but is no
longer used.

This was an implementation detail that leaked into the public
API. Removing them would change the API, so they are deprecated instead.

Fixes http://b/issue?id=1962203
---
 api/current.xml                          | 4 ++--
 core/java/android/app/SearchManager.java | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 7df41159bc53d..aee5138cf5416 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -23622,7 +23622,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 <parameter name="dialog" type="android.content.DialogInterface">
@@ -23635,7 +23635,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 <parameter name="dialog" type="android.content.DialogInterface">
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 5d25f10e34017..0291882b8a4e1 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -1719,11 +1719,16 @@ public class SearchManager
 
     }
 
-    // TODO: remove the DialogInterface interfaces from SearchManager.
-    // This changes the public API, so I'll do it in a separate change.
+    /**
+     * @deprecated This method is an obsolete internal implementation detail. Do not use.
+     */
     public void onCancel(DialogInterface dialog) {
         throw new UnsupportedOperationException();
     }
+
+    /**
+     * @deprecated This method is an obsolete internal implementation detail. Do not use.
+     */
     public void onDismiss(DialogInterface dialog) {
         throw new UnsupportedOperationException();
     }