Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 9f004b17523494a0b123a0034742c47ff2880428
  1. 9f004b1 Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8 am: 0bfb717a37 by Chih-hung Hsieh · 7 years ago
  2. 0bfb717 Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8 by Chih-hung Hsieh · 7 years ago
  3. 16fbd3a Merge "Use -Werror in frameworks/base" by Chih-hung Hsieh · 7 years ago
  4. a550f85 Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 am: 7edf405cdd by nharold · 7 years ago
  5. 7edf405 Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 by nharold · 7 years ago
  6. ce1f9af Merge "Remove getNetworkType() from ServiceState" by nharold · 7 years ago
  7. 9336d62 Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours am: 7e3f20e249 -s ours by Bill Yi · 7 years ago
  8. b597ff8 Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours by Bill Yi · 7 years ago
  9. 7e3f20e Import translations. DO NOT MERGE am: b081f1e809 -s ours by Bill Yi · 7 years ago
  10. 43b03fb Import translations. DO NOT MERGE am: b081f1e809 -s ours by Bill Yi · 7 years ago
  11. b081f1e Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  12. 8e60def Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 by Tobias Thierer · 7 years ago
  13. 9778539 Merge "Add change to show Invalid card when erroneous card is inserted." am: 4bc825aecc by Wileen Chiu · 7 years ago
  14. 4071792 Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 by Hugo Benichi · 7 years ago
  15. e69366f Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 by Tobias Thierer · 7 years ago
  16. 8279494 Merge "Add change to show Invalid card when erroneous card is inserted." by Wileen Chiu · 7 years ago
  17. 104b2bc Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 by Hugo Benichi · 7 years ago
  18. faededa Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2 by Colin Cross · 7 years ago
  19. 8feea07 Merge "Convert ext.jar to Android.bp" am: 42156f3e56 by Colin Cross · 7 years ago
  20. c7edf07 Use -Werror in frameworks/base by Chih-Hung Hsieh · 7 years ago
  21. 03d2399 Remove getNetworkType() from ServiceState by Nathan Harold · 7 years ago
  22. 2681793 Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." by Tobias Thierer · 7 years ago
  23. 4bc825a Merge "Add change to show Invalid card when erroneous card is inserted." by Treehugger Robot · 7 years ago
  24. d098328 Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" by Hugo Benichi · 7 years ago
  25. 42156f3 Merge "Convert ext.jar to Android.bp" by Colin Cross · 7 years ago
  26. 23be5ee Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8 by Jordan Liu · 7 years ago
  27. c04d233 Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8 by Jordan Liu · 7 years ago
  28. db95dff Merge "Add a new carrier config to suppress AoC indication" by Jordan Liu · 7 years ago
  29. 29b132b Add a new carrier config to suppress AoC indication by Omata Shou · 7 years ago
  30. 506f89a Merge "Move to some properties users to libbase properties" am: 2b20612e77 by Tom Cherry · 7 years ago
  31. 9e4bfdb Merge "Move to some properties users to libbase properties" am: 2b20612e77 by Tom Cherry · 7 years ago
  32. 2b20612 Merge "Move to some properties users to libbase properties" by Tom Cherry · 7 years ago
  33. 95aa2ea Update locked_region_code_injection tool to ASM 6.0-BETA. by Tobias Thierer · 7 years ago
  34. edfcd5f Merge "MSIM: Fix to show PUK view when two sims locked on PIN." am: 00644ec5cc by Pengquan Meng · 7 years ago
  35. 98eb4a2 Merge "MSIM: Fix to show PUK view when two sims locked on PIN." am: 00644ec5cc by Pengquan Meng · 7 years ago
  36. 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
  37. 00644ec Merge "MSIM: Fix to show PUK view when two sims locked on PIN." by Pengquan Meng · 7 years ago
  38. bad318f Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" by Shawn · 7 years ago
  39. afc4e37 Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" by Treehugger Robot · 7 years ago
  40. ae40f23 DO NOT MERGE Update demo mode time to 8:00 for Android 8.0 by Shawn · 7 years ago
  41. 93099e4 Move to some properties users to libbase properties by Tom Cherry · 7 years ago
  42. 1e5039e Fix ConnectivityServiceTest#testNetworkCallbackMaximum by Hugo Benichi · 7 years ago
  43. 3d4d464 Merge "Import a few android.net unit tests into frameworks-net" am: 24660e5bb7 by Hugo Benichi · 7 years ago
  44. 1ce75f6 Merge "Import a few android.net unit tests into frameworks-net" am: 24660e5bb7 by Hugo Benichi · 7 years ago
  45. 24660e5 Merge "Import a few android.net unit tests into frameworks-net" by Hugo Benichi · 7 years ago
  46. c40687f Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 7 years ago
  47. 7d9588c Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 7 years ago
  48. 9d456cd Merge "Migrate most of core networking tests to junit4" by Treehugger Robot · 7 years ago
  49. da7edaf Import a few android.net unit tests into frameworks-net by Hugo Benichi · 7 years ago
  50. 4a0c5d7 Migrate most of core networking tests to junit4 by Hugo Benichi · 7 years ago
  51. 4b267df MSIM: Fix to show PUK view when two sims locked on PIN. by Pengquan Meng · 7 years ago
  52. e95023f Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 7 years ago
  53. 1c36619 Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 7 years ago
  54. 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
  55. 5f123e6 Merge "Fix URI unparceling and clarify an error condition" by Hall Liu · 7 years ago
  56. 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
  57. 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
  58. 014d73e Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 by Brad Ebinger · 7 years ago
  59. 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
  60. 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
  61. 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
  62. 946ff79 Merge "Add new Download Error Codes" am: e9bd5449b5 by Brad Ebinger · 7 years ago
  63. 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
  64. 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
  65. 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
  66. e9bd544 Merge "Add new Download Error Codes" by Brad Ebinger · 7 years ago
  67. 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
  68. 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
  69. e9aaf3c Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 by Dan Albert · 7 years ago
  70. 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
  71. 41c08f4 Merge "Add missing includes." am: 4be4bb3db7 by Dan Albert · 7 years ago
  72. 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
  73. 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
  74. 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
  75. 4be4bb3 Merge "Add missing includes." by Treehugger Robot · 7 years ago
  76. 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
  77. 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
  78. 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
  79. 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
  80. 8860624 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours by Jeff Sharkey · 7 years ago
  81. ba1f2d2 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 by Jeff Sharkey · 7 years ago
  82. 8bfef31 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 by Jeff Sharkey · 7 years ago
  83. 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
  84. da3d105 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 by Jeff Sharkey · 7 years ago
  85. 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
  86. 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
  87. e9d2113 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee by Jeff Sharkey · 7 years ago
  88. 8916c30 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c by Jeff Sharkey · 7 years ago
  89. 3f671b3 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev by Jeff Sharkey · 7 years ago
  90. 72df970 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a by Jeff Sharkey · 7 years ago
  91. e1ae848 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c by Jeff Sharkey · 7 years ago
  92. 98371ee Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours by Jeff Sharkey · 7 years ago
  93. e62d479 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 by Jeff Sharkey · 7 years ago
  94. 5d60a49 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 by Jeff Sharkey · 7 years ago
  95. b4d23d5 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev by Jeff Sharkey · 7 years ago
  96. 4a60106 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev by Jeff Sharkey · 7 years ago
  97. 31c5adc Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev by TreeHugger Robot · 7 years ago
  98. d20cad6 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 by Jeff Sharkey · 7 years ago
  99. 7555eb5 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 by Jeff Sharkey · 7 years ago
  100. 5f17a28 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev by Jeff Sharkey · 7 years ago