Commit 7a04bee
DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now.
Or, if an instrumentation starts another instrumentation and so on,
and the original instrumentation is started from SHELL, allow all
Context#startInstrumentation calls in this chain.
Otherwise, it'll throw a SecurityException.
Bug: 237766679
Test: atest CtsAppTestCases:InstrumentationTest
Merged-In: Ia08f225c21a3933067d066a578ea4af9c23e7d4c
Merged-In: I1b76f61c5fd6c9f7e738978592260945a606f40c
Merged-In: I3ea7aa27bd776fec546908a37f667f680da9c892
Change-Id: I7ca7345b064e8e74f7037b8fa3ed45bb6423e406
(cherry picked from commit a3e618a)
Merged-In: I7ca7345b064e8e74f7037b8fa3ed45bb6423e4061 parent eec689f commit 7a04bee
1 file changed
Lines changed: 34 additions & 0 deletions
Lines changed: 34 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14655 | 14655 | | |
14656 | 14656 | | |
14657 | 14657 | | |
| 14658 | + | |
| 14659 | + | |
| 14660 | + | |
| 14661 | + | |
| 14662 | + | |
| 14663 | + | |
| 14664 | + | |
| 14665 | + | |
| 14666 | + | |
| 14667 | + | |
| 14668 | + | |
14658 | 14669 | | |
14659 | 14670 | | |
14660 | 14671 | | |
| |||
14877 | 14888 | | |
14878 | 14889 | | |
14879 | 14890 | | |
| 14891 | + | |
| 14892 | + | |
| 14893 | + | |
| 14894 | + | |
| 14895 | + | |
| 14896 | + | |
| 14897 | + | |
| 14898 | + | |
| 14899 | + | |
| 14900 | + | |
| 14901 | + | |
| 14902 | + | |
| 14903 | + | |
| 14904 | + | |
| 14905 | + | |
| 14906 | + | |
| 14907 | + | |
| 14908 | + | |
| 14909 | + | |
| 14910 | + | |
| 14911 | + | |
| 14912 | + | |
| 14913 | + | |
14880 | 14914 | | |
14881 | 14915 | | |
14882 | 14916 | | |
| |||
0 commit comments