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

Commit bae5ca14 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Rename MountService to StorageManagerService."

parents f8a440a8 2250d56a

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -245,9 +245,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IUpdateLock.aidl \

	core/java/android/os/IUserManager.aidl \

	core/java/android/os/IVibratorService.aidl \

	core/java/android/os/storage/IMountService.aidl \

	core/java/android/os/storage/IMountServiceListener.aidl \

	core/java/android/os/storage/IMountShutdownObserver.aidl \

	core/java/android/os/storage/IStorageManager.aidl \

	core/java/android/os/storage/IStorageEventListener.aidl \

	core/java/android/os/storage/IStorageShutdownObserver.aidl \

	core/java/android/os/storage/IObbActionListener.aidl \

	core/java/android/security/IKeystoreService.aidl \

	core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ $(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framewo 
$(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/APPS/FeatureSplit1_intermediates/src/com/android/test/split/feature/R.java)

$(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/APPS/FeatureSplit2_intermediates/src/com/android/test/split/feature/R.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/hardware)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/core/java/android/os/storage/*)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

cmds/sm/src/com/android/commands/sm/Sm.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.storage.DiskInfo;

import android.os.storage.IMountService;

import android.os.storage.IStorageManager;

import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.util.Log;
@@ -28,7 +28,7 @@ import android.util.Log; 
public final class Sm {

    private static final String TAG = "Sm";



    IMountService mSm;

    IStorageManager mSm;



    private String[] mArgs;

    private int mNextArg;
@@ -55,7 +55,7 @@ public final class Sm { 
            throw new IllegalArgumentException();

        }



        mSm = IMountService.Stub.asInterface(ServiceManager.getService("mount"));

        mSm = IStorageManager.Stub.asInterface(ServiceManager.getService("mount"));

        if (mSm == null) {

            throw new RemoteException("Failed to find running mount service");

        }

compiled-classes-phone

+9 −9
Original line number Diff line number Diff line
@@ -3223,17 +3223,17 @@ android.os.health.HealthStatsParceler 
android.os.health.SystemHealthManager

android.os.storage.DiskInfo

android.os.storage.DiskInfo$1

android.os.storage.IMountService

android.os.storage.IMountService$Stub

android.os.storage.IMountService$Stub$Proxy

android.os.storage.IMountServiceListener

android.os.storage.IMountServiceListener$Stub

android.os.storage.IMountServiceListener$Stub$Proxy

android.os.storage.IMountShutdownObserver

android.os.storage.IStorageManager

android.os.storage.IStorageManager$Stub

android.os.storage.IStorageManager$Stub$Proxy

android.os.storage.IStorageEventListener

android.os.storage.IStorageEventListener$Stub

android.os.storage.IStorageEventListener$Stub$Proxy

android.os.storage.IStorageShutdownObserver

android.os.storage.IObbActionListener

android.os.storage.IObbActionListener$Stub

android.os.storage.MountServiceInternal

android.os.storage.MountServiceInternal$ExternalStorageMountPolicy

android.os.storage.StorageManagerInternal

android.os.storage.StorageManagerInternal$ExternalStorageMountPolicy

android.os.storage.StorageEventListener

android.os.storage.StorageManager

android.os.storage.StorageManager$ObbActionListener

core/java/android/app/ContextImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.storage.IMountService;

import android.os.storage.IStorageManager;

import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;
@@ -2213,10 +2213,11 @@ class ContextImpl extends Context { 
                    if (!dir.exists()) {

                        // Failing to mkdir() may be okay, since we might not have

                        // enough permissions; ask vold to create on our behalf.

                        final IMountService mount = IMountService.Stub.asInterface(

                        final IStorageManager storageManager = IStorageManager.Stub.asInterface(

                                ServiceManager.getService("mount"));

                        try {

                            final int res = mount.mkdirs(getPackageName(), dir.getAbsolutePath());

                            final int res = storageManager.mkdirs(

                                    getPackageName(), dir.getAbsolutePath());

                            if (res != 0) {

                                Log.w(TAG, "Failed to ensure " + dir + ": " + res);

                                dir = null;