Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / d409459c5d30ed304f2b31cc3b2a2e62c40261d0
  1. d409459 Merge changes I58f904d5,Ie0bf7804 am: 6717a6f930 am: 32efb6d2b3 by Remi NGUYEN VAN · 6 years ago
  2. 8396f84 Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" am: b0896e61f8 by Ian Zerny · 6 years ago
  3. 753be22 Merge "Add @UnsupportedAppUsage annotations" am: fa4ccace61 am: 44787b6aa7 by Mathew Inwood · 6 years ago
  4. aa68114 resolve merge conflicts of 882f4e1f444194405ef78a3a9d5c1618cb8a8013 to pi-dev-plus-aosp by Shaotang Li · 6 years ago
  5. 32efb6d Merge changes I58f904d5,Ie0bf7804 am: 6717a6f930 by Remi NGUYEN VAN · 6 years ago
  6. ba11aee Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" by Ian Zerny · 6 years ago
  7. 44787b6 Merge "Add @UnsupportedAppUsage annotations" am: fa4ccace61 by Mathew Inwood · 6 years ago
  8. 6717a6f Merge changes I58f904d5,Ie0bf7804 by Remi NGUYEN VAN · 6 years ago
  9. b0896e6 Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" by Ian Zerny · 6 years ago
  10. e72a524 Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" by Ian Zerny · 6 years ago
  11. fa4ccac Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 6 years ago
  12. 6557a24 Fix DHCP options sent by DHCP server by Remi NGUYEN VAN · 6 years ago
  13. e59d031 Fix BOOTP fields for server-generated DHCP packets by Remi NGUYEN VAN · 6 years ago
  14. 882f4e1 resolve merge conflicts of b825510b80a6d8db12590f2f0995bddf97970946 to stage-aosp-master by Shaotang Li · 6 years ago
  15. 76dcc6b Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" am: d8523f3c01 by Meng Wang · 6 years ago
  16. 946e6ee Merge "Convert aapt to Soong" am: 7bd321ca25 am: 9f5e3e822c by Dan Willemsen · 6 years ago
  17. 62ced9c Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" am: d8523f3c01 by Meng Wang · 6 years ago
  18. 87dfff6 Merge "Switch DHCP server based on global setting" am: 846c80acf5 am: 85b40cb793 by Remi NGUYEN VAN · 6 years ago
  19. 9f5e3e8 Merge "Convert aapt to Soong" am: 7bd321ca25 by Dan Willemsen · 6 years ago
  20. 5ecc085 Merge "Simply logic for connect and disconnect in HeadsetProfile" am: 7aae482135 by Chienyuan · 6 years ago
  21. 85b40cb Merge "Switch DHCP server based on global setting" am: 846c80acf5 by Remi NGUYEN VAN · 6 years ago
  22. b825510 Merge "Add new metrics constants for emergency dialer" by Shaotang Li · 6 years ago
  23. ea9afe0 Merge "Remove connected device check logic in getConnectionState" am: 8593fc6c06 by Chienyuan · 6 years ago
  24. d8523f3 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" by Treehugger Robot · 6 years ago
  25. 474e4f3 Merge "Simply logic for connect and disconnect in HeadsetProfile" am: 7aae482135 by Chienyuan · 6 years ago
  26. 9cc6c2a Merge "Remove connected device check logic in getConnectionState" am: 8593fc6c06 by Chienyuan · 6 years ago
  27. 7bd321c Merge "Convert aapt to Soong" by Treehugger Robot · 6 years ago
  28. 846c80a Merge "Switch DHCP server based on global setting" by Remi NGUYEN VAN · 6 years ago
  29. 7aae482 Merge "Simply logic for connect and disconnect in HeadsetProfile" by Treehugger Robot · 6 years ago
  30. 8593fc6 Merge "Remove connected device check logic in getConnectionState" by Treehugger Robot · 6 years ago
  31. a63d7aa Merge "Docs: fixed formatting for setLaunchBounds()" into pi-dev am: 7795e97f27 by Benjamin Miller · 6 years ago
  32. 7795e97 Merge "Docs: fixed formatting for setLaunchBounds()" into pi-dev by TreeHugger Robot · 6 years ago
  33. e4f3b95 Merge "Add new Telephony API for settings migration" am: adbe45e0ca by Pengquan Meng · 6 years ago
  34. e8cf7b5 Merge "Fix some fields in WifiInfo are not written into Parcel" am: 5add10333d by Oscar Shu · 6 years ago
  35. 9351849 Merge "Add new Telephony API for settings migration" am: adbe45e0ca by Pengquan Meng · 6 years ago
  36. e3de537 Merge "Fix some fields in WifiInfo are not written into Parcel" am: 5add10333d by Oscar Shu · 6 years ago
  37. adbe45e Merge "Add new Telephony API for settings migration" by Pengquan Meng · 6 years ago
  38. 6ec43e0 Merge "Docs: fixed a broken link in SystemUpdatePolicy" into pi-dev by Benjamin Miller · 6 years ago
  39. 5d12935 Convert aapt to Soong by Dan Willemsen · 6 years ago
  40. f38640a Merge "Add new team member to owners file." am: 05d5ec7842 am: cc2f23b6b9 by Tyler Gunn · 6 years ago
  41. 8bb6781 Merge "Docs: fixed a broken link in SystemUpdatePolicy" into pi-dev by TreeHugger Robot · 6 years ago
  42. 5add103 Merge "Fix some fields in WifiInfo are not written into Parcel" by Oscar Shu · 6 years ago
  43. cc2f23b Merge "Add new team member to owners file." am: 05d5ec7842 by Tyler Gunn · 6 years ago
  44. 05d5ec7 Merge "Add new team member to owners file." by Treehugger Robot · 6 years ago
  45. 1a96e5c Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev by Benjamin Miller · 6 years ago
  46. 53141c3 Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev by TreeHugger Robot · 6 years ago
  47. df80c8d Merge "Fixes possible issue with no-op creator." into pi-dev am: f5411070a8 by dwchen · 6 years ago
  48. ad224b6 Add new Telephony API for settings migration by Pengquan Meng · 6 years ago
  49. f541107 Merge "Fixes possible issue with no-op creator." into pi-dev by TreeHugger Robot · 6 years ago
  50. 87a1397 Add new team member to owners file. by Tyler Gunn · 6 years ago
  51. edc2a4b [automerger skipped] Merge changes from topic "androidx-settings-aosp" am: cdf75c3cc8 -s ours by KOUSHIK PANUGANTI · 6 years ago
  52. 9c729ed [automerger skipped] Migrated various apps under frameworks/base/packages/Shell to androidx am: ec8d258c60 -s ours by KOUSHIK PANUGANTI · 6 years ago
  53. 856a246 [automerger skipped] Merge changes from topic "androidx-settings-aosp" by KOUSHIK PANUGANTI · 6 years ago
  54. 973c33f [automerger skipped] Migrated various apps under frameworks/base/packages/Shell to androidx by KOUSHIK PANUGANTI · 6 years ago
  55. cdf75c3 Merge changes from topic "androidx-settings-aosp" by Treehugger Robot · 6 years ago
  56. 8a12c12 docs: Added reminder that custom CAs aren't automatically trusted by apps. by Benjamin Miller · 7 years ago
  57. c129df8 Remove connected device check logic in getConnectionState by Chienyuan · 6 years ago
  58. edd44ec Simply logic for connect and disconnect in HeadsetProfile by Chienyuan · 6 years ago
  59. 76bb514 Merge "BLE: Add service solicitation uuid feature in scan filter" am: 13d6540956 by Jakub Pawlowski · 6 years ago
  60. 2534030 Merge "BLE: Add service solicitation uuid feature in scan filter" am: 13d6540956 by Jakub Pawlowski · 6 years ago
  61. 13d6540 Merge "BLE: Add service solicitation uuid feature in scan filter" by Jakub Pawlowski · 6 years ago
  62. b613c39 Merge "Include NOTICE from /product and /product_services" am: 17115bdb02 by Dario Freni · 6 years ago
  63. ccbda28 Merge "Include NOTICE from /product and /product_services" am: 17115bdb02 by Dario Freni · 6 years ago
  64. 17115bd Merge "Include NOTICE from /product and /product_services" by Dario Freni · 6 years ago
  65. d35c4ea Merge "Also copy-construct multinetwork policy preference" am: 0c7343ccd7 by Erik Kline · 6 years ago
  66. ccf3aeb Merge "Also copy-construct multinetwork policy preference" am: 0c7343ccd7 by Erik Kline · 6 years ago
  67. 0c7343c Merge "Also copy-construct multinetwork policy preference" by Treehugger Robot · 6 years ago
  68. 397f811 Also copy-construct multinetwork policy preference by Erik Kline · 6 years ago
  69. 1555eae BLE: Add service solicitation uuid feature in scan filter by Nitin Shivpure · 6 years ago
  70. ec139ee Merge "Ignore DHCP packet sent from non-68 client port" am: ef7432f245 by Remi NGUYEN VAN · 6 years ago
  71. 83ac5c5 Merge "Add global setting to use new DHCPv4 server" am: 64dda3cf18 by Remi NGUYEN VAN · 6 years ago
  72. 83a7650 Merge "Ignore DHCP packet sent from non-68 client port" am: ef7432f245 by Remi NGUYEN VAN · 6 years ago
  73. 0f78680 Merge "Add global setting to use new DHCPv4 server" am: 64dda3cf18 by Remi NGUYEN VAN · 6 years ago
  74. ef7432f Merge "Ignore DHCP packet sent from non-68 client port" by Remi NGUYEN VAN · 6 years ago
  75. 64dda3c Merge "Add global setting to use new DHCPv4 server" by Remi NGUYEN VAN · 6 years ago
  76. b9a9a2f Add new metrics constants for emergency dialer by Shaotang Li · 6 years ago
  77. cae667c Merge "Add DhcpServer" am: e3a0f42e8e am: dccc1866de by Remi NGUYEN VAN · 6 years ago
  78. e3bb5c5 Switch DHCP server based on global setting by Remi NGUYEN VAN · 6 years ago
  79. dccc186 Merge "Add DhcpServer" am: e3a0f42e8e by Remi NGUYEN VAN · 6 years ago
  80. 37e01c9 Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f by Erik Kline · 6 years ago
  81. e3a0f42 Merge "Add DhcpServer" by Remi NGUYEN VAN · 6 years ago
  82. 0bd9ac4 Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f by Erik Kline · 6 years ago
  83. 0e16212 Merge "Remove ResolveUtil from frameworks/base callers" by Treehugger Robot · 6 years ago
  84. 2825c5c Merge "[java9] Convert hiddenapi-list target to Metalava" am: c96760f4f3 by Nan Zhang · 6 years ago
  85. 1ed3e96 Merge "[java9] Convert hiddenapi-list target to Metalava" am: c96760f4f3 by Nan Zhang · 6 years ago
  86. c96760f Merge "[java9] Convert hiddenapi-list target to Metalava" by Treehugger Robot · 6 years ago
  87. f53446d Fix some fields in WifiInfo are not written into Parcel by keigo, nishira · 6 years ago
  88. e784500 Merge "Added access networks manager" am: c5a00e0957 am: 1804391a45 by Jack Yu · 6 years ago
  89. 1804391 Merge "Added access networks manager" am: c5a00e0957 by Jack Yu · 6 years ago
  90. abbb784 [automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am: 08bd9bdbb3 -s ours by hjchangliao · 6 years ago
  91. 7d1d938 [automerger skipped] Merge changes from topic "androidx-settings-stage-aosp-master" into stage-aosp-master by Colin Cross · 6 years ago
  92. c5a00e0 Merge "Added access networks manager" by Jack Yu · 6 years ago
  93. 8a2a2c1 [automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" by hjchangliao · 6 years ago
  94. 82fa377 [automerger skipped] Migrated various apps under frameworks/base/packages/Shell to androidx by KOUSHIK PANUGANTI · 6 years ago
  95. 08bd9bd Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" by Treehugger Robot · 6 years ago
  96. ab2b39c Merge changes from topic "androidx-settings-stage-aosp-master" into stage-aosp-master by Colin Cross · 6 years ago
  97. ec8d258 Migrated various apps under frameworks/base/packages/Shell to androidx by KOUSHIK PANUGANTI · 6 years ago
  98. b8616dc Migrated SystemUI & SettingsLib to androidx by Aurimas Liutikas · 6 years ago
  99. a29e519 Merge "Add fallback case to layers_extensions.cpp" am: 46e75a69e8 am: eac760d236 by Victor Khimenko · 6 years ago
  100. eac760d Merge "Add fallback case to layers_extensions.cpp" am: 46e75a69e8 by Victor Khimenko · 6 years ago