Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
730,340 Commits 3 Branches 0 Tags
e0eb65ed7b07100eefcfecb68717c65f3dd5f5af
Commit Graph

730340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pratyush More
e0eb65ed7b Merge changes I1bada812,Ia50e462d 
* changes:
  Automatically run LocaleManager CTS cases for relevant changes.
  Automatically run LocaleManager CTS cases for relevant changes.
 2021-11-10 09:04:32 +00:00
TreeHugger Robot
98c7b477c9 [automerger skipped] Merge "Fix preserving app links user selection on package update" into sc-v2-dev am: bf3446ce37 am: ff7f255ce3 -s ours 
am skip reason: Merged-In I2c864a34f356e32948cbc4e5d249e12c691a5726 with SHA-1 8f68089dac is already in history

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

Change-Id: I6d22071a6e1e3aba092970fbfb21e88a634bfd69
 2021-11-10 08:36:24 +00:00
TreeHugger Robot
ff7f255ce3 Merge "Fix preserving app links user selection on package update" into sc-v2-dev am: bf3446ce37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16216167

Change-Id: I0c4af1c01c4057f742f0df77e2e8c8d23eb753d3
 2021-11-10 08:32:18 +00:00
TreeHugger Robot
bf3446ce37 Merge "Fix preserving app links user selection on package update" into sc-v2-dev 2021-11-10 08:28:25 +00:00
TreeHugger Robot
1c36aa60c8 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 5b210b31f0 am: c1b7e5e91f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81982655b8644c04f6327cd5ac711d6f99f46041
 2021-11-10 08:17:32 +00:00
