diff options
author | Divya Sharma <c_shard@codeaurora.org> | 2015-08-05 19:26:05 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-10 00:50:11 -0700 |
commit | 660ecbf79c70c067485f248234d5e08e7ffb26ab (patch) | |
tree | 4652a7fb559b4e5e22848880944f4e9cd1e7d6ed /src/com/android/camera/SDCard.java | |
parent | 63d8b7eecabba370830e7af6a91209b1c503213c (diff) | |
download | android_packages_apps_Snap-660ecbf79c70c067485f248234d5e08e7ffb26ab.tar.gz android_packages_apps_Snap-660ecbf79c70c067485f248234d5e08e7ffb26ab.tar.bz2 android_packages_apps_Snap-660ecbf79c70c067485f248234d5e08e7ffb26ab.zip |
SnapdragonCamera: Use StorageManager for SDCard
--Use StorageManager instead of MountService for SDCard
Change-Id: Ia5fd63a48c8ae79bfe44b7f5291e485ff7ced0af
Diffstat (limited to 'src/com/android/camera/SDCard.java')
-rw-r--r-- | src/com/android/camera/SDCard.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/com/android/camera/SDCard.java b/src/com/android/camera/SDCard.java index 7e035970d..8fda17c67 100644 --- a/src/com/android/camera/SDCard.java +++ b/src/com/android/camera/SDCard.java @@ -28,12 +28,11 @@ package com.android.camera; +import android.content.Context; import android.os.UserHandle; -import android.os.StatFs; import android.os.Environment; import android.os.storage.StorageVolume; -import android.os.storage.IMountService; -import android.os.ServiceManager; +import android.os.storage.StorageManager; import android.util.Log; public class SDCard { @@ -41,7 +40,7 @@ public class SDCard { private static final int VOLUME_SDCARD_INDEX = 1; - private IMountService mMountService = null; + private StorageManager mStorageManager = null; private StorageVolume mVolume = null; private String path = null; private String rawpath = null; @@ -76,10 +75,13 @@ public class SDCard { return rawpath; } - public static synchronized SDCard instance() { + public static void initialize(Context context) { if (sSDCard == null) { - sSDCard = new SDCard(); + sSDCard = new SDCard(context); } + } + + public static synchronized SDCard instance() { return sSDCard; } @@ -87,11 +89,10 @@ public class SDCard { return mVolume.getState(); } - private SDCard() { + private SDCard(Context context) { try { - mMountService = IMountService.Stub.asInterface(ServiceManager - .getService("mount")); - final StorageVolume[] volumes = mMountService.getVolumeList(UserHandle.myUserId(), "com.android.camera"); + mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE); + final StorageVolume[] volumes = mStorageManager.getVolumeList(); if (volumes.length > VOLUME_SDCARD_INDEX) { mVolume = volumes[VOLUME_SDCARD_INDEX]; } |