Merge "Remove StorageManager#mountAppFuse hidden API."
diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl
index 59394b2..b03c907 100644
--- a/core/java/android/os/storage/IStorageManager.aidl
+++ b/core/java/android/os/storage/IStorageManager.aidl
@@ -286,7 +286,6 @@
void prepareUserStorage(in String volumeUuid, int userId, int serialNumber, int flags) = 66;
void destroyUserStorage(in String volumeUuid, int userId, int flags) = 67;
boolean isConvertibleToFBE() = 68;
- ParcelFileDescriptor mountAppFuse(in String name) = 69;
void addUserKeyAuth(int userId, int serialNumber, in byte[] token, in byte[] secret) = 70;
void fixateNewestUserKeyAuth(int userId) = 71;
void fstrim(int flags) = 72;
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 85df48f..c6ff476 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1319,16 +1319,6 @@
}
/** {@hide} */
- public ParcelFileDescriptor mountAppFuse(String name) {
- try {
- return mStorageManager.mountAppFuse(name);
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
- }
-
-
- /** {@hide} */
@VisibleForTesting
public @NonNull ParcelFileDescriptor openProxyFileDescriptor(
int mode, ProxyFileDescriptorCallback callback, ThreadFactory factory)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index f9b9d6f..94acd75 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2991,38 +2991,6 @@
}
}
- @Override
- public ParcelFileDescriptor mountAppFuse(final String name) throws RemoteException {
- try {
- final int uid = Binder.getCallingUid();
- final int pid = Binder.getCallingPid();
- final NativeDaemonEvent event =
- mConnector.execute("appfuse", "mount", uid, pid, name);
- if (event.getFileDescriptors() == null) {
- throw new RemoteException("AppFuse FD from vold is null.");
- }
- return ParcelFileDescriptor.fromFd(
- event.getFileDescriptors()[0],
- mHandler,
- new ParcelFileDescriptor.OnCloseListener() {
- @Override
- public void onClose(IOException e) {
- try {
- final NativeDaemonEvent event = mConnector.execute(
- "appfuse", "unmount", uid, pid, name);
- } catch (NativeDaemonConnectorException unmountException) {
- Log.e(TAG, "Failed to unmount appfuse.");
- }
- }
- });
- } catch (NativeDaemonConnectorException e) {
- throw e.rethrowAsParcelableException();
- } catch (IOException e) {
- throw new RemoteException(e.getMessage());
- }
- }
-
-
class CloseableHolder<T extends AutoCloseable> implements AutoCloseable {
@Nullable T mCloseable;