Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Un-hide the DropBoxManager interface, and update the public API accordingly.
diff --git a/core/java/android/app/ApplicationContext.java b/core/java/android/app/ApplicationContext.java
index 305ee6a..1e04abf 100644
--- a/core/java/android/app/ApplicationContext.java
+++ b/core/java/android/app/ApplicationContext.java
@@ -70,7 +70,7 @@
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.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 @@
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 @@
} else if (WALLPAPER_SERVICE.equals(name)) {
return getWallpaperManager();
} else if (DROPBOX_SERVICE.equals(name)) {
- return getDropBox();
+ return getDropBoxManager();
}
return null;
@@ -1060,15 +1060,15 @@
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
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index b4ab408..d77a6ca 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1324,7 +1324,6 @@
* 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";
diff --git a/core/java/android/os/DropBox.aidl b/core/java/android/os/DropBoxManager.aidl
similarity index 94%
rename from core/java/android/os/DropBox.aidl
rename to core/java/android/os/DropBoxManager.aidl
index 77abd22..6474ec2 100644
--- a/core/java/android/os/DropBox.aidl
+++ b/core/java/android/os/DropBoxManager.aidl
@@ -16,4 +16,4 @@
package android.os;
-parcelable DropBox.Entry;
+parcelable DropBoxManager.Entry;
diff --git a/core/java/android/os/DropBox.java b/core/java/android/os/DropBoxManager.java
similarity index 95%
rename from core/java/android/os/DropBox.java
rename to core/java/android/os/DropBoxManager.java
index 0551dc1..b374043 100644
--- a/core/java/android/os/DropBox.java
+++ b/core/java/android/os/DropBoxManager.java
@@ -18,7 +18,7 @@
import android.util.Log;
-import com.android.internal.os.IDropBoxService;
+import com.android.internal.os.IDropBoxManagerService;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -37,14 +37,12 @@
* {@link android.content.Context#getSystemService}
* with {@link android.content.Context#DROPBOX_SERVICE}.
*
- * <p>DropBox entries are not sent anywhere directly, but other system services
- * and debugging tools may scan and upload entries for processing.
- *
- * {@pending}
+ * <p>DropBoxManager entries are not sent anywhere directly, but other system
+ * services and debugging tools may scan and upload entries for processing.
*/
-public class DropBox {
- private static final String TAG = "DropBox";
- private final IDropBoxService mService;
+public class DropBoxManager {
+ private static final String TAG = "DropBoxManager";
+ private final IDropBoxManagerService mService;
/** Flag value: Entry's content was deleted to save space. */
public static final int IS_EMPTY = 1;
@@ -198,14 +196,14 @@
}
/** {@hide} */
- public DropBox(IDropBoxService service) { mService = service; }
+ public DropBoxManager(IDropBoxManagerService service) { mService = service; }
/**
* Create a dummy instance for testing. All methods will fail unless
* overridden with an appropriate mock implementation. To obtain a
* functional instance, use {@link android.content.Context#getSystemService}.
*/
- protected DropBox() { mService = null; }
+ protected DropBoxManager() { mService = null; }
/**
* Stores human-readable text. The data may be discarded eventually (or even
diff --git a/core/java/com/android/internal/os/IDropBoxManagerService.aidl b/core/java/com/android/internal/os/IDropBoxManagerService.aidl
new file mode 100644
index 0000000..d067926
--- /dev/null
+++ b/core/java/com/android/internal/os/IDropBoxManagerService.aidl
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+import android.os.DropBoxManager;
+import android.os.ParcelFileDescriptor;
+
+/**
+ * "Backend" interface used by {@link android.os.DropBoxManager} to talk to the
+ * DropBoxManagerService that actually implements the drop box functionality.
+ *
+ * @see DropBoxManager
+ * @hide
+ */
+interface IDropBoxManagerService {
+ /**
+ * @see DropBoxManager#addText
+ * @see DropBoxManager#addData
+ * @see DropBoxManager#addFile
+ */
+ void add(in DropBoxManager.Entry entry);
+
+ /** @see DropBoxManager#getNextEntry */
+ boolean isTagEnabled(String tag);
+
+ /** @see DropBoxManager#getNextEntry */
+ DropBoxManager.Entry getNextEntry(String tag, long millis);
+}
diff --git a/core/java/com/android/internal/os/IDropBoxService.aidl b/core/java/com/android/internal/os/IDropBoxService.aidl
deleted file mode 100644
index f940041..0000000
--- a/core/java/com/android/internal/os/IDropBoxService.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.os;
-
-import android.os.DropBox;
-import android.os.ParcelFileDescriptor;
-
-/**
- * "Backend" interface used by {@link android.os.DropBox} to talk to the
- * DropBoxService that actually implements the drop box functionality.
- *
- * @see DropBox
- * @hide
- */
-interface IDropBoxService {
- /**
- * @see DropBox#addText
- * @see DropBox#addData
- * @see DropBox#addFile
- */
- void add(in DropBox.Entry entry);
-
- /** @see DropBox#getNextEntry */
- boolean isTagEnabled(String tag);
-
- /** @see DropBox#getNextEntry */
- DropBox.Entry getNextEntry(String tag, long millis);
-}