OSDN Git Service

android-x86/frameworks-base.git
3 years agoRequire a more specific intent
Lucas Dupin [Wed, 25 Mar 2020 17:46:44 +0000 (10:46 -0700)]
Require a more specific intent

Bug: 147606347
Fixes: 161150380
Test: run poc, device didn't reboot
Change-Id: I8f721ca659d58271880a7adbf386b270b331e55b
Merged-In: I8f721ca659d58271880a7adbf386b270b331e55b
(cherry picked from commit a9afc32ddc013424e2d17a091ef3fdfbe18c0d76)
(cherry picked from commit d16e86f466c2fc18448b654cbe71089c7fede991)

3 years agoMerge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev
Winson Chiu [Fri, 26 Jun 2020 18:36:22 +0000 (18:36 +0000)]
Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev

3 years ago[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts...
Chris Tate [Fri, 26 Jun 2020 17:01:21 +0000 (17:01 +0000)]
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886

Change-Id: Ic64521287117aa94ef5aa8d5a2769dc5335aea85

3 years ago[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am:...
Christopher Tate [Fri, 26 Jun 2020 17:01:16 +0000 (17:01 +0000)]
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886

Change-Id: I3fb26cd2006afd5ea1bcf214eb6729b839827771

3 years ago[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts...
Chris Tate [Fri, 26 Jun 2020 16:48:31 +0000 (16:48 +0000)]
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours

am skip reason: Change-Id Ibaf087946966ad82d60c7b255e3ee75990716b63 with SHA-1 153de338c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886

Change-Id: I71a42974a35edf5b0cc4b6bd7c5029fbe09bff19

3 years ago[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am:...
Christopher Tate [Fri, 26 Jun 2020 16:48:26 +0000 (16:48 +0000)]
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours

am skip reason: Change-Id Ibaf087946966ad82d60c7b255e3ee75990716b63 with SHA-1 153de338c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886

Change-Id: I225e1f57ca119c4483ef947b6f4d2343a335405a

3 years agoMerge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 17470...
Chris Tate [Fri, 26 Jun 2020 16:36:39 +0000 (16:36 +0000)]
Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886

Change-Id: If3b2da4d31d061c3fbf927fce597e12c040f7cfc

3 years agoDO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442
Christopher Tate [Fri, 26 Jun 2020 16:36:25 +0000 (16:36 +0000)]
DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886

Change-Id: I8ff3f48cfd11d3e1a5510a5a93e3f820a84a33b8

3 years agoMerge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev
Chris Tate [Fri, 26 Jun 2020 16:24:08 +0000 (16:24 +0000)]
Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev

3 years agoMerge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5
Chris Tate [Thu, 25 Jun 2020 23:56:54 +0000 (23:56 +0000)]
Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692559

Change-Id: I49a68f860713af9887bc70e4521acb379ccb90af

3 years agoMerge "Only autoVerify at install for new hosts" into oc-mr1-dev
Chris Tate [Thu, 25 Jun 2020 23:41:35 +0000 (23:41 +0000)]
Merge "Only autoVerify at install for new hosts" into oc-mr1-dev

3 years agoMerge "Only autoVerify at install for new hosts" into pi-dev
Chris Tate [Thu, 25 Jun 2020 23:41:25 +0000 (23:41 +0000)]
Merge "Only autoVerify at install for new hosts" into pi-dev

3 years agoRevert "Ignores protected broadcasts if not priv-app"
Winson Chiu [Tue, 16 Jun 2020 21:41:22 +0000 (21:41 +0000)]
Revert "Ignores protected broadcasts if not priv-app"

Revert of I5bd2bf3bd7c38fd9cc563a02b24bc569495d79ed

For now, allow all system apps to declare protected
broadcasts. This will be cleaned up in a future change.

Bug: 158570769

Merged-In: I54d236c0a6daaa934bd64a3bd05e2654e0e868fe
Change-Id: I54d236c0a6daaa934bd64a3bd05e2654e0e868fe

3 years ago[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc...
Chris Tate [Wed, 3 Jun 2020 22:24:24 +0000 (22:24 +0000)]
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev am: 239ab1c9d6 -s ours

am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9f8923d54a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602836

Change-Id: Ic6abfc0ae396a514e7712c6fbc65662152cd1165

3 years agoMerge "More fixes towards the race conditions in AMS" into oc-mr1-dev
Chris Tate [Wed, 3 Jun 2020 22:09:12 +0000 (22:09 +0000)]
Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev

3 years agoMerge "More fixes towards the race conditions in AMS" into pi-dev
Chris Tate [Wed, 3 Jun 2020 22:09:01 +0000 (22:09 +0000)]
Merge "More fixes towards the race conditions in AMS" into pi-dev

3 years ago[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when...
Winson Chiu [Wed, 3 Jun 2020 19:28:38 +0000 (19:28 +0000)]
[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-dev am: c842acc15a am: 65d650efa4 am: fab2a65c3a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11384837

Change-Id: I9179d9984d11b4bba3ead52709f3ea6aa3ec49a2

3 years ago[automerger skipped] DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding...
Winson [Wed, 3 Jun 2020 19:28:33 +0000 (19:28 +0000)]
[automerger skipped] DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am: fc8bfed553 am: 0ce3ba0c26 am: 6bb732c781 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11384837

Change-Id: I86a38df690ec1473332fe317949379b5e4d072cc

3 years agoMerge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer packag...
Winson Chiu [Wed, 3 Jun 2020 19:14:46 +0000 (19:14 +0000)]
Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-dev am: c842acc15a am: 65d650efa4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11384837

Change-Id: Iefbafa175e953e423dcbbd36dd424f2d3aafd1b0

3 years agoDO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am...
Winson [Wed, 3 Jun 2020 19:14:39 +0000 (19:14 +0000)]
DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am: fc8bfed553 am: 0ce3ba0c26

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11384837

Change-Id: I5f72c7affc0ca20beb48a18bdfc3ab55821bd0bc

3 years agoMerge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer packag...
Winson Chiu [Wed, 3 Jun 2020 18:49:19 +0000 (18:49 +0000)]
Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-dev am: c842acc15a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11384837

Change-Id: I9aa4e553e5b1b1605f4452fe5a4d5801efaec124

3 years agoDO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am...
Winson [Wed, 3 Jun 2020 18:49:15 +0000 (18:49 +0000)]
DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am: fc8bfed553

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11384837

Change-Id: I42a87fe06a2634d5fd40119ef46d71a99e147f50

3 years ago[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when...
Winson Chiu [Wed, 3 Jun 2020 18:49:02 +0000 (18:49 +0000)]
[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-mr1-dev am: a567c14f22 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11558518

Change-Id: I68ecf2aa4487d271bc47c07e80636ac6517b4f14

3 years ago[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing...
Wu Ahan [Wed, 3 Jun 2020 18:48:46 +0000 (18:48 +0000)]
[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef am: 172a0954c5 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: Id8b902414fece6eb61bbac240db49d1193edd30f

3 years ago[automerger skipped] DO NOT MERGE Prevent ImageWallpaper from keeping crashing am...
Ahan Wu [Wed, 3 Jun 2020 18:48:42 +0000 (18:48 +0000)]
[automerger skipped] DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18 am: 7c459fe322 am: 76288ca6b5 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: Iaad5b58c446d597c45182cb5bfae93c05fb37850

3 years agoMerge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer packag...
Winson Chiu [Wed, 3 Jun 2020 18:34:31 +0000 (18:34 +0000)]
Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-mr1-dev

3 years agoMerge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer packag...
Winson Chiu [Wed, 3 Jun 2020 18:34:30 +0000 (18:34 +0000)]
Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-dev

3 years agoMerge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer packag...
Winson Chiu [Wed, 3 Jun 2020 18:34:30 +0000 (18:34 +0000)]
Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into pi-dev

3 years agoMerge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am...
Wu Ahan [Wed, 3 Jun 2020 18:34:13 +0000 (18:34 +0000)]
Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: I81d396dcd42fccff04b84978dabaa5c904007d5c

3 years agoDO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18 am: 7c459fe322
Ahan Wu [Wed, 3 Jun 2020 18:34:00 +0000 (18:34 +0000)]
DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18 am: 7c459fe322

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: I6c0581c0c46314dab10d68a7a0d712b25438083e

3 years agoMerge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am...
Wu Ahan [Wed, 3 Jun 2020 18:22:22 +0000 (18:22 +0000)]
Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: I2aa74fd4e158b2f76aed3559c9bb28458fabc7ef

3 years agoDO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18
Ahan Wu [Wed, 3 Jun 2020 18:22:17 +0000 (18:22 +0000)]
DO NOT MERGE Prevent ImageWallpaper from keeping crashing am: a3bff94e18

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786

Change-Id: I112e4cbab9cc6c8da12a65c3691aa1dc92bb60d4

3 years agoMerge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev
Wu Ahan [Wed, 3 Jun 2020 18:08:35 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev

3 years agoDO NOT MERGE - Only autoVerify at install for new hosts
Christopher Tate [Fri, 29 May 2020 00:49:53 +0000 (17:49 -0700)]
DO NOT MERGE - Only autoVerify at install for new hosts

Re-run app link verification at update time only when the set of hosts
has expanded.  Intentionally revoke verify history when an app stops
using autoVerify, as a one-time measure to place it back into the
non-autoverify model for tracking the user's launch preferences.  If the
app starts using autoVerify again later, it behaves identically to an
app that has never done so before.

Bug: 151475497
Bug: 146204120
Test: described on master CL

Merged-In: I200d85085ce79842a3ed39377d1f75ec381c8991
Merged-In: Ibaf087946966ad82d60c7b255e3ee75990716b63
Change-Id: Ibaf087946966ad82d60c7b255e3ee75990716b63

3 years agoMerge "Add back enforceReadPermission for getmetadata" into pi-dev
Diksha Gohlyan [Wed, 3 Jun 2020 17:47:43 +0000 (17:47 +0000)]
Merge "Add back enforceReadPermission for getmetadata" into pi-dev

3 years ago[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am:...
Julia Reynolds [Wed, 3 Jun 2020 16:39:10 +0000 (16:39 +0000)]
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0 am: 18b5a53447 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218

Change-Id: Ie90e466880ef5c59cb1ca88d916a39af1ed67b38

3 years ago[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97d...
Julia Reynolds [Wed, 3 Jun 2020 16:39:03 +0000 (16:39 +0000)]
[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df am: e0862c053d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218

Change-Id: Iee0696a8b77a8b4c12976d08fdf473f7cd4f1b82

3 years agoMerge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0
Julia Reynolds [Wed, 3 Jun 2020 16:25:15 +0000 (16:25 +0000)]
Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218

Change-Id: I504497cf351c0fa556f930f0f2f59ee562829a92

3 years agoDO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df
Julia Reynolds [Wed, 3 Jun 2020 16:25:07 +0000 (16:25 +0000)]
DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218

Change-Id: I48a72258c4bdf1a3f9841c36165675c6e2c99cda

3 years agoMerge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f
Julia Reynolds [Wed, 3 Jun 2020 16:13:32 +0000 (16:13 +0000)]
Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218

Change-Id: Ib1236e0f32527661d59cc2dafd0ebfce259bdc00

3 years agoDO NOT MERGE Make intents immutable am: dba9823ac7
Julia Reynolds [Wed, 3 Jun 2020 16:13:27 +0000 (16:13 +0000)]
DO NOT MERGE Make intents immutable am: dba9823ac7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218

Change-Id: I6a4caca0386a2c3da9db55be6eb1e66c4e63212c

3 years ago[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-mr1-dev...
Julia Reynolds [Wed, 3 Jun 2020 16:13:19 +0000 (16:13 +0000)]
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-mr1-dev am: b6bf062ea4 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11630373

Change-Id: I7598497f7a8207f7d399d3aea9419ce92e52f5e6

3 years agoMerge "DO NOT MERGE Make intents immutable" into oc-dev
Julia Reynolds [Wed, 3 Jun 2020 16:00:19 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Make intents immutable" into oc-dev

3 years agoMerge "DO NOT MERGE Make intents immutable" into oc-mr1-dev
Julia Reynolds [Wed, 3 Jun 2020 16:00:11 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Make intents immutable" into oc-mr1-dev

3 years agoMerge "DO NOT MERGE Make intents immutable" into pi-dev
Julia Reynolds [Wed, 3 Jun 2020 15:59:54 +0000 (15:59 +0000)]
Merge "DO NOT MERGE Make intents immutable" into pi-dev

3 years agoDO NOT MERGE Prevent ImageWallpaper from keeping crashing
Ahan Wu [Tue, 2 Jun 2020 20:21:45 +0000 (04:21 +0800)]
DO NOT MERGE Prevent ImageWallpaper from keeping crashing

GLUtil.texImage2D may throw exception that indicates bad image format.
We should catch this exception, otherwise, systemui may keep crashing.

Bug: 156087409
Test: Set a 16-bit rgb image as wallpaper
Test: Systemui shouldn't keep crashing
Change-Id: I6c9715c049b7848ecd5559ab76612a98dcd4ee6f

3 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f...
TreeHugger Robot [Wed, 3 Jun 2020 12:04:06 +0000 (12:04 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361 am: b2e6bdfcdb -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: I0668ed146259bc8c4dca5b2e0a8e24dd2e9d404a

3 years ago[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0 am: 12b250968b...
Linus Tufvesson [Wed, 3 Jun 2020 12:03:58 +0000 (12:03 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0 am: 12b250968b -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: Ic1c4e412c990b281d5cbee7ded146a300d0d7110

3 years agoMerge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361
TreeHugger Robot [Wed, 3 Jun 2020 11:49:14 +0000 (11:49 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: I60579a7a49f3b2c3288c814cb6e4c70463854dbd

3 years agoRESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0
Linus Tufvesson [Wed, 3 Jun 2020 11:49:08 +0000 (11:49 +0000)]
RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: I603a9a03417c985a7d766e3acdc546ad5db0c4c3

3 years agoMerge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06
TreeHugger Robot [Wed, 3 Jun 2020 11:35:07 +0000 (11:35 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: I3b54fb6905a9286037db54654e372af6929d9f41

3 years agoRESTRICT AUTOMERGE am: 78fe3b0aa2
Linus Tufvesson [Wed, 3 Jun 2020 11:35:02 +0000 (11:35 +0000)]
RESTRICT AUTOMERGE am: 78fe3b0aa2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: I38516ab9216169c555e702947a5448c142648c90

3 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b539388631 -s...
TreeHugger Robot [Wed, 3 Jun 2020 11:34:52 +0000 (11:34 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b539388631 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375235

Change-Id: I49abb29e02d9cc3da691dd44d8ea040100893005

3 years agoMerge "RESTRICT AUTOMERGE" into oc-dev
TreeHugger Robot [Wed, 3 Jun 2020 11:15:08 +0000 (11:15 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-dev

3 years agoMerge "RESTRICT AUTOMERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 3 Jun 2020 11:09:39 +0000 (11:09 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-mr1-dev

3 years agoMerge "RESTRICT AUTOMERGE" into pi-dev
TreeHugger Robot [Wed, 3 Jun 2020 09:16:16 +0000 (09:16 +0000)]
Merge "RESTRICT AUTOMERGE" into pi-dev

3 years agoOnly autoVerify at install for new hosts
Christopher Tate [Fri, 29 May 2020 00:49:53 +0000 (17:49 -0700)]
Only autoVerify at install for new hosts

Re-run app link verification at update time only when the set of hosts
has expanded.  Intentionally revoke verify history when an app stops
using autoVerify, as a one-time measure to place it back into the
non-autoverify model for tracking the user's launch preferences.  If the
app starts using autoVerify again later, it behaves identically to an
app that has never done so before.

Bug: 151475497
Bug: 146204120
Test: described on master CL

Merged-In: I200d85085ce79842a3ed39377d1f75ec381c8991
Change-Id: Ibaf087946966ad82d60c7b255e3ee75990716b63

3 years agoOnly autoVerify at install for new hosts
Christopher Tate [Fri, 29 May 2020 00:49:53 +0000 (17:49 -0700)]
Only autoVerify at install for new hosts

Re-run app link verification at update time only when the set of hosts
has expanded.  Intentionally revoke verify history when an app stops
using autoVerify, as a one-time measure to place it back into the
non-autoverify model for tracking the user's launch preferences.  If the
app starts using autoVerify again later, it behaves identically to an
app that has never done so before.

Bug: 151475497
Bug: 146204120
Test: described on master CL

Merged-In: I200d85085ce79842a3ed39377d1f75ec381c8991
Change-Id: Ibaf087946966ad82d60c7b255e3ee75990716b63

3 years agoDO NOT MERGE Make intents immutable
Julia Reynolds [Thu, 28 May 2020 14:45:19 +0000 (10:45 -0400)]
DO NOT MERGE Make intents immutable

Test: make
Fixes: 154719656
Change-Id: I212ca5f1a48174ed85311b551259da314718f082
(cherry picked from commit 36b3352784ae90326a2b308542b1d2cfe18661a0)

3 years agoDO NOT MERGE Make intents immutable
Julia Reynolds [Thu, 28 May 2020 14:45:19 +0000 (10:45 -0400)]
DO NOT MERGE Make intents immutable

Test: make
Fixes: 154719656
Change-Id: I212ca5f1a48174ed85311b551259da314718f082
(cherry picked from commit 36b3352784ae90326a2b308542b1d2cfe18661a0)

3 years agoDO NOT MERGE Make intents immutable
Julia Reynolds [Thu, 28 May 2020 14:45:19 +0000 (10:45 -0400)]
DO NOT MERGE Make intents immutable

Test: make
Fixes: 154719656
Change-Id: I212ca5f1a48174ed85311b551259da314718f082
Merged-In: I212ca5f1a48174ed85311b551259da314718f082
(cherry picked from commit 36b3352784ae90326a2b308542b1d2cfe18661a0)

3 years agoMore fixes towards the race conditions in AMS
Jing Ji [Fri, 25 Oct 2019 19:03:30 +0000 (12:03 -0700)]
More fixes towards the race conditions in AMS

Bug: 142986887
Bug: 140108616
Test: Manual
Change-Id: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
(cherry picked from commit b2e84f0406139156442984943d8de7dd37d51368)

3 years agoMore fixes towards the race conditions in AMS
Jing Ji [Fri, 25 Oct 2019 19:03:30 +0000 (12:03 -0700)]
More fixes towards the race conditions in AMS

Bug: 142986887
Bug: 140108616
Test: Manual
Change-Id: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
(cherry picked from commit b2e84f0406139156442984943d8de7dd37d51368)

3 years agoDO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package
Winson [Thu, 23 Apr 2020 17:45:55 +0000 (10:45 -0700)]
DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package

Without this check, any package can set the installer package of
another package whose installer has been removed or was never set.
This provides access to other privileged actions and is undesired.

Bug: 150857253

Test: manual verify with proof of concept in linked bug
Test: atest android.appsecurity.cts.PackageSetInstallerTest

Change-Id: I2159c357911ff39ffd819054b42f96ae86bc98bc

3 years agoDO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package
Winson [Thu, 23 Apr 2020 17:45:55 +0000 (10:45 -0700)]
DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package

Without this check, any package can set the installer package of
another package whose installer has been removed or was never set.
This provides access to other privileged actions and is undesired.

Bug: 150857253

Test: manual verify with proof of concept in linked bug
Test: atest android.appsecurity.cts.PackageSetInstallerTest

Change-Id: I2159c357911ff39ffd819054b42f96ae86bc98bc

4 years agoAdd back enforceReadPermission for getmetadata
Diksha Gohlyan [Thu, 7 May 2020 00:46:46 +0000 (00:46 +0000)]
Add back enforceReadPermission for getmetadata

Test: manually tested
Bug: 151095863

Change-Id: I29ef120c10c488550b85269e598aeb6ff9505038
Merged-In: I4f04f08f76d039196c2c67bac80d4a46ebec87f2

4 years agoMerge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev
Kevin Chyn [Thu, 7 May 2020 00:42:23 +0000 (00:42 +0000)]
Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev

4 years agoRevert "Check Read permissions when getDocumentMetadata"
Kevin Chyn [Thu, 7 May 2020 00:39:46 +0000 (00:39 +0000)]
Revert "Check Read permissions when getDocumentMetadata"

This reverts commit c94646177cbc86b07e9572ea88ab94ae8c235375.

Reason for revert: 155930637

Change-Id: Id452d316d1c1721fce715474df009ebe0fb719e8

4 years agoMerge "Check Read permissions when getDocumentMetadata" into pi-dev
Diksha Gohlyan [Wed, 6 May 2020 22:51:59 +0000 (22:51 +0000)]
Merge "Check Read permissions when getDocumentMetadata" into pi-dev

4 years ago[RESTRICT AUTOMERGE] Add import of MAX_APP_TRANSITION_DURATION
Bryan Ferris [Wed, 6 May 2020 16:57:55 +0000 (09:57 -0700)]
[RESTRICT AUTOMERGE] Add import of MAX_APP_TRANSITION_DURATION

The commit at ag/10876662 did not contain a required import. This change
fixes the build.

Bug: 145728687
Test: `mma` in frameworks/base/services/core/java/com/android/server/wm/

Change-Id: Ic37e2dc8498b0f6f5308653f4f9935038a486001

4 years ago[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum...
Bryan Ferris [Tue, 5 May 2020 21:48:11 +0000 (21:48 +0000)]
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be am: b1ae5fd443 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifcfb341328552ff00f058df8ae3eb5734f87b4af

4 years ago[automerger skipped] [RESTRICT AUTOMERGE] Restrict app transition maximum duration...
lumark [Tue, 5 May 2020 21:48:05 +0000 (21:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Restrict app transition maximum duration am: 36bcc77337 am: dcc38988ee am: 748bcb047c -s ours

am skip reason: subject contains skip directive

Change-Id: If5cb6f5e581b9615f0aa4ecd586a860bcc47baf7

4 years agoMerge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev...
Bryan Ferris [Tue, 5 May 2020 21:33:02 +0000 (21:33 +0000)]
Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be

Change-Id: Ie34ba15b709417dfad6cf071a313b23a42bbff2e

4 years ago[RESTRICT AUTOMERGE] Restrict app transition maximum duration am: 36bcc77337 am:...
lumark [Tue, 5 May 2020 21:32:53 +0000 (21:32 +0000)]
[RESTRICT AUTOMERGE] Restrict app transition maximum duration am: 36bcc77337 am: dcc38988ee

Change-Id: Ied1793dbc8d7b58170e22729aa351c582c894ffa

4 years agoMerge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev...
Bryan Ferris [Tue, 5 May 2020 21:05:06 +0000 (21:05 +0000)]
Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39

Change-Id: I88c9f8957623fe784010ea7cadc9566fa4496377

4 years ago[RESTRICT AUTOMERGE] Restrict app transition maximum duration am: 36bcc77337
lumark [Tue, 5 May 2020 21:04:59 +0000 (21:04 +0000)]
[RESTRICT AUTOMERGE] Restrict app transition maximum duration am: 36bcc77337

Change-Id: Ia049c055935fdc0ceb0369cf131e7d166e5522f6

4 years agoMerge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev
Bryan Ferris [Tue, 5 May 2020 20:49:41 +0000 (20:49 +0000)]
Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev

4 years agoMerge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev
Bryan Ferris [Tue, 5 May 2020 20:49:16 +0000 (20:49 +0000)]
Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev

4 years agoDO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package
Winson [Thu, 23 Apr 2020 17:45:55 +0000 (10:45 -0700)]
DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package

Without this check, any package can set the installer package of
another package whose installer has been removed or was never set.
This provides access to other privileged actions and is undesired.

Bug: 150857253

Test: manual verify with proof of concept in linked bug
Test: atest android.appsecurity.cts.PackageSetInstallerTest

Merged-In: I2159c357911ff39ffd819054b42f96ae86bc98bc
Change-Id: I2159c357911ff39ffd819054b42f96ae86bc98bc

4 years agoCheck Read permissions when getDocumentMetadata
Diksha Gohlyan [Wed, 1 Apr 2020 19:37:04 +0000 (12:37 -0700)]
Check Read permissions when getDocumentMetadata

Test: manually tested
Bug: 151095863

Change-Id: I4f04f08f76d039196c2c67bac80d4a46ebec87f2
(cherry picked from commit 0e7580995549134aa765bf7b891c0ede73d9f0d0)

4 years agoRESTRICT AUTOMERGE
Linus Tufvesson [Tue, 5 May 2020 10:13:51 +0000 (11:13 +0100)]
RESTRICT AUTOMERGE

This change is the union of
I2aaab1903dee54190338f7b6e49888aa51437108 and I58834636e092f992e403342e36b475dc60e8f20ai

Original CL descriptions:

*** I2aaab1903dee54190338f7b6e49888aa51437108
Block TYPE_PRESENTATION windows on default display

... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

*** I58834636e092f992e403342e36b475dc60e8f20a
Use TYPE_PRIVATE_PRESENTATION for private presentations
Detect if the Presenation is targeting a private virtual display, and if they
are use the windowType TYPE_PRIVATE_PRESENTATION.
***

Bug: 141745510
Test: cts-tradefed run cts -m CtsDisplayTestCases -t android.display.cts.VirtualDisplayTest
Test: Manually verfied that presentations are blocked on main display
Change-Id: I67c79c84ec2adfcdaf3b0f7bc7f0f41d30618e85

4 years agoRESTRICT AUTOMERGE
Linus Tufvesson [Tue, 5 May 2020 10:13:51 +0000 (11:13 +0100)]
RESTRICT AUTOMERGE

This change is the union of
I2aaab1903dee54190338f7b6e49888aa51437108 and I58834636e092f992e403342e36b475dc60e8f20ai

Original CL descriptions:

*** I2aaab1903dee54190338f7b6e49888aa51437108
Block TYPE_PRESENTATION windows on default display

... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

*** I58834636e092f992e403342e36b475dc60e8f20a
Use TYPE_PRIVATE_PRESENTATION for private presentations
Detect if the Presenation is targeting a private virtual display, and if they
are use the windowType TYPE_PRIVATE_PRESENTATION.
***

Bug: 141745510
Test: cts-tradefed run cts -m CtsDisplayTestCases -t android.display.cts.VirtualDisplayTest
Test: Manually verfied that presentations are blocked on main display

Change-Id: I9f1c4b140ab4bc6183151aafc5501e8648fbc3fa

4 years agoRESTRICT AUTOMERGE
Linus Tufvesson [Tue, 5 May 2020 10:13:51 +0000 (11:13 +0100)]
RESTRICT AUTOMERGE

This change is the union of
I2aaab1903dee54190338f7b6e49888aa51437108 and I58834636e092f992e403342e36b475dc60e8f20ai

Original CL descriptions:

*** I2aaab1903dee54190338f7b6e49888aa51437108
Block TYPE_PRESENTATION windows on default display

... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

*** I58834636e092f992e403342e36b475dc60e8f20a
Use TYPE_PRIVATE_PRESENTATION for private presentations
Detect if the Presenation is targeting a private virtual display, and if they
are use the windowType TYPE_PRIVATE_PRESENTATION.
***

Bug: 141745510
Test: atest CtsWindowManagerDeviceTestCases:android.server.wm.PresentationTest CtsDisplayTestCases:android.display.cts.VirtualDisplayTest

Change-Id: I9f1c4b140ab4bc6183151aafc5501e8648fbc3fa

4 years ago[RESTRICT AUTOMERGE] Restrict app transition maximum duration
lumark [Mon, 10 Feb 2020 10:41:57 +0000 (18:41 +0800)]
[RESTRICT AUTOMERGE] Restrict app transition maximum duration

As WindowState#startAnimation for restricting window animation duration
(currently is 10 secs),

For security reason, we also need to restrict app transition animation
duration as 3 secs to prevent malicious app may set a long duration or
infinity repeat counts through ActivityOption#makeCustomAnimation or
Activity#overridePendingTransition with custom animation set.

Bug: 145728687
Test: manual as issue provided test app
Change-Id: I39051d6e4d2b681ce2becbafe14aab3f3d8ebf6b

4 years ago[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc...
Chris Tate [Tue, 7 Apr 2020 18:19:56 +0000 (18:19 +0000)]
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours

am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 bfa7796010 is in history

Change-Id: I69aadc11e70ca60b1feadc30489986f00eb57507

4 years ago[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc...
Chris Tate [Tue, 7 Apr 2020 18:07:20 +0000 (18:07 +0000)]
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours

am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 a481c86cd3 is in history

Change-Id: I842025dc7002c0f4830ff77c91e3ed563199441c

4 years agoMerge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776
Chris Tate [Tue, 7 Apr 2020 17:52:30 +0000 (17:52 +0000)]
Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776

Change-Id: I81ea478e735c5c3d571835a99edb1547885d76ab

4 years ago[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc...
Chris Tate [Tue, 7 Apr 2020 17:52:06 +0000 (17:52 +0000)]
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-mr1-dev am: 097d107125 -s ours

am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 bfa7796010 is in history

Change-Id: I074ac74f576cff42b3b78c4739ea790054fd90a6

4 years agoMerge "Verify all possible hosts that match web nav" into pi-dev
Chris Tate [Tue, 7 Apr 2020 17:40:48 +0000 (17:40 +0000)]
Merge "Verify all possible hosts that match web nav" into pi-dev

4 years agoMerge "Verify all possible hosts that match web nav" into oc-mr1-dev
Chris Tate [Tue, 7 Apr 2020 17:40:31 +0000 (17:40 +0000)]
Merge "Verify all possible hosts that match web nav" into oc-mr1-dev

4 years agoMerge "Verify all possible hosts that match web nav" into oc-dev
Chris Tate [Tue, 7 Apr 2020 17:40:04 +0000 (17:40 +0000)]
Merge "Verify all possible hosts that match web nav" into oc-dev

4 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb am: 7461be...
Linus Tufvesson [Fri, 3 Apr 2020 10:21:49 +0000 (10:21 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb am: 7461be09bd am: bbd74617ac -s ours

am skip reason: subject contains skip directive

Change-Id: Ib362ea5f60af604f6966b98b943a4c1e8e57efdc

4 years ago[automerger skipped] RESTRICT AUTOMERGE am: 59ba151854 am: d903a3ef4c am: f439ddfeed...
Linus Tufvesson [Fri, 3 Apr 2020 10:21:42 +0000 (10:21 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am: 59ba151854 am: d903a3ef4c am: f439ddfeed -s ours

am skip reason: subject contains skip directive

Change-Id: I65b723c28b38756c2185cc380c1c9f6304d39fd9

4 years agoMerge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb am: 7461be09bd
Linus Tufvesson [Fri, 3 Apr 2020 10:01:43 +0000 (10:01 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb am: 7461be09bd

Change-Id: I6c7d8fb0bf4b8f77f1dfa803a4581129097104cb

4 years agoRESTRICT AUTOMERGE am: 59ba151854 am: d903a3ef4c
Linus Tufvesson [Fri, 3 Apr 2020 10:01:37 +0000 (10:01 +0000)]
RESTRICT AUTOMERGE am: 59ba151854 am: d903a3ef4c

Change-Id: Ib4870e118b6969d2f0e82a813467334bb0f20c93

4 years agoMerge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb
Linus Tufvesson [Fri, 3 Apr 2020 09:44:31 +0000 (09:44 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb

Change-Id: Icc872c5ed01ce4b788fad5e3670748c5a218a02f

4 years agoRESTRICT AUTOMERGE am: 59ba151854
Linus Tufvesson [Fri, 3 Apr 2020 09:44:26 +0000 (09:44 +0000)]
RESTRICT AUTOMERGE am: 59ba151854

Change-Id: Ic48f81f9259cb5bb2a3af3befcd5ef9a630c4766

4 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: 0c6de1676d -s...
Linus Tufvesson [Fri, 3 Apr 2020 09:43:21 +0000 (09:43 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: 0c6de1676d -s ours

am skip reason: subject contains skip directive

Change-Id: I15c5f086463e34da186456659cf88d44ca8e829e

4 years agoMerge "RESTRICT AUTOMERGE" into oc-mr1-dev
Linus Tufvesson [Fri, 3 Apr 2020 09:27:20 +0000 (09:27 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-mr1-dev

4 years agoMerge "RESTRICT AUTOMERGE" into oc-dev
Linus Tufvesson [Fri, 3 Apr 2020 09:27:08 +0000 (09:27 +0000)]
Merge "RESTRICT AUTOMERGE" into oc-dev