aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-06-22 17:48:15 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-06-23 14:30:52 -0700
commit8328024c8409c947d69092479073c16ac3f1aa2a (patch)
treed3b82019b9cb6b666ee620c189ea206d55255d83
parentb1a7da27d96e6100ff40ec1d7b6b7072f95decb1 (diff)
downloadandroid_packages_apps_CMFileManager-8328024c8409c947d69092479073c16ac3f1aa2a.tar.gz
android_packages_apps_CMFileManager-8328024c8409c947d69092479073c16ac3f1aa2a.tar.bz2
android_packages_apps_CMFileManager-8328024c8409c947d69092479073c16ac3f1aa2a.zip
Navigate to path when launched from folder shortcut
The logic was backward here. Instead, prompt the user if no permissions and start navigating if already granted. FEIJ-1389 Change-Id: Idee7024516eed5671bc7a1101fc812680db3447b (cherry picked from commit 994dd345daf99017b179b6e6edabab23ae538a1a)
-rwxr-xr-xsrc/com/cyanogenmod/filemanager/activities/NavigationActivity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index cf590306..e1e4a35f 100755
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -781,6 +781,8 @@ public class NavigationActivity extends Activity
//Initialize navigation
if (!hasPermissions()) {
+ requestNecessaryPermissions();
+ } else {
initNavigation(this.mCurrentNavigationView, restore, intent);
}