diff options
author | junjiez <junjiez@codeaurora.org> | 2018-07-04 17:50:28 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-27 00:24:01 -0700 |
commit | 477750028462d658ff655ce1b8eaded26067b804 (patch) | |
tree | f89a12d6b1b01810f2c97b4b2442bdb6db238d17 /src | |
parent | 49f53be4cf3d548bc2c0c07125a36c5c28fdf428 (diff) | |
download | android_packages_apps_Snap-477750028462d658ff655ce1b8eaded26067b804.tar.gz android_packages_apps_Snap-477750028462d658ff655ce1b8eaded26067b804.tar.bz2 android_packages_apps_Snap-477750028462d658ff655ce1b8eaded26067b804.zip |
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
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/camera/imageprocessor/filter/DeepPortraitFilter.java | 11 |
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()) { |