diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2020-02-10 08:46:26 -0800 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2020-02-12 18:51:53 +0000 |
| commit | ee29509ecd73c3910011b2bdc12d1ef28fcb5a3d (patch) | |
| tree | 88289fe02f2ffd203dd0468e829e42b56ea9118f /tests/MemoryUsage | |
| parent | 998c6ad176d4c419f52184842692c3009379d3f5 (diff) | |
Revert "Revert "Activity start: Send featureId from context->AppOpsManager""
This reverts commit e7421e92d947b09ca3cb9e6dfb66bbb27b9ed114.
Exempt-From-Owner-Approval: revert-revert and only piping anyway
Test: 1:1 revert-revert
Bug: 136595429
Change-Id: I44e5fa2019f5604c6e2c08bdd1967129c64a90a7
Diffstat (limited to 'tests/MemoryUsage')
| -rw-r--r-- | tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java index 1361df30e9d7..59049160e885 100644 --- a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java +++ b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java @@ -321,7 +321,8 @@ public class MemoryUsageTest extends InstrumentationTestCase { } mAtm.startActivityAndWait(null, - getInstrumentation().getContext().getBasePackageName(), mLaunchIntent, + getInstrumentation().getContext().getBasePackageName(), + getInstrumentation().getContext().getFeatureId(), mLaunchIntent, mimeType, null, null, 0, mLaunchIntent.getFlags(), null, null, UserHandle.USER_CURRENT_OR_SELF); } catch (RemoteException e) { |