summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 17:35:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 17:35:12 -0700
commit2f1eee34706cf42855541def5737c37a071d7293 (patch)
treee237ddf06e3538de7aef10e49f199ea0b059478f /core
parent49af98ed877e8a2db5a6b5be811c798e6f73dff7 (diff)
parente9dbf208e4f72b41dc3961d9d4570d5b69126307 (diff)
downloadframeworks_base-2f1eee34706cf42855541def5737c37a071d7293.zip
frameworks_base-2f1eee34706cf42855541def5737c37a071d7293.tar.gz
frameworks_base-2f1eee34706cf42855541def5737c37a071d7293.tar.bz2
am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp * commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307': Fix issue #3117472: Format storage dialog still broken
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/app/ExternalMediaFormatActivity.java17
1 files changed, 5 insertions, 12 deletions
diff --git a/core/java/com/android/internal/app/ExternalMediaFormatActivity.java b/core/java/com/android/internal/app/ExternalMediaFormatActivity.java
index 98dcb8b..5ab9217 100644
--- a/core/java/com/android/internal/app/ExternalMediaFormatActivity.java
+++ b/core/java/com/android/internal/app/ExternalMediaFormatActivity.java
@@ -16,6 +16,8 @@
package com.android.internal.app;
+import com.android.internal.os.storage.ExternalStorageFormatter;
+
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -23,10 +25,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
-import android.os.storage.IMountService;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.Environment;
import android.util.Log;
/**
@@ -95,14 +93,9 @@ public class ExternalMediaFormatActivity extends AlertActivity implements Dialog
public void onClick(DialogInterface dialog, int which) {
if (which == POSITIVE_BUTTON) {
- IMountService mountService = IMountService.Stub.asInterface(ServiceManager
- .getService("mount"));
- if (mountService != null) {
- try {
- mountService.formatVolume(Environment.getExternalStorageDirectory().toString());
- } catch (RemoteException e) {
- }
- }
+ Intent intent = new Intent(ExternalStorageFormatter.FORMAT_ONLY);
+ intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME);
+ startService(intent);
}
// No matter what, finish the activity