Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / c94756d4a9ae4639cd49a51c1f65cf392ca4d3d6
  1. c94756d Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev by Winson Chung · 7 years ago
  2. 44e1d4e Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev by Winson Chung · 7 years ago
  3. 9132969 Merge "MSIM: Fix to show PUK view when two sims locked on PIN." am: 00644ec5cc am: 98eb4a23b5 by Pengquan Meng · 7 years ago
  4. edfcd5f Merge "MSIM: Fix to show PUK view when two sims locked on PIN." am: 00644ec5cc by Pengquan Meng · 7 years ago
  5. 98eb4a2 Merge "MSIM: Fix to show PUK view when two sims locked on PIN." am: 00644ec5cc by Pengquan Meng · 7 years ago
  6. 61fbefbba Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" am: afc4e370cd -s ours am: bad318fc93 -s ours by Shawn · 7 years ago
  7. dc2917f Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" am: afc4e370cd -s ours by Shawn · 7 years ago
  8. 00644ec Merge "MSIM: Fix to show PUK view when two sims locked on PIN." by Pengquan Meng · 7 years ago
  9. bad318f Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" by Shawn · 7 years ago
  10. afc4e37 Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" by Treehugger Robot · 7 years ago
  11. ae40f23 DO NOT MERGE Update demo mode time to 8:00 for Android 8.0 by Shawn · 7 years ago
  12. 86eb8a5 Merge "Import a few android.net unit tests into frameworks-net" am: 24660e5bb7 am: 1ce75f643c by Hugo Benichi · 7 years ago
  13. 3d4d464 Merge "Import a few android.net unit tests into frameworks-net" am: 24660e5bb7 by Hugo Benichi · 7 years ago
  14. 1ce75f6 Merge "Import a few android.net unit tests into frameworks-net" am: 24660e5bb7 by Hugo Benichi · 7 years ago
  15. 24660e5 Merge "Import a few android.net unit tests into frameworks-net" by Hugo Benichi · 7 years ago
  16. 550de39 Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 am: 7d9588c836 by Hugo Benichi · 7 years ago
  17. c40687f Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 7 years ago
  18. 7d9588c Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 7 years ago
  19. 9d456cd Merge "Migrate most of core networking tests to junit4" by Treehugger Robot · 7 years ago
  20. da7edaf Import a few android.net unit tests into frameworks-net by Hugo Benichi · 7 years ago
  21. 4a0c5d7 Migrate most of core networking tests to junit4 by Hugo Benichi · 7 years ago
  22. aceb151 Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev by Jaewan Kim · 7 years ago
  23. 0e4fcfe Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  24. 73e2acb Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev by Phil Weaver · 7 years ago
  25. 0a2c716 Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 am: 1c36619f5b by Hall Liu · 7 years ago
  26. 15c8747 Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  27. 4b267df MSIM: Fix to show PUK view when two sims locked on PIN. by Pengquan Meng · 7 years ago
  28. 9822017 Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev by Hall Liu · 7 years ago
  29. 1bfc9ff Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: 065dc70c5a" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  30. adaae4c Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev by Hall Liu · 7 years ago
  31. 850e668 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 by Jeff Sharkey · 7 years ago
  32. 609a6cf Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: f718585bf4" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  33. e95023f Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 7 years ago
  34. 74de279 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 by Jeff Sharkey · 7 years ago
  35. 4c8e31d DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 am: e286f08000 by Jeff Sharkey · 7 years ago
  36. 1c36619 Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 7 years ago
  37. d10a908 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 am: e286f08000 by Jeff Sharkey · 7 years ago
  38. 065dc70 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 by Jeff Sharkey · 7 years ago
  39. f718585 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 by Jeff Sharkey · 7 years ago
  40. 5f123e6 Merge "Fix URI unparceling and clarify an error condition" by Hall Liu · 7 years ago
  41. 1b1ea96 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 by Jeff Sharkey · 7 years ago
  42. bb38194 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 by Brad Ebinger · 7 years ago
  43. e68565b DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 by Jeff Sharkey · 7 years ago
  44. 9704426 Don't recycle replaced nodes in a11y cache by Phil Weaver · 7 years ago
  45. 753a9ab DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours by Jeff Sharkey · 7 years ago
  46. 6530612 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp by Jeff Sharkey · 7 years ago
  47. 014d73e Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 by Brad Ebinger · 7 years ago
  48. e286f08 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours by Jeff Sharkey · 7 years ago
  49. bbcb8e4 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa by Jeff Sharkey · 7 years ago
  50. da968fb Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 am: 5712d1fb47" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  51. d6e3d35 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 by Jeff Sharkey · 7 years ago
  52. 6694c5c Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 by Jeff Sharkey · 7 years ago
  53. 946ff79 Merge "Add new Download Error Codes" am: e9bd5449b5 by Brad Ebinger · 7 years ago
  54. 620c5cf DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 by Jeff Sharkey · 7 years ago
  55. caebafa Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 am: e9aaf3c546 by Dan Albert · 7 years ago
  56. 54bfe3a Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  57. 6ef8866 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  58. b969ac5 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 by Jeff Sharkey · 7 years ago
  59. af93051 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 by Jeff Sharkey · 7 years ago
  60. e9bd544 Merge "Add new Download Error Codes" by Brad Ebinger · 7 years ago
  61. 92d80b7 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb by Jeff Sharkey · 7 years ago
  62. 5712d1f Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf by Jeff Sharkey · 7 years ago
  63. a54bfed Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf by Jeff Sharkey · 7 years ago
  64. e9aaf3c Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 by Dan Albert · 7 years ago
  65. 289b4d8 Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  66. e3e396a Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev by Jeff Sharkey · 7 years ago
  67. 44adace DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 by Jeff Sharkey · 7 years ago
  68. a04a837 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  69. 2771394 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 by Jeff Sharkey · 7 years ago
  70. 41c08f4 Merge "Add missing includes." am: 4be4bb3db7 by Dan Albert · 7 years ago
  71. a7f0504 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours by Jeff Sharkey · 7 years ago
  72. f1f2a61 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 by Jeff Sharkey · 7 years ago
  73. fd77afd Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  74. c4649e2 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 by Jeff Sharkey · 7 years ago
  75. 47aa351 Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432 by Jean-Michel Trivi · 7 years ago
  76. 7512875 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 by Jeff Sharkey · 7 years ago
  77. e2a1e9f Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 by Jeff Sharkey · 7 years ago
  78. 4be4bb3 Merge "Add missing includes." by Treehugger Robot · 7 years ago
  79. 0de1d85 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 by Jeff Sharkey · 7 years ago
  80. 300e6ff DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours by Jeff Sharkey · 7 years ago
  81. 3b47256 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a by Jeff Sharkey · 7 years ago
  82. b49d357 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 by Jeff Sharkey · 7 years ago
  83. 383ab09 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev by Android Build Merger (Role) · 7 years ago
  84. 97f6a0d Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c by Jeff Sharkey · 7 years ago
  85. fad72cb Fix URI unparceling and clarify an error condition by Hall Liu · 7 years ago
  86. 8860624 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours by Jeff Sharkey · 7 years ago
  87. 4a69ee9 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 by Jeff Sharkey · 7 years ago
  88. 69e0260 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 by Jeff Sharkey · 7 years ago
  89. ba1f2d2 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 by Jeff Sharkey · 7 years ago
  90. b9629cd Merge "Fix alarm preview volume" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  91. 8bfef31 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 by Jeff Sharkey · 7 years ago
  92. 4a71a2d Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours by Jeff Sharkey · 7 years ago
  93. da3d105 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 by Jeff Sharkey · 7 years ago
  94. e6f60d0 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 by Jeff Sharkey · 7 years ago
  95. e0e1c8a Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 by Jeff Sharkey · 7 years ago
  96. 7f108b8 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 by Jeff Sharkey · 7 years ago
  97. e9d2113 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee by Jeff Sharkey · 7 years ago
  98. 8916c30 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c by Jeff Sharkey · 7 years ago
  99. 3f671b3 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev by Jeff Sharkey · 7 years ago
  100. c1bcf2f Merge "Check target api version before crashing apps." into oc-mr1-dev by Julia Reynolds · 7 years ago