Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / a5a2d80ae8d727b7caa0b0f3646aafecec05ffe6
  1. a5a2d80 Merge "Restore new SurfaceView background implementation." into qt-dev am: e6ffb72e55 am: be569d6301 by Rob Carr · 5 years ago
  2. 8fa6aef [automerger skipped] Merge "resolve merge conflicts of 40654b7696962cab6c23743114a711bab5bea16c to qt-dev-plus-aosp" into qt-dev-plus-aosp am: 796cf90551 by Chris Wailes · 5 years ago
  3. 057ca13 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master am: 32891b31b2 -s ours am: c7e849b3df by Xin Li · 5 years ago
  4. ec5ded1 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: c76d117d2a -s ours am: 33a31c83c7 by Xin Li · 5 years ago
  5. 376f7fe Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev am: 3bd719b534 am: 8eebd293e5 by Ian Pedowitz · 5 years ago
  6. 51c8abb Merge "Revert "Revert "Finalizing Q resources""" into qt-dev am: d7219205a0 am: cd6a23e0f9 by Ian Pedowitz · 5 years ago
  7. 6424caa Merge "Revert "Revert "Removing deprecated APIs added to Q""" into qt-dev am: 028b649f71 am: 164aa62fb2 by Ian Pedowitz · 5 years ago
  8. 90261f5 Merge "Revert "Revert "Android Q is API 29""" into qt-dev am: a326dfb1e5 am: 563abce4ed by Ian Pedowitz · 5 years ago
  9. 94bfc90 [automerger skipped] Merge "Add NAME_SOURCE_CARRIER for subscription display name." am: fa5c6e2cc6 am: 6793ebe4d1 -s ours am: 977e99d7ff -s ours by Amit Mahajan · 5 years ago
  10. 5d3cf0c Merge "Fix shadow and animation clipping for Global Actions Dialog." into qt-dev am: c543db049d am: b3a5cbf56d by Aran Ink · 5 years ago
  11. 07d3c17 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours am: f9526e03d4 -s ours by Xiao Ma · 5 years ago
  12. 3d56390 [automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev am: 2913482e08 -s ours am: d8edfbbd79 -s ours by Aaron Huang · 5 years ago
  13. ffe906e Merge "Restore new SurfaceView background implementation." into qt-dev am: e6ffb72e55 by Rob Carr · 5 years ago
  14. 8dee060 [automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev am: 7afeb17fb2 -s ours am: c2af11cf1b -s ours by Aaron Huang · 5 years ago
  15. 225def4 Merge "resolve merge conflicts of 40654b7696962cab6c23743114a711bab5bea16c to qt-dev-plus-aosp" into qt-dev-plus-aosp by Chris Wailes · 5 years ago
  16. cc4a3c2 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master am: 32891b31b2 -s ours by Xin Li · 5 years ago
  17. 7060b90 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: c76d117d2a -s ours by Xin Li · 5 years ago
  18. fffc4cc Merge "Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev am: 7aac1013b7 am: 285a12043d" into qt-r1-dev-plus-aosp by Michael Groover · 5 years ago
  19. 8935f91 Merge "Merge "Fix AES encryption for SP" into qt-dev am: 9ff409c726 am: 609fe3c33d" into qt-r1-dev-plus-aosp by Rubin Xu · 5 years ago
  20. c0782a0 Merge "Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e062950 am: e65bd9574b" into qt-r1-dev-plus-aosp by Rubin Xu · 5 years ago
  21. 31677dc Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev am: 3bd719b534 by Ian Pedowitz · 5 years ago
  22. eec1a81 Merge "Revert "Revert "Finalizing Q resources""" into qt-dev am: d7219205a0 by Ian Pedowitz · 5 years ago
  23. c338d74 Merge "Revert "Revert "Removing deprecated APIs added to Q""" into qt-dev am: 028b649f71 by Ian Pedowitz · 5 years ago
  24. b60dac3 Merge "Revert "Revert "Android Q is API 29""" into qt-dev am: a326dfb1e5 by Ian Pedowitz · 5 years ago
  25. 60fb2cb Merge "Fix shadow and animation clipping for Global Actions Dialog." into qt-dev am: c543db049d by Aran Ink · 5 years ago
  26. 4deacf9 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours by Xiao Ma · 5 years ago
  27. 0334533 [automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev am: 2913482e08 -s ours by Aaron Huang · 5 years ago
  28. 712b98d [automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev am: 7afeb17fb2 -s ours by Aaron Huang · 5 years ago
  29. 9a411cd Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev am: 3bd719b534 by Ian Pedowitz · 5 years ago
  30. 6f65541 Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev am: 7aac1013b7 by Michael Groover · 5 years ago
  31. 049d448 Merge "Revert "Revert "Finalizing Q resources""" into qt-dev am: d7219205a0 by Ian Pedowitz · 5 years ago
  32. 5663cda Merge "Revert "Revert "Removing deprecated APIs added to Q""" into qt-dev am: 028b649f71 by Ian Pedowitz · 5 years ago
  33. 4df3922 Merge "Revert "Revert "Android Q is API 29""" into qt-dev am: a326dfb1e5 by Ian Pedowitz · 5 years ago
  34. be569d6 Merge "Restore new SurfaceView background implementation." into qt-dev by Rob Carr · 5 years ago
  35. 977c1a9 [automerger skipped] Merge "Add NAME_SOURCE_CARRIER for subscription display name." am: fa5c6e2cc6 am: 6793ebe4d1 -s ours by Amit Mahajan · 5 years ago
  36. a80c642 Merge "Fix shadow and animation clipping for Global Actions Dialog." into qt-dev am: c543db049d by Aran Ink · 5 years ago
  37. 796cf90 Merge "resolve merge conflicts of 40654b7696962cab6c23743114a711bab5bea16c to qt-dev-plus-aosp" into qt-dev-plus-aosp by TreeHugger Robot · 5 years ago
  38. 0feadf6 resolve merge conflicts of 40654b7696962cab6c23743114a711bab5bea16c to qt-dev-plus-aosp by Chris Wailes · 5 years ago
  39. a76da42 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours by Xiao Ma · 5 years ago
  40. f1cf4f0 [automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev am: 2913482e08 -s ours by Aaron Huang · 5 years ago
  41. 9e2daa7 Merge "Fix AES encryption for SP" into qt-dev am: 9ff409c726 am: e22dafbec8 by Rubin Xu · 5 years ago
  42. 77f7a13 [automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev am: 7afeb17fb2 -s ours by Aaron Huang · 5 years ago
  43. 1d3f600 Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e062950 by Rubin Xu · 5 years ago
  44. 211fc57 Merge "Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev am: 7aac1013b7 am: 285a12043d" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  45. ab82b47 Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev am: 7aac1013b7 by Michael Groover · 5 years ago
  46. fe11b67 Merge "Merge "Fix AES encryption for SP" into qt-dev am: 9ff409c726 am: 609fe3c33d" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  47. aace4bf Merge "Fix AES encryption for SP" into qt-dev am: 9ff409c726 am: 609fe3c33d by Rubin Xu · 5 years ago
  48. 6d39a8a Merge "Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e062950 am: e65bd9574b" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  49. 15deb08 Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e062950 by Rubin Xu · 5 years ago
  50. ce00803 Merge "Removing emulator check for starting BluetoothService" into qt-dev am: 3d622b7016 am: 7de296f82b by Hayden Gomes · 5 years ago
  51. 43e5975 Merge "Compute size range before setting DisplayInfoOverride" into qt-dev am: b3196e53d7 am: 9b87c5f635 by Tiger Huang · 5 years ago
  52. aea6c33 Merge "Atom and puller for historical AppOps." into qt-dev am: fcbd9112e6 am: 1ff3494078 by Martijn Coenen · 5 years ago
  53. 04ddb0f [automerger skipped] Merge "Fix a bug where private DNS to v4-only servers don't validate." into qt-dev am: 036871beb8 -s ours am: 72cfd0af95 -s ours by Chiachang Wang · 5 years ago
  54. f225251 Merge "Add build targets for non-mainline NetworkStack" into qt-dev am: bca73ac0c6 am: 678d4ea608 by Remi NGUYEN VAN · 5 years ago
  55. c7e849b [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master by Xin Li · 5 years ago
  56. 85aa407 Merge "Fix copying of insets" into qt-dev am: c3371300eb am: 1548ff08ee by Jorim Jaggi · 5 years ago
  57. 459f90d Merge "Fix a bug where private DNS to v4-only servers don't validate." am: b846759154 am: 5f7aee0050 am: 4b5f3a313c by Chiachang Wang · 5 years ago
  58. ad374d7 Merge "Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" am: 4d492d89fa am: 24f14ed21b" into qt-dev-plus-aosp am: 4168f24684 by Aaron Huang · 5 years ago
  59. c4dfbae [automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4e1078e291 -s ours am: c6edf97d59 -s ours by Lorenzo Colitti · 5 years ago
  60. c3d6694 Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev by Ian Pedowitz · 5 years ago
  61. 6c2e976 Merge "Revert "Revert "Finalizing Q resources""" into qt-dev am: d7219205a0 by Ian Pedowitz · 5 years ago
  62. ce5989b [automerger skipped] Clean up the permission control code in framework am: 66404a1224 -s ours am: 8b1e1db54e -s ours by Chenbo Feng · 5 years ago
  63. dc6e6cb Merge "Revert "Revert "Removing deprecated APIs added to Q""" into qt-dev by Ian Pedowitz · 5 years ago
  64. 414f18e Merge "Add NAME_SOURCE_CARRIER for subscription display name." into qt-dev am: ed4fe03371 am: 6853ba9296 by Amit Mahajan · 5 years ago
  65. 203ac63 Merge "Revert "Revert "Android Q is API 29""" into qt-dev am: a326dfb1e5 by Ian Pedowitz · 5 years ago
  66. f381551 Merge "Block face auth when lock icon is pressed" into qt-dev am: d8941d0451 am: b77bf39d68 by Lucas Dupin · 5 years ago
  67. 9600d51 Merge "Fix shadow and animation clipping for Global Actions Dialog." into qt-dev by Aran Ink · 5 years ago
  68. cedbf50e [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev by Xiao Ma · 5 years ago
  69. 264e57b [automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev am: 53e2a9b0ae -s ours am: e2695f1f60 -s ours by Paul Hu · 5 years ago
  70. 92ba6d1 [automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev by Aaron Huang · 5 years ago
  71. 1880333 [automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev by Aaron Huang · 5 years ago
  72. 4f47c63 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" am: 910b72f109 am: f672e96b87 am: 273f61880e by Paul Hu · 5 years ago
  73. 27069cc Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev by Michael Groover · 5 years ago
  74. e22dafb Merge "Fix AES encryption for SP" into qt-dev am: 9ff409c726 by Rubin Xu · 5 years ago
  75. 8420b0e Merge "Adds the keyguard indication area overlays" into qt-dev am: 18cb49bbab am: e2fb55037a by TYM Tsai · 5 years ago
  76. 33a31c8 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master by Xin Li · 5 years ago
  77. 264d30b Merge "Fix a bug about the z-order of layers caused by merging transactions" into qt-dev am: 6e52f838ba am: a741d7c8c2 by Tiger Huang · 5 years ago
  78. e5ff48a Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e062950 by Rubin Xu · 5 years ago
  79. 065be0b Merge "Merge "Generate challenge and reset lockout only if user has enrolled biometrics" into qt-dev am: c6dd30da9f" into qt-dev-plus-aosp am: 18f4dfd31d by Kevin Chyn · 5 years ago
  80. b3cad46 [automerger skipped] Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" am: 149edbd87b am: 019f54d32f -s ours am: b8b339bf29 -s ours by Jack Yu · 5 years ago
  81. 2effb4c Merge "Fix legacy recents crash on Go devices" into qt-dev am: 92f755e339 am: e66be84adc by Kevin · 5 years ago
  82. 876fc25 Merge "Removing emulator check for starting BluetoothService" into qt-dev am: 3d622b7016 by Hayden Gomes · 5 years ago
  83. fa30afc Merge "Compute size range before setting DisplayInfoOverride" into qt-dev am: b3196e53d7 by Tiger Huang · 5 years ago
  84. 3c67a5f Merge "Make the USAP Pool refill delay configurable." by Christian Wailes · 5 years ago
  85. 4018e38 Merge "Atom and puller for historical AppOps." into qt-dev am: fcbd9112e6 by Martijn Coenen · 5 years ago
  86. dab9561 [automerger skipped] Merge "Fix a bug where private DNS to v4-only servers don't validate." into qt-dev am: 036871beb8 -s ours by Chiachang Wang · 5 years ago
  87. 32891b3 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master by TreeHugger Robot · 5 years ago
  88. 72c4c36 Merge "Explicitly request clearing of external storage." into qt-dev am: 9637326ea8 am: b7be677e24 by Jeff Sharkey · 5 years ago
  89. dec4de0 Merge "Add build targets for non-mainline NetworkStack" into qt-dev am: bca73ac0c6 by Remi NGUYEN VAN · 5 years ago
  90. 1ee736c Merge "Fix copying of insets" into qt-dev am: c3371300eb am: 1548ff08ee by Jorim Jaggi · 5 years ago
  91. 87cca15 Merge "Fix a bug where private DNS to v4-only servers don't validate." am: b846759154 am: 5f7aee0050 by Chiachang Wang · 5 years ago
  92. 6173905 Merge "Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" am: 4d492d89fa am: 24f14ed21b" into qt-dev-plus-aosp by Aaron Huang · 5 years ago
  93. f2977eb Merge "Updates java doc in AppPredictionService" into qt-dev am: 60c9f4803a am: 2f0c8f7e69 by Mehdi Alizadeh · 5 years ago
  94. e22cb12 [automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4e1078e291 -s ours by Lorenzo Colitti · 5 years ago
  95. e49ff5b [automerger skipped] Clean up the permission control code in framework am: 66404a1224 -s ours by Chenbo Feng · 5 years ago
  96. 6735f52 Merge "Add NAME_SOURCE_CARRIER for subscription display name." into qt-dev am: ed4fe03371 by Amit Mahajan · 5 years ago
  97. 19ee7fdf Merge "Remember last time we mounted a volume." into qt-dev am: 3ad357f649 am: 75ab7a6293 by Jeff Sharkey · 5 years ago
  98. d1e8243 Merge "Block face auth when lock icon is pressed" into qt-dev am: d8941d0451 by Lucas Dupin · 5 years ago
  99. ffa5c21 [automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev am: 53e2a9b0ae -s ours by Paul Hu · 5 years ago
  100. 57fc769 Merge "Offload role manager work to background thread" into qt-dev am: 7b1973bfb8 am: b50f07c8c3 by Winson Chung · 5 years ago