Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev (4bbd3c48) · Commits · e / os / android_frameworks_base

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);
		}