Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / bdbf13e9896ea07a0000fee22fd80da020f4fe7d
  1. a21569c resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e by Narayan Kamath · 8 years ago
  2. 8f4f9e4 resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 by Narayan Kamath · 8 years ago
  3. c2a760e resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 by Sudheer Shanka · 8 years ago
  4. 603a69f Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 by Sudheer Shanka · 8 years ago
  5. 9080d44 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec by Amith Yamasani · 8 years ago
  6. 86ac88c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 by Sudheer Shanka · 8 years ago
  7. 368ae62 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 by Amith Yamasani · 8 years ago
  8. 0fd07c4 docs: Removing non-English /preview/ directories am: 2d629c3e5b by Andrew Solovay · 8 years ago
  9. b5760c1 Fetch ga script over https to avoid mixed content. by Dirk Dougherty · 8 years ago
  10. 184edd6 Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev by TreeHugger Robot · 8 years ago
  11. 30cba33 Merge "docs: rewrite one attribute description in R.attr" into nyc-dev by Mark Lu · 8 years ago
  12. d428a01 Merge "docs: fix broken links in Activity reference" into nyc-dev by Mark Lu · 8 years ago
  13. 209fb02 Merge "docs: fix code snippets in SQL Databases page" into nyc-dev by Mark Lu · 8 years ago
  14. a544221 Docs: Fixed the Bluetooth guide link am: 65813dff14 by Hemal Patel · 8 years ago
  15. cbd6fb2 Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." am: 7f9ed1cd85 -s ours by Felipe Leme · 8 years ago
  16. 3bfa245 Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." by Felipe Leme · 8 years ago
  17. 7f9ed1c Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." by Treehugger Robot · 8 years ago
  18. 1657493 Merge changes from topic 'utf' am: 0a357a1a73 am: de8a6a66f6 by Martijn Coenen · 8 years ago
  19. de8a6a6 Merge changes from topic 'utf' am: 0a357a1a73 by Martijn Coenen · 8 years ago
  20. 0a357a1 Merge changes from topic 'utf' by Martijn Coenen · 8 years ago
  21. dd28b7b Try to mitigate issue #31016187: system_server crash in ArraySet. by Dianne Hackborn · 8 years ago
  22. 1c22ae2 docs: Fix typo by Mark Goldstein · 8 years ago
  23. 2d629c3 docs: Removing non-English /preview/ directories by Andrew Solovay · 8 years ago
  24. 9fb8a51 Merge "Fix suspend crash issue on no GPU platform." am: 175621f517 by Ivan.liu · 8 years ago
  25. 98b07f6 Merge "Fix suspend crash issue on no GPU platform." am: 175621f517 by Ivan.liu · 8 years ago
  26. 175621f Merge "Fix suspend crash issue on no GPU platform." by Treehugger Robot · 8 years ago
  27. d90d8d6 Add bound checks to utf16_to_utf8 by Sergio Giro · 8 years ago
  28. 8f7b8a1 Unicode: specify destination length in utf8_to_utf16 methods by Sergio Giro · 8 years ago
  29. 1fbc4b8 resolve merge conflicts of 5191225 to mnc-dev by Narayan Kamath · 8 years ago
  30. 984827c Fix suspend crash issue on no GPU platform. by Ivan.liu · 8 years ago
  31. 48609b7 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0 am: 472a7792f3 by Narayan Kamath · 8 years ago
  32. d3bc7c6 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef am: 551e6c786f am: 80b8f38224 by David Christie · 8 years ago
  33. 3bd70a4 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75 am: 7f2aaf204d by David Christie · 8 years ago
  34. ed259c2 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 am: 00e1e39ae2 by David Christie · 8 years ago
  35. 77a9ef9 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0 by Narayan Kamath · 8 years ago
  36. 9c4d02f Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef am: 551e6c786f by David Christie · 8 years ago
  37. 0ae74a8 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75 by David Christie · 8 years ago
  38. 4f1d1fc resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 by David Christie · 8 years ago
  39. e05354b resolve merge conflicts of 8aaffd9 to nyc-dev am: 36246a43e5 by David Christie · 8 years ago
  40. 36246a4 resolve merge conflicts of 8aaffd9 to nyc-dev by David Christie · 8 years ago
  41. 472a779 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 by Narayan Kamath · 8 years ago
  42. 80b8f38 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef by David Christie · 8 years ago
  43. 7f2aaf2 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 by David Christie · 8 years ago
  44. 00e1e39 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 by David Christie · 8 years ago
  45. dd496ec Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 by Narayan Kamath · 8 years ago
  46. 551e6c7 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 by David Christie · 8 years ago
  47. 187d841 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 by David Christie · 8 years ago
  48. a6de8f2 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 by David Christie · 8 years ago
  49. 8aaffd9 resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5 by David Christie · 8 years ago
  50. 8e16811 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 by Narayan Kamath · 8 years ago
  51. 735699f Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b by David Christie · 8 years ago
  52. 0777ad8 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 by David Christie · 8 years ago
  53. 3aaac55 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d by David Christie · 8 years ago
  54. 362668b resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5 by David Christie · 8 years ago
  55. e24eb2d resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 by David Christie · 8 years ago
  56. c01db7d Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f by Narayan Kamath · 8 years ago
  57. 3970ee9 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c by David Christie · 8 years ago
  58. d610363 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 by David Christie · 8 years ago
  59. dd1016c resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d by David Christie · 8 years ago
  60. 910e6efe DO NOT MERGE ANYWHERE - Clear preferences when package is removed. by Felipe Leme · 8 years ago
  61. 6195acc resolve merge conflicts of a2399b4 to mnc-dev by David Christie · 8 years ago
  62. cdf70ba resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 by Sudheer Shanka · 8 years ago
  63. dfc2d0a Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 by Sudheer Shanka · 8 years ago
  64. 7b81406 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 by Amith Yamasani · 8 years ago
  65. 26bb7bf Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 by Sudheer Shanka · 8 years ago
  66. 117a383 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf by Amith Yamasani · 8 years ago
  67. 5191225 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433 by Narayan Kamath · 8 years ago
  68. c11e8fc Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605 by Narayan Kamath · 8 years ago
  69. c6ab92e Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f by Narayan Kamath · 8 years ago
  70. af369f6e Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 by David Christie · 8 years ago
  71. 975879a resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 by David Christie · 8 years ago
  72. b92c637 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d by Bill Yi · 8 years ago
  73. abef050 Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d by Sergio Giro · 8 years ago
  74. 8d9a875 Merge "javax.crypto: update classes in javax.crypto (part 2)" am: c7f97dbd57 by Sergio Giro · 8 years ago
  75. 77322b0 Merge "java.security.spec: add public field in MGF1ParameterSpec" am: 5b24bccbc8 by Sergio Giro · 8 years ago
  76. 9e948dc Merge "Add WorkSource to BLE scanning API" am: d0a0ae349c -s ours by Jakub Pawlowski · 8 years ago
  77. 1bf3b41 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d by Bill Yi · 8 years ago
  78. 3b7c46a Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d by Sergio Giro · 8 years ago
  79. 1384be9 Merge "javax.crypto: update classes in javax.crypto (part 2)" am: c7f97dbd57 by Sergio Giro · 8 years ago
  80. 08b6a09 Merge "java.security.spec: add public field in MGF1ParameterSpec" am: 5b24bccbc8 by Sergio Giro · 8 years ago
  81. 2fde849 Merge "Add WorkSource to BLE scanning API" am: d0a0ae349c -s ours by Jakub Pawlowski · 8 years ago
  82. e71ecb2 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD by Bill Yi · 8 years ago
  83. 3253853 Merge "Added error handling to settings suggestions list" into nyc-dev by Salvador Martinez · 8 years ago
  84. 23af0c0 Added error handling to settings suggestions list am: 18bf581c77 by Salvador Martinez · 8 years ago
  85. ed004e2 Merge "Added error handling to settings suggestions list" into nyc-dev by Salvador Martinez · 8 years ago
  86. 550e6775 Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev by Alan Viverette · 8 years ago
  87. 387ebba Avoid potential re-entry as a result of child mutation am: 66b3a0d1aa by Alan Viverette · 8 years ago
  88. 462f29f Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev by TreeHugger Robot · 8 years ago
  89. 18bf581 Added error handling to settings suggestions list by Salvador Martinez · 8 years ago
  90. 263820b frameworks/base: add changes coming from aosp am: 29835cc56e by Sergio Giro · 8 years ago
  91. 5d47325 Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" by Sergio Giro · 8 years ago
  92. c7f97db Merge "javax.crypto: update classes in javax.crypto (part 2)" by Sergio Giro · 8 years ago
  93. 5b24bcc Merge "java.security.spec: add public field in MGF1ParameterSpec" by Sergio Giro · 8 years ago
  94. 29835cc frameworks/base: add changes coming from aosp by Sergio Giro · 8 years ago
  95. a2399b4 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev by David Christie · 8 years ago
  96. f929ef6 resolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3 by John Reck · 8 years ago
  97. 621fb59 resolve merge conflicts of 24e38ab to stage-aosp-master by John Reck · 8 years ago
  98. 0a7e139 javax.crypto.spec: update PBEParameterSpec to Java 8 by Sergio Giro · 8 years ago
  99. d0a0ae3 Merge "Add WorkSource to BLE scanning API" by Jakub Pawlowski · 8 years ago
  100. 99b20863 javax.crypto: update classes in javax.crypto (part 2) by Sergio Giro · 8 years ago