diff options
| author | 2016-11-16 15:30:40 +0900 | |
|---|---|---|
| committer | 2017-01-23 09:36:59 +0900 | |
| commit | baa011685404ab5512e0b0724f07e7c98648d8ab (patch) | |
| tree | db954d45ce5fcbf96a0671648fc1410035453c32 | |
| parent | e2a31c02269c3426172790e4e0e50a7a2620f1ed (diff) | |
Remove StorageManager#mountAppFuse hidden API.
The API should be replaced with StorageManager#openProxyFileDescriptor.
Bug: 32891253
Test: build
Change-Id: Ibbf8b64f3a39900a1f05a52132aa931491d6fd48
| -rw-r--r-- | core/java/android/os/storage/IStorageManager.aidl | 1 | ||||
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 32 |
3 files changed, 0 insertions, 43 deletions
diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl index 59394b2c58d7..b03c9070dc44 100644 --- a/core/java/android/os/storage/IStorageManager.aidl +++ b/core/java/android/os/storage/IStorageManager.aidl @@ -286,7 +286,6 @@ interface IStorageManager { 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 85df48f91a5a..c6ff47694bab 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1319,16 +1319,6 @@ public class StorageManager { } /** {@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 f9b9d6f54669..94acd751c6c4 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -2991,38 +2991,6 @@ class StorageManagerService extends IStorageManager.Stub } } - @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; |