Tiger Huang
03c20bbf6e
Merge "Remove InputForwarder"
2019-02-19 07:18:41 +00:00
TreeHugger Robot
1ca52f005a
Merge "Remove opposite position of nav bar for short aspect ratio app"
2019-02-19 04:29:37 +00:00
Jeff Chang
bee3883606
Merge "Suppress the warning toast if the preferredDisplay was set to singleTask"
2019-02-19 04:08:26 +00:00
TreeHugger Robot
d8b240cbb0
Merge "Add TEST_MAPPING for GtsUnofficialApisUsageTestCases"
2019-02-19 03:35:39 +00:00
Raj Mamadgi
50ca62a11b
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am: 43d11758fa am: 0f174795e4
...
am: 03549b860a
Change-Id: I4d6037597d60b5990db0b95bdee3cb69c500ec49
2019-02-18 18:36:10 -08:00
Raj Mamadgi
03549b860a
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am: 43d11758fa
...
am: 0f174795e4
Change-Id: Ie32376993dcc8b06f3d2254d6aecdb9a4f843236
2019-02-18 18:22:41 -08:00
Raj Mamadgi
0f174795e4
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
...
am: 43d11758fa
Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c
2019-02-18 18:13:45 -08:00
Treehugger Robot
43d11758fa
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
2019-02-19 02:02:35 +00:00
Yunfan Chen
1cdbfae1fb
Merge "Move WindowStateTests into flaky one"
2019-02-19 02:02:17 +00:00
TreeHugger Robot
623a9c6dc7
Merge "Mark apexd session as successful before marking staged session applied"
2019-02-18 22:08:18 +00:00
Ruslan Tkhakokhov
732d357954
Merge "BackupManager shouldn't clear app's data during restore if agent wasn't invoked yet"
2019-02-18 21:51:49 +00:00
David Brazdil
2022cbf43c
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()" am: da75e38817 am: 20a71e4a90
...
am: af4651f75f
Change-Id: Ifa3bb90eeb3393f70a6263711073c58186e09a77
2019-02-18 11:40:24 -08:00
David Brazdil
af4651f75f
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()" am: da75e38817
...
am: 20a71e4a90
Change-Id: I07d5ec63ffcf5bda0a2cb3c2d4b0d3af0d3fdbf3
2019-02-18 11:29:01 -08:00
David Brazdil
20a71e4a90
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
...
am: da75e38817
Change-Id: I50ac78d0e85ab34cea2abaef4f44ee8d418e517c
2019-02-18 11:18:40 -08:00
Treehugger Robot
da75e38817
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
2019-02-18 19:11:00 +00:00
TreeHugger Robot
c064ace652
Merge "Fix testDefaultDisplayOverrideConfiguration failed."
2019-02-18 19:09:04 +00:00
Android Build Merger (Role)
b0a3946386
Merge "Merge "Revert "Remove legacy-test and legacy-android-test targets"" am: 049c1589ee am: 7f997d4cfc am: 95a9dc906f"
2019-02-18 18:51:41 +00:00
Jakub Gielzak
e00505b90a
Merge "Revert "Remove legacy-test and legacy-android-test targets"" am: 049c1589ee am: 7f997d4cfc
...
am: 95a9dc906f
Change-Id: I1034050336bdf8be84e3b86ae346dc4bfe1737ef
2019-02-18 10:51:09 -08:00
TreeHugger Robot
0d3e229a6b
Merge "Fix screen size configuration computing of task"
2019-02-18 18:48:16 +00:00
Jakub Gielzak
95a9dc906f
Merge "Revert "Remove legacy-test and legacy-android-test targets"" am: 049c1589ee
...
am: 7f997d4cfc
Change-Id: If998990b94bd36f0ffae26dede85df8ad079093e
2019-02-18 10:42:20 -08:00
Anton Hansson
5641b63411
Merge "Specify no resource_dirs for SystemUI" am: 347d6ff9f9 am: a05d598bc0
...
am: dd33e2766b
Change-Id: Ifbd329e479ba447707d1a2a3a9492b5b9e48e331
2019-02-18 10:35:05 -08:00
Jakub Gielzak
7f997d4cfc
Merge "Revert "Remove legacy-test and legacy-android-test targets""
...
am: 049c1589ee
Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce
2019-02-18 10:32:40 -08:00
Anton Hansson
dd33e2766b
Merge "Specify no resource_dirs for SystemUI" am: 347d6ff9f9
...
am: a05d598bc0
Change-Id: I2f2fd095a77726c62ea7f557a7ed3b5844691bf5
2019-02-18 10:26:05 -08:00
Jakub Gielzak
049c1589ee
Merge "Revert "Remove legacy-test and legacy-android-test targets""
2019-02-18 18:24:58 +00:00
Jakub Gielzak
7d7af10dc9
Revert "Remove legacy-test and legacy-android-test targets"
...
This reverts commit 3b0be60307 .
Reason for revert: Broken build
Change-Id: I71270c7b47163ab7147029f2d3961d1848fdd9eb
2019-02-18 18:24:17 +00:00
Anton Hansson
a05d598bc0
Merge "Specify no resource_dirs for SystemUI"
...
am: 347d6ff9f9
Change-Id: I0b752a641e5f74d7dac1017616553f464427e219
2019-02-18 10:16:37 -08:00
Anton Hansson
347d6ff9f9
Merge "Specify no resource_dirs for SystemUI"
2019-02-18 18:03:36 +00:00
TreeHugger Robot
77ed438f0f
Merge changes Ie125d44c,If9b5d57e,I001427c7
...
* changes:
Create basic test for rollback of staged install.
Stub out code for a host driven StagedRollbackTest.
Move RollbackTest app code to a new subdirectory.
2019-02-18 17:49:56 +00:00
Ruslan Tkhakokhov
d894401fee
BackupManager shouldn't clear app's data during restore if agent wasn't invoked yet
...
Bug: 123738850
Test: 1) atest RunBackupFrameworksServicesRoboTests
2) atest CtsBackupTestCases
3) atest CtsBackupHostTestCases
4) atest GtsBackupTestCases
5) atest GtsBackupHostTestCases
6) Manual: Force exceptions before/after agent was called, verify
the new behavior.
Change-Id: Ia9ddea2939fc6d72dd9bc060b0c47bc8da2b868d
2019-02-18 17:02:21 +00:00
lumark
137cc51bca
Fix testDefaultDisplayOverrideConfiguration failed.
...
Fixed problem introduced in ag/6135784 where override configuration may
not write to proto correctly when passing wrong "critical" parameter
to Configuration#writeToProto().
Fix: 124326029
Test: atest ActivityManagerDisplayTests
Change-Id: If509099192b333c3b6113b88259ab908b6effa12
2019-02-19 00:50:45 +08:00
Jeff Sharkey
c2b55eb98f
Merge changes from topic "wrapz"
...
* changes:
Add tests for DocumentsContract/Provider.
Replace ContentInterface with wrapping.
2019-02-18 16:42:07 +00:00
Beth Thibodeau
71779d34f2
Merge "Set seekbar to clickable"
2019-02-18 16:15:48 +00:00
Mark Renouf
d60890b484
Merge "ActivityView: avoid crash in release() when detached from window"
2019-02-18 16:09:19 +00:00
TreeHugger Robot
1869313a88
Merge "Trigger CtsDevicePolicyManagerTestCases in postsubmit"
2019-02-18 16:02:35 +00:00
Svetoslav Ganov
bdea76f9ae
Merge "Add request object for querying historical ops"
2019-02-18 15:48:19 +00:00
Android Build Merger (Role)
86a8aab944
Merge "Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf747 am: 4a83feb18a am: 9248379c98"
2019-02-18 15:45:19 +00:00
Paul Duffin
0cc3064ada
Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf747 am: 4a83feb18a
...
am: 9248379c98
Change-Id: Ia409c6c4596269120386f8ae47d7f6379a1073bf
2019-02-18 07:44:41 -08:00
TreeHugger Robot
222032ba1a
Merge "Refine UI janky in split-screen when launch & close IME opened app"
2019-02-18 15:43:28 +00:00
Paul Duffin
9248379c98
Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf747
...
am: 4a83feb18a
Change-Id: I920fe03eb41e0aceab8ba794bdfd53d3a5c75388
2019-02-18 07:35:37 -08:00
Paul Duffin
4a83feb18a
Merge "Remove legacy-test and legacy-android-test targets"
...
am: 14daedf747
Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc
2019-02-18 07:26:09 -08:00
Jin Seok Park
4516110570
Merge "Add OWNERS for ExifInterface" am: 996d37ea59 am: 3250d90912
...
am: b3cec6a72d
Change-Id: Ie96e8e9991513de5edcb70d68ff67de42a037b90
2019-02-18 07:24:32 -08:00
Jin Seok Park
b3cec6a72d
Merge "Add OWNERS for ExifInterface" am: 996d37ea59
...
am: 3250d90912
Change-Id: I96a63075aca417d269e941a84612c72575c073fd
2019-02-18 07:15:59 -08:00
Paul Duffin
14daedf747
Merge "Remove legacy-test and legacy-android-test targets"
2019-02-18 15:13:45 +00:00
Jin Seok Park
3250d90912
Merge "Add OWNERS for ExifInterface"
...
am: 996d37ea59
Change-Id: I24669310bf259344675110b2e4463894843e776b
2019-02-18 07:06:53 -08:00
David Brazdil
68982d3f40
Force blacklist on VMRuntime.setTargetSdkVersion*()
...
The methods could be used to bypass the restrictions. Force them
onto the blacklist.
Test: builds
Change-Id: I77d1fb8ca7339bec5e933f87a3b672096e2e559e
2019-02-18 15:02:59 +00:00
Riddle Hsu
88e3c8731c
Fix screen size configuration computing of task
...
Correct the typo for screen height.
Bug: 124532338
Test: atest TaskRecordTests#testComputeConfigResourceOverrides
Change-Id: I02ff82620f538291f2ae5518e1b4ee2c2ac288d1
2019-02-18 22:57:05 +08:00
Jin Seok Park
996d37ea59
Merge "Add OWNERS for ExifInterface"
2019-02-18 14:56:06 +00:00
Michal Karpinski
e6cb28ce13
Merge "Deliver realCallingUid and realCallingPid to AMS.broadcastIntentLocked() and make permission checks on them"
2019-02-18 14:40:22 +00:00
TreeHugger Robot
ffdc325ff2
Merge "Update color display javadoc"
2019-02-18 14:36:55 +00:00
Pavel Grafov
5af5841b05
Trigger CtsDevicePolicyManagerTestCases in postsubmit
...
In this configuration the tests will only be triggered by changes
to services/devicepolicy/** and core/java/android/app/admin/**, so
we won't be able to catch breakages coming from the rest of the tree
with a single CL precision. But let's see which parts are causing
the most breakages and add them later.
Bug: 124653467
Test: atest --test-mapping core/java/android/app/admin:postsubmit
Test: atest --test-mapping services/devicepolicy:postsubmit
Change-Id: I58f87fff4b5b5e3e4fb8a333dd6ac4dd4100b587
2019-02-18 14:12:00 +00:00