Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 55eb1a0a081039bc938f3a370a539e25faabb7a9
  1. 55eb1a0 Merge changes from topic "ExtractBackupDataFromSettings" by Al Sutton · 6 years ago
  2. 94a973b Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 am: 4722a8680e am: 7446cd21f1 by Chalard Jean · 6 years ago
  3. 2b85f99 Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 am: 4722a8680e by Chalard Jean · 6 years ago
  4. 7446cd2 Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 am: 4722a8680e by Chalard Jean · 6 years ago
  5. 4722a86 Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 by Chalard Jean · 6 years ago
  6. 54f1300 Merge "Opportunistic cleanup" am: da5685428a by Chalard Jean · 6 years ago
  7. da56854 Merge "Opportunistic cleanup" by Chalard Jean · 6 years ago
  8. c8e9459 [automerger skipped] Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 am: eeeac923bd am: d1ec5eb541 by Andreas Gampe · 6 years ago
  9. 717f846 [automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617 am: 489edfda20 by Ian Kasprzak · 6 years ago
  10. 040b2e8 Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 am: eeeac923bd by Andreas Gampe · 6 years ago
  11. 525ef5d Merge "Re-enable testPlatformPermissionPolicyUnaltered presubmit test" by Philip P. Moltmann · 6 years ago
  12. 2b7053a [automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617 by Ian Kasprzak · 6 years ago
  13. 5789a6df Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 am: 18f96879c2 am: 7bebbb7c6e am: 9cfe7babca by Brad Ebinger · 6 years ago
  14. d1ec5eb Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 by Andreas Gampe · 6 years ago
  15. 489edfd [automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours by Ian Kasprzak · 6 years ago
  16. ce766b3 Merge changes from topic "mappingz" by Jeff Sharkey · 6 years ago
  17. eeeac92 Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 by Andreas Gampe · 6 years ago
  18. 0cd1fdd [automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master by Ian Kasprzak · 6 years ago
  19. c53172e Merge "Framework: Clean up blacklist" into stage-aosp-master by TreeHugger Robot · 6 years ago
  20. baba1a0 Merge "Add ranking object to each NotificationEntry" by TreeHugger Robot · 6 years ago
  21. 33e559a Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master by Ian Kasprzak · 6 years ago
  22. d457ea8 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 123f51ff28 am: 882828b6d6 by Kevin Hufnagle · 6 years ago
  23. e89f3a1 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec am: 12ecfb5b7c by Kevin Hufnagle · 6 years ago
  24. 65d8b4a Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 am: 18f96879c2 am: 7bebbb7c6e by Brad Ebinger · 6 years ago
  25. d1b62b2 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 123f51ff28 by Kevin Hufnagle · 6 years ago
  26. fa71485 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec by Kevin Hufnagle · 6 years ago
  27. 9cfe7ba Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 am: 18f96879c2 by Brad Ebinger · 6 years ago
  28. 3c7aa60 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec am: 5e1a48a660 by Kevin Hufnagle · 6 years ago
  29. 882828b6 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 by Kevin Hufnagle · 6 years ago
  30. 6149beb Merge changes from topic "drop_circular_dep" by TreeHugger Robot · 6 years ago
  31. 7bebbb7 Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 by Brad Ebinger · 6 years ago
  32. eba15ec Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 am: 13e2b970ec by Kevin Hufnagle · 6 years ago
  33. 13b0504 Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab am: 1a9034d44e am: 66460139d2 by Amit Mahajan · 6 years ago
  34. 12ecfb5 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 by Kevin Hufnagle · 6 years ago
  35. 5e1a48a Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: b14d2dede2 by Kevin Hufnagle · 6 years ago
  36. 2292c5d [automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" am: 1953ea490f -s ours am: c898d8096a -s ours am: 11d9ed1c2b -s ours am: 82ab503f6c -s ours by chen xu · 6 years ago
  37. 1fb3554 Merge "Add OWNERS file to textclassifier directory" am: c55eedf2a3 am: 1fdf6d4599 am: 8b8774696b am: 4b7b37eada by Tony Mak · 6 years ago
  38. 7877e3c Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 033de4e8c2 am: 2500352d1d by Andrew Solovay · 6 years ago
  39. 123f51f Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev by Kevin Hufnagle · 6 years ago
  40. 13e2b97 Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev by Kevin Hufnagle · 6 years ago
  41. 8b64d158 Merge "Copy appop modes on write to avoid locked IO" by TreeHugger Robot · 6 years ago
  42. 18f9687 Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" am: 597234f119 by Brad Ebinger · 6 years ago
  43. c0f522c Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab am: 1a9034d44e by Amit Mahajan · 6 years ago
  44. bb7cbd3 Re-enable testPlatformPermissionPolicyUnaltered presubmit test by Philip P. Moltmann · 6 years ago
  45. f997c75 [DO NOT MERGE] Disabled the following tests in TEST_MAPPING: by Raman Tenneti · 6 years ago
  46. cd2dbe7 Merge "Send package changed for consumers of an updated shared lib" by TreeHugger Robot · 6 years ago
  47. 2042653 Cut the dependency to framework from droiddoc modules by Jiyong Park · 6 years ago
  48. f4d962c [automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" am: 1953ea490f -s ours am: c898d8096a -s ours am: 11d9ed1c2b -s ours by chen xu · 6 years ago
  49. 11b706c Copy appop modes on write to avoid locked IO by Eugene Susla · 6 years ago
  50. a955377 Merge "Add OWNERS file to textclassifier directory" am: c55eedf2a3 am: 1fdf6d4599 am: 8b8774696b by Tony Mak · 6 years ago
  51. 6646013 Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab by Amit Mahajan · 6 years ago
  52. be2b8ca Sprinkle in some TEST_MAPPING. by Jeff Sharkey · 6 years ago
  53. 22fea3e Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 033de4e8c2 by Andrew Solovay · 6 years ago
  54. b14d2de Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev by Kevin Hufnagle · 6 years ago
  55. 597234f Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" by Brad Ebinger · 6 years ago
  56. 82ab503 [automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" am: 1953ea490f -s ours am: c898d8096a -s ours by chen xu · 6 years ago
  57. 4537e61 Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 73a66dc100 am: 676ef1a61c by Andrew Solovay · 6 years ago
  58. 4b7b37e Merge "Add OWNERS file to textclassifier directory" am: c55eedf2a3 am: 1fdf6d4599 by Tony Mak · 6 years ago
  59. 0d2b539 Merge "[base] close zip archive when parsing fails" by Songchun Fan · 6 years ago
  60. 8d4be69 Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 73a66dc100 am: c149d6ff19 by Andrew Solovay · 6 years ago
  61. 1a9034d Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 by Amit Mahajan · 6 years ago
  62. 2500352 Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 by Andrew Solovay · 6 years ago
  63. 05b8a33 Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 73a66dc100 by Andrew Solovay · 6 years ago
  64. 11d9ed1 [automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" am: 1953ea490f -s ours by chen xu · 6 years ago
  65. 9f226a0 Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 am: 73a66dc100 by Andrew Solovay · 6 years ago
  66. 44846f0c Merge "Add test API to change the exit transition timeout." by George Mount · 6 years ago
  67. 130baf8 Merge "[SurfaceFlingerStats] Add initial statsd atoms" by TreeHugger Robot · 6 years ago
  68. 8b87746 Merge "Add OWNERS file to textclassifier directory" am: c55eedf2a3 by Tony Mak · 6 years ago
  69. c149d6f Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 by Andrew Solovay · 6 years ago
  70. 676ef1a Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 by Andrew Solovay · 6 years ago
  71. c302ce5 Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 by Amit Mahajan · 6 years ago
  72. c898d80 [automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" by chen xu · 6 years ago
  73. 033de4e Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 by Andrew Solovay · 6 years ago
  74. 1fdf6d4 Merge "Add OWNERS file to textclassifier directory" am: c55eedf2a3 by Tony Mak · 6 years ago
  75. 73a66dc Merge "Docs: clarify getSharedPreferences behavior" into qt-dev am: 3791f9b071 by Andrew Solovay · 6 years ago
  76. 898b316 [base] close zip archive when parsing fails by Songchun Fan · 6 years ago
  77. 2c8d3c5 Merge "Fix invalid padding bits for 7-bit ASCII encoding" by Amit Mahajan · 6 years ago
  78. 081deaf Merge "Add apex configuration for statsd" by TreeHugger Robot · 6 years ago
  79. cb3b482 Framework: Clean up blacklist by Andreas Gampe · 6 years ago
  80. 55bfbfa Merge "Update visibility of finishing activities" by Andrii Kulian · 6 years ago
  81. da4767be Merge "Return correct value for Activity#releaseInstance()" by Andrii Kulian · 6 years ago
  82. 4ef8702 Fix subtle bug when using empty withValues(). by Jeff Sharkey · 6 years ago
  83. 84bb274 Merge "Improved AbstractMasterSystemService to handle supported user types." by TreeHugger Robot · 6 years ago
  84. b636296 Merge "Allow ContentProviders to be injected into." by Dave Mankoff · 6 years ago
  85. 3791f9b Merge "Docs: clarify getSharedPreferences behavior" into qt-dev by Andrew Solovay · 6 years ago
  86. 25266af docs: Added desc. of launcher app criteria in Q by Kevin Hufnagle · 6 years ago
  87. 1953ea4 Merge "SDK API doesSwitchModemConfigTriggerReboot" by Treehugger Robot · 6 years ago
  88. c55eedf Merge "Add OWNERS file to textclassifier directory" by Treehugger Robot · 6 years ago
  89. ae90a9e Add ranking object to each NotificationEntry by Ned Burns · 6 years ago
  90. a4a7136 Allow ContentProviders to be injected into. by Dave Mankoff · 6 years ago
  91. 72fcdcd Merge "Remove IMaintenanceActivityListener (which was unused)" by Makoto Onuki · 6 years ago
  92. a14d1dd Add OWNERS file to textclassifier directory by Tony Mak · 6 years ago
  93. 281a34a Merge "wifi: add SAE password identifier to WifiConfiguration" by Jimmy Chen · 6 years ago
  94. da5a3ac Merge "Resuming the restarting activities only if they were on stack top" by TreeHugger Robot · 6 years ago
  95. 09ff08d Merge "Add bmgr command to enable/disable auto restore" by Ruslan Tkhakokhov · 6 years ago
  96. 42e3357 Merge "Add missing header in android_media_MediaCodecList.cpp" by Derek Sollenberger · 6 years ago
  97. cbafe0b Send package changed for consumers of an updated shared lib by Patrick Baumann · 6 years ago
  98. e0a0963 Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" am: 6fecb94292 am: a3ddee80fd am: f03f803aaf am: f9b00a4427 by Luke Huang · 6 years ago
  99. 0833b2e Move the list of settings to backup out of the Settings class by Al Sutton · 6 years ago
  100. 91f89d0 Move the validators out of the settings class by Al Sutton · 6 years ago