commit 33b0202273269c35906d4080a7ef656a180d6f1c
author San Mehat <san@google.com> Tue Jan 12 12:22:37 2010 -0800
committer San Mehat <san@google.com> Tue Jan 12 12:22:37 2010 -0800
tree 97d6fb32b065a3534ef88aabba384acae947a56c
parent 00d2476d8fc122b4eef59d6be6f7aa41e9c56fde

Settings: Switch to new MountService api names

Signed-off-by: San Mehat <san@google.com>

src/com/android/settings/MediaFormat.java

diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index e0d9af6..e414569 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -68,7 +68,7 @@
                         IMountService.Stub.asInterface(ServiceManager.getService("mount"));
                 if (service != null) {
                     try {
-                        service.formatMedia(Environment.getExternalStorageDirectory().toString());
+                        service.formatVolume(Environment.getExternalStorageDirectory().toString());
                     } catch (android.os.RemoteException e) {
                         // Intentionally blank - there's nothing we can do here
                         Log.w("MediaFormat", "Unable to invoke IMountService.formatMedia()");

src/com/android/settings/SdCardSettings.java

diff --git a/src/com/android/settings/SdCardSettings.java b/src/com/android/settings/SdCardSettings.java
index 67f3550..75f02e7 100644
--- a/src/com/android/settings/SdCardSettings.java
+++ b/src/com/android/settings/SdCardSettings.java
@@ -169,7 +169,7 @@
     OnClickListener mUnmountButtonHandler = new OnClickListener() {
         public void onClick(View v) {
             try {
-                mMountService.unmountMedia(Environment.getExternalStorageDirectory().toString());
+                mMountService.unmountVolume(Environment.getExternalStorageDirectory().toString());
             } catch (RemoteException ex) {
             }
         }
@@ -178,7 +178,7 @@
     OnClickListener mFormatButtonHandler = new OnClickListener() {
         public void onClick(View v) {
             try {
-                mMountService.formatMedia(Environment.getExternalStorageDirectory().toString());
+                mMountService.formatVolume(Environment.getExternalStorageDirectory().toString());
             } catch (RemoteException ex) {
             }
         }

src/com/android/settings/deviceinfo/Memory.java

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index a7f5617..422b5fe 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -141,7 +141,7 @@
         IMountService mountService = getMountService();
         try {
             if (mountService != null) {
-                mountService.unmountMedia(Environment.getExternalStorageDirectory().toString());
+                mountService.unmountVolume(Environment.getExternalStorageDirectory().toString());
             } else {
                 Log.e(TAG, "Mount service is null, can't unmount");
             }
@@ -155,7 +155,7 @@
         IMountService mountService = getMountService();
         try {
             if (mountService != null) {
-                mountService.mountMedia(Environment.getExternalStorageDirectory().toString());
+                mountService.mountVolume(Environment.getExternalStorageDirectory().toString());
             } else {
                 Log.e(TAG, "Mount service is null, can't mount");
             }