Charles Chen
6de31e28e1 [automerger skipped] [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 71b2172abc am: 13f7c9ec32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I094dc98ae222e8ebeed7f3a11157c237aad907ca
 2021-11-10 08:17:20 +00:00
Siarhei Vishniakou
20438e9ea2 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: a0a4b2a294 -s ours am: befb36682b -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: Ibbff8d12ed0f210bff2577aab88fcd9dc911efa3
 2021-11-10 08:16:50 +00:00
Automerger Merge Worker
42563099a8 Merge "Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 8156e54a86" into sc-v2-dev-plus-aosp am: fbb3ef486d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: I72fd13432edf3f893bbc9e3b6334694807e9ce11
 2021-11-10 08:16:10 +00:00
Siarhei Vishniakou
b629787452 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 090c357efe -s ours am: c047f9bf98 -s ours am: 5eabfb340b -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: Ib149c3fdf628419a16e94afe5f62dbf08e640f97
 2021-11-10 08:14:25 +00:00
Siarhei Vishniakou
1823ebdd7e [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: 6cfb9c4636 -s ours am: 47f238829f -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: Iae2a3dda56c4bfa61c6566faa91f7493b23cc716
 2021-11-10 08:14:09 +00:00
Wei Sheng Shih
8139a55ddd Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 46c778cde8 am: 6b3fd0c6cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: I704a2e2f0902f9fe11e6aa21700ae479bee1f8a2
 2021-11-10 08:13:14 +00:00
TreeHugger Robot
c1b7e5e91f Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 5b210b31f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879397

Change-Id: I4988ed358c9a7d4d7332027151843e867e392164
 2021-11-10 07:56:47 +00:00
Charles Chen
13f7c9ec32 [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 71b2172abc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879397

Change-Id: I722c5a2fd21c0d0969c849650b477e0105f7a1b2
 2021-11-10 07:56:38 +00:00
Siarhei Vishniakou
befb36682b [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: a0a4b2a294 -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: I67abf000e7d6851f4fc879c99e12c74ea58ae7d3
 2021-11-10 07:56:27 +00:00
Automerger Merge Worker
fbb3ef486d Merge "Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 8156e54a86" into sc-v2-dev-plus-aosp 2021-11-10 07:56:16 +00:00
Siarhei Vishniakou
5eabfb340b [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 090c357efe -s ours am: c047f9bf98 -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: I11d2f19d885fc8222de383a8ade0ed62f9e9d752
 2021-11-10 07:56:10 +00:00
Siarhei Vishniakou
47f238829f [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: 6cfb9c4636 -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: I3facfa35e04091d805fcb9b1a41e92e6f505e256
 2021-11-10 07:56:04 +00:00
Wei Sheng Shih
4251d6dde4 Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 8156e54a86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: Icdfc648174b930b4f278bff06e8ce4f16c03ee26
 2021-11-10 07:56:04 +00:00
Wei Sheng Shih
6b3fd0c6cb Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 46c778cde8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: Ib2d9a9f1c9be9f232839b55a4eaa8718bbdc3f0d
 2021-11-10 07:55:47 +00:00
Siarhei Vishniakou
3cb2509ef7 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 72a28c9d02 -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: I5856ed6e5fd91b1b06e50017c35f371ed4552820
 2021-11-10 07:55:14 +00:00
Siarhei Vishniakou
c047f9bf98 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 090c357efe -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: I866142aebacb3e1e46b741b3f982ebccc55e19e5
 2021-11-10 07:54:46 +00:00
TreeHugger Robot
5b210b31f0 Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev 2021-11-10 07:47:53 +00:00
Siarhei Vishniakou
6cfb9c4636 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -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: I34d315668bb2793e49a5dfc14d94aef990fbf9e3
 2021-11-10 07:38:19 +00:00
Siarhei Vishniakou
a0a4b2a294 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -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: Id9b9263693256529d079ea57b1098cf7ab268e27
 2021-11-10 07:38:08 +00:00
Wei Sheng Shih
46c778cde8 Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: Iee30f68590d89367516fc93adb51462c58f25d84
 2021-11-10 07:38:04 +00:00
Wei Sheng Shih
8156e54a86 Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: Idc5f92613cbfac9a6ab8e0045fe4d6fe8a484c28
 2021-11-10 07:38:02 +00:00
Siarhei Vishniakou
db96b08d15 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY 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: If0144bfc51f707d85648e5a5f0c377463f5ec109
 2021-11-10 07:38:00 +00:00
Siarhei Vishniakou
72a28c9d02 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY 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 07:37:06 +00:00
Siarhei Vishniakou
090c357efe [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY 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: I37721fcdcf49633274882e53a1ae08b0980269a1
 2021-11-10 07:36:15 +00:00
Wei Sheng Shih
16e78720c9 Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev 2021-11-10 07:21:27 +00:00
Siarhei Vishniakou
e1a2ccd0e5 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY 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-10 07:19:43 +00:00
Siarhei Vishniakou
6bdebc2a7d Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16190719

Change-Id: Ida640d4498e98eaaa9922b611e38c65936dd9814
 2021-11-10 07:07:03 +00:00
Siarhei Vishniakou
07e7aaff29 Only allow trusted overlays to specify FLAG_SLIPPERY 
For all other requests, drop this flag.

Test: atest FlagSlipperyTest
Bug: 157929241
Change-Id: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b
Merged-In: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b
 2021-11-10 06:49:04 +00:00
Charles Chen
71b2172abc [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent 
Before this CL, SystemUiContexts were fixed to the Display metrics
when the SystemUiContexts were created. It is the same mechanism
as DisplayContext but applies to SystemUiContexts unexpectedly.
This CL makes SystemUiContexts associate with DisplayContent with
the corresponding display ID. In this way, SystemUiContext would
receive updates when there is a Display property change.

Bug: 194262507
Bug: 191064581
Test: atest InputMethodMenuControllerTest WindowContextControllerTest

Change-Id: Idd74da965c18bdbf8912bd45e89be21f652dcf93
 2021-11-10 14:19:53 +08:00
TreeHugger Robot
4d021782fe [automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: 603e4d74fd -s ours am: 3e891aa6d4 -s ours am: b0b86d80c5 -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: I6b2216b903c95249624645fdd2a035558c38e24b
 2021-11-10 03:57:47 +00:00
TreeHugger Robot
b200140a18 [automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: ff0fc9a500 am: 93e559619a -s ours am: 25434f9279 -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: I870805ece1d5c616a6d03bf2b6451a1780b54b54
 2021-11-10 03:57:29 +00:00
TreeHugger Robot
3a7dee4128 [automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: 603e4d74fd am: db38b7faf4 am: e15f7800d1 -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: I4377a09f80d0f480099ffed2d72389f91c69a2f0
 2021-11-10 03:57:11 +00:00
TreeHugger Robot
82e9c54293 Merge changes from topic "remove-intermediate-callbacks" into sc-v2-dev am: 152b410194 am: 89dff675bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16175313

Change-Id: I8f6ea18f11463b00d62abac920ac81cf1726fc8f
 2021-11-10 03:56:42 +00:00
Shivam Agrawal
a91f35846b Do not send split info update when TaskFragmentContainer am: 5cb70ee9d4 am: 1f83ba9a7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16144437

Change-Id: Id2905e9d5dd0c1064c08ff6884dd9e31d1f6e17e
 2021-11-10 03:56:24 +00:00
Shivam Agrawal
ba1833fbd0 Include Activities That Have Not Been Assigned... am: 9c906fbc94 am: ce285229e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16133688

Change-Id: I28656f0bab1ecb100e308d7a29532cb48a6f1967
 2021-11-10 03:55:51 +00:00
Shivam Agrawal
993f30872f Update toString methods for various Embedding... am: d6cf8c85ac am: 3c32c63356 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16133687

Change-Id: Ia42bbf2880d42cbaae2cac02e8cf203cbf20e766
 2021-11-10 03:55:14 +00:00
TreeHugger Robot
b0b86d80c5 [automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: 603e4d74fd -s ours am: 3e891aa6d4 -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: I096608ae41f64ab63525a05aa9088407a18c0bab
 2021-11-10 03:49:52 +00:00
TreeHugger Robot
25434f9279 [automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: ff0fc9a500 am: 93e559619a -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: If8131f390a962ec9d9c356056da7e3e2f2352937
 2021-11-10 03:49:37 +00:00
TreeHugger Robot
87e104156b Merge "Adding enforcement for receiver exported flags." 2021-11-10 03:46:13 +00:00
TreeHugger Robot
9d3815d636 Merge "Remove the settings DISPLAY_SHAPE and BOTTOM_OFFSET" 2021-11-10 03:44:31 +00:00
TreeHugger Robot
e15f7800d1 Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: 603e4d74fd am: db38b7faf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: I6206e52df230c59bbe18539e8ad7019d6c9c9aba
 2021-11-10 03:34:16 +00:00
TreeHugger Robot
89dff675bd Merge changes from topic "remove-intermediate-callbacks" into sc-v2-dev am: 152b410194 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16175313

Change-Id: Ief1c0ba769a8ef536bc6ba061f89bd0fcffd8e96
 2021-11-10 03:33:47 +00:00
Shivam Agrawal
1f83ba9a7a Do not send split info update when TaskFragmentContainer am: 5cb70ee9d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16144437

Change-Id: I7a9e4737f8288cff0ef73f96e6a22649f60755d2
 2021-11-10 03:33:39 +00:00
Shivam Agrawal
ce285229e4 Include Activities That Have Not Been Assigned... am: 9c906fbc94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16133688

Change-Id: I4ab00e79514bf6c53e9a5ee0ab409ca5b665a2cd
 2021-11-10 03:33:28 +00:00
Shivam Agrawal
3c32c63356 Update toString methods for various Embedding... am: d6cf8c85ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16133687

Change-Id: I09a3bbbc943d7d866ef47526afb55e9faf8da122
 2021-11-10 03:33:07 +00:00