API tools faq
paste
Advertisement
arter97

Untitled

arter97
Jan 28th, 2020
590
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.59 KB | None | 0 0
raw download clone embed print report
  1. From https://source.codeaurora.org/quic/la/platform/bionic
  2. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  3. Auto-merging libc/Android.bp
  4. Merge made by the 'recursive' strategy.
  5. libc/Android.bp | 21 ---------------------
  6. 1 file changed, 21 deletions(-)
  7. From https://source.codeaurora.org/quic/la/platform/build
  8. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  9. Merge made by the 'recursive' strategy.
  10. core/build_id.mk | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. From https://source.codeaurora.org/quic/la/device/qcom/sepolicy
  13. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  14. Merge made by the 'recursive' strategy.
  15. generic/vendor/common/shsusrd.te | 2 ++
  16. generic/vendor/test/ustaservice_app.te | 1 +
  17. legacy/vendor/test/ustaservice_app.te | 1 +
  18. qva/private/cameraserver.te | 3 +++
  19. qva/vendor/atoll/genfs_contexts | 1 +
  20. qva/vendor/bengal/update_engine_common.te | 40 +++++++++++++++++++++++++++++++
  21. qva/vendor/common/device.te | 1 +
  22. qva/vendor/common/file_contexts | 1 +
  23. qva/vendor/common/hal_spu_qti.te | 1 +
  24. 9 files changed, 51 insertions(+)
  25. mode change 100644 => 100755 qva/private/cameraserver.te
  26. create mode 100644 qva/vendor/bengal/update_engine_common.te
  27. From https://source.codeaurora.org/quic/la/platform/frameworks/av
  28. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  29. Merge made by the 'recursive' strategy.
  30. media/libstagefright/ACodec.cpp | 8 +++++---
  31. 1 file changed, 5 insertions(+), 3 deletions(-)
  32. From https://source.codeaurora.org/quic/la/platform/frameworks/base
  33. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  34. Auto-merging wifi/java/com/android/server/wifi/BaseWifiService.java
  35. Auto-merging services/core/java/com/android/server/statusbar/StatusBarManagerService.java
  36. Auto-merging services/core/java/com/android/server/audio/AudioService.java
  37. Auto-merging core/res/res/values/symbols.xml
  38. Auto-merging core/res/res/values/config.xml
  39. Auto-merging core/java/android/provider/Settings.java
  40. Merge made by the 'recursive' strategy.
  41. core/java/android/provider/Settings.java | 18 +++++++
  42. core/res/res/values/config.xml | 4 +-
  43. core/res/res/values/symbols.xml | 2 +-
  44. packages/SettingsLib/res/values-af/arrays.xml | 2 +
  45. packages/SettingsLib/res/values-am/arrays.xml | 2 +
  46. packages/SettingsLib/res/values-ar/arrays.xml | 2 +
  47. packages/SettingsLib/res/values-as/arrays.xml | 2 +
  48. packages/SettingsLib/res/values-az/arrays.xml | 2 +
  49. .../SettingsLib/res/values-b+sr+Latn/arrays.xml | 2 +
  50. packages/SettingsLib/res/values-be/arrays.xml | 2 +
  51. packages/SettingsLib/res/values-bg/arrays.xml | 2 +
  52. packages/SettingsLib/res/values-bn/arrays.xml | 2 +
  53. packages/SettingsLib/res/values-bs/arrays.xml | 2 +
  54. packages/SettingsLib/res/values-ca/arrays.xml | 2 +
  55. packages/SettingsLib/res/values-cs/arrays.xml | 2 +
  56. packages/SettingsLib/res/values-da/arrays.xml | 2 +
  57. packages/SettingsLib/res/values-de/arrays.xml | 2 +
  58. packages/SettingsLib/res/values-el/arrays.xml | 2 +
  59. packages/SettingsLib/res/values-en-rAU/arrays.xml | 2 +
  60. packages/SettingsLib/res/values-en-rCA/arrays.xml | 2 +
  61. packages/SettingsLib/res/values-en-rGB/arrays.xml | 2 +
  62. packages/SettingsLib/res/values-en-rIN/arrays.xml | 2 +
  63. packages/SettingsLib/res/values-es-rUS/arrays.xml | 2 +
  64. packages/SettingsLib/res/values-es/arrays.xml | 2 +
  65. packages/SettingsLib/res/values-et/arrays.xml | 2 +
  66. packages/SettingsLib/res/values-eu/arrays.xml | 2 +
  67. packages/SettingsLib/res/values-fa/arrays.xml | 2 +
  68. packages/SettingsLib/res/values-fi/arrays.xml | 2 +
  69. packages/SettingsLib/res/values-fr-rCA/arrays.xml | 2 +
  70. packages/SettingsLib/res/values-fr/arrays.xml | 2 +
  71. packages/SettingsLib/res/values-gl/arrays.xml | 2 +
  72. packages/SettingsLib/res/values-gu/arrays.xml | 2 +
  73. packages/SettingsLib/res/values-hi/arrays.xml | 2 +
  74. packages/SettingsLib/res/values-hr/arrays.xml | 2 +
  75. packages/SettingsLib/res/values-hu/arrays.xml | 2 +
  76. packages/SettingsLib/res/values-hy/arrays.xml | 2 +
  77. packages/SettingsLib/res/values-in/arrays.xml | 2 +
  78. packages/SettingsLib/res/values-is/arrays.xml | 2 +
  79. packages/SettingsLib/res/values-it/arrays.xml | 2 +
  80. packages/SettingsLib/res/values-iw/arrays.xml | 2 +
  81. packages/SettingsLib/res/values-ja/arrays.xml | 2 +
  82. packages/SettingsLib/res/values-ka/arrays.xml | 2 +
  83. packages/SettingsLib/res/values-kk/arrays.xml | 2 +
  84. packages/SettingsLib/res/values-km/arrays.xml | 2 +
  85. packages/SettingsLib/res/values-kn/arrays.xml | 2 +
  86. packages/SettingsLib/res/values-ko/arrays.xml | 2 +
  87. packages/SettingsLib/res/values-ky/arrays.xml | 2 +
  88. packages/SettingsLib/res/values-lo/arrays.xml | 2 +
  89. packages/SettingsLib/res/values-lt/arrays.xml | 2 +
  90. packages/SettingsLib/res/values-lv/arrays.xml | 2 +
  91. packages/SettingsLib/res/values-mk/arrays.xml | 2 +
  92. packages/SettingsLib/res/values-ml/arrays.xml | 2 +
  93. packages/SettingsLib/res/values-mn/arrays.xml | 2 +
  94. packages/SettingsLib/res/values-mr/arrays.xml | 2 +
  95. packages/SettingsLib/res/values-ms/arrays.xml | 2 +
  96. packages/SettingsLib/res/values-my/arrays.xml | 2 +
  97. packages/SettingsLib/res/values-nb/arrays.xml | 2 +
  98. packages/SettingsLib/res/values-ne/arrays.xml | 2 +
  99. packages/SettingsLib/res/values-nl/arrays.xml | 2 +
  100. packages/SettingsLib/res/values-or/arrays.xml | 2 +
  101. packages/SettingsLib/res/values-pa/arrays.xml | 2 +
  102. packages/SettingsLib/res/values-pl/arrays.xml | 2 +
  103. packages/SettingsLib/res/values-pt-rBR/arrays.xml | 2 +
  104. packages/SettingsLib/res/values-pt-rPT/arrays.xml | 2 +
  105. packages/SettingsLib/res/values-pt/arrays.xml | 2 +
  106. packages/SettingsLib/res/values-ro/arrays.xml | 2 +
  107. packages/SettingsLib/res/values-ru/arrays.xml | 2 +
  108. packages/SettingsLib/res/values-sk/arrays.xml | 2 +
  109. packages/SettingsLib/res/values-sl/arrays.xml | 2 +
  110. packages/SettingsLib/res/values-sq/arrays.xml | 2 +
  111. packages/SettingsLib/res/values-sr/arrays.xml | 2 +
  112. packages/SettingsLib/res/values-sv/arrays.xml | 2 +
  113. packages/SettingsLib/res/values-sw/arrays.xml | 2 +
  114. packages/SettingsLib/res/values-ta/arrays.xml | 2 +
  115. packages/SettingsLib/res/values-te/arrays.xml | 2 +
  116. packages/SettingsLib/res/values-th/arrays.xml | 2 +
  117. packages/SettingsLib/res/values-tl/arrays.xml | 2 +
  118. packages/SettingsLib/res/values-tr/arrays.xml | 2 +
  119. packages/SettingsLib/res/values-uk/arrays.xml | 2 +
  120. packages/SettingsLib/res/values-ur/arrays.xml | 2 +
  121. packages/SettingsLib/res/values-uz/arrays.xml | 2 +
  122. packages/SettingsLib/res/values-vi/arrays.xml | 2 +
  123. packages/SettingsLib/res/values-zh-rCN/arrays.xml | 2 +
  124. packages/SettingsLib/res/values-zh-rHK/arrays.xml | 2 +
  125. packages/SettingsLib/res/values-zh-rTW/arrays.xml | 2 +
  126. packages/SettingsLib/res/values/strings.xml | 8 ++++
  127. proto/src/system_messages.proto | 3 ++
  128. .../android/server/audio/AudioDeviceBroker.java | 4 --
  129. .../android/server/audio/AudioDeviceInventory.java | 7 +--
  130. .../com/android/server/audio/AudioService.java | 28 -----------
  131. .../server/statusbar/StatusBarManagerService.java | 3 +-
  132. wifi/java/android/net/wifi/IWifiManager.aidl | 8 ++++
  133. wifi/java/android/net/wifi/WifiConfiguration.java | 12 +++++
  134. wifi/java/android/net/wifi/WifiManager.java | 56 ++++++++++++++++++++++
  135. .../com/android/server/wifi/BaseWifiService.java | 20 ++++++++
  136. 95 files changed, 295 insertions(+), 42 deletions(-)
  137. From https://source.codeaurora.org/quic/la/platform/frameworks/opt/telephony
  138. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  139. Merge made by the 'recursive' strategy.
  140. .../telephony/dataconnection/DcTracker.java | 17 +++--
  141. .../internal/telephony/uicc/IccRecords.java | 42 ++++++++++++
  142. .../internal/telephony/uicc/IsimUiccRecords.java | 23 ++++++-
  143. .../internal/telephony/uicc/RuimRecords.java | 60 ++++++++++++-----
  144. .../internal/telephony/uicc/SIMRecords.java | 75 +++++++++++++++-------
  145. 5 files changed, 170 insertions(+), 47 deletions(-)
  146. From https://source.codeaurora.org/quic/la/platform/hardware/interfaces
  147. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  148. Merge made by the 'recursive' strategy.
  149. wifi/1.3/default/service.cpp | 2 +-
  150. wifi/1.3/default/wifi_chip.cpp | 12 ++++++++++--
  151. wifi/1.3/default/wifi_iface_util.cpp | 9 +++++++++
  152. wifi/1.3/default/wifi_iface_util.h | 1 +
  153. wifi/1.3/default/wifi_nan_iface.cpp | 4 ++++
  154. wifi/1.3/default/wifi_nan_iface.h | 4 ++++
  155. 6 files changed, 29 insertions(+), 3 deletions(-)
  156. From https://source.codeaurora.org/quic/la/platform/hardware/qcom/wlan
  157. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  158. Auto-merging qcwcn/wifi_hal/wifilogger_diag.cpp
  159. Merge made by the 'recursive' strategy.
  160. qcwcn/wifi_hal/rb_wrapper.cpp | 2 +-
  161. qcwcn/wifi_hal/roam.cpp | 20 ++++++++++++++++++++
  162. qcwcn/wifi_hal/rtt.cpp | 14 ++++++++++++++
  163. qcwcn/wifi_hal/wifi_hal.cpp | 3 ++-
  164. qcwcn/wifi_hal/wificonfig.cpp | 3 +++
  165. qcwcn/wifi_hal/wifilogger_diag.cpp | 16 ++++++++++++----
  166. 6 files changed, 52 insertions(+), 6 deletions(-)
  167. From https://source.codeaurora.org/quic/la/platform/packages/apps/Settings
  168. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  169. Merge made by the 'recursive' strategy.
  170. res/xml/development_settings.xml | 10 +++
  171. .../DevelopmentSettingsDashboardFragment.java | 2 +
  172. ...iUnsavedNetworkLinkingPreferenceController.java | 79 ++++++++++++++++++++++
  173. .../WifiWhitelistRoamingPreferenceController.java | 79 ++++++++++++++++++++++
  174. .../location/DimmableIZatIconPreference.java | 14 ++++
  175. 5 files changed, 184 insertions(+)
  176. create mode 100644 src/com/android/settings/development/WifiUnsavedNetworkLinkingPreferenceController.java
  177. create mode 100644 src/com/android/settings/development/WifiWhitelistRoamingPreferenceController.java
  178. From https://source.codeaurora.org/quic/la/platform/packages/services/Telephony
  179. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  180. Auto-merging src/com/android/phone/PhoneGlobals.java
  181. Merge made by the 'recursive' strategy.
  182. src/com/android/phone/PhoneGlobals.java | 4 ++++
  183. 1 file changed, 4 insertions(+)
  184. From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/bluetooth_ext
  185. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  186. Merge made by the 'recursive' strategy.
  187. .../src/avrcp/Avrcp_ext.java | 3 ++
  188. system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc | 14 ++----
  189. system_bt_ext/conf/bt_profile.conf | 6 ---
  190. system_bt_ext/conf/interop_database.conf | 2 +
  191. system_bt_ext/device/src/profile_config.cc | 53 ----------------------
  192. vhal/include/hardware/vendor.h | 2 -
  193. 6 files changed, 8 insertions(+), 72 deletions(-)
  194. From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/system/bt
  195. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  196. Auto-merging btif/src/btif_dm.cc
  197. Merge made by the 'recursive' strategy.
  198. bta/ag/bta_ag_int.h | 7 +-
  199. bta/ag/bta_ag_sco.cc | 135 +++++++++++++++++++------------------
  200. bta/jv/bta_jv_act.cc | 4 ++
  201. btcore/src/device_class.cc | 4 +-
  202. btcore/test/device_class_test.cc | 39 ++++++-----
  203. btif/co/bta_av_co.cc | 1 -
  204. btif/include/btif_dm.h | 2 +-
  205. btif/src/btif_dm.cc | 140 +++++++++++++++++++++------------------
  206. stack/btm/btm_sec.cc | 2 +-
  207. 9 files changed, 178 insertions(+), 156 deletions(-)
  208. From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/core-utils
  209. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  210. Merge made by the 'recursive' strategy.
  211. build/build.sh | 9 ++++++---
  212. vendor_framework_compatibility_matrix.xml | 2 +-
  213. 2 files changed, 7 insertions(+), 4 deletions(-)
  214. From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/power
  215. * tag LA.UM.8.11.r1-02400-NICOBAR.0 -> FETCH_HEAD
  216. Merge made by the 'recursive' strategy.
  217. config/kona/powerhint.xml | 5 ++++-
  218. 1 file changed, 4 insertions(+), 1 deletion(-)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!