Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 6ffb81d821c11bcd87f513f97f4a4f7b623b740b
  1. 6ffb81d Merge "Fix getting target SDK version for uid in PermissionManagerService." by TreeHugger Robot · 6 years ago
  2. 3cad27c Merge "Move DeviceIdle to the JS apex" by Makoto Onuki · 6 years ago
  3. cf65493 Merge changes from topics "macRandWhitelist", "paranoidSsidOptIn" by Oscar Shu · 6 years ago
  4. 2099cba resolve merge conflicts of 8f843170a43f7085379ac38afbde7b9f69a16a0f to qt-qpr1-dev-plus-aosp by Pengquan Meng · 6 years ago
  5. 5834544 Merge "Add phenotype property for profiling system server" by Mathieu Chartier · 6 years ago
  6. 43ea8ce Merge "Skip some duplicated tasks when booting from non-system user." by TreeHugger Robot · 6 years ago
  7. 11fef4e Merge "Fix security issue in DynamicRefTable::load." by Ryan Mitchell · 6 years ago
  8. 007ecbb Merge "Revert "Delete FalsingManager tests that are very flaky."" by TreeHugger Robot · 6 years ago
  9. 8c1e4e8 resolve merge conflicts of 8f843170a43f7085379ac38afbde7b9f69a16a0f to qt-qpr1-dev-plus-aosp by Pengquan Meng · 6 years ago
  10. 6f9af93 Merge "Import translations. DO NOT MERGE" by Bill Yi · 6 years ago
  11. 06f32dc Merge "Fix that Bluetooth device should not duplicate in the list" by TreeHugger Robot · 6 years ago
  12. 845465c [automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp by Roshan Pius · 6 years ago
  13. b402c73 Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp by TreeHugger Robot · 6 years ago
  14. 9d4f41f Merge "wifi: common name support in PPS-MO profile" by Jimmy Chen · 6 years ago
  15. 8bd25aff [automerger skipped] Import translations. DO NOT MERGE am: 8e24ea2b4c -s ours by Bill Yi · 6 years ago
  16. 7c76146 [automerger skipped] Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  17. 8e24ea2 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  18. 86bddb6 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  19. 56c4d15 Merge "Add statsd atom for Legacy DRM usage" by Robert Shih · 6 years ago
  20. 2524ed3 Merge "Import translations. DO NOT MERGE" by Bill Yi · 6 years ago
  21. f05b3e9 Merge "Added flag to toggle acquire messages on keyguard" by TreeHugger Robot · 6 years ago
  22. 4222abd Merge "Handles null outInfo in deleteSystemPackageLI" by TreeHugger Robot · 6 years ago
  23. 2941abb Merge "Revert "The source of subtree chagnes should be the viewParent"" by TreeHugger Robot · 6 years ago
  24. 4c30dd5 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 6 years ago
  25. 254ebf6 Merge "AttestedKeyPair: Address API review comments" by TreeHugger Robot · 6 years ago
  26. aaab0a0 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 6 years ago
  27. 49ba074 Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd am: e83d4f6c7d by Nagaraja · 6 years ago
  28. a6fe399 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 am: 884ef46cdc by Anna Trostanetski · 6 years ago
  29. 237f58d Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a am: bc59f857aa by Tobias Thierer · 6 years ago
  30. 70ee8b5 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 am: 02142d5462 by Oscar Shu · 6 years ago
  31. 89accb0 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp by Tobias Thierer · 6 years ago
  32. 8a88548 Merge "Add an API to dump incident report for dumpstate" by Mike Ma · 6 years ago
  33. 4b7b1af Merge "Make TextClock.refresh() a public API" by TreeHugger Robot · 6 years ago
  34. 1ae707d Merge "UserController.switchUser accepts MANAGE_USERS" by TreeHugger Robot · 6 years ago
  35. 70307c5 Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 23cdf1a48c" into qt-qpr1-dev-plus-aosp by Santos Cordon · 6 years ago
  36. 5e39293 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 Neil Fuller · 6 years ago
  37. 3807423 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 by Remi NGUYEN VAN · 6 years ago
  38. ffeb94f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours by Bill Yi · 6 years ago
  39. 8756d94 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 Adrian Salido · 6 years ago
  40. 191ab39 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 by Yi Kong · 6 years ago
  41. f871c4a [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 -s ours am: 56b04b1721 -s ours by Lucas Dupin · 6 years ago
  42. a311d59 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours am: 5c56a5e691 -s ours by Bill Yi · 6 years ago
  43. 05eccbc Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff am: 6060198534 by Long Ling · 6 years ago
  44. 7b69ac4 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 -s ours am: 318adae023 by Long Ling · 6 years ago
  45. ab7e828 [automerger skipped] DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: 66e9298ac6 am: 8da4630093 by Long Ling · 6 years ago
  46. f7db1c4 Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd by Nagaraja · 6 years ago
  47. 8649477 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 by Anna Trostanetski · 6 years ago
  48. eb2a053 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a by Tobias Thierer · 6 years ago
  49. 1863f3e Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp am: 73c6f3caa3 am: ce8fa14129 by Sasha Smundak · 6 years ago
  50. edeb031 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 by Oscar Shu · 6 years ago
  51. 3d9f74b [automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 am: 975bd46c43 by Yi Kong · 6 years ago
  52. 58c20f9 [automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef am: 2b952530f3 by Yi Kong · 6 years ago
  53. 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) · 6 years ago
  54. 011723e Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 by Tobias Thierer · 6 years ago
  55. 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) · 6 years ago
  56. 66ee479 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe by Santos Cordon · 6 years ago
  57. 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) · 6 years ago
  58. 6653f2b Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 by Neil Fuller · 6 years ago
  59. 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) · 6 years ago
  60. 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 · 6 years ago
  61. 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) · 6 years ago
  62. afe708f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours by Bill Yi · 6 years ago
  63. 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) · 6 years ago
  64. ea14786 Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 by Adrian Salido · 6 years ago
  65. 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) · 6 years ago
  66. 8602e0f Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours by Yi Kong · 6 years ago
  67. cfb337a [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 -s ours by Lucas Dupin · 6 years ago
  68. c40d399 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours by Bill Yi · 6 years ago
  69. 90fd03e Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff by Long Ling · 6 years ago
  70. 74ee0f2 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 -s ours by Long Ling · 6 years ago
  71. cacba7e DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: 66e9298ac6 by Long Ling · 6 years ago
  72. f650335 Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp am: 73c6f3caa3 by Sasha Smundak · 6 years ago
  73. 5b14cee Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 am: 975bd46c43 by Yi Kong · 6 years ago
  74. f1df1e4 Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev am: 1d20f2096c by Roman Kiryanov · 6 years ago
  75. a4c4948 Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef by Yi Kong · 6 years ago
  76. 738b383 [automerger skipped] Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev am: b55bf00418 by Pengquan Meng · 6 years ago
  77. bf069a4 Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev by Roman Kiryanov · 6 years ago
  78. 919efca Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev am: b55bf00418 by Pengquan Meng · 6 years ago
  79. 1287dbb Merge "[automerger skipped] resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp am: f1ceee0166 am: 0c859fa482 -s ours am skip reason: change_id I6d69fb418bac675bbb9e4ac25c3269dfa3029219 with SHA1 4fe9f0f8fd is in history" by Android Build Merger (Role) · 6 years ago
  80. 4c39531 Merge "Ensure lock icon animates closed on long press" by TreeHugger Robot · 6 years ago
  81. dd94337 [automerger skipped] resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp am: f1ceee0166 by Inseob Kim · 6 years ago
  82. d6010cd Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0c06bd1122 -s ours by Bill Yi · 6 years ago
  83. 71b48a0 [automerger skipped] Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-dev am: 9b94c35a54 am: 729bac82ff by Adrian Salido · 6 years ago
  84. 6cd6f67 [automerger skipped] DO NOT MERGE DMD: Support minimum refresh rate am: 86ce8f764b am: 9df1afdec3 -s ours by Long Ling · 6 years ago
  85. 3656416 [automerger skipped] Merge "[DO NOT MERGE]Daggerize Android Auto" into qt-qpr1-dev am: 3684678602 by Neil Fuller · 6 years ago
  86. aee6fcb [automerger skipped] [DO NOT MERGE]Daggerize Android Auto am: 8d49d0d63f by Govinda Wasserman · 6 years ago
  87. 8b8bf33 [automerger skipped] DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: dde6248065 by Long Ling · 6 years ago
  88. 2967ec1 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 1a5d1e7252 by Santos Cordon · 6 years ago
  89. fbd7290 [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 am: c9b3e09ad4 -s ours by Lucas Dupin · 6 years ago
  90. ebc534f8 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours am: 968e15bced -s ours by Bill Yi · 6 years ago
  91. cbffc34 Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master am: e9a702d526 am: 2b3c5c79c0 am: d132b29cc2 by Colin Cross · 6 years ago
  92. 0c859fa resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp by Inseob Kim · 6 years ago
  93. 23cdf1a Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev by Santos Cordon · 6 years ago
  94. 56b04b1 [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev by Lucas Dupin · 6 years ago
  95. 5c56a5e [automerger skipped] Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  96. 59e67d0 Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff am: ef2d11deda by Long Ling · 6 years ago
  97. 8cc1203 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 am: 999a704b02 -s ours by Long Ling · 6 years ago
  98. 6060198 Merge changes from topic "device_config_for_display_90" into qt-r1-dev by Long Ling · 6 years ago
  99. 2d32dd4 Merge "change network suggestion notification content string" into qt-qpr1-dev am: a43b5f2d6c by Nate Jiang · 6 years ago
  100. 35e1eb4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a8de0ae9da -s ours by Bill Yi · 6 years ago