Merge "Rehide the PTP content provider interface from the public API."

2 files changed, 2 insertions, 462 deletions

diff --git a/api/current.xml b/api/current.xml
index 5f22c47..5cb4c81 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -161301,468 +161301,6 @@
 >
 </field>
 </interface>
-<class name="Ptp"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="Ptp"
- type="android.provider.Ptp"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<field name="AUTHORITY"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;ptp&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
-<class name="Ptp.Device"
- extends="java.lang.Object"
- abstract="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.provider.BaseColumns">
-</implements>
-<constructor name="Ptp.Device"
- type="android.provider.Ptp.Device"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="getContentUri"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-</method>
-<field name="CONTENT_URI"
- type="android.net.Uri"
- transient="false"
- volatile="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="MANUFACTURER"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;manufacturer&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="MODEL"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;model&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
-<class name="Ptp.Object"
- extends="java.lang.Object"
- abstract="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.provider.BaseColumns">
-</implements>
-<constructor name="Ptp.Object"
- type="android.provider.Ptp.Object"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="getContentUri"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-<parameter name="objectID" type="long">
-</parameter>
-</method>
-<method name="getContentUriForImport"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-<parameter name="objectID" type="long">
-</parameter>
-<parameter name="destPath" type="java.lang.String">
-</parameter>
-</method>
-<method name="getContentUriForObjectChildren"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-<parameter name="objectID" type="long">
-</parameter>
-</method>
-<method name="getContentUriForStorageChildren"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-<parameter name="storageID" type="long">
-</parameter>
-</method>
-<field name="ASSOCIATION_DESC"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;association_desc&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ASSOCIATION_TYPE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;association_type&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="DATE_CREATED"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;date_created&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="DATE_MODIFIED"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;date_modified&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="FORMAT"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;format&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="IMAGE_DEPTH"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;image_depth&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="IMAGE_HEIGHT"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;image_height&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="IMAGE_WIDTH"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;image_width&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="KEYWORDS"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;keywords&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NAME"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;name&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="PARENT"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;parent&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="PROTECTION_STATUS"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;protection_status&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="SEQUENCE_NUMBER"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;sequence_number&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="SIZE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;size&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="STORAGE_ID"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;storage_id&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="THUMB"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;thumb&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="THUMB_FORMAT"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;thumb_format&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="THUMB_HEIGHT"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;thumb_height&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="THUMB_SIZE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;thumb_size&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="THUMB_WIDTH"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;thumb_width&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
-<class name="Ptp.Storage"
- extends="java.lang.Object"
- abstract="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.provider.BaseColumns">
-</implements>
-<constructor name="Ptp.Storage"
- type="android.provider.Ptp.Storage"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="getContentUri"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-</method>
-<method name="getContentUri"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="deviceID" type="int">
-</parameter>
-<parameter name="storageID" type="long">
-</parameter>
-</method>
-<field name="DESCRIPTION"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;description&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="IDENTIFIER"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;identifier&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
 <class name="SearchRecentSuggestions"
  extends="java.lang.Object"
  abstract="false"
diff --git a/core/java/android/provider/Ptp.java b/core/java/android/provider/Ptp.java
index 0f0919e..0072f3d 100644
--- a/core/java/android/provider/Ptp.java
+++ b/core/java/android/provider/Ptp.java
@@ -27,6 +27,8 @@ import android.util.Log;
  * - deleting files and directories on PTP devices
  * - importing a file from PTP device into the host device's storage
  *   and adding it to the media provider
+ *
+ * @hide
  */
 public final class Ptp
 {