Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / eb730715366947ea0eb583562bf26b810581f1ed
commiteb730715366947ea0eb583562bf26b810581f1ed[log] [tgz]
authorBeth Thibodeau <ethibodeau@google.com>Tue Apr 02 21:01:52 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Apr 02 21:01:52 2024 +0000
treeab0897d96b75e76def6d24f4d738358e5a0a2884
parent4b16ec2aa6ecb82708464b5c77b5864a89769256 [diff]
parent4fa1ec340542052d75dd94a4b83f3ad2546de03a [diff]
[automerger skipped] Update media_controls_lock_screen setting behavior am: 06e0a7b620 -s ours am: a52ef69ae8 -s ours am: 4fa1ec3405 -s ours

am skip reason: Merged-In I4f618e4013db894291e6fca9d49bceb1cb7e4bd9 with SHA-1 a441f4acd6 is already in history

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

Change-Id: Ibf5f4019ed696f2a8cd6ddf0de2487f1aa3870f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: ab0897d96b75e76def6d24f4d738358e5a0a2884
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. boot/
  6. cmds/
  7. config/
  8. core/
  9. data/
  10. docs/
  11. drm/
  12. errorprone/
  13. graphics/
  14. identity/
  15. keystore/
  16. libs/
  17. location/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc/
  23. nfc-extras/
  24. obex/
  25. omapi/
  26. opengl/
  27. packages/
  28. proto/
  29. ravenwood/
  30. rs/
  31. samples/
  32. sax/
  33. services/
  34. startop/
  35. telecomm/
  36. telephony/
  37. test-base/
  38. test-junit/
  39. test-legacy/
  40. test-mock/
  41. test-runner/
  42. tests/
  43. tools/
  44. wifi/
  45. .clang-format
  46. .gitignore
  47. .mailmap
  48. AconfigFlags.bp
  49. ADPF_OWNERS
  50. Android.bp
  51. Android.mk
  52. BAL_OWNERS
  53. BATTERY_STATS_OWNERS
  54. BROADCASTS_OWNERS
  55. CleanSpec.mk
  56. framework-jarjar-rules.txt
  57. GAME_MANAGER_OWNERS
  58. INPUT_OWNERS
  59. INTENT_OWNERS
  60. ktfmt_includes.txt
  61. lint-baseline.xml
  62. LSE_APP_COMPAT_OWNERS
  63. MEMORY_OWNERS
  64. METADATA
  65. MODULE_LICENSE_APACHE2
  66. MULTIUSER_OWNERS
  67. NOTICE
  68. OWNERS
  69. OWNERS.md
  70. PACKAGE_MANAGER_OWNERS
  71. pathmap.mk
  72. PERFORMANCE_OWNERS
  73. PREUPLOAD.cfg
  74. ProtoLibraries.bp
  75. Ravenwood.bp
  76. SECURITY_STATE_OWNERS
  77. SQLITE_OWNERS
  78. TEST_MAPPING
  79. TestProtoLibraries.bp
  80. THERMAL_OWNERS
  81. TRACE_OWNERS
  82. WEAR_OWNERS
  83. ZYGOTE_OWNERS