Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 87d2ab1ebbe7d62b1a5c1c6325a0c06b55b74a40
  1. 87d2ab1 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5 am: aad33e6905 -s ours am: c8a7fd0502 by fionaxu · 8 years ago
  2. 8e71c85 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5 am: aad33e6905 -s ours by fionaxu · 8 years ago
  3. c8a7fd0 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5 by fionaxu · 8 years ago
  4. aad33e6 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 by fionaxu · 8 years ago
  5. 50904be DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa by fionaxu · 8 years ago
  6. ced2efe Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours am: ea5f6a74c0 by Chen Xu · 8 years ago
  7. f2da1cf Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am: 83f71845af by Scott Main · 8 years ago
  8. 404862b Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf by Svetoslav Ganov · 8 years ago
  9. d56e73b Merge "Merge \"Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours am: ea5f6a74c0\" into nyc-mr1-dev am: cba5f29304" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  10. 3fa5eaa Merge "Merge \"Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am: 83f71845af\" into nyc-mr1-dev am: 925a5ffa5e" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  11. f910dab Merge "Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf\" into nyc-mr1-dev am: d0302f579b" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  12. 23a027d Merge "Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 -s ours\" into nyc-mr1-dev am: 6f93a6c2c3" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  13. 54a704b Merge "Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev am: 3a4408640a" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  14. f6923d2 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours by fionaxu · 8 years ago
  15. 065096e Merge \"Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours am: ea5f6a74c0\" into nyc-mr1-dev by fionaxu · 8 years ago
  16. 7f2d8af Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 by Pankaj Kanwar · 8 years ago
  17. c1108c3 Merge \"Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am: 83f71845af\" into nyc-mr1-dev by smain@google.com · 8 years ago
  18. eabaf26 Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf\" into nyc-mr1-dev by Svet Ganov · 8 years ago
  19. 2dbe9b4 Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 -s ours\" into nyc-mr1-dev by Lorenzo Colitti · 8 years ago
  20. 6d8cffc Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  21. cba5f29 Merge "Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours am: ea5f6a74c0" into nyc-mr1-dev by Android Build Merger (Role) · 8 years ago
  22. 925a5ff Merge "Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev am: 83f71845af" into nyc-mr1-dev by Android Build Merger (Role) · 8 years ago
  23. d0302f5 Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am: dcf2e205bf" into nyc-mr1-dev by Android Build Merger (Role) · 8 years ago
  24. 6f93a6c Merge "Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev am: 33cdc4d136 -s ours" into nyc-mr1-dev by Android Build Merger (Role) · 8 years ago
  25. e1df7df Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours by fionaxu · 8 years ago
  26. c526ad0 Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev by smain@google.com · 8 years ago
  27. 8495456 Merge \"Use proper lock when accessing the generation registry\" into nyc-dev by Svet Ganov · 8 years ago
  28. 17b1adc Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev by Lorenzo Colitti · 8 years ago
  29. 3a44086 Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  30. d061c3a DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 by fionaxu · 8 years ago
  31. b4849f8 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 by fionaxu · 8 years ago
  32. 92b8cbd DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf by fionaxu · 8 years ago
  33. 117a8ae Merge \"Fixing app transition due to left-nav bar inset.\" into nyc-mr1-dev by Winson · 8 years ago
  34. 8d90128 Merge "Fixing app transition due to left-nav bar inset." into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  35. 1a18a57 Merge \"Move phone number formatting logic into DeviceInfoUtils.\" into nyc-mr1-dev by Fan Zhang · 8 years ago
  36. 53185e4 Merge "Move phone number formatting logic into DeviceInfoUtils." into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  37. 863ac47 DO NOT MERGE revert system api loadSafeLabel by fionaxu · 8 years ago
  38. fb55bee Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours by fionaxu · 8 years ago
  39. ea5f6a7 Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c by Chen Xu · 8 years ago
  40. e5643a1 Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 by fionaxu · 8 years ago
  41. 69a071e Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3 by Chen Xu · 8 years ago
  42. d992523 Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev by Annie Chin · 8 years ago
  43. 59fc768 Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev by fionaxu · 8 years ago
  44. d58f07f Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev by Annie Chin · 8 years ago
  45. d2e2288 Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev by Chen Xu · 8 years ago
  46. f2bead5 Switch network cycle calculation to use Calendar. by Jeff Sharkey · 8 years ago
  47. 4675ed8 Merge \"Capture fingerprint statistics for estimating FRR\" into nyc-mr1-dev by Jim Miller · 8 years ago
  48. 6f8d49d Merge "Capture fingerprint statistics for estimating FRR" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  49. 68d9896 Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev by smain@google.com · 8 years ago
  50. 83f7184 Merge "remove "referenceonly" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates." into nyc-dev by Scott Main · 8 years ago
  51. c31422f Merge \"Add getters for ButtonDispatcher HomeButton and its views\" into nyc-mr1-dev by Annie Chin · 8 years ago
  52. 0353f42 Merge \"Allow preference theming to remove divider.\" into nyc-mr1-dev by Michael Kwan · 8 years ago
  53. 0aff5ad Merge "Add getters for ButtonDispatcher HomeButton and its views" into nyc-mr1-dev by Annie Chin · 8 years ago
  54. 929c8f4 Merge "Allow preference theming to remove divider." into nyc-mr1-dev by Michael Kwan · 8 years ago
  55. cbb625b Fixing app transition due to left-nav bar inset. by Winson · 8 years ago
  56. 75ee8d1 Move phone number formatting logic into DeviceInfoUtils. by Fan Zhang · 8 years ago
  57. 8503bf3 Merge \"Use proper lock when accessing the generation registry\" into nyc-dev by Svet Ganov · 8 years ago
  58. dcf2e20 Merge "Use proper lock when accessing the generation registry" into nyc-dev by Svetoslav Ganov · 8 years ago
  59. bcc100a Capture fingerprint statistics for estimating FRR by Jim Miller · 8 years ago
  60. 932cd75 Merge \"Skip screenshots when user storage is locked.\" into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  61. fd60712 Merge \"Don\'t cache external storage directories.\" into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  62. e7f14ce Merge "Skip screenshots when user storage is locked." into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  63. d683945 Merge "Don't cache external storage directories." into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  64. f00768d Merge \"Ignore serial number checks when emulating FBE.\" into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  65. 21e9073 Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev by Lorenzo Colitti · 8 years ago
  66. 12f6687 Merge "Ignore serial number checks when emulating FBE." into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  67. 33cdc4d Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev by Pankaj Kanwar · 8 years ago
  68. 7145cac Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev by Daniel Nishi · 8 years ago
  69. 9b4725d Merge \"Frameworks/base: Refactor UserHandle and Environment a bit\" into nyc-mr1-dev by Andreas Gampe · 8 years ago
  70. 9459f93 Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev by Daniel Nishi · 8 years ago
  71. 51b8395 Use proper lock when accessing the generation registry by Svet Ganov · 8 years ago
  72. e6fcebb Merge "Frameworks/base: Refactor UserHandle and Environment a bit" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  73. 26fcca7a Merge \"Fix: DatePicker can\'t show long date string at landscape\" into nyc-mr1-dev by Alan Viverette · 8 years ago
  74. c71fc24 Merge "Fix: DatePicker can't show long date string at landscape" into nyc-mr1-dev by Alan Viverette · 8 years ago
  75. 753fee6 Import translations. DO NOT MERGE am: 4c78b8e544 -s ours by Bill Yi · 8 years ago
  76. 91a4cd8 Merge \"Log as histogram instead of counter\" into nyc-mr1-dev am: 0f6c2bfe30 by Amith Yamasani · 8 years ago
  77. 05bd5be Merge \"Don\'t bridge autobundle summaries to other devices.\" into nyc-mr1-dev by Julia Reynolds · 8 years ago
  78. 7836a20 Import translations. DO NOT MERGE am: 4c78b8e544 -s ours by Bill Yi · 8 years ago
  79. 0f6c2bf Merge "Log as histogram instead of counter" into nyc-mr1-dev by Amith Yamasani · 8 years ago
  80. 6e16714 Frameworks/base: Refactor UserHandle and Environment a bit by Andreas Gampe · 8 years ago
  81. 3c32cf8 Merge "Don't bridge autobundle summaries to other devices." into nyc-mr1-dev by Julia Reynolds · 8 years ago
  82. c29d2b0 Move the MIME type icon detection into the platform. by Daniel Nishi · 8 years ago
  83. e2c0df0 Merge \"Grant location permission to camera app.\" into nyc-mr1-dev by Sudheer Shanka · 8 years ago
  84. 400960a Merge "Grant location permission to camera app." into nyc-mr1-dev by Sudheer Shanka · 8 years ago
  85. dfc9007 Merge \"Update isValidLockdownProfile to block PPTP\" into nyc-mr1-dev by Robin Lee · 8 years ago
  86. da68f06 Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev by Robin Lee · 8 years ago
  87. 2960700 Don't bridge autobundle summaries to other devices. by Julia Reynolds · 8 years ago
  88. 73ab965 Fix: DatePicker can't show long date string at landscape by Alan Viverette · 8 years ago
  89. e62b36b Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev by Erik Kline · 8 years ago
  90. 58ef889 Merge "[net mgmt svc] add method to retrieve INetd reference" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  91. 4e37b70 [net mgmt svc] add method to retrieve INetd reference by Erik Kline · 8 years ago
  92. bae6d82 Update isValidLockdownProfile to block PPTP by Robin Lee · 8 years ago
  93. 746320f Merge \\\"MediaSession: Use mHandler for sending a pending intent\\\" am: fcae61308c am: b417585b29 by riddle_hsu · 8 years ago
  94. e765619 Merge \\"MediaSession: Use mHandler for sending a pending intent\\" am: fcae61308c by riddle_hsu · 8 years ago
  95. b417585 Merge \"MediaSession: Use mHandler for sending a pending intent\" am: fcae61308c by riddle_hsu · 8 years ago
  96. a9f35e0 resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c by Jae Seo · 8 years ago
  97. fcae613 Merge "MediaSession: Use mHandler for sending a pending intent" by Treehugger Robot · 8 years ago
  98. 8575120 resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c by Jae Seo · 8 years ago
  99. 5f5bd88 resolve merge conflicts of 5b6c034 to stage-aosp-master by Jae Seo · 8 years ago
  100. 5b6c034 Merge "Fix deadlock in MediaSessionService during getCurrentUser()" by Jae Seo · 8 years ago