commit d019bce4129b224e638dd4ec235387f85d19e052
author Svet Ganov <svetoslavganov@google.com> Thu Jul 16 19:57:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 19:57:26 2015 +0000
tree 468a9394f08fc3b288d1b99af72074336021931b
parent d73354007291ad548dbeca0a756e54074aee7828
parent e7b7049b95fd02b0b4b4f42bb7a8a33d1b3296c4

am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit 'e7b7049b95fd02b0b4b4f42bb7a8a33d1b3296c4':
  Return a result from Fragment#shouldShowRequestPermissionRationale

core/java/android/app/Fragment.java

diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index 5490fe7..66e2733 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1249,7 +1249,8 @@
      */
     public boolean shouldShowRequestPermissionRationale(@NonNull String permission) {
         if (mHost != null) {
-            mHost.getContext().getPackageManager().shouldShowRequestPermissionRationale(permission);
+            return mHost.getContext().getPackageManager()
+                    .shouldShowRequestPermissionRationale(permission);
         }
         return false;
     }