Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 50217d590e316d9b5a79554e51c1892b7c1d584e
  1. 50217d5 [automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp am: 9f480e0b8a by Roshan Pius · 5 years ago
  2. 71b9472 Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 am: b2cfc86e8b by Jared Henderson · 5 years ago
  3. 997b46a Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 am: 9b42b7095d by Anna Trostanetski · 5 years ago
  4. 44117ea Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c by Jay Patel · 5 years ago
  5. 28f41e7 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours am: ec2c5c2e18 by Da Xing · 5 years ago
  6. 33b44ef [automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 am: e0afc80afb -s ours by Jack Yu · 5 years ago
  7. 64be6a4 [automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd am: 966c2eb20d -s ours by Jack Yu · 5 years ago
  8. 8c1e4e8 resolve merge conflicts of 8f843170a43f7085379ac38afbde7b9f69a16a0f to qt-qpr1-dev-plus-aosp by Pengquan Meng · 5 years ago
  9. b402c73 Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp by TreeHugger Robot · 5 years ago
  10. 7c76146 [automerger skipped] Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  11. 8e24ea2 Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  12. f7db1c4 Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd by Nagaraja · 5 years ago
  13. 8649477 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 by Anna Trostanetski · 5 years ago
  14. eb2a053 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a by Tobias Thierer · 5 years ago
  15. edeb031 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 by Oscar Shu · 5 years ago
  16. 867daa7 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  17. 011723e Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 by Tobias Thierer · 5 years ago
  18. cb7ebee Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 23cdf1a48c" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  19. 66ee479 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe by Santos Cordon · 5 years ago
  20. 1ff9dc9 Merge "Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 am: 7a5ba3f59d" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  21. 6653f2b Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 by Neil Fuller · 5 years ago
  22. 2da6de0 Merge "[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours am: a8aa5abfa0 -s ours am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  23. 85f6ce6 [automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours by Remi NGUYEN VAN · 5 years ago
  24. e6495d4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  25. afe708f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours by Bill Yi · 5 years ago
  26. 2c91624 Merge "Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 am: 83392f441d" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  27. ea14786 Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 by Adrian Salido · 5 years ago
  28. 9607b94 Merge "Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours am: 594180c68c -s ours am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  29. 8602e0f Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours by Yi Kong · 5 years ago
  30. cfb337a [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 -s ours by Lucas Dupin · 5 years ago
  31. c40d399 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours by Bill Yi · 5 years ago
  32. 90fd03e Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff by Long Ling · 5 years ago
  33. 74ee0f2 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 -s ours by Long Ling · 5 years ago
  34. cacba7e DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: 66e9298ac6 by Long Ling · 5 years ago
  35. f650335 Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp am: 73c6f3caa3 by Sasha Smundak · 5 years ago
  36. 5b14cee Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 am: 975bd46c43 by Yi Kong · 5 years ago
  37. a4c4948 Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef by Yi Kong · 5 years ago
  38. bf069a4 Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev by Roman Kiryanov · 5 years ago
  39. 919efca Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev am: b55bf00418 by Pengquan Meng · 5 years ago
  40. 0c859fa resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp by Inseob Kim · 5 years ago
  41. 23cdf1a Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev by Santos Cordon · 5 years ago
  42. 56b04b1 [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev by Lucas Dupin · 5 years ago
  43. 5c56a5e [automerger skipped] Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  44. 6060198 Merge changes from topic "device_config_for_display_90" into qt-r1-dev by Long Ling · 5 years ago
  45. 318adae [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager by Long Ling · 5 years ago
  46. 8da4630 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager by Long Ling · 5 years ago
  47. e69976f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0c06bd1122 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  48. 5d86701 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev by Bill Yi · 5 years ago
  49. 18e41d0 Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-dev am: 9b94c35a54 by Adrian Salido · 5 years ago
  50. 33b9c6b [automerger skipped] DO NOT MERGE DMD: Support minimum refresh rate am: 86ce8f764b by Long Ling · 5 years ago
  51. 1d20f20 Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  52. b55bf00 Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev by Pengquan Meng · 5 years ago
  53. f061a70 NetworkStackClient: Refactor network stack process interaction by Roshan Pius · 5 years ago
  54. 0c06bd1 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  55. 50d95f3 Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp by Roshan Pius · 5 years ago
  56. 9f480e0 Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp by Roshan Pius · 5 years ago
  57. 8ceaffb Merge "[DO NOT MERGE]Daggerize Android Auto" into qt-qpr1-dev am: 3684678602 by Neil Fuller · 5 years ago
  58. 3e0a59b [DO NOT MERGE]Daggerize Android Auto am: 8d49d0d63f by Govinda Wasserman · 5 years ago
  59. 3684678 Merge "[DO NOT MERGE]Daggerize Android Auto" into qt-qpr1-dev by Neil Fuller · 5 years ago
  60. 8d49d0d [DO NOT MERGE]Daggerize Android Auto by Govinda Wasserman · 5 years ago
  61. 7227ff1 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager by Long Ling · 5 years ago
  62. dde62480 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager by Long Ling · 5 years ago
  63. e05a580 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe by Santos Cordon · 5 years ago
  64. 323160d [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 by Lucas Dupin · 5 years ago
  65. 666fbf7 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours by Bill Yi · 5 years ago
  66. b2bf0d3 Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master am: e9a702d526 am: 2b3c5c79c0 by Colin Cross · 5 years ago
  67. 43a8d7b Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff by Long Ling · 5 years ago
  68. 80f9ea6 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 by Long Ling · 5 years ago
  69. 37f8b55 Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 by Jared Henderson · 5 years ago
  70. 6f5669e Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 by Anna Trostanetski · 5 years ago
  71. 77c7496 Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c by Jay Patel · 5 years ago
  72. 2476002 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours by Da Xing · 5 years ago
  73. b2cfc86 Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef by Jared Henderson · 5 years ago
  74. 9b42b70 Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d by Anna Trostanetski · 5 years ago
  75. 3dba92b [automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 by Jack Yu · 5 years ago
  76. 1cf8392 [automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd by Jack Yu · 5 years ago
  77. 4088527 Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d by Jay Patel · 5 years ago
  78. 8f84317 Merge "Add geo targeting implementation" am: df2293f68b am: 52cd1fe0f1 by Pengquan Meng · 5 years ago
  79. ec2c5c2 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours by Da Xing · 5 years ago
  80. e83d4f6 Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 by Nagaraja · 5 years ago
  81. 884ef46 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb by Anna Trostanetski · 5 years ago
  82. 7f1e92a Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" by Jared Henderson · 5 years ago
  83. bc59f85 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 by Tobias Thierer · 5 years ago
  84. 02142d5 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 by Oscar Shu · 5 years ago
  85. a105206 Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d by Anna Trostanetski · 5 years ago
  86. e0afc80 Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 by Jack Yu · 5 years ago
  87. 966c2eb Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd by Jack Yu · 5 years ago
  88. 13e58d2 Merge "Add geo targeting implementation" am: df2293f68b am: 52cd1fe0f1 by Pengquan Meng · 5 years ago
  89. 87700db Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" by Treehugger Robot · 5 years ago
  90. 40efe81 Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 by Nagaraja · 5 years ago
  91. babd85e Merge "Fix AVR compatibility." am: 9e4df4985a by Jay Patel · 5 years ago
  92. 20f2516 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb by Anna Trostanetski · 5 years ago
  93. b0c5a7a Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c by Tobias Thierer · 5 years ago
  94. 4f05f46 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 by Oscar Shu · 5 years ago
  95. 4999ce0 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc by Tobias Thierer · 5 years ago
  96. 392130f [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." by Da Xing · 5 years ago
  97. 54e83ac Merge changes from topic "null_callback" am: 5ce391b313 by Jack Yu · 5 years ago
  98. 75db0a7 Added debug messages and watchdog am: 594931f5d9 by Jack Yu · 5 years ago
  99. 1f64582 Support WAC decoding in UMTS format by Pengquan Meng · 5 years ago
  100. 1b6d718 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a by Tobias Thierer · 5 years ago