Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f18a01c7 authored by Dan Egnor's avatar Dan Egnor
Browse files

Rename [I]DropBox[Service] to [I]DropBoxManager[Service]. 

Un-hide the DropBoxManager interface, and update the public API accordingly.
parent 897a744b

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/appwidget/IAppWidgetService.aidl \

	core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \

	core/java/com/android/internal/backup/IBackupTransport.aidl \

	core/java/com/android/internal/os/IDropBoxService.aidl \

	core/java/com/android/internal/os/IDropBoxManagerService.aidl \

	core/java/com/android/internal/os/IResultReceiver.aidl \

	core/java/com/android/internal/view/IInputContext.aidl \

	core/java/com/android/internal/view/IInputContextCallback.aidl \
@@ -218,7 +218,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

	frameworks/base/core/java/android/net/Uri.aidl \

	frameworks/base/core/java/android/os/Bundle.aidl \

	frameworks/base/core/java/android/os/DropBox.aidl \

	frameworks/base/core/java/android/os/DropBoxManager.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

	frameworks/base/core/java/android/os/ParcelUuid.aidl \

	frameworks/base/core/java/android/view/KeyEvent.aidl \

api/current.xml

+331 −0
Original line number Diff line number Diff line
@@ -32012,6 +32012,17 @@ 
 visibility="public"

>

</field>

<field name="DROPBOX_SERVICE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;dropbox&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INPUT_METHOD_SERVICE"

 type="java.lang.String"

 transient="false"
@@ -102116,6 +102127,326 @@ 
>

</field>

</class>

<class name="DropBoxManager"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="DropBoxManager"

 type="android.os.DropBoxManager"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</constructor>

<method name="addData"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="data" type="byte[]">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="addFile"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="fd" type="android.os.ParcelFileDescriptor">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="addText"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="data" type="java.lang.String">

</parameter>

</method>

<method name="getNextEntry"

 return="android.os.DropBoxManager.Entry"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="msec" type="long">

</parameter>

</method>

<method name="isTagEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

</method>

<field name="IS_EMPTY"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IS_GZIPPED"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IS_TEXT"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="DropBoxManager.Entry"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="DropBoxManager.Entry"

 type="android.os.DropBoxManager.Entry"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="millis" type="long">

</parameter>

</constructor>

<constructor name="DropBoxManager.Entry"

 type="android.os.DropBoxManager.Entry"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="millis" type="long">

</parameter>

<parameter name="text" type="java.lang.String">

</parameter>

</constructor>

<constructor name="DropBoxManager.Entry"

 type="android.os.DropBoxManager.Entry"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="millis" type="long">

</parameter>

<parameter name="data" type="byte[]">

</parameter>

<parameter name="flags" type="int">

</parameter>

</constructor>

<constructor name="DropBoxManager.Entry"

 type="android.os.DropBoxManager.Entry"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="millis" type="long">

</parameter>

<parameter name="data" type="android.os.ParcelFileDescriptor">

</parameter>

<parameter name="flags" type="int">

</parameter>

</constructor>

<constructor name="DropBoxManager.Entry"

 type="android.os.DropBoxManager.Entry"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="millis" type="long">

</parameter>

<parameter name="data" type="java.io.File">

</parameter>

<parameter name="flags" type="int">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</constructor>

<method name="close"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFlags"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getInputStream"

 return="java.io.InputStream"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="getTag"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getText"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="maxBytes" type="int">

</parameter>

</method>

<method name="getTimeMillis"

 return="long"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="out" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Environment"

 extends="java.lang.Object"

 abstract="false"

cleanspec.mk

0 → 100644
+1 −0
Original line number Diff line number Diff line 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java)

core/java/android/app/ApplicationContext.java

+9 −9
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ import android.net.wifi.IWifiManager; 
import android.net.wifi.WifiManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.DropBox;

import android.os.DropBoxManager;

import android.os.FileUtils;

import android.os.Handler;

import android.os.IBinder;
@@ -94,7 +94,7 @@ import android.view.inputmethod.InputMethodManager; 
import android.accounts.AccountManager;

import android.accounts.IAccountManager;



import com.android.internal.os.IDropBoxService;

import com.android.internal.os.IDropBoxManagerService;



import java.io.File;

import java.io.FileInputStream;
@@ -185,7 +185,7 @@ class ApplicationContext extends Context { 
    private ClipboardManager mClipboardManager = null;

    private boolean mRestricted;

    private AccountManager mAccountManager; // protected by mSync

    private DropBox mDropBox = null;

    private DropBoxManager mDropBoxManager = null;



    private final Object mSync = new Object();
@@ -901,7 +901,7 @@ class ApplicationContext extends Context { 
        } else if (WALLPAPER_SERVICE.equals(name)) {

            return getWallpaperManager();

        } else if (DROPBOX_SERVICE.equals(name)) {

            return getDropBox();

            return getDropBoxManager();

        }



        return null;
@@ -1060,15 +1060,15 @@ class ApplicationContext extends Context { 
        return mAudioManager;

    }



    private DropBox getDropBox() {

    private DropBoxManager getDropBoxManager() {

        synchronized (mSync) {

            if (mDropBox == null) {

            if (mDropBoxManager == null) {

                IBinder b = ServiceManager.getService(DROPBOX_SERVICE);

                IDropBoxService service = IDropBoxService.Stub.asInterface(b);

                mDropBox = new DropBox(service);

                IDropBoxManagerService service = IDropBoxManagerService.Stub.asInterface(b);

                mDropBoxManager = new DropBoxManager(service);

            }

        }

        return mDropBox;

        return mDropBoxManager;

    }



    @Override

core/java/android/content/Context.java

+0 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,6 @@ public abstract class Context { 
     * Use with {@link #getSystemService} to retrieve a

     * {@blink android.os.DropBox DropBox} instance for recording

     * diagnostic logs.

     * @hide

     * @see #getSystemService

     */

    public static final String DROPBOX_SERVICE = "dropbox";