summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-06-01 20:54:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-01 20:54:21 -0700
commit501b2b400a15a43849ff84c5da4e68d23ed726cf (patch)
tree17339a857fa6e65bcd0474f3ca9bd9315a83b39c
parent7c1cf2e27d7b6fd4e41006ad74345879ba880511 (diff)
parenta6703415ead229d6387973c25f5b833cefd26e9b (diff)
downloadframeworks_base-501b2b400a15a43849ff84c5da4e68d23ed726cf.zip
frameworks_base-501b2b400a15a43849ff84c5da4e68d23ed726cf.tar.gz
frameworks_base-501b2b400a15a43849ff84c5da4e68d23ed726cf.tar.bz2
am a6703415: am 85fb2066: Amend previous ndc commit
Merge commit 'a6703415ead229d6387973c25f5b833cefd26e9b' into kraken * commit 'a6703415ead229d6387973c25f5b833cefd26e9b': Amend previous ndc commit
-rw-r--r--services/java/com/android/server/MountService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 413d66f..6c2f1b2 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -642,8 +642,9 @@ class MountService extends IMountService.Stub
}
private boolean doGetShareMethodAvailable(String method) {
+ ArrayList<String> rsp;
try {
- ArrayList<String> rsp = mConnector.doCommand("share status " + method);
+ rsp = mConnector.doCommand("share status " + method);
} catch (NativeDaemonConnectorException ex) {
Slog.e(TAG, "Failed to determine whether share method " + method + " is available.");
return false;