Commit Graph

423075 Commits

Author SHA1 Message Date
Philip P. Moltmann
4f7f78cce5 Merge "Disable historical appops" into qt-dev
am: 16128cc7a2

Change-Id: I5f3701c4510057aa69dec50c3dbae6c8fce860e8
2019-06-28 20:48:36 -07:00
Eugene Susla
230c3cfaab Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev
am: 40c5864445

Change-Id: I42f6363f3037da833e70d31f8cda096dfe5832c8
2019-06-28 20:42:04 -07:00
Eugene Susla
2f27997760 [DO NOT MERGE] Guard against launching permission backup/restore twice per request
am: 8c2fb0ea1e

Change-Id: Ibfd0a70b91eb6ae13b8ad6506e02314521c36084
2019-06-28 20:42:01 -07:00
TreeHugger Robot
16128cc7a2 Merge "Disable historical appops" into qt-dev 2019-06-29 03:28:31 +00:00
TreeHugger Robot
40c5864445 Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev 2019-06-29 02:56:35 +00:00
Wale Ogunwale
8aa1dd7096 Merge "Reland: Clear transitions for app windows display change." into qt-dev
am: bf4eee2181

Change-Id: Id28ab24b939f8e5ca1a234a5076611775b874257
2019-06-28 19:44:44 -07:00
TreeHugger Robot
bf4eee2181 Merge "Reland: Clear transitions for app windows display change." into qt-dev 2019-06-29 01:49:22 +00:00
Bryan Ferris
6b4e794ccd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours
am: 8b98bdc834

Change-Id: I1d753056c171bec25bc29e488f9b630067cf4405
2019-06-28 17:54:17 -07:00
Shuzhen Wang
6f14111467 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
am: 6da414a8f6

Change-Id: I2ade92a130cc6267a51802633f970d906891d5a6
2019-06-28 17:48:51 -07:00
Bryan Ferris
8b98bdc834 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev
am: b2964b2956 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd5eb4109d1eca28aee7004b0625f51b1c9d203b
2019-06-28 17:39:07 -07:00
Eugene Susla
8c2fb0ea1e [DO NOT MERGE] Guard against launching permission backup/restore twice per request
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.

Fixes: 135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
2019-06-29 00:20:09 +00:00
Bryan Ferris
b2964b2956 Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev 2019-06-28 23:59:16 +00:00
TreeHugger Robot
6da414a8f6 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev 2019-06-28 23:54:09 +00:00
Kavi Gupta
c1a4da00c6 Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b
am: 7762c4aa6c

Change-Id: I717b3393095ae16b919aa77ace6104526ea8b17a
2019-06-28 16:16:52 -07:00
Kavi Gupta
7762c4aa6c Merge "Add JVMTI agent to dump/reset JaCoCo coverage information"
am: edf7470e0b

Change-Id: Ic0905474c956824a9526ce29949c8d667c91ba39
2019-06-28 16:01:36 -07:00
Treehugger Robot
edf7470e0b Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" 2019-06-28 22:41:14 +00:00
Mathew Inwood
cd82f9adff Merge "Restore some greylist entries." into qt-dev
am: f4535c8d51

Change-Id: I3851fed60bedab9748f2d6d53f342f2605ecf78b
2019-06-28 13:18:30 -07:00
TreeHugger Robot
f4535c8d51 Merge "Restore some greylist entries." into qt-dev 2019-06-28 20:01:13 +00:00
Wale Ogunwale
b8e6b6313f Reland: Clear transitions for app windows display change.
This prevents unwanted animations from running for windows on the new
display that are no longer relevant.
Also,
- Transfer the opening app token transition to the new display so that
it can be eventually made visible on that display
- Clean-up TODO relating to moving VR activity to main display, so that
the right states are set.

Bug: 128449959
Test: VrDisplayTests
Test: manual - launch activity with options moving between virtual and
default display, atest WmTests

Change-Id: I285c6742839d38e76322621b9c2a1d7f313cd6f8
2019-06-28 10:58:12 -07:00
Andrew Sapperstein
f08f33b97b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev
am: 9dd0c5628b

Change-Id: Ia58094614151af83aadd36bb04e0389050dd05be
2019-06-28 10:28:00 -07:00
Andrew Sapperstein
9dd0c5628b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev 2019-06-28 16:56:04 +00:00
Mathieu Chartier
fd36670bd0 Merge "Remove support for image classes" am: 566bfcf475
am: e8131249e5

Change-Id: I52062c008a9b658471e4adfca8d5d116dd35790c
2019-06-28 09:49:41 -07:00
Mathieu Chartier
e8131249e5 Merge "Remove support for image classes"
am: 566bfcf475

