Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / 70f6c9990bd83ffe81f9747f945b187975cf438b
  1. 70f6c99 resolve merge conflicts of a2b0b7381c7e to master by Jason Monk · 9 years ago
  2. 4f17b25 Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18 am: d6465983f1 am: df2d829272 -s ours by Pankaj Kanwar · 9 years ago
  3. a2b0b73 Merge "Fix crash in plugin settings" into oc-dev am: 133eb460bd by Jason Monk · 9 years ago
  4. 9c5b9fc Merge changes I3d96f55a,I581c100b,I5c424160 by Juan Lang · 9 years ago
  5. 8c4cd98 Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18 am: d6465983f1 by Pankaj Kanwar · 9 years ago
  6. 133eb46 Merge "Fix crash in plugin settings" into oc-dev by Jason Monk · 9 years ago
  7. 20c99a2 Merge "Fix BandConfig parcelable deserialization to properly interpret subclass data." by Tomasz Wasilczyk · 9 years ago
  8. 74c2103 Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev am: 3036e728e7 by Antony Sargent · 9 years ago
  9. 8288594 Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev by Antony Sargent · 9 years ago
  10. 3036e72 Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev by Antony Sargent · 9 years ago
  11. df2d829 Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18 by Pankaj Kanwar · 9 years ago
  12. 7b1986d Merge "Explicitly wait for the WebView Zygote." into oc-dev am: 3202c10207 by Gustav Sennton · 9 years ago
  13. d646598 Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18 by Pankaj Kanwar · 9 years ago
  14. 60237ac Merge "Explicitly wait for the WebView Zygote." into oc-dev am: 3202c10207 by Gustav Sennton · 9 years ago
  15. 41f48e3 Merge "Provide an API to make USSD calls and read the responses." by Pankaj Kanwar · 9 years ago
  16. 3202c10 Merge "Explicitly wait for the WebView Zygote." into oc-dev by Gustav Sennton · 9 years ago
  17. 2efc369 Merge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce by Jean-Michel Trivi · 9 years ago
  18. 40f7202 Merge "AAPT2: Add better error message when processing invalid files" into oc-dev am: b9dbee430d by Adam Lesinski · 9 years ago
  19. d4561d4 Merge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce by Jean-Michel Trivi · 9 years ago
  20. 79f9620 Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev am: 7beb895d75 by Adam Lesinski · 9 years ago
  21. 4451535 Merge "VolumeShaper: API change for duration" into oc-dev by Jean-Michel Trivi · 9 years ago
  22. 56ee63d Merge "AAPT2: Add better error message when processing invalid files" into oc-dev by Adam Lesinski · 9 years ago
  23. 706b85e Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev by Adam Lesinski · 9 years ago
  24. b9dbee4 Merge "AAPT2: Add better error message when processing invalid files" into oc-dev by TreeHugger Robot · 9 years ago
  25. 7beb895 Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev by TreeHugger Robot · 9 years ago
  26. 75f2283 Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev am: 4f86a894e1 by Rubin Xu · 9 years ago
  27. ab72729 Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev am: 390cdab47c by Geoffrey Pitsch · 9 years ago
  28. 59c65a8 Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev by Rubin Xu · 9 years ago
  29. ba93a15 Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am: 3c6305cc55 am: 887fd90742 by Etan Cohen · 9 years ago
  30. 442a4e4 Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev by Geoffrey Pitsch · 9 years ago
  31. 4f86a89 Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev by TreeHugger Robot · 9 years ago
  32. 79d9e99 Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am: 3c6305cc55 by Etan Cohen · 9 years ago
  33. 390cdab Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev by Geoffrey Pitsch · 9 years ago
  34. 887fd90 Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 by Etan Cohen · 9 years ago
  35. 3c6305c Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 by Etan Cohen · 9 years ago
  36. 2fd19ff Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" by Etan Cohen · 9 years ago
  37. add429d Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev am: a31f49a0df by Rubin Xu · 9 years ago
  38. e45651b Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev by Rubin Xu · 9 years ago
  39. dd0064d Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev am: 2c20a6db28 by Rubin Xu · 9 years ago
  40. a31f49a Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev by TreeHugger Robot · 9 years ago
  41. 0a555a6 Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev am: 2c20a6db28 by Rubin Xu · 9 years ago
  42. 2c20a6d Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev by TreeHugger Robot · 9 years ago
  43. 33342df Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev am: 544cf7793f by Fan Zhang · 9 years ago
  44. 17b995d Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev by Fan Zhang · 9 years ago
  45. 544cf77 Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev by TreeHugger Robot · 9 years ago
  46. e6623e5b Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev am: fc513f98d7 by Felipe Leme · 9 years ago
  47. 535422c Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev by Felipe Leme · 9 years ago
  48. fc513f9 Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev by TreeHugger Robot · 9 years ago
  49. 5c5b6da Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp by Hugo Benichi · 9 years ago
  50. c3d2f25 Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp by Hugo Benichi · 9 years ago
  51. 8d22c01 Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev am: 6ccc29bba5 by Philip Cuadra · 9 years ago
  52. 7d66c48 Merge "Take new autofill structure for each partition" into oc-dev am: f40d1cb773 by Philip P. Moltmann · 9 years ago
  53. d6cf20f Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev by Philip Cuadra · 9 years ago
  54. 5a3ac07 Merge "Take new autofill structure for each partition" into oc-dev by Philip P. Moltmann · 9 years ago
  55. 6ccc29b Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev by TreeHugger Robot · 9 years ago
  56. f40d1cb7 Merge "Take new autofill structure for each partition" into oc-dev by TreeHugger Robot · 9 years ago
  57. 8c4c92c NetworkCapabilities: remove duplicated TRANSPORT_NAMES by Hugo Benichi · 9 years ago
  58. f3f46a54 Merge "Add javadoc about APIs requiring uses-feature" into oc-dev am: 07d2cec982 by Eugene Susla · 9 years ago
  59. 3aa1f65 Merge "Check for uses-feature in Companion APIs" into oc-dev am: 7575fa7600 by Eugene Susla · 9 years ago
  60. 0cc9c80 Merge "Add javadoc about APIs requiring uses-feature" into oc-dev am: 07d2cec982 by Eugene Susla · 9 years ago
  61. 0f88845 Merge "Check for uses-feature in Companion APIs" into oc-dev am: 7575fa7600 by Eugene Susla · 9 years ago
  62. 07d2cec Merge "Add javadoc about APIs requiring uses-feature" into oc-dev by TreeHugger Robot · 9 years ago
  63. 7575fa7 Merge "Check for uses-feature in Companion APIs" into oc-dev by TreeHugger Robot · 9 years ago
  64. 8d7b1c9 Merge "Continue to @hide freeform decor caption APIs" into oc-dev am: 302ba2d3ab by Wale Ogunwale · 9 years ago
  65. 8f8c43b Merge "Continue to @hide freeform decor caption APIs" into oc-dev am: 302ba2d3ab by Wale Ogunwale · 9 years ago
  66. 302ba2d Merge "Continue to @hide freeform decor caption APIs" into oc-dev by TreeHugger Robot · 9 years ago
  67. 03bec90 Merge "Move RecentsImpl task stack listener to background." into oc-dev am: 024f80ca82 by Winson Chung · 9 years ago
  68. 6120510 Merge "Move RecentsImpl task stack listener to background." into oc-dev by Winson Chung · 9 years ago
  69. 024f80ca Merge "Move RecentsImpl task stack listener to background." into oc-dev by TreeHugger Robot · 9 years ago
  70. d8dddc8 Merge "Hide deprecated APIs." into oc-dev am: 59fe3108fa am: 4e71ae1243 by Felipe Leme · 9 years ago
  71. 5a209621 Merge "Remove the docstring dependency on telephony-common" into oc-dev am: b06ff6f256 by Nathan Harold · 9 years ago
  72. 4e71ae1 Merge "Hide deprecated APIs." into oc-dev am: 59fe3108fa by Felipe Leme · 9 years ago
  73. 49d4e5e Merge "Remove the docstring dependency on telephony-common" into oc-dev by Nathan Harold · 9 years ago
  74. 59fe310 Merge "Hide deprecated APIs." into oc-dev by TreeHugger Robot · 9 years ago
  75. b06ff6f Merge "Remove the docstring dependency on telephony-common" into oc-dev by TreeHugger Robot · 9 years ago
  76. 3bc2df4 Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev am: 940f6a9962 by Fan Zhang · 9 years ago
  77. 24a2f01 Merge "fix check for provider resolution" into oc-dev am: ade1496f96 by Todd Kennedy · 9 years ago
  78. bb6f846 Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev am: 940f6a9962 by Fan Zhang · 9 years ago
  79. 3627c94 Merge "fix check for provider resolution" into oc-dev am: ade1496f96 by Todd Kennedy · 9 years ago
  80. 940f6a9 Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev by Fan Zhang · 9 years ago
  81. ade1496 Merge "fix check for provider resolution" into oc-dev by TreeHugger Robot · 9 years ago
  82. de0ecde Merge "Remove redundant lockscreen shown check" into oc-dev am: 90c3489525 by lei.xa.liu · 9 years ago
  83. 35cdba9 Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev am: f4472b6507 by Wale Ogunwale · 9 years ago
  84. 9af8f27 Merge "Remove redundant lockscreen shown check" into oc-dev am: 90c3489525 by lei.xa.liu · 9 years ago
  85. a805e2c Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev by Wale Ogunwale · 9 years ago
  86. d3ed82b Merge "jni: Adjust for libui gralloc flags change" into oc-dev am: 3b7c1a32f1 by Chris Forbes · 9 years ago
  87. 90c3489 Merge "Remove redundant lockscreen shown check" into oc-dev by TreeHugger Robot · 9 years ago
  88. f4472b6 Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev by TreeHugger Robot · 9 years ago
  89. d8b8a23 Merge "jni: Adjust for libui gralloc flags change" into oc-dev am: 3b7c1a32f1 by Chris Forbes · 9 years ago
  90. 3b7c1a3 Merge "jni: Adjust for libui gralloc flags change" into oc-dev by TreeHugger Robot · 9 years ago
  91. 2f7c057 Merge "Move child package feature behind sys prop" into oc-dev am: 6b3263a6e2 by Svetoslav Ganov · 9 years ago
  92. f9b00d7 Merge "Move child package feature behind sys prop" into oc-dev am: 6b3263a6e2 by Svetoslav Ganov · 9 years ago
  93. 724ca14 Continue to @hide freeform decor caption APIs by Wale Ogunwale · 9 years ago
  94. 6b3263a Merge "Move child package feature behind sys prop" into oc-dev by Svetoslav Ganov · 9 years ago
  95. 45bf2f3 Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev am: 14ff091a1d by Etan Cohen · 9 years ago
  96. b1e3576 Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev by Etan Cohen · 9 years ago
  97. eace6ca Merge "Allow a11y listeners to specify handlers" by TreeHugger Robot · 9 years ago
  98. 14ff091 Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev by Etan Cohen · 9 years ago
  99. 8494b6b Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev am: 3db7350d7d by Ta-wei Yen · 9 years ago
  100. 683624a Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev by Ta-wei Yen · 9 years ago