summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-07-28 06:09:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-28 06:09:16 -0700
commitda299f0a074c62dd1ae105089cf7c64b1e5032a8 (patch)
treea742af9178031a9cb60641c3ba6c9f5f8ef8eae5 /src/com/android/gallery3d/app
parent84b398c3380f4e5e2d25d35f118ecd73cb7793b7 (diff)
parentad6505defd7e7e74a126f3dc72fd95d44f938a01 (diff)
downloadandroid_packages_apps_Gallery2-da299f0a074c62dd1ae105089cf7c64b1e5032a8.tar.gz
android_packages_apps_Gallery2-da299f0a074c62dd1ae105089cf7c64b1e5032a8.tar.bz2
android_packages_apps_Gallery2-da299f0a074c62dd1ae105089cf7c64b1e5032a8.zip
Merge "Fix crash when start FilterShowActivity with no permission uri"
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r--src/com/android/gallery3d/app/AbstractPermissionActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AbstractPermissionActivity.java b/src/com/android/gallery3d/app/AbstractPermissionActivity.java
index e4fc95372..f193e7f7a 100644
--- a/src/com/android/gallery3d/app/AbstractPermissionActivity.java
+++ b/src/com/android/gallery3d/app/AbstractPermissionActivity.java
@@ -33,10 +33,11 @@ import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
import java.util.ArrayList;
-public abstract class AbstractPermissionActivity extends Activity {
+public abstract class AbstractPermissionActivity extends FragmentActivity {
public static final int PERMISSION_REQUEST_STORAGE = 1;
private boolean permissionGranted = false;