Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 373c5ac49e78467827763bdbf2fa0252d1cd961b
commit373c5ac49e78467827763bdbf2fa0252d1cd961b[log] [tgz]
authorAnton Potapov <apotapov@google.com>Wed Aug 02 11:25:18 2023 +0000
committerAnton Potapov <apotapov@google.com>Wed Aug 02 13:12:21 2023 +0000
treea9683dde66c64227962fb7e4deb6a81ca7db710d
parentf4361774253065eafb54af0cb7750717145758c6 [diff]
parent2818ba8c93a6ad55ad58ed7955628aea4dcfa5ae [diff]
[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93

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

Merged-In: I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2
Merged-In: I60896a6f53307f0e97a9223b599a2891c6c0c08d
Merged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec
Merged-In: Ibe4fb69a90904787b9f97a7cd90d318a047d1e11
Merged-In: Iba846f19098c71c0519470cd7b8c1fd60d47e70b
Change-Id: I4666499fa8e2c51a7900913c9e22127cb6a4283a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: a9683dde66c64227962fb7e4deb6a81ca7db710d
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. cmds/
  6. config/
  7. core/
  8. data/
  9. docs/
  10. drm/
  11. errorprone/
  12. graphics/
  13. identity/
  14. keystore/
  15. libs/
  16. location/
  17. lowpan/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc-extras/
  23. non-updatable-api/
  24. obex/
  25. opengl/
  26. packages/
  27. proto/
  28. rs/
  29. samples/
  30. sax/
  31. services/
  32. startop/
  33. telecomm/
  34. telephony/
  35. test-base/
  36. test-legacy/
  37. test-mock/
  38. test-runner/
  39. tests/
  40. tools/
  41. wifi/
  42. .clang-format
  43. .gitignore
  44. .mailmap
  45. Android.bp
  46. Android.mk
  47. ApiDocs.bp
  48. CleanSpec.mk
  49. framework-jarjar-rules.txt
  50. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING