Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / b02f8eb241579163688daaa1d959cd4a49fe7c85
  1. b02f8eb resolve merge conflicts of d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev-plus-aosp by Philip P. Moltmann · 9 years ago
  2. 2e5e232 Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am: 3023906b1b am: 49e0cad3e1 by Orion Hodson · 9 years ago
  3. 4105747 Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am: 3023906b1b by Orion Hodson · 9 years ago
  4. 49e0cad Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" by Orion Hodson · 9 years ago
  5. d043a84 Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev by Philip P. Moltmann · 9 years ago
  6. 3023906 Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" by Orion Hodson · 9 years ago
  7. ec42e34 Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev by Manu Cornet · 9 years ago
  8. f47658f Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev by TreeHugger Robot · 9 years ago
  9. c2b7dd0 Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 am: f69a73793d by songjinshi · 9 years ago
  10. d0e8146 Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 by songjinshi · 9 years ago
  11. f69a737 Merge "[NotificationManagerService]: Fixes the thread-safe issue." by songjinshi · 9 years ago
  12. d530d1b Merge "[NotificationManagerService]: Fixes the thread-safe issue." by Treehugger Robot · 9 years ago
  13. d850804 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245 by Erik Kline · 9 years ago
  14. 8055daf Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc by Erik Kline · 9 years ago
  15. 02e71f6 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc by Erik Kline · 9 years ago
  16. 3d57eb0 Merge "Verify duplicate upstream notifications are ignored" by Treehugger Robot · 9 years ago
  17. 624bf3d Verify duplicate upstream notifications are ignored by Erik Kline · 9 years ago
  18. ea7e8f7 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db by Erik Kline · 9 years ago
  19. 663ec79 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db by Erik Kline · 9 years ago
  20. 76e6f79 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 by Erik Kline · 9 years ago
  21. ed6d75d Merge "Cleanup in the face of upstream error" by Erik Kline · 9 years ago
  22. fa207eb Merge changes from topic 'pixel-c' into nyc-mr2-dev am: dee514fae3 by Badhri Jagan Sridharan · 9 years ago
  23. dee514f Merge changes from topic 'pixel-c' into nyc-mr2-dev by TreeHugger Robot · 9 years ago
  24. 8ea4548 Cleanup in the face of upstream error by Erik Kline · 9 years ago
  25. c2c718b Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586 by Ningyuan Wang · 9 years ago
  26. 9d1be09 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586 by Ningyuan Wang · 9 years ago
  27. 18b3a7f Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 by Ningyuan Wang · 9 years ago
  28. fb19d8d7 Merge "Create createFromByteArray() for WifiSsid" by Ningyuan Wang · 9 years ago
  29. b4f9ceb Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382 by Chen Xu · 9 years ago
  30. e8b0e11 Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE] by Badhri Jagan Sridharan · 9 years ago
  31. 8b0807c Fix handling usb dialog for wall chargers. [DO NOT MERGE] by Badhri Jagan Sridharan · 9 years ago
  32. 60ca278 Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 by Chen Xu · 9 years ago
  33. b206f5b Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 by Chen Xu · 9 years ago
  34. 132842e Merge "Add simActivationState to PhoneStateListener" by Chen Xu · 9 years ago
  35. b8aac67 Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: ee37330dff" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  36. 05d24ccd Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 by Amith Yamasani · 9 years ago
  37. 669d669 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 by Amith Yamasani · 9 years ago
  38. 67dbaa8 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 by Amith Yamasani · 9 years ago
  39. ee37330 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 by Amith Yamasani · 9 years ago
  40. a0dff34 Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 am: d56887f8fa" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  41. 5af3dd4 Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 by Michael Kwan · 9 years ago
  42. 49fa040 Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 by Michael Kwan · 9 years ago
  43. c510e19 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev by Amith Yamasani · 9 years ago
  44. a26e371 Merge "Only modify window layout params when necessary." into cw-f-dev by Michael Kwan · 9 years ago
  45. d56887f Merge "Only modify window layout params when necessary." into cw-f-dev by Michael Kwan · 9 years ago
  46. 7556690 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev by TreeHugger Robot · 9 years ago
  47. b98f76e Merge "DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: 45fa749c5a" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  48. 9fbd981 Merge "Only modify window layout params when necessary." into cw-f-dev by Michael Kwan · 9 years ago
  49. f135045 DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: 45fa749c5a by Hakan Seyalioglu · 9 years ago
  50. 62666ab DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: aeb1f1241e by Hakan Seyalioglu · 9 years ago
  51. aeb1f12 DO NOT MERGE - Check exported status in chooser am: 7bae18232e by Hakan Seyalioglu · 9 years ago
  52. 45fa749 DO NOT MERGE - Check exported status in chooser am: 7bae18232e by Hakan Seyalioglu · 9 years ago
  53. 755d78d [DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" by Philip P. Moltmann · 9 years ago
  54. a6ea570 Create createFromByteArray() for WifiSsid by Ningyuan Wang · 9 years ago
  55. 7bae182 DO NOT MERGE - Check exported status in chooser by Hakan Seyalioglu · 9 years ago
  56. 5510057 DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system." by Amith Yamasani · 9 years ago
  57. 134ad6e Only modify window layout params when necessary. by Michael Kwan · 9 years ago
  58. 8542554 Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev by Bryan Mawhinney · 9 years ago
  59. 5de3e5a Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev by TreeHugger Robot · 9 years ago
  60. bfceb41 Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c am: 5644c190a0 by Peter Qiu · 9 years ago
  61. b70bd94 Merge "Workaround wallpaper restore race" into nyc-mr2-dev am: 29e3920c4e by Bryan Mawhinney · 9 years ago
  62. 1b510ec Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c am: 5644c190a0 by Peter Qiu · 9 years ago
  63. 29e3920 Merge "Workaround wallpaper restore race" into nyc-mr2-dev by TreeHugger Robot · 9 years ago
  64. 5644c19 Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c by Peter Qiu · 9 years ago
  65. d3146f3 Merge "hotspot2: fix typo in the getter functions" by Treehugger Robot · 9 years ago
  66. 6982f2df Merge "Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c am: ddc6e0b7ae" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  67. 7e8fab3 Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c am: ddc6e0b7ae by Michael Kwan · 9 years ago
  68. 6853de9 Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c am: 2155f773db by Michael Kwan · 9 years ago
  69. 2155f77 Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c by Michael Kwan · 9 years ago
  70. ddc6e0b Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c by Michael Kwan · 9 years ago
  71. e7aadaa Workaround wallpaper restore race by Bryan Mawhinney · 9 years ago
  72. cd757d4 Fix live wallpaper not showing on lock screen after restore by Bryan Mawhinney · 9 years ago
  73. 46cff11 Import translations. DO NOT MERGE am: c342666ac8 -s ours by Bill Yi · 9 years ago
  74. c342666 Import translations. DO NOT MERGE by Bill Yi · 9 years ago
  75. 60d14c4 Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 am: 0cca15ff88 by Erik Kline · 9 years ago
  76. 3de5971 Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 by Erik Kline · 9 years ago
  77. 0cca15f Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 by Erik Kline · 9 years ago
  78. 89e6bf0 Merge "Add test coverage for cleanup bug to be fixed." by Treehugger Robot · 9 years ago
  79. a954be9 Add test coverage for cleanup bug to be fixed. by Erik Kline · 9 years ago
  80. 64eebba Add simActivationState to PhoneStateListener by fionaxu · 10 years ago
  81. 5758a9a Add tweaks to smooth out swipe to dismiss. by Michael Kwan · 9 years ago
  82. 912a5f0 Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 am: 62314d7dd3 am: 41c9029be0" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  83. 065974c DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 am: 62314d7dd3 by Jeff Sharkey · 9 years ago
  84. ed3841d DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 am: 62314d7dd3 by Jeff Sharkey · 9 years ago
  85. 8100f54 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 by Jeff Sharkey · 9 years ago
  86. 41c9029 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 by Jeff Sharkey · 9 years ago
  87. 62314d7 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc by Jeff Sharkey · 9 years ago
  88. 09b336f Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 am: d491410316" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  89. 4f86c07 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 by Jeff Sharkey · 9 years ago
  90. ce567aa DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 by Jeff Sharkey · 9 years ago
  91. 55ef8ba DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a by Jeff Sharkey · 9 years ago
  92. 5b49be4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b by Jeff Sharkey · 9 years ago
  93. d491410 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b by Jeff Sharkey · 9 years ago
  94. ab29698 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours by Jeff Sharkey · 9 years ago
  95. 86f242b DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 by Jeff Sharkey · 9 years ago
  96. 9aca892 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 by Jeff Sharkey · 9 years ago
  97. c7b754f DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 by Jeff Sharkey · 9 years ago
  98. 208dcadb DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 by Jeff Sharkey · 9 years ago
  99. 853e178 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours by Jeff Sharkey · 9 years ago
  100. 9335807 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a by Jeff Sharkey · 9 years ago