Commit Graph

640002 Commits

Author SHA1 Message Date
Matt Pietal
9193412bc6 Merge "Revert "Enable smartspace"" into sc-dev am: f8fa4efc58
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103510

Change-Id: I36e39161f8f7ee881a0cd15d30e9c41a3713ebb7
2021-04-06 18:44:23 +00:00
Paul Duffin
2d9395d4df Merge "Update OWNERS files for frameworks/base/boot" am: 2d9637c6fe am: 0f8ac7c313 am: eca71c137d am: b4d5ceda63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665363

Change-Id: If5bac760624e34fcdb4a8d675c2bf9f269e468ea
2021-04-06 18:44:00 +00:00
Roshan Pius
a6d7bf81c7 Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f83 am: aa9a283fc8 am: b142a134be am: 80da2e1cba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: Ibe3f00c6b9b84dfe89298957d80b2cfe69fe5d3d
2021-04-06 18:43:33 +00:00
Chris Tate
d8ac0de621 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: 1de72903d4 am: ac47f8e9ec -s ours am: 0908b0d8d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfca2251d7526518f287cabd8704a28a25e6880d
2021-04-06 18:43:04 +00:00
Christopher Tate
722baafc1d [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881 am: 69a77a4185 am: 9765e6c50c -s ours am: b27dfc8b28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I866cc08f684e165c23d22843ee458e35e40654d0
2021-04-06 18:43:00 +00:00
Siim Sammul
06c9b4ea93 [automerger skipped] Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." into sc-dev am: 2528f3dcd5 -s ours
am skip reason: skip tag Change-Id I8a123f7aed7c0ce416814372f2287b04a8a04ac0 with SHA-1 8d0ecde2b8 is already in history

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

Change-Id: Icfe90c8a39f9f817fdfa92e9f0fc53e2b581ca13
2021-04-06 18:42:46 +00:00
Matt Pietal
f8fa4efc58 Merge "Revert "Enable smartspace"" into sc-dev 2021-04-06 18:32:43 +00:00
Paul Duffin
b4d5ceda63 Merge "Update OWNERS files for frameworks/base/boot" am: 2d9637c6fe am: 0f8ac7c313 am: eca71c137d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665363

Change-Id: I495f721e819910a51a65fd0a8d639e343abe4287
2021-04-06 18:26:52 +00:00
Roshan Pius
80da2e1cba Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f83 am: aa9a283fc8 am: b142a134be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da
2021-04-06 18:25:52 +00:00
Chris Tate
0908b0d8d3 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: 1de72903d4 am: ac47f8e9ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf95015ea4dbd9435641419a85d217778c69bfea
2021-04-06 18:24:27 +00:00
Christopher Tate
b27dfc8b28 [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881 am: 69a77a4185 am: 9765e6c50c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4147be05d08a096103cce9d0989b24e13fdafc1f
2021-04-06 18:24:04 +00:00
Siim Sammul
2528f3dcd5 Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." into sc-dev 2021-04-06 18:23:23 +00:00
Chris Tate
ab5c8d6722 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: d894cc9d01 -s ours am: f906029106 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7614f94a8dcd6684641862e74105a333664d1cd8
2021-04-06 17:56:23 +00:00
Christopher Tate
934bd9b5fd [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881 am: c3a36e5830 -s ours am: edd6e60bad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0413d24cb8a212abfedc0bd38b09929a692e7a05
2021-04-06 17:56:14 +00:00
Chris Tate
f906029106 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: d894cc9d01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I903ac9bf138060243cfaa744f244b039451a0916
2021-04-06 17:40:47 +00:00
Christopher Tate
edd6e60bad [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881 am: c3a36e5830 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idaf3254b85a0d96bb43882249f9a7844b951e9ae
2021-04-06 17:40:38 +00:00
Victoria Lestari
991d50328e Merge "Updating config files and system API to create roles for on-device system intelligence features" into sc-dev am: a3146c7aee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901313

Change-Id: I8849e8d4e33636375da23549f426e93043a169ec
2021-04-06 17:37:58 +00:00
Paul Duffin
eca71c137d Merge "Update OWNERS files for frameworks/base/boot" am: 2d9637c6fe am: 0f8ac7c313
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665363

Change-Id: I0a70c7387fe5596433a412bd953990bcc106b6c1
2021-04-06 17:37:55 +00:00
TreeHugger Robot
946f6bace9 Merge "Add elevation to toast" into sc-dev am: 2a29cb2584
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14093795

Change-Id: I6f4a0b194f8678a1c28c4e5b76edbe7088d707af
2021-04-06 17:37:08 +00:00
Roshan Pius
b142a134be Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f83 am: aa9a283fc8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: If4d2d06c0e3ca6793dcb6139d3cd197e33f5aab7
2021-04-06 17:36:58 +00:00
TreeHugger Robot
d42ce92b1c Merge "Remove scrollbars in QS" into sc-dev am: a9bb9e420d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14095394

Change-Id: I1e67bac9fdcb37d73c83b64b6ebbf89c85b3bc6b
2021-04-06 17:36:15 +00:00
Chris Tate
ac47f8e9ec Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: 1de72903d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I132581d3f63bf06d9d230aa77f7493d12c8ae3bc
2021-04-06 17:36:06 +00:00
Christopher Tate
9765e6c50c DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881 am: 69a77a4185
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I973718b559bceed3b925a51b80db5adce60a07c8
2021-04-06 17:35:58 +00:00
Chloris Kuo
5ec81e9e7b Merge "NAS Feedback API document change" 2021-04-06 17:29:02 +00:00
Victoria Lestari
a3146c7aee Merge "Updating config files and system API to create roles for on-device system intelligence features" into sc-dev 2021-04-06 17:27:37 +00:00
TreeHugger Robot
2a29cb2584 Merge "Add elevation to toast" into sc-dev 2021-04-06 17:21:28 +00:00
TreeHugger Robot
a9bb9e420d Merge "Remove scrollbars in QS" into sc-dev 2021-04-06 17:20:13 +00:00
Winson Chiu
69e2bb8bea Merge "Fix package equivalence tests" into sc-dev am: 8316505a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14099788

Change-Id: I03da4f765c9d89626659957c744dc49e9526a3a6
2021-04-06 17:14:17 +00:00
TreeHugger Robot
5f1319c441 Merge "Don't set mNextDrawUseBlastSync when hardware is not enabled" into sc-dev am: 7c8aea622c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14091169

Change-Id: I4798082eecfc7156250ce39846b0b799098b7d54
2021-04-06 17:13:44 +00:00
Chris Tate
c55b197fd8 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-qpr-dev am: ced44641d9 am: b2f7cb747b -s ours am: 20953edc6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I112643ee40e410fc89f83995dc28bb3894f7b789
2021-04-06 17:12:29 +00:00
Christopher Tate
8476128dfe [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 2a33098b6c am: 33b7a223b1 -s ours am: e17befe01e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a18eb6bb5360eddb5f1459090bcab319cb085cb
2021-04-06 17:12:24 +00:00
Treehugger Robot
3af6d82511 Merge "Add SilkFX OWNERS" am: 4ff50eb031 am: c1c4f87b13 am: 32d949e4ea am: 9e5fc9a6c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664579

Change-Id: Idaebd6c67ba169378bcbb1744d3c29788229084b
2021-04-06 17:12:10 +00:00
Zimuzo Ezeozue
f06d35b5ac Merge "Allow list PACKAGE_USAGE_STATS permission for MediaProvider" into sc-dev am: 1d0073a1d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14036665

Change-Id: I86990999d29bcf9542f75795b39630e46103bc8e
2021-04-06 17:11:45 +00:00
Julia Reynolds
443d9c19ff [automerger skipped] Restrict alarm broadcast am: 1c08e32233 am: 9319bd87fc -s ours am: 3a6fc4b4ed -s ours
am skip reason: skip tag Change-Id I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 abf15b731a is already in history

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

Change-Id: I4904a94ecf6d69c5c63e730be299f0d9e046dc28
2021-04-06 17:10:54 +00:00
Winson Chiu
8316505a38 Merge "Fix package equivalence tests" into sc-dev 2021-04-06 17:10:49 +00:00
Paul Duffin
0f8ac7c313 Merge "Update OWNERS files for frameworks/base/boot" am: 2d9637c6fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665363

Change-Id: I83ea487cb055f54e00fff8058f1d57803fe5a9ea
2021-04-06 17:06:46 +00:00
TreeHugger Robot
7c8aea622c Merge "Don't set mNextDrawUseBlastSync when hardware is not enabled" into sc-dev 2021-04-06 17:05:39 +00:00
Chris Tate
20953edc6f [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-qpr-dev am: ced44641d9 am: b2f7cb747b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib146b5111d80653b9b1dbb0a87567e7e3f7b2b99
2021-04-06 16:56:36 +00:00
Christopher Tate
e17befe01e [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 2a33098b6c am: 33b7a223b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22c1527c35e1ce08a286ac46295bd48bb375e4f7
2021-04-06 16:56:02 +00:00
Treehugger Robot
9e5fc9a6c5 Merge "Add SilkFX OWNERS" am: 4ff50eb031 am: c1c4f87b13 am: 32d949e4ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664579

Change-Id: Ia4b69dac042ba7d5d03fd032cca894265d06cce3
2021-04-06 16:55:13 +00:00
Chris Tate
d894cc9d01 Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I30befd7e02b0765e985be2f5eac50eddcd0309c8
2021-04-06 16:54:45 +00:00
Christopher Tate
c3a36e5830 DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I1bf03cf9731b3e6b7a3397da120faf0368d199a0
2021-04-06 16:54:43 +00:00
Zimuzo Ezeozue
1d0073a1d7 Merge "Allow list PACKAGE_USAGE_STATS permission for MediaProvider" into sc-dev 2021-04-06 16:54:34 +00:00
Julia Reynolds
3a6fc4b4ed [automerger skipped] Restrict alarm broadcast am: 1c08e32233 am: 9319bd87fc -s ours
am skip reason: skip tag Change-Id I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 abf15b731a is already in history

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

Change-Id: Ieeaac734c7e4334ffa4d103bd69758d3cfc00fb2
2021-04-06 16:54:14 +00:00
Kholoud Mohamed
551b34d092 Merge "Add testAPI to get adopted shell permissions." into sc-dev am: a09e44982d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13948532

Change-Id: I67e3bcd0a91dcccbefdd2690a7982d41a7566a34
2021-04-06 16:52:08 +00:00
Chris Ye
2b66cf5dac Merge "Fixed input device vibrator manager with single vibrator in CombinedEffects." into sc-dev am: f0ee658a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14095812

Change-Id: Ied0342d8d2789f65aa4768b957151c7d6a73e77a
2021-04-06 16:51:51 +00:00
TreeHugger Robot
40683b719f Merge "Re-grant install permissions on build fingerprint change." into sc-dev am: 54c39c71a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14064891

Change-Id: Ia2bfcc509dea31783575b0a6551e4b35431f482d
2021-04-06 16:51:31 +00:00
Peter Kalauskas
933e49fd3c Merge "Always draw a background for the user avatar" into sc-dev am: 66582a8861
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056123

Change-Id: I536c4357d0a048357f0921337db1af77a55fa093
2021-04-06 16:51:00 +00:00
Kholoud Mohamed
a09e44982d Merge "Add testAPI to get adopted shell permissions." into sc-dev 2021-04-06 16:50:05 +00:00
Chris Tate
1de72903d4 Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I919b0c3ec34d7c0eb0384a65be961d9191429f1b
2021-04-06 16:49:32 +00:00