am 0e01ea41: Deprecate DialogInterface methods in SearchManager

Merge commit '0e01ea41b215941128a4ea8dee454e6b35a4e798'

* commit '0e01ea41b215941128a4ea8dee454e6b35a4e798':
  Deprecate DialogInterface methods in SearchManager

api/current.xml

@@ -25846,7 +25846,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 <parameter name="dialog" type="android.content.DialogInterface">
@@ -25859,7 +25859,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 <parameter name="dialog" type="android.content.DialogInterface">

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();
     }