Gitiles
Code Review Sign In
gerrit.omnirom.org / android_frameworks_base / 093158d736244dff64b13b4e57eb3ce186191db1
  1. 093158d Merge "Use String8/16 c_str" into main am: 5af8505e4a am: 5accccc4c3 am: 83ab214b87 by Treehugger Robot · 2 years, 7 months ago
  2. 7b64191 Merge changes I57de36ba,I75d58e09 into main am: cd00f7a7f2 am: 420ee29980 am: a354379a93 by Eric Biggers · 2 years, 7 months ago
  3. a2ab90c [automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours am: 0ca0eefe9b -s ours am: 4c7844f103 -s ours by Jacob Hobbie · 2 years, 7 months ago
  4. 063f803 Merge "Remove cbrubaker from core/java/android/service/trust/OWNERS" into main am: c5d7c01fa2 am: ea3ebd64de am: a683cc24e9 by Eric Biggers · 2 years, 7 months ago
  5. 0f60fe2 Merge "Remove vishwath@google.com from core/java/android/service/trust/OWNERS" into main am: ffc88ff933 am: c25cfe90ae am: fb7aa27b84 by Eric Biggers · 2 years, 7 months ago
  6. 6d85b4c [automerger skipped] Merge "Add jacobhobbie@google.com to trust owners." into main am: 20303070b8 -s ours am: 226a3885af -s ours am: 27881829e1 -s ours by Eric Biggers · 2 years, 7 months ago
  7. 6e3c7a4 [automerger skipped] Add jacobhobbie@google.com to trust owners. am: 2e84a54c89 -s ours am: 09aa2665e6 -s ours am: 27e22c8045 -s ours by Jacob Hobbie · 2 years, 7 months ago
  8. a43f135 Merge "Add OWNERS for IFileIntegrityService.aidl" into main am: fc9287ed5b am: b9f32e069d am: 1a4a95a020 by Treehugger Robot · 2 years, 7 months ago
  9. 83ab214 Merge "Use String8/16 c_str" into main am: 5af8505e4a am: 5accccc4c3 by Treehugger Robot · 2 years, 7 months ago
  10. a354379 Merge changes I57de36ba,I75d58e09 into main am: cd00f7a7f2 am: 420ee29980 by Eric Biggers · 2 years, 7 months ago
  11. 4c7844f [automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours am: 0ca0eefe9b -s ours by Jacob Hobbie · 2 years, 7 months ago
  12. a683cc2 Merge "Remove cbrubaker from core/java/android/service/trust/OWNERS" into main am: c5d7c01fa2 am: ea3ebd64de by Eric Biggers · 2 years, 7 months ago
  13. fb7aa27 Merge "Remove vishwath@google.com from core/java/android/service/trust/OWNERS" into main am: ffc88ff933 am: c25cfe90ae by Eric Biggers · 2 years, 7 months ago
  14. 2788182 [automerger skipped] Merge "Add jacobhobbie@google.com to trust owners." into main am: 20303070b8 -s ours am: 226a3885af -s ours by Eric Biggers · 2 years, 7 months ago
  15. 27e22c8 [automerger skipped] Add jacobhobbie@google.com to trust owners. am: 2e84a54c89 -s ours am: 09aa2665e6 -s ours by Jacob Hobbie · 2 years, 7 months ago
  16. 1a4a95a Merge "Add OWNERS for IFileIntegrityService.aidl" into main am: fc9287ed5b am: b9f32e069d by Treehugger Robot · 2 years, 7 months ago
  17. 5accccc Merge "Use String8/16 c_str" into main am: 5af8505e4a by Treehugger Robot · 2 years, 7 months ago
  18. 420ee29 Merge changes I57de36ba,I75d58e09 into main am: cd00f7a7f2 by Eric Biggers · 2 years, 7 months ago
  19. 0ca0eef [automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours by Jacob Hobbie · 2 years, 7 months ago
  20. ea3ebd6 Merge "Remove cbrubaker from core/java/android/service/trust/OWNERS" into main am: c5d7c01fa2 by Eric Biggers · 2 years, 7 months ago
  21. c25cfe9 Merge "Remove vishwath@google.com from core/java/android/service/trust/OWNERS" into main am: ffc88ff933 by Eric Biggers · 2 years, 7 months ago
  22. 226a388 [automerger skipped] Merge "Add jacobhobbie@google.com to trust owners." into main am: 20303070b8 -s ours by Eric Biggers · 2 years, 7 months ago
  23. 09aa266 [automerger skipped] Add jacobhobbie@google.com to trust owners. am: 2e84a54c89 -s ours by Jacob Hobbie · 2 years, 7 months ago
  24. b9f32e0 Merge "Add OWNERS for IFileIntegrityService.aidl" into main am: fc9287ed5b by Treehugger Robot · 2 years, 7 months ago
  25. 5af8505 Merge "Use String8/16 c_str" into main by Treehugger Robot · 2 years, 7 months ago
  26. cd00f7a Merge changes I57de36ba,I75d58e09 into main by Eric Biggers · 2 years, 7 months ago
  27. c5d7c01 Merge "Remove cbrubaker from core/java/android/service/trust/OWNERS" into main by Eric Biggers · 2 years, 7 months ago
  28. ffc88ff Merge "Remove vishwath@google.com from core/java/android/service/trust/OWNERS" into main by Eric Biggers · 2 years, 7 months ago
  29. 87af05b Fix timer bug in TrustManagerService. by Jacob Hobbie · 3 years ago
  30. 2352987 TrustManagerService: remove ENABLE_ACTIVE_UNLOCK_FLAG by Eric Biggers · 2 years, 7 months ago
  31. eebbb8b Remove cbrubaker from core/java/android/service/trust/OWNERS by Eric Biggers · 2 years, 7 months ago
  32. fdfbb0d Remove vishwath@google.com from core/java/android/service/trust/OWNERS by Owner Cleanup Bot · 2 years, 8 months ago
  33. 2030307 Merge "Add jacobhobbie@google.com to trust owners." into main by Eric Biggers · 2 years, 7 months ago
  34. fc9287e Merge "Add OWNERS for IFileIntegrityService.aidl" into main by Treehugger Robot · 2 years, 7 months ago
  35. e023903 Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main am: af5672fbbb am: 5a3c1bdc29 am: c9f6570ddb by Eric Biggers · 2 years, 7 months ago
  36. 2e84a54 Add jacobhobbie@google.com to trust owners. by Jacob Hobbie · 2 years, 11 months ago
  37. 8f0ff7c Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 0da0258364 by Anvesh Renikindi · 2 years, 7 months ago
  38. f32dc8d Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into udc-dev-plus-aosp am: 38e9c2e9d6 by Anvesh Renikindi · 2 years, 7 months ago
  39. db06c37 Merge "Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."" into udc-dev-plus-aosp am: 550e3e628e by Anvesh Renikindi · 2 years, 7 months ago
  40. c9f6570 Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main am: af5672fbbb am: 5a3c1bdc29 by Eric Biggers · 2 years, 7 months ago
  41. 5a3c1bd Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main am: af5672fbbb by Eric Biggers · 2 years, 7 months ago
  42. 0da0258 Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp by Anvesh Renikindi · 2 years, 7 months ago
  43. 38e9c2e Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into udc-dev-plus-aosp by Anvesh Renikindi · 2 years, 7 months ago
  44. 550e3e6 Merge "Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."" into udc-dev-plus-aosp by Anvesh Renikindi · 2 years, 7 months ago
  45. af5672f Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main by Eric Biggers · 2 years, 7 months ago
  46. 2f83bde Merge "Fix NullPointerException for WifiDisplayController." into main am: b8e8e73b22 am: 892743b87b am: f322f5ad5a by Piotr Wilczyński · 2 years, 7 months ago
  47. f322f5a Merge "Fix NullPointerException for WifiDisplayController." into main am: b8e8e73b22 am: 892743b87b by Piotr Wilczyński · 2 years, 7 months ago
  48. 892743b Merge "Fix NullPointerException for WifiDisplayController." into main am: b8e8e73b22 by Piotr Wilczyński · 2 years, 7 months ago
  49. b8e8e73 Merge "Fix NullPointerException for WifiDisplayController." into main by Piotr Wilczyński · 2 years, 7 months ago
  50. 4bc3d30 Merge "Add TEST_MAPPING for VPN related files" into main am: 942d47b019 am: 2d68ef25ec am: 567cee5e49 by Chiachang Wang · 2 years, 7 months ago
  51. 567cee5 Merge "Add TEST_MAPPING for VPN related files" into main am: 942d47b019 am: 2d68ef25ec by Chiachang Wang · 2 years, 7 months ago
  52. e795ad6 Merge "Add VPN UT and CTS into presubmit" into main am: 0b0bc526a5 am: 914ad29f61 am: c1279ec2fd by Chiachang Wang · 2 years, 7 months ago
  53. 2d68ef2 Merge "Add TEST_MAPPING for VPN related files" into main am: 942d47b019 by Chiachang Wang · 2 years, 7 months ago
  54. 942d47b Merge "Add TEST_MAPPING for VPN related files" into main by Chiachang Wang · 2 years, 7 months ago
  55. c1279ec Merge "Add VPN UT and CTS into presubmit" into main am: 0b0bc526a5 am: 914ad29f61 by Chiachang Wang · 2 years, 7 months ago
  56. c552f9e Merge "Update process animating state with different reasons" into udc-d1-dev am: 14e4e6c54e by Riddle Hsu · 2 years, 7 months ago
  57. 14e4e6c Merge "Update process animating state with different reasons" into udc-d1-dev by Riddle Hsu · 2 years, 7 months ago
  58. 914ad29 Merge "Add VPN UT and CTS into presubmit" into main am: 0b0bc526a5 by Chiachang Wang · 2 years, 7 months ago
  59. 0b0bc52 Merge "Add VPN UT and CTS into presubmit" into main by Chiachang Wang · 2 years, 7 months ago
  60. 6bfdee0 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 22d35f5ab5 -s ours am: ddaee50504 -s ours by Xin Li · 2 years, 7 months ago
  61. dcc389b1 [automerger skipped] Merge Android U (ab/10368041) am: 7d3ffbae61 -s ours am: 5e747452de -s ours by Xin Li · 2 years, 7 months ago
  62. ddaee50 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 22d35f5ab5 -s ours by Xin Li · 2 years, 7 months ago
  63. 5e74745 [automerger skipped] Merge Android U (ab/10368041) am: 7d3ffbae61 -s ours by Xin Li · 2 years, 7 months ago
  64. 3815d34 Use String8/16 c_str by Tomasz Wasilczyk · 2 years, 7 months ago
  65. 4a80d34 Merge "Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 am: edd48b50ae" into udc-d1-dev-plus-aosp by Automerger Merge Worker · 2 years, 7 months ago
  66. 7a405e7 Merge "Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 am: bd6653edf5" into udc-d1-dev-plus-aosp by Automerger Merge Worker · 2 years, 7 months ago
  67. 8255c9a Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 am: edd48b50ae by Hawkwood Glazier · 2 years, 7 months ago
  68. 755c9b5 Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 am: bd6653edf5 by Hawkwood Glazier · 2 years, 7 months ago
  69. b83dc8d Merge "Update autoHandwritingEnabled documentation" into udc-dev am: 0cf9bf990d am: 519ea49123 by Justin Ghan · 2 years, 7 months ago
  70. 01e850c Merge "Update autoHandwritingEnabled documentation" into udc-dev am: 0cf9bf990d am: 37e0c5b0c0 by Justin Ghan · 2 years, 7 months ago
  71. 22d35f5 Merge "Merge Android U (ab/10368041)" into aosp-main-future by Xin Li · 2 years, 7 months ago
  72. bd6653e Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 by Hawkwood Glazier · 2 years, 7 months ago
  73. edd48b5 Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 by Hawkwood Glazier · 2 years, 7 months ago
  74. 37e0c5b Merge "Update autoHandwritingEnabled documentation" into udc-dev am: 0cf9bf990d by Justin Ghan · 2 years, 7 months ago
  75. 519ea49 Merge "Update autoHandwritingEnabled documentation" into udc-dev am: 0cf9bf990d by Justin Ghan · 2 years, 7 months ago
  76. 0de1041 Merge "Select the default clock if current clock id was not found" into udc-dev by Hawkwood Glazier · 2 years, 7 months ago
  77. 0cf9bf9 Merge "Update autoHandwritingEnabled documentation" into udc-dev by Justin Ghan · 2 years, 7 months ago
  78. 1a36783 PolicyVersionUpgrader: fix ERROR + stacktrace on first boot by Eric Biggers · 2 years, 8 months ago
  79. 4995402 Merge "Avoid loading duplicate jobs." into udc-dev-plus-aosp am: a8c8940e3d by Treehugger Robot · 2 years, 7 months ago
  80. a8c8940 Merge "Avoid loading duplicate jobs." into udc-dev-plus-aosp by Treehugger Robot · 2 years, 7 months ago
  81. 6cc574b Merge "Remove the duplicated RFC7421_PREFIX_LENGTH constants." into main am: 6c8fb01159 am: b8a745503d am: 9c1d1d5bc4 by Treehugger Robot · 2 years, 7 months ago
  82. 9c1d1d5 Merge "Remove the duplicated RFC7421_PREFIX_LENGTH constants." into main am: 6c8fb01159 am: b8a745503d by Treehugger Robot · 2 years, 7 months ago
  83. cedc246 Merge "Set underlying network as soon as VPN tries using the network" into main am: 0b3c59e37e am: 87fa06b4c8 am: 06c1c3ed21 by Chiachang Wang · 2 years, 7 months ago
  84. 63979eb Merge "Migrate from android::String isEmpty to empty [process]" into main am: 846d6a30bc am: 4abf02bc37 am: c6a4960b26 by Treehugger Robot · 2 years, 7 months ago
  85. b8a7455 Merge "Remove the duplicated RFC7421_PREFIX_LENGTH constants." into main am: 6c8fb01159 by Treehugger Robot · 2 years, 7 months ago
  86. 6c8fb01 Merge "Remove the duplicated RFC7421_PREFIX_LENGTH constants." into main by Treehugger Robot · 2 years, 7 months ago
  87. 06c1c3e Merge "Set underlying network as soon as VPN tries using the network" into main am: 0b3c59e37e am: 87fa06b4c8 by Chiachang Wang · 2 years, 7 months ago
  88. c6a4960 Merge "Migrate from android::String isEmpty to empty [process]" into main am: 846d6a30bc am: 4abf02bc37 by Treehugger Robot · 2 years, 7 months ago
  89. 87fa06b Merge "Set underlying network as soon as VPN tries using the network" into main am: 0b3c59e37e by Chiachang Wang · 2 years, 7 months ago
  90. 4abf02b Merge "Migrate from android::String isEmpty to empty [process]" into main am: 846d6a30bc by Treehugger Robot · 2 years, 7 months ago
  91. 0b3c59e Merge "Set underlying network as soon as VPN tries using the network" into main by Chiachang Wang · 2 years, 7 months ago
  92. 846d6a3 Merge "Migrate from android::String isEmpty to empty [process]" into main by Treehugger Robot · 2 years, 7 months ago
  93. f1d256e Merge "Add VirtualCamera package and OWNERS" into main am: cd4aae5f6d am: e71d071862 am: 869f7f088b by Vadim Caen · 2 years, 7 months ago
  94. c0ccb35 Merge "adding more owners for frameworks/base/packages/SettingsLib/src/com/android/settingslib/bluetooth/OWNERS" into main am: 341816bd71 am: ec7dcf471e am: 62b6307349 by Yuanru Qian · 2 years, 7 months ago
  95. 869f7f0 Merge "Add VirtualCamera package and OWNERS" into main am: cd4aae5f6d am: e71d071862 by Vadim Caen · 2 years, 7 months ago
  96. 62b6307 Merge "adding more owners for frameworks/base/packages/SettingsLib/src/com/android/settingslib/bluetooth/OWNERS" into main am: 341816bd71 am: ec7dcf471e by Yuanru Qian · 2 years, 7 months ago
  97. 5f7fbc2 Add TEST_MAPPING for VPN related files by Chiachang Wang · 2 years, 7 months ago
  98. 31d229d Add VPN UT and CTS into presubmit by Chiachang Wang · 2 years, 7 months ago
  99. 23bdc16c Fix NullPointerException for WifiDisplayController. by jiayongqiang · 2 years, 9 months ago
  100. e71d071 Merge "Add VirtualCamera package and OWNERS" into main am: cd4aae5f6d by Vadim Caen · 2 years, 7 months ago