Change-Id: I6795fe57078b679ef4077c751458603124d848e7
2019-06-28 09:30:23 -07:00
Philip P. Moltmann
f816bb587c Disable historical appops
Fixes: 133419419
Test: atest CtsAppOpsTestCases
Change-Id: I1790581b5ac6608c59d731d9d28110f125186a39
Merged-In: I6debd3cbb6768b256eb558a81ba13efea375769b
2019-06-28 16:25:28 +00:00
Bernardo Rufino
c745b59945 [automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP" am: 51b6c76660 -s ours
am: c4d53ba7f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f3a2bb325bb5870101b70206879c02ae2077683
2019-06-28 09:17:34 -07:00
Anna Trostanetski
edf0d51c84 Merge "Make unsupportedappusage_index.csv a build artifact." am: 19cb14b3be
am: 2e43120685

Change-Id: Ife8c17d76c3fb9ae53a789ef98c58c66c0a084d5
2019-06-28 09:12:47 -07:00
Anton Hansson
ad013e1c68 Merge "Remove ro.url.legal* props from proto" am: c4fdd9ac1d
am: 3b47b26fe3

Change-Id: Iefa4f434b5c7898e18cfe1a991e53287b6e55c3a
2019-06-28 09:06:17 -07:00
Chalard Jean
ba3ba4b915 Merge "Simplify Exception expressions in CSTest" am: febb37f376
am: cb5aa75dd9

Change-Id: Iae16e8d68e2b1b9a1e5aa86170177c68b22cd7b5
2019-06-28 08:57:18 -07:00
Mathieu Chartier
566bfcf475 Merge "Remove support for image classes" 2019-06-28 15:56:58 +00:00
Bernardo Rufino
c4d53ba7f3 [automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP"
am: 51b6c76660 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie8c749bbefa05cae3f5104be30dca0f08ae0a2c1
2019-06-28 08:02:27 -07:00
Anna Trostanetski
2e43120685 Merge "Make unsupportedappusage_index.csv a build artifact."
am: 19cb14b3be

Change-Id: Ic4511fc6e192408b7a79655e828eeb5fcc64b9fc
2019-06-28 07:57:03 -07:00
Anton Hansson
3b47b26fe3 Merge "Remove ro.url.legal* props from proto"
am: c4fdd9ac1d

Change-Id: I45135f3159b758b6dc265bfdd3cf070bf5199031
2019-06-28 07:52:04 -07:00
Jorim Jaggi
de8014e068 Merge "GestureNav: Limit exclusion rects" into qt-dev
am: ea3216d462

Change-Id: Id52bcbd80028ce0030b7f8b38058e7a786744497
2019-06-28 07:48:06 -07:00
Mathew Inwood
13ffa87a6d Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I320e33be57b8124ff7c132a67c8981d53802f8f5
2019-06-28 07:43:43 -07:00
Chalard Jean
cb5aa75dd9 Merge "Simplify Exception expressions in CSTest"
am: febb37f376

Change-Id: I547133d879f33f5eaa38f6b4df7674c4d068fe60
2019-06-28 07:42:38 -07:00
Matt Pietal
1437b43eb6 Merge "Resolver - Improve flow for Intent URL handling" into qt-dev
am: d73543b588

Change-Id: I158e33705154e00fae20c29ebb7177877beae655
2019-06-28 07:39:26 -07:00
Sanry Huang
c58a2d795f Merge "Use the real activity component to find reusable task" into qt-dev
am: f0cea00104

Change-Id: Ic454dd700b849c394a78b268804eb358d3dc4197
2019-06-28 07:29:06 -07:00
Jorim Jaggi
ea3216d462 Merge "GestureNav: Limit exclusion rects" into qt-dev 2019-06-28 13:48:37 +00:00
Treehugger Robot
51b6c76660 Merge "DO NOT MERGE Fix robotests for AOSP" 2019-06-28 13:00:07 +00:00
TreeHugger Robot
f76bdce6e0 Merge "Restore some greylist entries." into qt-dev 2019-06-28 12:02:43 +00:00
Matt Pietal
d73543b588 Merge "Resolver - Improve flow for Intent URL handling" into qt-dev 2019-06-28 12:02:04 +00:00
Sanry Huang
f0cea00104 Merge "Use the real activity component to find reusable task" into qt-dev 2019-06-28 11:07:49 +00:00
Anna Trostanetski
19cb14b3be Merge "Make unsupportedappusage_index.csv a build artifact." 2019-06-28 10:46:22 +00:00
Adrian Roos
506267d5f4 GestureNav: Limit exclusion rects
Add limits for system gesture exclusion on the left and right edges.
This prevents non-immersive-sticky apps from totally disabling the
back gesture.

Bug: 135522625
Test: atest SystemGestureExclusionRectsTest

Merged-In: Ib26161663a6aababe803d3c70044f4017bdbe675
Change-Id: Ib26161663a6aababe803d3c70044f4017bdbe675
2019-06-28 17:59:06 +08:00
Anna Trostanetski
97088e9909 Make unsupportedappusage_index.csv a build artifact.
Add the output of unsupportedappusage-annotation-processor as a build artifact to make it available for the hiddenapi ayeaye analyzer.

Test: build artifact appears in treehuger, found by ayeaye.
Bug: 135601059
Change-Id: If3ef7bde96e008127694a8b0aa25bf19767faf1c
2019-06-28 10:33:04 +01:00
Mathew Inwood
a5531fa161 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: Ie3dd15c8e17d530d853473a013717e6175383080
2019-06-28 09:23:06 +00:00
Mathew Inwood
3a75f264a8 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
2019-06-28 10:15:37 +01:00
Anton Hansson
c4fdd9ac1d Merge "Remove ro.url.legal* props from proto" 2019-06-28 09:11:09 +00:00
Chalard Jean
febb37f376 Merge "Simplify Exception expressions in CSTest" 2019-06-28 07:19:20 +00:00
Chalard Jean
e7b2475523 Simplify Exception expressions in CSTest
Test: CSTest
Change-Id: Ie9b9fc334b85836bf156bda71e54e8d30885b82a
2019-06-28 14:22:30 +09:00