diff options
author | Alan Newberger <alann@google.com> | 2014-08-27 15:28:57 -0700 |
---|---|---|
committer | Alan Newberger <alann@google.com> | 2014-08-27 15:28:57 -0700 |
commit | 3c3398db2d9d67ce61c88f1887dbe7dfcd8c47a6 (patch) | |
tree | cd2cc82fc23565a329ccf1f0fa88803cf45ad4ae | |
parent | a98b4b10a1ce7a6ce6499f364ae33cebbb94d023 (diff) | |
download | android_packages_apps_Camera2-3c3398db2d9d67ce61c88f1887dbe7dfcd8c47a6.tar.gz android_packages_apps_Camera2-3c3398db2d9d67ce61c88f1887dbe7dfcd8c47a6.tar.bz2 android_packages_apps_Camera2-3c3398db2d9d67ce61c88f1887dbe7dfcd8c47a6.zip |
Remove FeedbackHelper
ag/393130 has comments pointing out that startFeedback has a leak. We don't
use it anymore after Help library integration, so just remove it.
Bug: 17302992
Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 | ||||
-rw-r--r-- | src_pd/com/android/camera/util/FeedbackHelper.java | 34 |
2 files changed, 0 insertions, 43 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 6772aae12..112eb4337 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -123,7 +123,6 @@ import com.android.camera.ui.PreviewStatusListener; import com.android.camera.util.ApiHelper; import com.android.camera.util.Callback; import com.android.camera.util.CameraUtil; -import com.android.camera.util.FeedbackHelper; import com.android.camera.util.GalleryHelper; import com.android.camera.util.GcamHelper; import com.android.camera.util.GoogleHelpHelper; @@ -246,8 +245,6 @@ public class CameraActivity extends Activity private PeekAnimationHandler mPeekAnimationHandler; private HandlerThread mPeekAnimationThread; - private FeedbackHelper mFeedbackHelper; - private Intent mGalleryIntent; private long mOnCreateTime; @@ -1474,9 +1471,6 @@ public class CameraActivity extends Activity getContentResolver().registerContentObserver( MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true, mLocalVideosObserver); - if (FeedbackHelper.feedbackAvailable()) { - mFeedbackHelper = new FeedbackHelper(mAppContext); - } mMemoryManager = getServices().getMemoryManager(); AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() { @@ -1836,9 +1830,6 @@ public class CameraActivity extends Activity protected void onStop() { mIsActivityRunning = false; mPanoramaViewHelper.onStop(); - if (mFeedbackHelper != null) { - mFeedbackHelper.stopFeedback(); - } mLocationManager.disconnect(); super.onStop(); diff --git a/src_pd/com/android/camera/util/FeedbackHelper.java b/src_pd/com/android/camera/util/FeedbackHelper.java deleted file mode 100644 index d4cb6a625..000000000 --- a/src_pd/com/android/camera/util/FeedbackHelper.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.camera.util; - -import android.content.Context; - -public class FeedbackHelper { - public static boolean feedbackAvailable() { - return false; - } - - public FeedbackHelper(Context context) { - } - - public void startFeedback() { - } - - public void stopFeedback() { - } -} |