diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-17 18:32:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-17 18:32:53 -0700 |
| commit | 5a3ddfb2e197bc8f9cdbca885adcdff3df0aa75b (patch) | |
| tree | ba97e2be305f2f281d28805fe62074dea61ce998 /src | |
| parent | 60f620a1f0b12f78292619a93a42790e84a529bf (diff) | |
| parent | fe56d3870dedf0d0a0f72ba1da8badd33c37e705 (diff) | |
| download | android_packages_apps_Snap-5a3ddfb2e197bc8f9cdbca885adcdff3df0aa75b.tar.gz android_packages_apps_Snap-5a3ddfb2e197bc8f9cdbca885adcdff3df0aa75b.tar.bz2 android_packages_apps_Snap-5a3ddfb2e197bc8f9cdbca885adcdff3df0aa75b.zip | |
Merge "SnapdragonCamera: Fixing NullPointerException in onCreate of VideoModule"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 12024eb09..4aa686c51 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1011,7 +1011,7 @@ public class VideoModule implements CameraModule, mUI.initDisplayChangeListener(); // Initializing it here after the preview is started. mUI.initializeZoom(mParameters); - + mUI.setPreviewGesturesVideoUI(); keepScreenOnAwhile(); mOrientationManager.resume(); diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 0966ef572..ebe5b1105 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -597,6 +597,9 @@ public class VideoUI implements PieRenderer.PieListener, } }); + } + + public void setPreviewGesturesVideoUI() { mActivity.setPreviewGestures(mGestures); } |