tree 60ebda3453d0a92ecb1e4b5954e2d9eb8c3645dd
parent 995627c3ee75dce1ebf6338012cba60d68fe94f0
author Jeff Sharkey <jsharkey@android.com> 1497310387 -0600
committer Jeff Sharkey <jsharkey@google.com> 1507062910 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Also fix ordering bug in general-purpose security check that was
allowing FLAG_GRANT_PERSISTABLE to bypass it.

Test: builds, boots
Bug: 32990341, 32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
(cherry picked from commit d722e780bac7685e8a012b5f479eba8c348c3c53)