Fix for onRequestPermissionsResult() not called for child fragments.

The solution is very similar to the one for onActivityResult.
Instead of iterating over fragments in FragmentActivity, pass the
execution of onRequestPermissionsResult() to FragmentManager, which
maintains list of permissions requests. Either fragment is found
and its onRequestPermissionsResult() callback is called, or child
FragmentManager is asked to process the result.

Author: Miłosz Lewandowski

src/java/android/support/v4/app/FragmentActivity.java

@@ -804,22 +804,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             @NonNull int[] grantResults) {
         int index = (requestCode>>8)&0xff;
         if (index != 0) {
-            index--;
-            final int activeFragmentsCount = mFragments.getActiveFragmentsCount();
-            if (activeFragmentsCount == 0 || index < 0 || index >= activeFragmentsCount) {
-                Log.w(TAG, "Activity result fragment index out of range: 0x"
-                        + Integer.toHexString(requestCode));
-                return;
-            }
-            final List<Fragment> activeFragments =
-                    mFragments.getActiveFragments(new ArrayList<Fragment>(activeFragmentsCount));
-            Fragment frag = activeFragments.get(index);
-            if (frag == null) {
-                Log.w(TAG, "Activity result no fragment exists for index: 0x"
-                        + Integer.toHexString(requestCode));
-            } else {
-                frag.onRequestPermissionsResult(requestCode&0xff, permissions, grantResults);
-            }
+            getSupportFragmentManager().onRequestPermissionsResult(requestCode, permissions, grantResults);
         }
     }
 
@@ -852,7 +837,7 @@ private void requestPermissionsFromFragment(Fragment fragment, String[] permissi
         }
         mRequestedPermissionsFromFragment = true;
         ActivityCompat.requestPermissions(this, permissions,
-                ((fragment.mIndex + 1) << 8) + (requestCode & 0xff));
+                (fragment.getFragmentManager().getPermissionsRequestCode(fragment)<<8) + (requestCode&0xff));
     }
 
     class HostCallbacks extends FragmentHostCallback<FragmentActivity> {

src/java/android/support/v4/app/FragmentManager.java

@@ -28,6 +28,7 @@
 import android.os.Parcelable;
 import android.support.annotation.CallSuper;
 import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.support.v4.util.DebugUtils;
 import android.support.v4.util.LogWriter;
@@ -366,13 +367,18 @@ public static void enableDebugLogging(boolean enabled) {
 
     abstract int getActivityRequestCode(Fragment fragment);
     abstract void onActivityResult(int requestCode, int resultCode, Intent data);
+
+    abstract int getPermissionsRequestCode(Fragment fragment);
+    abstract void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                             @NonNull int[] grantResults);
 }
 
 final class FragmentManagerState implements Parcelable {
     FragmentState[] mActive;
     int[] mAdded;
     BackStackState[] mBackStack;
     ActivityRequest[] mPendingActivityRequests;
+    PermissionsRequest[] mPendingPermissionsRequests;
 
     public FragmentManagerState() {
     }
@@ -382,6 +388,7 @@ public FragmentManagerState(Parcel in) {
         mAdded = in.createIntArray();
         mBackStack = in.createTypedArray(BackStackState.CREATOR);
         mPendingActivityRequests = in.createTypedArray(ActivityRequest.CREATOR);
+        mPendingPermissionsRequests = in.createTypedArray(PermissionsRequest.CREATOR);
     }
 
     public int describeContents() {
@@ -393,6 +400,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeIntArray(mAdded);
         dest.writeTypedArray(mBackStack, flags);
         dest.writeTypedArray(mPendingActivityRequests, flags);
+        dest.writeTypedArray(mPendingPermissionsRequests, flags);
     }
 
     public static final Parcelable.Creator<FragmentManagerState> CREATOR
@@ -448,6 +456,47 @@ public ActivityRequest[] newArray(int size) {
     };
 }
 
+final class PermissionsRequest implements Parcelable {
+    final int mFragmentIndex;
+    final int mRequestIndex;
+    final int mChildRequestIndex;
+
+    PermissionsRequest(int fragmentIndex, int requestIndex, int childRequestIndex) {
+        mFragmentIndex = fragmentIndex;
+        mRequestIndex = requestIndex;
+        mChildRequestIndex = childRequestIndex;
+    }
+
+    PermissionsRequest(Parcel in) {
+        mFragmentIndex = in.readInt();
+        mRequestIndex = in.readInt();
+        mChildRequestIndex = in.readInt();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(mFragmentIndex);
+        dest.writeInt(mRequestIndex);
+        dest.writeInt(mChildRequestIndex);
+    }
+
+    public static final Parcelable.Creator<PermissionsRequest> CREATOR
+            = new Parcelable.Creator<PermissionsRequest>() {
+        public PermissionsRequest createFromParcel(Parcel in) {
+            return new PermissionsRequest(in);
+        }
+
+        public PermissionsRequest[] newArray(int size) {
+            return new PermissionsRequest[size];
+        }
+    };
+}
+
 /**
  * Container for fragments associated with an activity.
  */
@@ -537,6 +586,8 @@ public void onAnimationRepeat(Animation animation) {
     ArrayList<Fragment> mCreatedMenus;
     ArrayList<ActivityRequest> mPendingActivityRequests;
     ArrayList<Integer> mAvailRequestIndices;
+    ArrayList<PermissionsRequest> mPendingPermissionsRequests;
+    ArrayList<Integer> mAvailPermissionsRequestIndices;
 
     // Must be accessed while locked.
     ArrayList<BackStackRecord> mBackStackIndices;
@@ -945,6 +996,77 @@ private boolean dispatchOnActivityResult(int requestIndex, int requestCode, int
         }
     }
 
