Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c94df7c6 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev 

am: 4bbd3c48

* commit '4bbd3c48':
  Clear calling identify b4 Beam callback.
parents bb107a85 4bbd3c48

core/java/android/nfc/NfcActivityManager.java

+34 −30
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ public final class NfcActivityManager extends IAppCallback.Stub 
            flags = state.flags;

            activity = state.activity;

        }



        final long ident = Binder.clearCallingIdentity();

        try {

            // Make callbacks without lock

            if (ndefCallback != null) {

                message = ndefCallback.createNdefMessage(event);
@@ -406,6 +407,9 @@ public final class NfcActivityManager extends IAppCallback.Stub 
                            Intent.FLAG_GRANT_READ_URI_PERMISSION);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

        return new BeamShareData(message, uris, new UserHandle(UserHandle.myUserId()), flags);

    }