Commit da9ce92
Backport missing permission check for querying main activity intent
- This was fixed in T in ag/16820166, but the original code was
submitted in S. This ensures that the caller of this method
is either holding the ACCESS_SHORTCUTS permission or is the
default launcher.
Bug: 229256049
Test: atest WMShellUnitTests
Change-Id: Ib233ad754a6c6e3c4e0d0e10ed788ab8e055cccc
Merged-In: Ib233ad754a6c6e3c4e0d0e10ed788ab8e055cccc
(cherry picked from commit f4ed441)
(cherry picked from commit b319280)
Merged-In: Ib233ad754a6c6e3c4e0d0e10ed788ab8e055cccc1 parent 6f692e2 commit da9ce92
3 files changed
Lines changed: 7 additions & 5 deletions
File tree
- core/java/android/content/pm
- services/core/java/com/android/server/pm
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
60 | | - | |
| 59 | + | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
752 | 752 | | |
753 | 753 | | |
754 | 754 | | |
755 | | - | |
| 755 | + | |
| 756 | + | |
756 | 757 | | |
757 | 758 | | |
758 | 759 | | |
| |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1119 | 1119 | | |
1120 | 1120 | | |
1121 | 1121 | | |
1122 | | - | |
1123 | | - | |
| 1122 | + | |
| 1123 | + | |
| 1124 | + | |
1124 | 1125 | | |
1125 | 1126 | | |
1126 | 1127 | | |
| |||
0 commit comments