+    @Override
+    int getPermissionsRequestCode(Fragment fragment) {
+        return getPermissionsRequestIndex(fragment, -1) + 1;
+    }
+
+    private int getPermissionsRequestIndex(Fragment fragment, int childRequestIndex) {
+        final PermissionsRequest request;
+
+        if (mAvailPermissionsRequestIndices == null || mAvailPermissionsRequestIndices.isEmpty()) {
+            if (mPendingPermissionsRequests == null) {
+                mPendingPermissionsRequests = new ArrayList<PermissionsRequest>();
+            }
+
+            if (mPendingPermissionsRequests.size() > 0xff) {
+                throw new IllegalStateException("Over 0xff pending permissions requests in " + fragment);
+            }
+
+            request = new PermissionsRequest(fragment.mIndex, mPendingPermissionsRequests.size(), childRequestIndex);
+            mPendingPermissionsRequests.add(request);
+        } else {
+            request = new PermissionsRequest(fragment.mIndex, mAvailPermissionsRequestIndices.remove(mAvailPermissionsRequestIndices.size() - 1), childRequestIndex);
+            mPendingPermissionsRequests.set(request.mRequestIndex, request);
+        }
+
+        Fragment parent = fragment.getParentFragment();
+        if (parent != null) {
+            return parent.mFragmentManager.getPermissionsRequestIndex(parent, request.mRequestIndex);
+        } else {
+            return request.mRequestIndex;
+        }
+    }
+
+    @Override
+    void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                    @NonNull int[] grantResults) {
+        if (!dispatchOnRequestPermissionsResult((requestCode>>8) - 1, requestCode&0xff,
+                permissions, grantResults)) {
+            Log.w(TAG, "No fragment exists for requestCode: 0x" + Integer.toHexString(requestCode));
+        }
+    }
+
+    private boolean dispatchOnRequestPermissionsResult(int requestIndex, int requestCode,
+                                                       @NonNull String[] permissions,
+                                                       @NonNull int[] grantResults) {
+        if (!checkElement(mPendingPermissionsRequests, requestIndex)) {
+            return false;
+        }
+
+        PermissionsRequest resultRequest = mPendingPermissionsRequests.get(requestIndex);
+        if (!checkElement(mActive, resultRequest.mFragmentIndex)) {
+            return false;
+        }
+
+        Fragment fragment = mActive.get(resultRequest.mFragmentIndex);
+        if (resultRequest.mChildRequestIndex != -1) {
+            mPendingPermissionsRequests.set(requestIndex, null);
+            if (mAvailPermissionsRequestIndices == null) {
+                mAvailPermissionsRequestIndices = new ArrayList<Integer>();
+            }
+            mAvailPermissionsRequestIndices.add(requestIndex);
+
+            return fragment.mChildFragmentManager.dispatchOnRequestPermissionsResult(
+                    resultRequest.mChildRequestIndex,
+                    requestCode, permissions, grantResults
+            );
+        } else {
+            fragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
+            return true;
+        }
+    }
+
     private boolean checkElement(ArrayList<?> list, int index) {
         return list != null && index < list.size() && list.get(index) != null;
     }
@@ -2028,11 +2150,18 @@ Parcelable saveAllState() {
             pendingActivityRequests = mPendingActivityRequests.toArray(new ActivityRequest[mPendingActivityRequests.size()]);
         }
 
+        // Save pending permissions requests
+        PermissionsRequest[] pendingPermissionsRequests = null;
+        if (mPendingPermissionsRequests != null) {
+            pendingPermissionsRequests = mPendingPermissionsRequests.toArray(new PermissionsRequest[mPendingPermissionsRequests.size()]);
+        }
+
         FragmentManagerState fms = new FragmentManagerState();
         fms.mActive = active;
         fms.mAdded = added;
         fms.mBackStack = backStack;
         fms.mPendingActivityRequests = pendingActivityRequests;
+        fms.mPendingPermissionsRequests = pendingPermissionsRequests;
         return fms;
     }
 
@@ -2163,6 +2292,22 @@ void restoreAllState(Parcelable state, List<Fragment> nonConfig) {
             }
             mPendingActivityRequests = new ArrayList<ActivityRequest>(Arrays.asList(fms.mPendingActivityRequests));
         }
+
+        // Restore pending permissions requests
+        if (fms.mPendingPermissionsRequests != null) {
+            mPendingPermissionsRequests = new ArrayList<PermissionsRequest>();
+            if (mAvailPermissionsRequestIndices != null) {
+                mAvailPermissionsRequestIndices.clear();
+            } else {
+                mAvailPermissionsRequestIndices = new ArrayList<Integer>();
+            }
+            for (int i=0; i<fms.mPendingPermissionsRequests.length; i++) {
+                if (fms.mPendingPermissionsRequests[i] == null) {
+                    mAvailPermissionsRequestIndices.add(i);
+                }
+            }
+            mPendingPermissionsRequests = new ArrayList<PermissionsRequest>(Arrays.asList(fms.mPendingPermissionsRequests));
+        }
     }
 
     public void attachController(FragmentHostCallback host,