SnapdragonCamera:Fix Dp init error

try to get sdcard root path in init
method and catch NullPointerException
to avoid deepportrait InitializerError

Change-Id: I1bd39da85592d3a4ba634b783ccc27145205560f
CRs-Fixed: 2270353

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/camera/imageprocessor/filter/DeepPortraitFilter.java b/src/com/android/camera/imageprocessor/filter/DeepPortraitFilter.java
index d3739ea16..6e98824d3 100755
--- a/src/com/android/camera/imageprocessor/filter/DeepPortraitFilter.java
+++ b/src/com/android/camera/imageprocessor/filter/DeepPortraitFilter.java
@@ -54,7 +54,7 @@ public class DeepPortraitFilter implements ImageFilter {
     private static String TAG = "DeepPortraitFilter";
     private static String VIDEO_DLC = "deepportrait_preview.dlce";
     private static String SNAPSHOT_DLC = "deepportrait_snapshot.dlce";
-    private static String SD_ROOT_PATH = Environment.getExternalStorageDirectory().toString();
+    private static String SD_ROOT_PATH;
     private static boolean mIsSupported = false;
     int mWidth;
     int mHeight;
@@ -98,6 +98,11 @@ public class DeepPortraitFilter implements ImageFilter {
         mStrideY = strideY;
         mStrideVU = strideVU;
         mSeqNo = 0;
+        try {
+            SD_ROOT_PATH = Environment.getExternalStorageDirectory().toString();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        }
         mDPInitialized = initPreview(width, height);
         if (mDPInitialized) {
             mVideoMaskSize = getMaskBufferSize();
@@ -109,6 +114,8 @@ public class DeepPortraitFilter implements ImageFilter {
     }
 
     public void initSnapshot(int width, int height) {
+        if (SD_ROOT_PATH == null)
+            return;
         String dlcPath = SD_ROOT_PATH + File.separator + SNAPSHOT_DLC;
         File dlc = new File(dlcPath);
         if (!dlc.exists()) {
@@ -122,6 +129,8 @@ public class DeepPortraitFilter implements ImageFilter {
     }
 
     public boolean initPreview(int width, int height) {
+        if (SD_ROOT_PATH == null)
+            return false;
         String dlcPath = SD_ROOT_PATH + File.separator + VIDEO_DLC;
         File dlc = new File(dlcPath);
         if (!dlc.exists()) {