/** 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 = 0;
- private static final int PERMISSIONS_RESULT_CODE_FAILED = 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;
mFeatureConfig = OneCameraFeatureConfigCreator.createDefault(getContentResolver(),
getServices().getMemoryManager());
mFatalErrorHandler = new FatalErrorHandlerImpl(this);
- checkPermissions();
profile.mark();
if (!Glide.isSetup()) {
Context context = getAndroidContext();
@Override
public void onResumeTasks() {
mPaused = false;
+ checkPermissions();
+ if (!mHasCriticalPermissions) {
+ Log.v(TAG, "Missing critical permissions.");
+ return;
+ }
if (!mSecureCamera) {
// Show the dialog if necessary. The rest resume logic will be invoked
// at the onFirstRunStateReady() callback.
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
-
// Close the app if critical permissions are missing.
if (requestCode == PERMISSIONS_ACTIVITY_REQUEST_CODE && resultCode == PERMISSIONS_RESULT_CODE_FAILED) {
finish();
Profile profile = mProfiler.create("CameraActivity.resume").start();
CameraPerformanceTracker.onEvent(CameraPerformanceTracker.ACTIVITY_RESUME);
Log.v(TAG, "Build info: " + Build.DISPLAY);
- if (!mHasCriticalPermissions) {
- Log.v(TAG, "Missing critical permissions.");
- return;
- }
preloadFilmstripItems();
updateStorageSpaceAndHint(null);
private static final Log.Tag TAG = new Log.Tag("PermissionsActivity");
private static int PERMISSION_REQUEST_CODE = 1;
- private static int RESULT_CODE_OK = 0;
- private static int RESULT_CODE_FAILED = 1;
+ private static int RESULT_CODE_OK = 1;
+ private static int RESULT_CODE_FAILED = 2;
private int mIndexPermissionRequestCamera;
private int mIndexPermissionRequestMicrophone;