Commits · 2a7084f906021cf5b53d1b6fec762db6ce9ebac8 · Farzin Kazemzadeh / platform_frameworks_base-old

Apr 04, 2024

Max Loh authored 11 months ago

Bug: 329902686
Test: Unit tests.
Change-Id: I443353c88c18808a4a4491b617bdb8a7f990c908

2a7084f9

Merge "Remove flag to disable the screen off broadcast receiver" into main · f28bdad9
Santiago Seifert authored 11 months ago

f28bdad9

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell... · 49deb078

Guojing Yuan authored 11 months ago

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-qpr-dev am: 79d7cf74 -s ours am: 5369e2c3 -s ours am: db6bb4c2 -s ours am: bda9b859 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I2f54ee965b07a57955029f71a05addceec31438f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

49deb078

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am:... · 9582234f

Guojing Yuan authored 11 months ago

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am: f2047355 -s ours am: 922629a9 -s ours am: 0ba6c94b -s ours am: e22c1ea1 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: Id4da77d63c47dc297e1cb78a19d5becd0b29d9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9582234f

Merge changes from topic "am-6dca74afd2444e73b1ab1e32407f3c7b" into main · 66bde900

Automerger Merge Worker authored 11 months ago

* changes:
  [automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours am: 5a94493f -s ours am: 8aa446f3 -s ours
  [automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours am: db74bfc5 -s ours am: d3256271 -s ours

66bde900

[automerger skipped] Merge "Resolve message/conversation image Uris with the... · ebaf7d1b

Matías Hernández authored 11 months ago

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours am: 5a94493f -s ours am: 8aa446f3 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I6fe34334d7cc47b5a6f0ac3869fd3c06d31f2a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ebaf7d1b

Merge "Update OWNER for SensitiveContentProtectionManager" into main am: am: · 42688896

Treehugger Robot authored 11 months ago

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

Change-Id: I14404f654af3a033676f66200dcd09f0f7ca23e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

42688896

[automerger skipped] Resolve message/conversation image Uris with the correct... · 48eb3ff3

Matías Hernández authored 11 months ago

[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours am: db74bfc5 -s ours am: d3256271 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I314a0da965ff6f873626127d4b13f6b22331a553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

48eb3ff3

Merge "Remove usage of status_bar_height in clocks" into main · 18235e5f
Sherry Zhou authored 11 months ago

18235e5f
Merge "[Flexiglass] Fix back handling in QS Edit mode" into main · 47c05043
Ale Nijamkin authored 11 months ago

47c05043

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell... · 49af9037

Guojing Yuan authored 11 months ago

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-qpr-dev am: 79d7cf74 -s ours am: 5369e2c3 -s ours am: f896877b -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: Ica27b09148d274c85aba41c340b9f018d2b6e5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

49af9037

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am:... · 15d048a1

Guojing Yuan authored 11 months ago

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am: f2047355 -s ours am: 922629a9 -s ours am: 93c7df53 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I6687bef405cd34ba7b3076ec322a3208dc46383c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

15d048a1

Merge "Update OWNER for SensitiveContentProtectionManager" into main am: · 77bc7b62

Treehugger Robot authored 11 months ago

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

Change-Id: Ibe624c05afdc2e4541e34967aa512957806a5b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

77bc7b62

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell... · bda9b859

Guojing Yuan authored 11 months ago

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-qpr-dev am: 79d7cf74 -s ours am: 5369e2c3 -s ours am: db6bb4c2 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I29d24093dc843520fae053c8eb9a211fae96cde9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bda9b859

[automerger skipped] Merge "Resolve message/conversation image Uris with the... · 3cf33e2b

Matías Hernández authored 11 months ago

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours am: f13e3615 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I62ac624be40f6af5781cc69fbaba02423e656f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3cf33e2b

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am:... · e22c1ea1

Guojing Yuan authored 11 months ago

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am: f2047355 -s ours am: 922629a9 -s ours am: 0ba6c94b -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I804a3b2ff108c18c1640f6e9de14ae13279ad1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e22c1ea1

[automerger skipped] Merge "Resolve message/conversation image Uris with the... · 8aa446f3

Matías Hernández authored 11 months ago

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours am: 5a94493f -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: Ifac57895375a5b7950f8f12e6e6d89a80676f872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8aa446f3

[automerger skipped] Resolve message/conversation image Uris with the correct... · 677b3494

Matías Hernández authored 11 months ago

[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours am: c1ed6151 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I5d0dfa4398ef6228ef72642f6d395f377100f54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

677b3494

[automerger skipped] Resolve message/conversation image Uris with the correct... · d3256271

Matías Hernández authored 11 months ago

[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours am: db74bfc5 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I12496c042d1a29984515f62930976260daf2fc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d3256271

Merge "Move MediaRouterService work out of main thread" into main · b68a6dc3
Santiago Seifert authored 11 months ago

b68a6dc3
Merge "[SettingsProvider] change the log level of failed writes from WTF to E" into main · 6cd152d4
Song Chun Fan authored 11 months ago

6cd152d4
Merge "Update/fix SensitiveContentProtectionManager test" into main · c1ba3798
Treehugger Robot authored 11 months ago

c1ba3798
Merge "Update OWNER for SensitiveContentProtectionManager" into main · 296b1164
Treehugger Robot authored 11 months ago

296b1164
Merge "[PM] Remove wear folder and the usage of xz-java" into main · 33e05520
Song Chun Fan authored 11 months ago

33e05520
Merge "Add hidden-api-checks=false to SelinuxFrameworksTests" into main · e942552f
Sandro Montanari authored 11 months ago

e942552f

Merge "ShadeCarrierGroupController: remove excessive log" into main am: am: · 5ff2ae9b

Neill Kapron authored 11 months ago

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

Change-Id: I3b81f955dfea1fa3bd714cfb1aa15900cd6d9384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5ff2ae9b

Merge "Adapt to changing function signature." into main am: am: · 8f9e245e

Treehugger Robot authored 11 months ago

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

Change-Id: Id2a210718afe7a23b144d6ed3f889be931c6db11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8f9e245e

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell... · f896877b

Guojing Yuan authored 11 months ago

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-qpr-dev am: 79d7cf74 -s ours am: 5369e2c3 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I5280e5169a7ac5ed8865f60b04a263e4bcd5fd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f896877b

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am:... · 93c7df53

Guojing Yuan authored 11 months ago

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am: f2047355 -s ours am: 922629a9 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I593cec9bd0473e2a9c082a0d9b970d6bd3584fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

93c7df53

Merge "update package watchdog to perform mitigations after every reboot once... · 01b20657

Shrinidhi Hegde authored 11 months ago

Merge "update package watchdog to perform mitigations after every reboot once threshold is reached." into main am: 02d17267 am: 9143a18b

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

Change-Id: I279c8e463e6d7b84467c6161bac8350b184bbb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

01b20657

[automerger skipped] Merge "Resolve message/conversation image Uris with the... · f13e3615

Matías Hernández authored 11 months ago

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I533f2d44af92f778b73b1eb0b8e7f256b9118d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f13e3615

[automerger skipped] Resolve message/conversation image Uris with the correct... · c1ed6151

Matías Hernández authored 11 months ago

[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: Ie5065be65f8b019446e348ed46ca3e3393b06fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c1ed6151

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell... · db6bb4c2

Guojing Yuan authored 11 months ago

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-qpr-dev am: 79d7cf74 -s ours am: 5369e2c3 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: I550e2da6ee41dbbee2947a4a2ebae90a4ac00317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

db6bb4c2

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am:... · 0ba6c94b

Guojing Yuan authored 11 months ago

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am: f2047355 -s ours am: 922629a9 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 54c968aa is already in history

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



Change-Id: Ic6cbf530040aae3d2200719d93a9927ca74bc92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0ba6c94b

Merge "ShadeCarrierGroupController: remove excessive log" into main am: · 2b678543

Neill Kapron authored 11 months ago

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

Change-Id: Iacc5767c6c21375ef92052053b64504dc23e2ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2b678543

[automerger skipped] Merge "Resolve message/conversation image Uris with the... · 5a94493f

Matías Hernández authored 11 months ago

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4 -s ours am: ba9d4443 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: I2ca169c9433f2a2e9ff59dbe61f3d52841c4166c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5a94493f

[automerger skipped] Resolve message/conversation image Uris with the correct... · db74bfc5

Matías Hernández authored 11 months ago

[automerger skipped] Resolve message/conversation image Uris with the correct user id am: a63ab761 -s ours am: 2075ea56 -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06 is already in history

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



Change-Id: Id68817cad72558203a96080118b2c8634ce1010f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

db74bfc5

Merge changes I0e61db91,Icb7ab995 into main am: am: · 14a57c14

Treehugger Robot authored 11 months ago

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

Change-Id: I0b6248135f1aeec61054161f6c1ab132b85d038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

14a57c14

Merge "Run audio and bluetooth calls on handler" into main · c0e6644b
Santiago Seifert authored 11 months ago

c0e6644b
Merge "ShadeCarrierGroupController: remove excessive log" into main · c3d10220
Neill Kapron authored 11 months ago

c3d10220