diff options
author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2016-01-02 20:14:18 +0100 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-02 20:47:57 +0100 |
commit | a575c653126a54850ed220b8255f035df4cdfe05 (patch) | |
tree | 09519219c8c8e4c3ce987d639e09bcae4ac53f88 /src/com/android/camera/SDCard.java | |
parent | 0575f19cf85fc06a070dd1ec15d952126e76d96c (diff) | |
download | android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.gz android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.bz2 android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.zip |
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade.
2. Comment out video dependencies to enable camera.
3. Fix compilation issue due to IMountService interface change.
4. Comment out ExtendedFace.
5. Remove non-standard video resolutions.
Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'src/com/android/camera/SDCard.java')
-rw-r--r-- | src/com/android/camera/SDCard.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/SDCard.java b/src/com/android/camera/SDCard.java index dad354007..e4f37f4e2 100644 --- a/src/com/android/camera/SDCard.java +++ b/src/com/android/camera/SDCard.java @@ -28,7 +28,8 @@ package com.android.camera; -import android.content.Context; +import android.app.ActivityThread; +import android.os.UserHandle; import android.os.StatFs; import android.os.Environment; import android.os.storage.StorageVolume; @@ -95,7 +96,10 @@ public class SDCard { try { mMountService = IMountService.Stub.asInterface(ServiceManager .getService("mount")); - final StorageVolume[] volumes = mMountService.getVolumeList(); + + String packageName = ActivityThread.currentOpPackageName(); + + final StorageVolume[] volumes = mMountService.getVolumeList(UserHandle.myUserId(), packageName, 0); if (volumes.length > VOLUME_SDCARD_INDEX) { mVolume = volumes[VOLUME_SDCARD_INDEX]; } |