Commit Graph

405305 Commits

Author SHA1 Message Date
Dario Freni
c603effca5 Merge "Remove unused APEX session state." 2019-02-19 15:46:51 +00:00
Dario Freni
95e9094aca Merge "Fix typo in javadoc." 2019-02-19 15:33:24 +00:00
Pavel Grafov
047bf28243 Merge "Dummy change to test postsubmit invocation" 2019-02-19 15:24:07 +00:00
Nicolas Geoffray
8b9abc98b5 Merge "Add a dalvik.vm.boot-image option for zygote and installd." am: 80e697a297 am: f2bcd619a1
am: bda2cb3b18

Change-Id: Ia60c8b93f1dec2285d2d539377e49b8bf79f7734
2019-02-19 07:03:10 -08:00
Nicolas Geoffray
bda2cb3b18 Merge "Add a dalvik.vm.boot-image option for zygote and installd." am: 80e697a297
am: f2bcd619a1

Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d
2019-02-19 06:53:30 -08:00
Nicolas Geoffray
f2bcd619a1 Merge "Add a dalvik.vm.boot-image option for zygote and installd."
am: 80e697a297

Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a
2019-02-19 06:44:44 -08:00
Gavin Corkery
f3f3d1ca94 Merge "Rename data/staging to data/pkg_staging" 2019-02-19 14:40:59 +00:00
Nicolas Geoffray
80e697a297 Merge "Add a dalvik.vm.boot-image option for zygote and installd." 2019-02-19 14:28:18 +00:00
Pavel Grafov
846ad2ded2 Dummy change to test postsubmit invocation
Bug: 124653467
Test: builds
Change-Id: I3cdf2a2647c8e0e4dd2e4bc49cd5cd5ff1daed4e
2019-02-19 11:26:46 +00:00
Dario Freni
38309712bc Remove unused APEX session state.
This state is unused and will be completely removed in a follow-up CL.

Bug: 124367761
Test: n/a
Change-Id: Ie4e0954aae0c72ae0887fc15a3cafb02e5c7099f
2019-02-19 10:52:35 +00:00
Philip P. Moltmann
753f4ce468 Merge "Support revoke-when-requested with pre-M apps" 2019-02-19 10:34:09 +00:00
Adam Vartanian
3deb23fead Merge "Fix authority parsing test" am: 8ce3609e58 am: becdd58df5
am: 598b2497b3

Change-Id: Ic32fceebd7936b779efed954dcd0745b1207f7ff
2019-02-19 02:04:16 -08:00
Adam Vartanian
598b2497b3 Merge "Fix authority parsing test" am: 8ce3609e58
am: becdd58df5

Change-Id: I41d4997661cf011e9589aedac9de301b1becb441
2019-02-19 01:54:53 -08:00
Adam Vartanian
becdd58df5 Merge "Fix authority parsing test"
am: 8ce3609e58

Change-Id: I8554fddceb326c52b85b34a483b3e3791abf2cdc
2019-02-19 01:44:45 -08:00
Adam Vartanian
8ce3609e58 Merge "Fix authority parsing test" 2019-02-19 09:27:35 +00:00
Adam Vartanian
f240cb8091 Fix authority parsing test
The test has been failing because http://r.android.com/793302 changed
how the port separator was found, only scanning ASCII digits until it
hits a colon, and previously it would scan for the colon and then
percent-decode the rest of it.  The new behavior actually better
matches the WHATWG URL parsing algorithm [1], which specifies that
ports only include ASCII digits.  It does mean that some edge cases
that previously parsed as host "foo", port 42 will now parse as
host "foo:42", no port, but those URLs wouldn't be accepted by
browsers so they should be exceedingly rare.

The behavior per the WHATWG spec would be to fail to parse in the case
of a percent-encoded character in the port section, but this class is
specifically documented to accept garbage, so lumping the mis-encoded
port as part of the hostname (which will result in a hostname that's
invalid and impossible to resolve) seems like the best option.

[1] https://url.spec.whatwg.org/#port-state

Fixes: 124360078
Test: atest android.net.UriTest
Change-Id: I1c788cb7703c821ae74b542b74d89e10cba5a546
2019-02-19 09:27:24 +00:00
Alan Stokes
218c9e7d9b Merge "Attempt to de-flake tests." 2019-02-19 09:08:55 +00:00
Richard Uhler
d943d26c55 Merge "RollbackManager: fix installedUsers null pointer exception." 2019-02-19 08:55:52 +00:00
Tiger Huang
03c20bbf6e Merge "Remove InputForwarder" 2019-02-19 07:18:41 +00:00
Philip P. Moltmann
d030ce24c1 Support revoke-when-requested with pre-M apps
In this case the permission should not be revoked, but the app-op should
be.

Fixes: 124609307
Test: atest SplitPermissionTests
Change-Id: I4e70b8f9ef1e01320adb55096437e82a058883db
2019-02-18 21:09:13 -08: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
Dario Freni
a0e3dda8d4 Fix typo in javadoc.
Test: n/a
Change-Id: I99e722902b21e46691af3d2d2e8e63cd4ced618e
2019-02-18 20:58:54 +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
Alan Stokes
206a69d409 Attempt to de-flake tests.
Some of these tests rely on audit logs being generated and then
visible when we try to read them. Occasionally this doesn't work -
probably because of throttling or the asynchronous, background nature
of logging. When it happens the tests fail.

To avoid this, re-run the susceptible tests multiple times rather than
failing on the first go, with increasingly long delays between
triggering and reading the logs on each run.

Bug: 123507824
Test: atest -p services/core/java/com/android/server/pm/dex
Change-Id: I62db997c912b2d153ecaea34011529c4c58207c7
2019-02-18 16:59:56 +00:00