summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2017-12-20 16:31:43 +0800
committerArne Coucheron <arco68@gmail.com>2018-11-10 23:58:02 +0100
commitb6ac2fa8be77919de6303909a3b2262b0f534a34 (patch)
tree00667e63a8e4f85b3765964afed68a78c98b15df /src/com/android/gallery3d/app
parentca6bc84c5607f8412d8518a5ba6028ee4eeb5dec (diff)
downloadandroid_packages_apps_Gallery2-b6ac2fa8be77919de6303909a3b2262b0f534a34.tar.gz
android_packages_apps_Gallery2-b6ac2fa8be77919de6303909a3b2262b0f534a34.tar.bz2
android_packages_apps_Gallery2-b6ac2fa8be77919de6303909a3b2262b0f534a34.zip
SnapdragonGallery: Fix FC when init() before setContentView
don't run init() before setContentView Change-Id: I98ebd60bc6b3a5e5590b3d35fadfc5cf77f55d94 CRs-Fixed: 2161808
Diffstat (limited to 'src/com/android/gallery3d/app')
-rwxr-xr-xsrc/com/android/gallery3d/app/GalleryActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index 16920b942..6768967b5 100755
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -100,6 +100,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
private static final int PERMISSION_REQUEST_STORAGE = 1;
private Bundle mSavedInstanceState;
+ private boolean mIsViewInited = false;
@Override
@@ -113,6 +114,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
setContentView(R.layout.gallery_main);
initView();
+ mIsViewInited = true;
mSavedInstanceState = savedInstanceState;
if (isPermissionGranted()) {
@@ -131,7 +133,9 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
@Override
protected void onGetPermissionsSuccess() {
- init();
+ if (mIsViewInited) {
+ init();
+ }
}
@Override