diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-24 13:31:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-24 13:31:55 -0700 |
| commit | 60ddc2913bd09f667755b53d1cc4455f2505549b (patch) | |
| tree | 3ab9f66a683d69a50fe26befeebd275347b652d6 /src/com/android/camera/CameraActivity.java | |
| parent | 40054fab392e3003a2755f2d89e04308966ad587 (diff) | |
| parent | 6fc6fdf1f4109ca0d065517b1a2ffd46d255b946 (diff) | |
| download | android_packages_apps_Snap-60ddc2913bd09f667755b53d1cc4455f2505549b.tar.gz android_packages_apps_Snap-60ddc2913bd09f667755b53d1cc4455f2505549b.tar.bz2 android_packages_apps_Snap-60ddc2913bd09f667755b53d1cc4455f2505549b.zip | |
Merge "SnapdragonCamera: Camera force close" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a23985ef1..98fddcbe8 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -165,6 +165,8 @@ public class CameraActivity extends Activity private static final int HIDE_ACTION_BAR = 1; private static final long SHOW_ACTION_BAR_TIMEOUT_MS = 3000; + private static final int SWITCH_SAVE_PATH = 2; + /** Permission request code */ private static final int PERMISSIONS_REQUEST_ACCESS_COARSE_LOCATION = 1; @@ -369,6 +371,8 @@ public class CameraActivity extends Activity if (msg.what == HIDE_ACTION_BAR) { removeMessages(HIDE_ACTION_BAR); CameraActivity.this.setSystemBarsVisibility(false); + }else if ( msg.what == SWITCH_SAVE_PATH ) { + mCurrentModule.onSwitchSavePath(); } } } @@ -1892,7 +1896,7 @@ public class CameraActivity extends Activity mStorageSpaceBytes = Storage.getAvailableSpace(); if (Storage.switchSavePath()) { mStorageSpaceBytes = Storage.getAvailableSpace(); - mCurrentModule.onSwitchSavePath(); + mMainHandler.sendEmptyMessage(SWITCH_SAVE_PATH); } return mStorageSpaceBytes; } |