Merge "Introduce new URI to clear data usage information"

Author: Makoto Onuki

api/current.txt

@@ -16944,6 +16944,7 @@ package android.provider {
 
   public static final class ContactsContract.DataUsageFeedback {
     ctor public ContactsContract.DataUsageFeedback();
+    field public static final android.net.Uri DELETE_USAGE_URI;
     field public static final android.net.Uri FEEDBACK_URI;
     field public static final java.lang.String USAGE_TYPE = "type";
     field public static final java.lang.String USAGE_TYPE_CALL = "call";

core/java/android/provider/ContactsContract.java

@@ -7504,7 +7504,7 @@ private ProviderStatus() {
      * <p>
      * Applications can also clear all usage information with:
      * <pre>
-     * boolean successful = resolver.delete(DataUsageFeedback.FEEDBACK_URI, null, null) > 0;
+     * boolean successful = resolver.delete(DataUsageFeedback.DELETE_USAGE_URI, null, null) > 0;
      * </pre>
      * </p>
      */
@@ -7517,6 +7517,14 @@ public static final class DataUsageFeedback {
         public static final Uri FEEDBACK_URI =
                 Uri.withAppendedPath(Data.CONTENT_URI, "usagefeedback");
 
+        /**
+         * The content:// style URI for deleting all usage information.
+         * Must be used with {@link ContentResolver#delete(Uri, String, String[])}.
+         * The {@code where} and {@code selectionArgs} parameters are ignored.
+         */
+        public static final Uri DELETE_USAGE_URI =
+                Uri.withAppendedPath(Contacts.CONTENT_URI, "delete_usage");
+
         /**
          * <p>
          * Name for query parameter specifying the type of data usage.