Google Git
Sign in
android / platform / frameworks / base / e8f110352b269ab00c1a0c80cd1cf791b160cd90
commite8f110352b269ab00c1a0c80cd1cf791b160cd90[log] [tgz]
authorJorim Jaggi <jjaggi@google.com>Fri Jun 11 10:25:20 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Jun 11 10:25:20 2021 +0000
tree136148985aa3bcd296f15b1d19414037f0a6f4c1
parentc3d061d3c685dbfe135292d58ab819567cee8e72 [diff]
parent208512ae75113fcbb06914f75d84d4123a0864f8 [diff]
[automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours

am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I6c9236eb0273d1e7d07b05f39d768c51d07c0904
tree: 136148985aa3bcd296f15b1d19414037f0a6f4c1
  1. apct-tests/
  2. api/
  3. cmds/
  4. config/
  5. core/
  6. data/
  7. docs/
  8. drm/
  9. graphics/
  10. keystore/
  11. libs/
  12. location/
  13. lowpan/
  14. media/
  15. native/
  16. nfc-extras/
  17. obex/
  18. opengl/
  19. packages/
  20. proto/
  21. rs/
  22. samples/
  23. sax/
  24. services/
  25. startop/
  26. telecomm/
  27. telephony/
  28. test-base/
  29. test-legacy/
  30. test-mock/
  31. test-runner/
  32. tests/
  33. tools/
  34. wifi/
  35. .gitignore
  36. Android.bp
  37. Android.mk
  38. CleanSpec.mk
  39. jarjar_rules_hidl.txt
  40. MODULE_LICENSE_APACHE2
  41. NOTICE
  42. pathmap.mk
  43. PREUPLOAD.cfg