Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / be053b7e197809408865a2a4989df05d3012385b
  1. be053b7 resolve merge conflicts of 525ed1c275ce445093448566eb72a55a1bdf939c to rvc-dev-plus-aosp by Orion Hodson · 4 years, 4 months ago
  2. d3093ce docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 by Kevin Hufnagle · 4 years, 4 months ago
  3. e69b8a9 docs: Fix note about new intent action changes coming with Android 11. by Kevin Hufnagle · 4 years, 4 months ago
  4. 525ed1c Merge "profman: inclusive language updates" am: cde7692843 by Treehugger Robot · 4 years, 4 months ago
  5. cde7692 Merge "profman: inclusive language updates" by Treehugger Robot · 4 years, 4 months ago
  6. 92876ac Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc am: 28a65b8942 by Treehugger Robot · 4 years, 4 months ago
  7. 28a65b8 Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc by Treehugger Robot · 4 years, 4 months ago
  8. 4983d13 Merge "Update language to comply with Android's inclusive language guidance" by Treehugger Robot · 4 years, 4 months ago
  9. 2736db5 Update language to comply with Android's inclusive language guidance by lpeter · 4 years, 4 months ago
  10. 3a3ec27 Merge "Post a notification if reboot to DSU failed" am: 5432af8406 am: dcdec0017e by Yo Chiang · 4 years, 4 months ago
  11. 45f2280 Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 am: 6c6c7cdb81 by Paul Hu · 4 years, 4 months ago
  12. bcc1edb Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 am: 4143779e4b by Paul Hu · 4 years, 4 months ago
  13. dcdec00 Merge "Post a notification if reboot to DSU failed" am: 5432af8406 by Yo Chiang · 4 years, 4 months ago
  14. 6c6c7cd Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 by Paul Hu · 4 years, 4 months ago
  15. 5432af8 Merge "Post a notification if reboot to DSU failed" by Yo Chiang · 4 years, 4 months ago
  16. 4143779 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 by Paul Hu · 4 years, 4 months ago
  17. 50bb631 Merge "Revert "[RFPM03] Check permission by uid."" by Paul Hu · 4 years, 4 months ago
  18. aad5331e Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" by Paul Hu · 4 years, 4 months ago
  19. fc81e4d Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp by Jason Hsu · 4 years, 4 months ago
  20. baaf7f8 Merge "Add systrace tag for system property" into rvc-dev-plus-aosp by TreeHugger Robot · 4 years, 4 months ago
  21. 6216075 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 by Paul Hu · 4 years, 4 months ago
  22. 654c328 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 by Paul Hu · 4 years, 4 months ago
  23. f811545 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" by Paul Hu · 4 years, 4 months ago
  24. 7e947ab Revert "[RFPM03] Check permission by uid." by Paul Hu · 4 years, 4 months ago
  25. 2878288 Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method" by Paul Hu · 4 years, 4 months ago
  26. e30e470 Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 by Treehugger Robot · 4 years, 4 months ago
  27. 3256c9c [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d am: 6124af6736 -s ours by junyulai · 4 years, 4 months ago
  28. 363fe9d Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 by Treehugger Robot · 4 years, 4 months ago
  29. 6124af6 Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d by junyulai · 4 years, 4 months ago
  30. 4cea2d3 Merge changes I0faeda20,I726e74f5 by Treehugger Robot · 4 years, 4 months ago
  31. 93b5848 Revert "[RFPM05] Add UidNetdPermissionInfo class" by Paul Hu · 4 years, 4 months ago
  32. dc08329 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d by Zach Johnson · 4 years, 4 months ago
  33. e32671c Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 by Zach Johnson · 4 years, 4 months ago
  34. 22399aa Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" by Zach Johnson · 4 years, 4 months ago
  35. f2a8b85 Remove listenUsingEncryptedRfcommOn & listenUsingScoOn by Zach Johnson · 4 years, 4 months ago
  36. 2206e69 Merge "IorapForwardingService: Suppress error log" am: c20242f7e6 am: 3e1b131387 by Treehugger Robot · 4 years, 4 months ago
  37. 3e1b131 Merge "IorapForwardingService: Suppress error log" am: c20242f7e6 by Treehugger Robot · 4 years, 4 months ago
  38. c20242f Merge "IorapForwardingService: Suppress error log" by Treehugger Robot · 4 years, 4 months ago
  39. d60c636 Merge "Removes unnecessary weak reference on the java object associated with" am: 244406a4f5 am: 7c40bef8d7 by Treehugger Robot · 4 years, 4 months ago
  40. 7c40bef Merge "Removes unnecessary weak reference on the java object associated with" am: 244406a4f5 by Treehugger Robot · 4 years, 4 months ago
  41. 244406a4 Merge "Removes unnecessary weak reference on the java object associated with" by Treehugger Robot · 4 years, 4 months ago
  42. aeec6c8 IorapForwardingService: Suppress error log by yawanng · 4 years, 5 months ago
  43. 29f2c0d Removes unnecessary weak reference on the java object associated with by Andreas Huber · 4 years, 4 months ago
  44. 8ef5d0e Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 by Tyler Gunn · 4 years, 4 months ago
  45. 8ea64c4 Update language to comply with Android's inclusive language guidance by jasonwshsu · 4 years, 4 months ago
  46. 503b23e Merge "Add default constructor to NR cell classes" am: f12f3415d0 by Tyler Gunn · 4 years, 4 months ago
  47. f12f341 Merge "Add default constructor to NR cell classes" by Tyler Gunn · 4 years, 4 months ago
  48. 591602b Post a notification if reboot to DSU failed by Yo Chiang · 4 years, 4 months ago
  49. 7dc8bf4 Add systrace tag for system property by Bowgo Tsai · 4 years, 9 months ago
  50. f2502dc Merge "Rename driver build time manifest flag." into rvc-dev-plus-aosp by TreeHugger Robot · 4 years, 4 months ago
  51. b0ce703 Rename driver build time manifest flag. by Peiyong Lin · 4 years, 4 months ago
  52. db76430 Merge "Remove unused #include." am: c235669ec2 am: 7d741780c9 by Elliott Hughes · 4 years, 4 months ago
  53. 7d74178 Merge "Remove unused #include." am: c235669ec2 by Elliott Hughes · 4 years, 4 months ago
  54. c235669 Merge "Remove unused #include." by Elliott Hughes · 4 years, 4 months ago
  55. aabfda3 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830 by Meng Wang · 4 years, 4 months ago
  56. f5997ba8 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 by Meng Wang · 4 years, 4 months ago
  57. 5c8e5ca Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" by Meng Wang · 4 years, 4 months ago
  58. 8af7727 [automerger skipped] Merge "Compose the main stubs jars from module stubs" am: bb7674fad3 am: 0c90961dcd -s ours by Anton Hansson · 4 years, 4 months ago
  59. 0c90961 Merge "Compose the main stubs jars from module stubs" am: bb7674fad3 by Anton Hansson · 4 years, 4 months ago
  60. bb7674f Merge "Compose the main stubs jars from module stubs" by Anton Hansson · 4 years, 4 months ago
  61. b1db866 Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp by Anton Hansson · 4 years, 4 months ago
  62. 53cf0ba Re-apply "Add bp-based disting of android stubs" by Anton Hansson · 4 years, 4 months ago
  63. dcd62bc Merge "Make framework-res dep in stubs explicit" am: f0031bf353 am: dffa4110c6 by Anton Hansson · 4 years, 4 months ago
  64. dffa411 Merge "Make framework-res dep in stubs explicit" am: f0031bf353 by Anton Hansson · 4 years, 4 months ago
  65. 69acf25 [automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff0042 am: 2b86731b42 -s ours by Anton Hansson · 4 years, 4 months ago
  66. f0031bf Merge "Make framework-res dep in stubs explicit" by Anton Hansson · 4 years, 4 months ago
  67. 2b86731 Merge "Tweak stubs for updatable media" am: 2c99ff0042 by Anton Hansson · 4 years, 4 months ago
  68. 2c99ff0 Merge "Tweak stubs for updatable media" by Anton Hansson · 4 years, 4 months ago
  69. ed63b6c Merge "Add usesCleartextTraffic to Tethering" am: 2940cc724a am: 6e202d7b50 by Mark Chien · 4 years, 4 months ago
  70. 6e202d7 Merge "Add usesCleartextTraffic to Tethering" am: 2940cc724a by Mark Chien · 4 years, 4 months ago
  71. 2940cc7 Merge "Add usesCleartextTraffic to Tethering" by Mark Chien · 4 years, 4 months ago
  72. 5e1ca2b Add usesCleartextTraffic to Tethering by markchien · 4 years, 4 months ago
  73. 52ac971 [automerger skipped] Merge "audio: add device definitions for BLE Audio" am: 42ac870219 am: 707c709cf4 -s ours by Jakub Pawlowski · 4 years, 4 months ago
  74. 707c709 Merge "audio: add device definitions for BLE Audio" am: 42ac870219 by Jakub Pawlowski · 4 years, 4 months ago
  75. 42ac870 Merge "audio: add device definitions for BLE Audio" by Jakub Pawlowski · 4 years, 4 months ago
  76. f976180 audio: add device definitions for BLE Audio by Eric Laurent · 4 years, 5 months ago
  77. ff6f1c5 Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c by Treehugger Robot · 4 years, 4 months ago
  78. 3335cb4 Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 by Treehugger Robot · 4 years, 4 months ago
  79. fc236db Merge "Update MediaSessionService to comply with Android's inclusive language guidance" by Treehugger Robot · 4 years, 4 months ago
  80. 9a6205d Update MediaSessionService to comply with Android's inclusive language guidance by Wilson Wu · 4 years, 4 months ago
  81. cb5c7ad Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 am: 453023d999 by Treehugger Robot · 4 years, 4 months ago
  82. 453023d Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 by Treehugger Robot · 4 years, 4 months ago
  83. 2e1b52b Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" by Treehugger Robot · 4 years, 4 months ago
  84. f3c7199 Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID by Meng Wang · 4 years, 5 months ago
  85. 6605a82 Merge "audio: add device definitions for BLE Audio" into rvc-dev-plus-aosp by Eric Laurent · 4 years, 4 months ago
  86. 5f6a8ef Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d by TreeHugger Robot · 4 years, 4 months ago
  87. 18cff60 Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev by TreeHugger Robot · 4 years, 4 months ago
  88. a3edc25 Remove unused #include. by Elliott Hughes · 4 years, 4 months ago
  89. bc551a7 [automerger skipped] Merge "Include log/log_read.h for reading logs" am: 7e3435208a am: a15f00fbce -s ours by Tom Cherry · 4 years, 4 months ago
  90. a15f00f Merge "Include log/log_read.h for reading logs" am: 7e3435208a by Tom Cherry · 4 years, 4 months ago
  91. 7e34352 Merge "Include log/log_read.h for reading logs" by Tom Cherry · 4 years, 4 months ago
  92. 377b7f3 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp by TreeHugger Robot · 4 years, 4 months ago
  93. 23a355b [automerger skipped] Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 am: 19740a4726 -s ours by Treehugger Robot · 4 years, 4 months ago
  94. 19740a4 Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 by Treehugger Robot · 4 years, 4 months ago
  95. fbe9d7e Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." by Treehugger Robot · 4 years, 4 months ago
  96. 94891ea6 Include log/log_read.h for reading logs by Tom Cherry · 4 years, 8 months ago
  97. 9dece9a Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 am: 3e43926852 by Sudheer Shanka · 4 years, 4 months ago
  98. 3e43926 Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 by Sudheer Shanka · 4 years, 4 months ago
  99. 255d5a9 Merge "Update language to comply with Android’s inclusive language guidance." by Sudheer Shanka · 4 years, 4 months ago
  100. 912622f Compose the main stubs jars from module stubs by Anton Hansson · 4 years, 9 months ago