Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / cts / 2116c3cd2fe71dda35b2f7cbc246fa191312f87b
  1. 2116c3c resolve merge conflicts of 49daa6e6db to mnc-dev. by Daniel Xie · 9 years ago
  2. 49daa6e Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev am: 37ece1e93c am: f4cda1d27f by Daniel Xie · 9 years ago
  3. 40385a3 Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev am: 37ece1e93c by Daniel Xie · 9 years ago
  4. f4cda1d Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  5. 37ece1e Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  6. 6dcff9f CameraITS: use linear tonemap in test_exposure by Gaurav Batra · 9 years ago
  7. ace696d Adding testConnectivityConstraintExecutes_withMobile to knownfailure list. by Daniel Xie · 9 years ago
  8. 032fd6b DO NOT MERGE CTS version is now 6.0_r1.5 by Daniel Xie · 9 years ago
  9. 4b2e76b Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 am: f234f41b50 by Daniel Xie · 9 years ago
  10. c90c930 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 by Daniel Xie · 9 years ago
  11. 49d36c3 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 by Daniel Xie · 9 years ago
  12. 4d409ca Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad by Daniel Xie · 9 years ago
  13. f234f41 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 by Daniel Xie · 9 years ago
  14. bfeea01 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c by Daniel Xie · 9 years ago
  15. a12dea8 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 by Daniel Xie · 9 years ago
  16. 949e824 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae by Daniel Xie · 9 years ago
  17. c28826b Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a by Daniel Xie · 9 years ago
  18. 44c25a4 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb by Daniel Xie · 9 years ago
  19. bad28d5 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb by Daniel Xie · 9 years ago
  20. 2df3fc6 Merge "Fix SeedTest for landscape" into kitkat-cts-dev by Daniel Xie · 9 years ago
  21. c9c7b3a Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae by Daniel Xie · 9 years ago
  22. 7f14a76 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 by Daniel Xie · 9 years ago
  23. a3012f2 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 by Daniel Xie · 9 years ago
  24. d51f2f6 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac by Daniel Xie · 9 years ago
  25. 4434dae Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac by Daniel Xie · 9 years ago
  26. 4791dcb Merge "Squashed commit of the following:" into kitkat-cts-dev by Daniel Xie · 9 years ago
  27. ffc3697 Squashed commit of the following: by Marco Nelissen · 9 years ago
  28. e5364a0 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: a22efb407b by Daniel Xie · 9 years ago
  29. e880e62 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours by Daniel Xie · 9 years ago
  30. a22efb4 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  31. e771efe Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  32. bdb5a21 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 am: 3332e427c4 by Daniel Xie · 9 years ago
  33. ac46400 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 by Daniel Xie · 9 years ago
  34. 3332e42 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f by Daniel Xie · 9 years ago
  35. a44564e am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours by Daniel Xie · 9 years ago
  36. c17d5c4 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  37. f7c3e99 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 518668280d by Daniel Xie · 9 years ago
  38. 7158f89 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df by Daniel Xie · 9 years ago
  39. 5186682 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  40. 09f4380 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  41. 837e940 am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  42. a06ee83 am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  43. 227b641 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  44. 791e51a Merge "security: Test mediaserver crash against an invalid MIDI file" into mnc-dev by Wonsik Kim · 9 years ago
  45. 0fda173 security: Test mediaserver crash against an invalid MIDI file by Wonsik Kim · 9 years ago
  46. 79081ef resolve merge conflicts of 07b3ebc3d3 to mnc-dev. by Zoltan Szatmary-Ban · 9 years ago
  47. 07b3ebc Merge "Use requestNetwork with all transport types that hardware features report" into marshmallow-cts-dev by szatmz · 9 years ago
  48. 3de2d8d Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  49. 79a4153 Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver." into mnc-dev by Daniel Xie · 9 years ago
  50. 279c620 Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  51. 859f10d In tests tearDown() method, ignore IllegalArgumentException by Vasu Nori · 9 years ago
  52. 4fc7782 Merge "Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH" into mnc-dev by Stuart Scott · 9 years ago
  53. 27da12f Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  54. 66963f6 Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  55. a8e55d2 Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev by Paul Mclean · 9 years ago
  56. 7fe1f92 DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam by Alex Chau · 9 years ago
  57. f55c3f6 Use requestNetwork with all transport types that hardware features report by Zoltan Szatmary-Ban · 9 years ago
  58. 2975486 am b078b54e: am feeded47: am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  59. b078b54 am feeded47: am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  60. feeded4 am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  61. 2149e97 am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  62. 4d5913f am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  63. e95788b am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  64. d5c8733 am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  65. 8bc09df am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  66. e913a7a am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  67. 3a3f33d am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  68. 79b7ea9 am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  69. cef6465 am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  70. e26185d am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  71. 18a2e91 am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  72. 50c36b9 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  73. ff0d56f am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  74. 71c0d24 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  75. 2a920db Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080 by Kuldeep Modi · 9 years ago
  76. a7b5b95 Fix test incompatibilities with Nemo (watch) device. by Paul McLean · 9 years ago
  77. 384f95e Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH by Stuart Scott · 9 years ago
  78. af4586a Merge "DO NOT MERGE Allow multiple deqp packages per API" into mnc-dev by Kalle Raita · 9 years ago
  79. 81ce705 am fef64426: am 900695d5: am 5c078a16: am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev by Ian Pedowitz · 9 years ago
  80. fef6442 am 900695d5: am 5c078a16: am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev by Ian Pedowitz · 9 years ago
  81. 900695d am 5c078a16: am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev by Ian Pedowitz · 9 years ago
  82. 5c078a1 am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev by Ian Pedowitz · 9 years ago
  83. d767a1a am a1694bdc: resolved conflicts for a500fef6 to lmp-dev by Ian Pedowitz · 9 years ago
  84. a1694bd resolved conflicts for a500fef6 to lmp-dev by Ian Pedowitz · 9 years ago
  85. a500fef resolved conflicts for b6679faf to klp-modular-dev by Wonsik Kim · 9 years ago
  86. b6679fa am 36919689: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel by Wonsik Kim · 9 years ago
  87. c32d97b am 136ce2a4: (-s ours) am 27e4de46: am a98203ea: am 4def5d0c: am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel by Wonsik Kim · 9 years ago
  88. 136ce2a am 27e4de46: am a98203ea: am 4def5d0c: am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel by Wonsik Kim · 9 years ago
  89. 27e4de4 am a98203ea: am 4def5d0c: am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel by Wonsik Kim · 9 years ago
  90. a98203e am 4def5d0c: am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel by Wonsik Kim · 9 years ago
  91. 4def5d0 am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel by Wonsik Kim · 9 years ago
  92. 17dbb7f Merge "Change TextView break strategy to meet Android Wear configuration." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  93. 109a23c Merge "Change TextView break strategy to meet Android Wear configuration." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  94. 2751d70 Change TextView break strategy to meet Android Wear configuration. by Seigo Nonaka · 9 years ago
  95. 95ce443 am ddefbc16: (-s ours) am 8ac15a8d: am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch by Nicholas Sauer · 9 years ago
  96. ddefbc1 am 8ac15a8d: am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch by Nicholas Sauer · 9 years ago
  97. 8ac15a8 am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch by Nicholas Sauer · 9 years ago
  98. 2440aa9 DO NOT MERGE Capture fields in CTS: by Nicholas Sauer · 9 years ago
  99. 018add7 Merge "Camera2: fix video stabilization test" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  100. adfddc1 Merge "Camera2: fix video stabilization test" into marshmallow-cts-dev by Daniel Xie · 9 years ago