package com.android.camera;
+import android.Manifest;
import android.animation.Animator;
import android.app.ActionBar;
import android.app.Activity;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.Matrix;
import com.android.camera.data.VideoItemFactory;
import com.android.camera.debug.Log;
import com.android.camera.device.ActiveCameraDeviceTracker;
+import com.android.camera.device.CameraId;
import com.android.camera.filmstrip.FilmstripContentPanel;
import com.android.camera.filmstrip.FilmstripController;
import com.android.camera.module.ModuleController;
import com.android.camera.ui.PreviewStatusListener;
import com.android.camera.util.ApiHelper;
import com.android.camera.util.Callback;
-import com.android.camera.util.CameraSettingsActivityHelper;
import com.android.camera.util.CameraUtil;
import com.android.camera.util.GalleryHelper;
import com.android.camera.util.GcamHelper;
import com.bumptech.glide.MemoryCategory;
import com.bumptech.glide.load.DecodeFormat;
import com.bumptech.glide.load.engine.executor.FifoPriorityThreadPoolExecutor;
+
import com.google.common.base.Optional;
import com.google.common.logging.eventprotos;
import com.google.common.logging.eventprotos.ForegroundEvent.ForegroundSource;
private static final long SCREEN_DELAY_MS = 2 * 60 * 1000; // 2 mins.
/** Load metadata for 10 items ahead of our current. */
private static final int FILMSTRIP_PRELOAD_AHEAD_ITEMS = 10;
+ private static final int PERMISSIONS_ACTIVITY_REQUEST_CODE = 1;
+ private static final int PERMISSIONS_RESULT_CODE_OK = 1;
+ private static final int PERMISSIONS_RESULT_CODE_FAILED = 2;
/** Should be used wherever a context is needed. */
private Context mAppContext;
private boolean mIsUndoingDeletion = false;
private boolean mIsActivityRunning = false;
private FatalErrorHandler mFatalErrorHandler;
+ private boolean mHasCriticalPermissions;
private final Uri[] mNfcPushUris = new Uri[1];
}
if (mCurrentModule != null) {
resetExposureCompensationToDefault(camera);
- mCurrentModule.onCameraAvailable(camera);
+ try {
+ mCurrentModule.onCameraAvailable(camera);
+ } catch (RuntimeException ex) {
+ Log.e(TAG, "Error connecting to camera", ex);
+ mFatalErrorHandler.onCameraOpenFailure();
+ }
} else {
Log.v(TAG, "mCurrentModule null, not invoking onCameraAvailable");
}
int currentIndex = mFilmstripController.getCurrentAdapterIndex();
for (Integer index : indexes) {
if (index == currentIndex) {
- updateBottomControlsByData(mDataAdapter.getItemAt(index));
+ updateUiByData(index);
// Currently we have only 1 data can be matched.
// No need to look for more, break.
break;
// this could cause user issues, so log a stack trace noting the call path
// which resulted in this scenario.
- return SettingsManager.getCameraSettingScope(
- mCameraController.getCurrentCameraId().getValue());
+ CameraId cameraId = mCameraController.getCurrentCameraId();
+
+ if(cameraId == null) {
+ Log.e(TAG, "Retrieving Camera Setting Scope with -1");
+ return SettingsManager.getCameraSettingScope("-1");
+ }
+
+ return SettingsManager.getCameraSettingScope(cameraId.getValue());
}
@Override
mFeatureConfig = OneCameraFeatureConfigCreator.createDefault(getContentResolver(),
getServices().getMemoryManager());
mFatalErrorHandler = new FatalErrorHandlerImpl(this);
-
+ checkPermissions();
+ if (!mHasCriticalPermissions) {
+ Log.v(TAG, "onCreate: Missing critical permissions.");
+ finish();
+ return;
+ }
profile.mark();
if (!Glide.isSetup()) {
Context context = getAndroidContext();
new PhotoDataFactory());
mVideoItemFactory = new VideoItemFactory(mAppContext, glideManager, appContentResolver,
new VideoDataFactory());
- mDataAdapter = new CameraFilmstripDataAdapter(mAppContext,
- mPhotoItemFactory, mVideoItemFactory);
- mDataAdapter.setLocalDataListener(mFilmstripItemListener);
-
- mPreloader = new Preloader<Integer, AsyncTask>(FILMSTRIP_PRELOAD_AHEAD_ITEMS, mDataAdapter,
- mDataAdapter);
-
mCameraAppUI.getFilmstripContentPanel().setFilmstripListener(mFilmstripListener);
if (mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
Keys.KEY_SHOULD_SHOW_REFOCUS_VIEWER_CLING)) {
mCurrentModule.init(this, isSecureCamera(), isCaptureIntent());
profile.mark("Init CurrentModule");
- if (!mSecureCamera) {
- mFilmstripController.setDataAdapter(mDataAdapter);
- if (!isCaptureIntent()) {
- mDataAdapter.requestLoad(new Callback<Void>() {
- @Override
- public void onCallback(Void result) {
- fillTemporarySessions();
- }
- });
- }
- } else {
- // Put a lock placeholder as the last image by setting its date to
- // 0.
- ImageView v = (ImageView) getLayoutInflater().inflate(
- R.layout.secure_album_placeholder, null);
- v.setTag(R.id.mediadata_tag_viewtype, FilmstripItemType.SECURE_ALBUM_PLACEHOLDER.ordinal());
- v.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- UsageStatistics.instance().changeScreen(NavigationChange.Mode.GALLERY,
- NavigationChange.InteractionCause.BUTTON);
- startGallery();
- finish();
- }
- });
- v.setContentDescription(getString(R.string.accessibility_unlock_to_camera));
- mDataAdapter = new FixedLastProxyAdapter(
- mAppContext,
- mDataAdapter,
- new PlaceholderItem(
- v,
- FilmstripItemType.SECURE_ALBUM_PLACEHOLDER,
- v.getDrawable().getIntrinsicWidth(),
- v.getDrawable().getIntrinsicHeight()));
- // Flush out all the original data.
- mDataAdapter.clear();
- mFilmstripController.setDataAdapter(mDataAdapter);
- }
+ preloadFilmstripItems();
setupNfcBeamPush();
new FirstRunDialog.FirstRunDialogListener() {
@Override
public void onFirstRunStateReady() {
- // Make sure additional preferences have the correct resolution selected
- CameraSettingsActivityHelper.verifyDefaults(getSettingsManager(),
- getAndroidContext());
-
// Run normal resume tasks.
resume();
}
mLocalImagesObserver.setForegroundChangeListener(null);
mLocalImagesObserver.setActivityPaused(true);
mLocalVideosObserver.setActivityPaused(true);
- mPreloader.cancelAllLoads();
+ if (mPreloader != null) {
+ mPreloader.cancelAllLoads();
+ }
resetScreenOn();
mMotionManager.stop();
@Override
public void onResumeTasks() {
mPaused = false;
+ checkPermissions();
+ if (!mHasCriticalPermissions) {
+ Log.v(TAG, "onResume: Missing critical permissions.");
+ finish();
+ return;
+ }
+ if (!mSecureCamera) {
+ // Show the dialog if necessary. The rest resume logic will be invoked
+ // at the onFirstRunStateReady() callback.
+ try {
+ mFirstRunDialog.showIfNecessary();
+ } catch (AssertionError e) {
+ Log.e(TAG, "Creating camera controller failed.", e);
+ mFatalErrorHandler.onGenericCameraAccessFailure();
+ }
+ } else {
+ // In secure mode from lockscreen, we go straight to camera and will
+ // show first run dialog next time user enters launcher.
+ Log.v(TAG, "in secure mode, skipping first run dialog check");
+ resume();
+ }
+ }
- // Show the dialog if necessary. The rest resume logic will be invoked
- // at the onFirstRunStateReady() callback.
- try {
- mFirstRunDialog.showIfNecessary();
- } catch (AssertionError e) {
- Log.e(TAG, "Creating camera controller failed.", e);
- mFatalErrorHandler.onGenericCameraAccessFailure();
+ /**
+ * Checks if any of the needed Android runtime permissions are missing.
+ * If they are, then launch the permissions activity under one of the following conditions:
+ * a) The permissions dialogs have not run yet. We will ask for permission only once.
+ * b) If the missing permissions are critical to the app running, we will display a fatal error dialog.
+ * Critical permissions are: camera, microphone and storage. The app cannot run without them.
+ * Non-critical permission is location.
+ */
+ private void checkPermissions() {
+ if (!ApiHelper.isMOrHigher()) {
+ Log.v(TAG, "not running on M, skipping permission checks");
+ mHasCriticalPermissions = true;
+ return;
+ }
+
+ if (checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED &&
+ checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED &&
+ checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+ mHasCriticalPermissions = true;
+ } else {
+ mHasCriticalPermissions = false;
+ }
+
+ if ((checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
+ !mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS)) ||
+ !mHasCriticalPermissions) {
+ Intent intent = new Intent(this, PermissionsActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ }
+
+ private void preloadFilmstripItems() {
+ if (mDataAdapter == null) {
+ mDataAdapter = new CameraFilmstripDataAdapter(mAppContext,
+ mPhotoItemFactory, mVideoItemFactory);
+ mDataAdapter.setLocalDataListener(mFilmstripItemListener);
+ mPreloader = new Preloader<Integer, AsyncTask>(FILMSTRIP_PRELOAD_AHEAD_ITEMS, mDataAdapter,
+ mDataAdapter);
+ if (!mSecureCamera) {
+ mFilmstripController.setDataAdapter(mDataAdapter);
+ if (!isCaptureIntent()) {
+ mDataAdapter.requestLoad(new Callback<Void>() {
+ @Override
+ public void onCallback(Void result) {
+ fillTemporarySessions();
+ }
+ });
+ }
+ } else {
+ // Put a lock placeholder as the last image by setting its date to
+ // 0.
+ ImageView v = (ImageView) getLayoutInflater().inflate(
+ R.layout.secure_album_placeholder, null);
+ v.setTag(R.id.mediadata_tag_viewtype, FilmstripItemType.SECURE_ALBUM_PLACEHOLDER.ordinal());
+ v.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ UsageStatistics.instance().changeScreen(NavigationChange.Mode.GALLERY,
+ NavigationChange.InteractionCause.BUTTON);
+ startGallery();
+ finish();
+ }
+ });
+ v.setContentDescription(getString(R.string.accessibility_unlock_to_camera));
+ mDataAdapter = new FixedLastProxyAdapter(
+ mAppContext,
+ mDataAdapter,
+ new PlaceholderItem(
+ v,
+ FilmstripItemType.SECURE_ALBUM_PLACEHOLDER,
+ v.getDrawable().getIntrinsicWidth(),
+ v.getDrawable().getIntrinsicHeight()));
+ // Flush out all the original data.
+ mDataAdapter.clear();
+ mFilmstripController.setDataAdapter(mDataAdapter);
+ }
}
}
Profile profile = mProfiler.create("CameraActivity.resume").start();
CameraPerformanceTracker.onEvent(CameraPerformanceTracker.ACTIVITY_RESUME);
Log.v(TAG, "Build info: " + Build.DISPLAY);
-
updateStorageSpaceAndHint(null);
mLastLayoutOrientation = getResources().getConfiguration().orientation;
unregisterReceiver(mShutdownReceiver);
}
+ // Ensure anything that checks for "isPaused" returns true.
+ mPaused = true;
+
mSettingsManager.removeAllListeners();
if (mCameraController != null) {
mCameraController.removeCallbackReceiver();
mCameraController.setCameraExceptionHandler(null);
}
- getContentResolver().unregisterContentObserver(mLocalImagesObserver);
- getContentResolver().unregisterContentObserver(mLocalVideosObserver);
+ if (mLocalImagesObserver != null) {
+ getContentResolver().unregisterContentObserver(mLocalImagesObserver);
+ }
+ if (mLocalVideosObserver != null) {
+ getContentResolver().unregisterContentObserver(mLocalVideosObserver);
+ }
getServices().getCaptureSessionManager().removeSessionListener(mSessionListener);
- mCameraAppUI.onDestroy();
- mModeListView.setVisibilityChangedListener(null);
+ if (mCameraAppUI != null) {
+ mCameraAppUI.onDestroy();
+ }
+ if (mModeListView != null) {
+ mModeListView.setVisibilityChangedListener(null);
+ }
mCameraController = null;
mSettingsManager = null;
mOrientationManager = null;
mButtonManager = null;
- mSoundPlayer.release();
+ if (mSoundPlayer != null) {
+ mSoundPlayer.release();
+ }
CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO);
}
@Override
public void onClick(View view) {
mDataAdapter.undoDeletion();
+ // Fix for b/21666018: When undoing a delete in Fullscreen
+ // mode, just flip
+ // back to the filmstrip to force a refresh.
+ if (mFilmstripController.inFullScreen()) {
+ mFilmstripController.goToFilmstrip();
+ }
hideUndoDeletionBar(true);
}
});
OSDN Git Service
