summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-15Snap for 7914678 from f461b0b97b1cc289ba76c7a6058fa35f915d4a82 to ↵android-mainline-12.0.0_r49android12-mainline-networkstack-releaseAndroid Build Coastguard Worker
mainline-networking-release Change-Id: Ifa821c20078151c113321fecba74520af8d8aeda
2021-11-13[automerger skipped] Merge "Update deletion conditions for a package's ↵Varun Shah
UsageStats." into rvc-dev am: 06c5973697 am: a7174fa6db -s ours am: 5cae04a584 -s ours am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 d95ce6779d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16244186 Change-Id: I9b066de3890c498084476ca84ff8b366de149d5d
2021-11-13[automerger skipped] Merge "Update deletion conditions for a package's ↵Varun Shah
UsageStats." into rvc-dev am: 06c5973697 am: a7174fa6db -s ours am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 d95ce6779d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16244186 Change-Id: I08dfa290a0d67ada639f59483c5abe526618a9ce
2021-11-13Merge "Update deletion conditions for a package's UsageStats." into rvc-dev ↵Varun Shah
am: 06c5973697 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704 Bug: 206039322 Change-Id: I8f02f4bce0661eaea6ae1e72c05f6fcafdc49884 Merged-In: I94a8e3dfca8ef4c7616f77944d61726e06043b85
2021-11-12[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY ↵Siarhei Vishniakou
am: 07e7aaff29 am: c7052c9c79 -s ours am: bb535c95d2 -s ours am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253 Change-Id: Ic5b1f572e23e0e298fc331c1a7c571cbe5a85b80
2021-11-12[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY ↵Siarhei Vishniakou
am: 07e7aaff29 am: c7052c9c79 -s ours am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253 Change-Id: I973210801594085c5d890a558cbb7b403b47f86f
2021-11-11Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29Siarhei Vishniakou
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16190719 Change-Id: If208e3c8b5a9d43034b4764d678a1a33ea2729c6 Merged-In: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b Bug: 157929241 Bug: 205996845
2021-11-11[automerger skipped] Merge "Update deletion conditions for a package's ↵Varun Shah
UsageStats." into rvc-dev am: 06c5973697 am: 68431cf82f -s ours am: 1359468d3e -s ours am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 157fbcfbe4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704 Change-Id: Ib606a19a94cf8082239d5ac47c0ef78fead6ee91
2021-11-11[automerger skipped] Merge "Update deletion conditions for a package's ↵Varun Shah
UsageStats." into rvc-dev am: 06c5973697 am: 68431cf82f -s ours am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 157fbcfbe4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704 Change-Id: Id1c78a33e62ea64ff5391a09ba3dd54dac8598fc
2021-11-11[automerger skipped] Merge "Mark screen decorations as trusted overlays" ↵TreeHugger Robot
into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours am: 86e8070289 -s ours am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: I7e299d5d48eba7f0ebf62332af2f88d0f7a2eb36
2021-11-11Merge changes from topic "trusted_overlay_backport" into rvc-dev am: ↵Winson Chung
58c437f18c am: f986999eec am: 24304ff554 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: Icce533ce60e09242e0d8cb5cb6cc3f97cda69b2a
2021-11-11[automerger skipped] DO NOT MERGE: Revert "Map ↵Winson Chung
TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1 am: 349eb4dff7 -s ours am: 920515f493 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I985e51a986b78824c5d9c625879519b9d09ee866
2021-11-11[automerger skipped] Add mechanism for a task's windows to be trusted ↵Winson Chung
overlays am: 47fb132ef2 am: c9869e0d9c -s ours am: ea9b0fc9d6 -s ours am skip reason: Merged-In I170cb5a7d22ef569eb36de21cc0bcbef60dd385e with SHA-1 47fb132ef2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849 Change-Id: I584244a0952cb0189a2c8b4ebdfa7db1bc6a6f5c
2021-11-11[automerger skipped] Merge "DO NOT MERGE: Revert "Map ↵Winson Chung
TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"" into rvc-qpr-dev am: 3d570b73d3 -s ours am: 3c33bfd12e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230862 Change-Id: I55b3bed800158e4ab0db4ea8be1e4c3413fa2621
2021-11-11[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be ↵Chris Ye
permission and flag based am: 716333761d am: 0ee0d7f55e -s ours am: bf60d8af3c -s ours am skip reason: Merged-In I70151697cc01e8427129f951f0ebadc4805b2d56 with SHA-1 716333761d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224221 Change-Id: I08e61d9d49506d2144d07b9ec7604ef1599b5125
2021-11-11[automerger skipped] Merge "Mark screen decorations as trusted overlays" ↵TreeHugger Robot
into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: I2fa7fea30e892495b874ece02d3ed73b7b235b6e
2021-11-11Merge changes from topic "trusted_overlay_backport" into rvc-dev am: ↵Winson Chung
58c437f18c am: f986999eec Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: Ib8c1874882dd1b578c9301958b22c2fbc2994081
2021-11-11[automerger skipped] DO NOT MERGE: Revert "Map ↵Winson Chung
TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1 am: 349eb4dff7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: Iccb3be9996467876b1b9486c606dcff54f7d3d29
2021-11-11[automerger skipped] Add mechanism for a task's windows to be trusted ↵Winson Chung
overlays am: 47fb132ef2 am: c9869e0d9c -s ours am skip reason: Merged-In I170cb5a7d22ef569eb36de21cc0bcbef60dd385e with SHA-1 47fb132ef2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849 Change-Id: I69cb6296f58953ec93f1dd3877ffbdc881b2efdf
2021-11-11[automerger skipped] Merge "DO NOT MERGE: Revert "Map ↵Winson Chung
TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"" into rvc-qpr-dev am: 3d570b73d3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230862 Change-Id: I56955e85820b0455e4928d5830b18e02b978f768
2021-11-11[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be ↵Chris Ye
permission and flag based am: 716333761d am: 0ee0d7f55e -s ours am skip reason: Merged-In I70151697cc01e8427129f951f0ebadc4805b2d56 with SHA-1 716333761d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224221 Change-Id: Iafead68ffbad240cb4a99bf63bba336857cf2772
2021-11-11Merge "Update deletion conditions for a package's UsageStats." into rvc-dev ↵Varun Shah
am: 06c5973697 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704 Change-Id: I8d86dd21a78900698780d3e0bd2fc82eb745ff23
2021-11-11Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9aTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: I944c3edf537f4bfcd393df4da8e5357f5597a141
2021-11-11Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18cWinson Chung
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I04d158903da2864a93ab17fba9d5309804ecce14
2021-11-11DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window ↵Winson Chung
type for A11y" am: 0cf0d420e1 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I42f2ec606dca66f088fcc441a675db1e7645bc07
2021-11-11Add mechanism for a task's windows to be trusted overlays am: 47fb132ef2Winson Chung
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849 Change-Id: Ia323593ceba41580d88b6d058ae0bfc8c92dce3f
2021-11-11Merge "DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system ↵Winson Chung
window type for A11y"" into rvc-qpr-dev
2021-11-11Merge "Update deletion conditions for a package's UsageStats." into rvc-devVarun Shah
2021-11-11Update deletion conditions for a package's UsageStats.Varun Shah
If a profile owner is defined for a specific user, do not delete usage stats for a package on package deletion. Bug: 197399948 Test: atest UsageStatsTest [all] Change-Id: I94a8e3dfca8ef4c7616f77944d61726e06043b85 Merged-In: I94a8e3dfca8ef4c7616f77944d61726e06043b85
2021-11-11Snap for 7905862 from 70bce76b3a4eb7554345edbb70598b16f7aa2617 to ↵Android Build Coastguard Worker
mainline-networking-release Change-Id: Ie7edf27d497677cb3030f9ae9c4fa2cf0f139abc
2021-11-11Merge "Update deletion conditions for a package's UsageStats." into sc-dev ↵Varun Shah
am: 2a14be36ff Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222839 Change-Id: Ibbed994ac9d04e3c29d3639c79df2e9bca715f46
2021-11-11Merge "Update deletion conditions for a package's UsageStats." into sc-devVarun Shah
2021-11-11Merge "Add android.permission.STATUS_BAR for cellbroadcast" into ↵Hui Wang
sc-mainline-prod
2021-11-10Change InputWindowInfo::isTrustedOverlay() to be permission and flag based ↵Chris Ye
am: 716333761d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975848 Bug: 196389741 Change-Id: I3109c9cadb88297ec13751171b15410633bba03a Merged-In: I70151697cc01e8427129f951f0ebadc4805b2d56
2021-11-10DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window ↵Winson Chung
type for A11y" This reverts commit 4ec7b5c3fbd80d38f1010631dfa84c1476f7c867. Bug: 196389741 Test: Ensure PIP windows are trusted overlays Change-Id: I49477ffd489ecbc969ab9b9310c2344ab03280e8 (cherry picked from commit 0cf0d420e18ebb88668f01595ef6acfe3b568430)
2021-11-10Update deletion conditions for a package's UsageStats.Varun Shah
If a profile owner is defined for a specific user, do not delete usage stats for a package on package deletion. Bug: 197399948 Test: atest UserUsageStatsServiceTest Test: atest UsageStatsTest [all] Change-Id: I94a8e3dfca8ef4c7616f77944d61726e06043b85 Merged-In: I94a8e3dfca8ef4c7616f77944d61726e06043b85
2021-11-10[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY ↵Siarhei Vishniakou
am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16190719 Change-Id: Ie9f9f7a00d3aab994d186556eea6f5ce631f2732
2021-11-10[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY ↵Siarhei Vishniakou
am: 07e7aaff29 am: 6bdebc2a7d -s ours am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16190719 Change-Id: I0888fd2e22727637aeb71c6b910d1f07403f1a03
2021-11-10Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29Siarhei Vishniakou
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16190719 Change-Id: Ida640d4498e98eaaa9922b611e38c65936dd9814
2021-11-10Only allow trusted overlays to specify FLAG_SLIPPERYSiarhei Vishniakou
For all other requests, drop this flag. Test: atest FlagSlipperyTest Bug: 157929241 Change-Id: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b Merged-In: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b
2021-11-10Merge "Mark screen decorations as trusted overlays" into rvc-dev am: ↵TreeHugger Robot
bb3f22df9a am: 5448bd7ed3 am: f159de0dcf Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: I7eeb3a5bafda2a83f989bba1f6f010270e0eeb8d
2021-11-10Merge "Mark screen decorations as trusted overlays" into rvc-dev am: ↵TreeHugger Robot
bb3f22df9a am: 5448bd7ed3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: I524489ca639856389e55fa4ac5c31f0f348b02ee
2021-11-10Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9aTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: Ie00822b22ee7e9b46a5229f1e778e5a4c1a1bccf
2021-11-10Merge "Mark screen decorations as trusted overlays" into rvc-devTreeHugger Robot
2021-11-10Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: ↵TreeHugger Robot
94fb6eff68 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730 Change-Id: Ia99b63aaa96f0bd1609a10a5903198c527d74269
2021-11-10Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-devTreeHugger Robot
2021-11-10Merge changes from topic "trusted_overlay_backport" into rvc-dev am: ↵Winson Chung
58c437f18c am: 88aae2f25f am: 1e2cf25915 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I17542803b32d6d6b9398f97fe6c86870a6930317
2021-11-10[automerger skipped] DO NOT MERGE: Revert "Map ↵Winson Chung
TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1 am: 4e58604920 -s ours am: 6b51131818 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850 Change-Id: I820214583cb11380b936c0e9480cc8b8697434ec
2021-11-10[automerger skipped] Add mechanism for a task's windows to be trusted ↵Winson Chung
overlays am: 47fb132ef2 am: 12c795620e -s ours am: 901c25122b -s ours am skip reason: Merged-In I170cb5a7d22ef569eb36de21cc0bcbef60dd385e with SHA-1 954ce27d13 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849 Change-Id: Ifaf04f97d2a25485a457c684d6fe81fe7d36e504
2021-11-10[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be ↵Chris Ye
permission and flag based am: 716333761d am: dc366a00d5 -s ours am: c7f2da5697 -s ours am skip reason: Merged-In I70151697cc01e8427129f951f0ebadc4805b2d56 with SHA-1 535a128dc1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975848 Change-Id: Ibc3edc06eb6ee7955114dcf4c9427b9121caf208
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:36:29 +0000