OSDN Git Service

KEY_INTENT shouldn't grant permissions.
authorJeff Sharkey <jsharkey@android.com>
Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)
committerJeff Sharkey <jsharkey@google.com>
Tue, 13 Jun 2017 19:44:03 +0000 (19:44 +0000)
commitd722e780bac7685e8a012b5f479eba8c348c3c53
tree8794def3cb25105022c6446677ae44ac655337d9
parent4cb3ae605ce2b09119cb3317e3fb540a4dd5295a
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: 3299034132879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
services/core/java/com/android/server/accounts/AccountManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java