Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
677,921 Commits 3 Branches 0 Tags
fbb3ef486def0bf1910b6cf7d2d1b6e42fbc7878
Commit Graph

677921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
db38b7faf4 Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: 603e4d74fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: I7682e8ff23c55bb9c72cc5251eb91487ce042580
 2021-11-10 03:26:34 +00:00
TreeHugger Robot
3e891aa6d4 [automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: 603e4d74fd -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: Iecf85d6800e9547163f6a182f065af0cf1c4c519
 2021-11-10 03:26:23 +00:00
TreeHugger Robot
93e559619a Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf am: ff0fc9a500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: Iea7cabede835d5e8982950018242d6d936c44f02
 2021-11-10 03:24:57 +00:00
TreeHugger Robot
152b410194 Merge changes from topic "remove-intermediate-callbacks" into sc-v2-dev 
* changes:
  Adds Test that verifies an Activity is Still Reported...
  Do not send split info update when TaskFragmentContainer
  Include Activities That Have Not Been Assigned...
  Update toString methods for various Embedding...
 2021-11-10 03:18:50 +00:00
TreeHugger Robot
603e4d74fd Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: I44bc3b5c92d0cf45625fefdc8f27a4db472892d2
 2021-11-10 03:13:59 +00:00
TreeHugger Robot
ff0fc9a500 Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 am: f159de0dcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: I660ca22cec61a82441ef98e70f5c6a1d4a224fa6
 2021-11-10 03:12:33 +00:00
TreeHugger Robot
f159de0dcf Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: 5448bd7ed3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: I524489ca639856389e55fa4ac5c31f0f348b02ee
 2021-11-10 03:02:14 +00:00
TreeHugger Robot
5448bd7ed3 Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361

Change-Id: Ie00822b22ee7e9b46a5229f1e778e5a4c1a1bccf
 2021-11-10 02:38:17 +00:00
Sergey Serokurov
e03e832642 Merge "Fix android Studio build due to "@Subcomponent.Builder is missing setters"" into sc-v2-dev am: 7225f45e77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16221519

Change-Id: I03dc15c7ea678e7d46fe713e1d981ee6d8dd5f3b
 2021-11-10 02:30:57 +00:00
TreeHugger Robot
bb3f22df9a Merge "Mark screen decorations as trusted overlays" into rvc-dev 2021-11-10 02:18:17 +00:00
Sergey Serokurov
7225f45e77 Merge "Fix android Studio build due to "@Subcomponent.Builder is missing setters"" into sc-v2-dev 2021-11-10 02:15:03 +00:00
Sergey Serokurov
7cf736976a Fix android Studio build due to "@Subcomponent.Builder is missing setters" 
Bug: 205776729
Test: manual
Change-Id: I39b4b2ba5534e91056f5d8194494cc1e49422010
 2021-11-09 18:10:55 -08:00
TreeHugger Robot
3f713915fb [automerger skipped] Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: 34798dcab0 -s ours am: 49f5431141 -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/+/15748730

Change-Id: I2a45c3d0394248735f22fe5da53207f68d73377b
 2021-11-10 01:51:35 +00:00
Jooyung Han
1d52ea1455 Merge "Parcel: add new methods for interface list/array" am: 2500e149bc am: ef7ca34bbe am: 90d9045ad5 am: ecc29bfce7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1881006

Change-Id: I5f809b781cf8e62624840183659c25ce1bcb31d1
 2021-11-10 01:51:11 +00:00
TreeHugger Robot
e01a07c6c1 Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: dbb5263581 am: c42bad074b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: Iba9e657232274a1510caa4bb5f9ee42918ce0727
 2021-11-10 01:50:01 +00:00
TreeHugger Robot
6aa434ca4b Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: 34798dcab0 am: d7d5f316da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: Ie349fd4e38b1285f2d1bd8fda628f754cc3a9e15
 2021-11-10 01:49:20 +00:00
TreeHugger Robot
d7d5f316da Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: 34798dcab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: I25f7c05f9d68050f2cacfe5e92196db83d5bc8da
 2021-11-10 01:32:25 +00:00
TreeHugger Robot
49f5431141 [automerger skipped] Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: 34798dcab0 -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/+/15748730

Change-Id: I5d2567606884c3d988d37443886378760d2122f4
 2021-11-10 01:32:14 +00:00
Jooyung Han
ecc29bfce7 Merge "Parcel: add new methods for interface list/array" am: 2500e149bc am: ef7ca34bbe am: 90d9045ad5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1881006

Change-Id: I375c7a2dfe80addbc4cf8dcb1dfcd4455aa31c1a
 2021-11-10 01:31:48 +00:00
TreeHugger Robot
c42bad074b Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: dbb5263581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: I81f83910a7fc265bacbc1eeaf96f15e27fc20a56
 2021-11-10 01:31:12 +00:00
Joe Bolinger
319f5265f5 Merge "Add jbolinger to OWNERS." am: ee4b5534fe am: a0f868f483 am: 6e604a01ab am: 4a7dcf4af3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883308

Change-Id: Iccb83f3d034c7c11a34dd56c0e3eb7f578eb9c2d
 2021-11-10 01:19:53 +00:00
Rambo Wang
946bf12535 Merge "Update javadoc of CarrierConfigManager" am: 540d638718 am: e994932ccc am: 874d08f1b5 am: d5cf5ae0b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878021

Change-Id: I2d8e509bd172111a266edaea4865a232f8ade805
 2021-11-10 01:19:19 +00:00
TreeHugger Robot
34798dcab0 Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: I7302147f409fbf99c346848ecf6b6805440cdf98
 2021-11-10 01:14:18 +00:00
Jooyung Han
90d9045ad5 Merge "Parcel: add new methods for interface list/array" am: 2500e149bc am: ef7ca34bbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1881006

Change-Id: Ib2f23366b180e112659a4646e605ab14aa2cc7e1
 2021-11-10 01:13:25 +00:00
TreeHugger Robot
dbb5263581 Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: I7f2914d4921e8599c453e439bc4a43c0a9ecc336
 2021-11-10 01:13:01 +00:00
Rob Carr
21a2971ec4 Merge "DO NOT MERGE: ViewRootImpl: Add P2P sync primitive" into sc-v2-dev am: eba32bb22f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16049442

Change-Id: I63bf72f55385196fa46ae8da9e47013ff0787288
 2021-11-10 01:06:54 +00:00
Robert Carr
b65a2595f0 DO NOT MERGE: ViewRootImpl: Add P2P sync primitive am: e5d1324755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16049442

Change-Id: Ife02e77849de798a9a77dd039d29a8870b9d3c4d
 2021-11-10 01:06:43 +00:00
Winson Chung
f762046821 Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: 88aae2f25f am: 1e2cf25915 am: 7fe98b5ceb am: ba3600f67e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850

Change-Id: Id075b3637bf193480304eed468c008907e7d0c05
 2021-11-10 01:05:48 +00:00