API tools faq
paste
Advertisement
arter97

Untitled

arter97
Jan 20th, 2020
765
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 69.02 KB | None | 0 0
raw download clone embed print report
  1. android_art:From https://source.codeaurora.org/quic/la/platform/art
  2. android_art: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  3. android_art:Already up to date!
  4. android_art:Merge made by the 'recursive' strategy.
  5. android_bionic:From https://source.codeaurora.org/quic/la/platform/bionic
  6. android_bionic: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  7. android_bionic:Merge made by the 'recursive' strategy.
  8. android_bionic: linker/linker.cpp | 7 +++++++
  9. android_bionic: tests/dlfcn_test.cpp | 4 ++++
  10. android_bionic: 2 files changed, 11 insertions(+)
  11. android_bootable_recovery:From https://source.codeaurora.org/quic/la/platform/bootable/recovery
  12. android_bootable_recovery: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  13. android_bootable_recovery:Merge made by the 'recursive' strategy.
  14. android_bootable_recovery: minadbd/minadbd_services.cpp | 35 ++++++++++++++++++++++++++---------
  15. android_bootable_recovery: 1 file changed, 26 insertions(+), 9 deletions(-)
  16. android_build:From https://source.codeaurora.org/quic/la/platform/build
  17. android_build: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  18. android_build:Merge made by the 'recursive' strategy.
  19. android_build: CleanSpec.mk | 4 ++
  20. android_build: core/Makefile | 56 +++++++++++++++----
  21. android_build: core/autogen_test_config.mk | 2 +-
  22. android_build: core/build_id.mk | 2 +-
  23. android_build: core/config.mk | 17 +++---
  24. android_build: core/instrumentation_test_config_template.xml | 2 +
  25. android_build: core/java_host_test_config_template.xml | 3 ++
  26. android_build: core/java_test_config_template.xml | 3 ++
  27. android_build: core/main.mk | 2 +
  28. android_build: core/native_benchmark_test_config_template.xml | 3 ++
  29. android_build: core/native_host_test_config_template.xml | 3 ++
  30. android_build: core/native_test_config_template.xml | 2 +-
  31. android_build: core/tasks/mts.mk | 25 +++++++++
  32. android_build: core/version_defaults.mk | 2 +-
  33. android_build: target/product/base_system.mk | 2 -
  34. android_build: target/product/gsi_common.mk | 5 ++
  35. android_build: tools/extract_kernel.py | 5 +-
  36. android_build: tools/fs_config/Android.mk | 4 +-
  37. android_build: tools/fs_config/fs_config_generator.py | 6 +--
  38. android_build: tools/releasetools/add_img_to_target_files.py | 3 +-
  39. android_build: tools/releasetools/apex_utils.py | 4 +-
  40. android_build: tools/releasetools/common.py | 3 ++
  41. android_build: tools/releasetools/merge_target_files.py | 4 ++
  42. android_build: tools/releasetools/ota_from_target_files.py | 68 ++++++++++++++++++++++-
  43. android_build: tools/releasetools/sign_target_files_apks.py | 4 ++
  44. android_build: tools/releasetools/test_ota_from_target_files.py | 69 +++++++++++++++++++++---
  45. android_build: tools/releasetools/validate_target_files.py | 9 ++--
  46. android_build: 27 files changed, 262 insertions(+), 50 deletions(-)
  47. android_build: create mode 100644 core/tasks/mts.mk
  48. android_build_blueprint:From https://source.codeaurora.org/quic/la/platform/build/blueprint
  49. android_build_blueprint: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  50. android_build_blueprint:Merge made by the 'recursive' strategy.
  51. android_build_blueprint: context.go | 15 ++++++++++++---
  52. android_build_blueprint: module_ctx.go | 29 +++++++++++++++++++++--------
  53. android_build_blueprint: 2 files changed, 33 insertions(+), 11 deletions(-)
  54. android_build_soong:From https://source.codeaurora.org/quic/la/platform/build/soong
  55. android_build_soong: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  56. android_build_soong:Merge made by the 'recursive' strategy.
  57. android_build_soong: android/mutator.go | 1 +
  58. android_build_soong: apex/apex.go | 18 +++++-
  59. android_build_soong: cc/binary.go | 4 +-
  60. android_build_soong: cc/cc.go | 26 +++++++++
  61. android_build_soong: cc/library.go | 6 +-
  62. android_build_soong: cc/llndk_library.go | 2 +-
  63. android_build_soong: cc/makevars.go | 15 ++++-
  64. android_build_soong: cc/sanitize.go | 163 ++++++++++++++++++++++++----------------------------
  65. android_build_soong: cc/test.go | 27 ++++++---
  66. android_build_soong: java/droiddoc.go | 42 +++++++++++---
  67. android_build_soong: tradefed/autogen.go | 65 +++++++++++++--------
  68. android_build_soong: 11 files changed, 232 insertions(+), 137 deletions(-)
  69. android_device_generic_goldfish:From https://source.codeaurora.org/quic/la/device/generic/goldfish
  70. android_device_generic_goldfish: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  71. android_device_generic_goldfish:Already up to date.
  72. android_device_qcom_sepolicy:From https://source.codeaurora.org/quic/la/device/qcom/sepolicy
  73. android_device_qcom_sepolicy: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  74. android_device_qcom_sepolicy:Merge made by the 'recursive' strategy.
  75. android_device_qcom_sepolicy: Android.mk | 4 +-
  76. android_device_qcom_sepolicy: legacy/vendor/common/file.te | 1 +
  77. android_device_qcom_sepolicy: legacy/vendor/common/file_contexts | 2 +
  78. android_device_qcom_sepolicy: legacy/vendor/common/hal_audio.te | 5 +
  79. android_device_qcom_sepolicy: legacy/vendor/qcs605/file_contexts | 159 +++++++++++++++++++++++++++
  80. android_device_qcom_sepolicy: legacy/vendor/qcs605/genfs_contexts | 58 ++++++++++
  81. android_device_qcom_sepolicy: legacy/vendor/qcs605/idmap.te | 29 +++++
  82. android_device_qcom_sepolicy: legacy/vendor/qcs605/init-qti-fbe-sh.te | 37 +++++++
  83. android_device_qcom_sepolicy: legacy/vendor/qcs605/init_shell.te | 41 +++++++
  84. android_device_qcom_sepolicy: legacy/vendor/qcs605/mediacodec.te | 28 +++++
  85. android_device_qcom_sepolicy: legacy/vendor/qcs605/mediaserver.te | 28 +++++
  86. android_device_qcom_sepolicy: legacy/vendor/qcs605/platform_app.te | 29 +++++
  87. android_device_qcom_sepolicy: legacy/vendor/qcs605/priv_app.te | 29 +++++
  88. android_device_qcom_sepolicy: legacy/vendor/qcs605/property.te | 29 +++++
  89. android_device_qcom_sepolicy: legacy/vendor/qcs605/property_contexts | 28 +++++
  90. android_device_qcom_sepolicy: legacy/vendor/qcs605/system_server.te | 29 +++++
  91. android_device_qcom_sepolicy: legacy/vendor/qcs605/untrusted_app.te | 30 +++++
  92. android_device_qcom_sepolicy: legacy/vendor/qcs605/update_engine_common.te | 39 +++++++
  93. android_device_qcom_sepolicy: legacy/vendor/qcs605/wfdservice.te | 30 +++++
  94. android_device_qcom_sepolicy: legacy/vendor/qcs605/zygote.te | 29 +++++
  95. android_device_qcom_sepolicy: 20 files changed, 662 insertions(+), 2 deletions(-)
  96. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/file_contexts
  97. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/genfs_contexts
  98. android_device_qcom_sepolicy: create mode 100755 legacy/vendor/qcs605/idmap.te
  99. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/init-qti-fbe-sh.te
  100. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/init_shell.te
  101. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/mediacodec.te
  102. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/mediaserver.te
  103. android_device_qcom_sepolicy: create mode 100755 legacy/vendor/qcs605/platform_app.te
  104. android_device_qcom_sepolicy: create mode 100755 legacy/vendor/qcs605/priv_app.te
  105. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/property.te
  106. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/property_contexts
  107. android_device_qcom_sepolicy: create mode 100755 legacy/vendor/qcs605/system_server.te
  108. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/untrusted_app.te
  109. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/update_engine_common.te
  110. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/wfdservice.te
  111. android_device_qcom_sepolicy: create mode 100644 legacy/vendor/qcs605/zygote.te
  112. android_external_ant-wireless_ant_native:From https://source.codeaurora.org/quic/la/platform/external/ant-wireless/ant_native
  113. android_external_ant-wireless_ant_native: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  114. android_external_ant-wireless_ant_native:Already up to date.
  115. android_external_libjpeg-turbo:From https://source.codeaurora.org/quic/la/platform/external/libjpeg-turbo
  116. android_external_libjpeg-turbo: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  117. android_external_libjpeg-turbo:Already up to date!
  118. android_external_libjpeg-turbo:Merge made by the 'recursive' strategy.
  119. android_external_libnfc-nxp:fatal: couldn't find remote ref LA.UM.8.8.1.r1-01100-QCS605.0
  120. android_external_selinux:From https://source.codeaurora.org/quic/la/platform/external/selinux
  121. android_external_selinux: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  122. android_external_selinux:Already up to date.
  123. android_external_skia:From https://source.codeaurora.org/quic/la/platform/external/skia
  124. android_external_skia: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  125. android_external_skia:Already up to date.
  126. android_external_zlib:From https://source.codeaurora.org/quic/la/platform/external/zlib
  127. android_external_zlib: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  128. android_external_zlib:Already up to date.
  129. android_frameworks_av:From https://source.codeaurora.org/quic/la/platform/frameworks/av
  130. android_frameworks_av: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  131. android_frameworks_av:Merge made by the 'recursive' strategy.
  132. android_frameworks_av: apex/ld.config.txt | 4 +-
  133. android_frameworks_av: camera/cameraserver/main_cameraserver.cpp | 1 +
  134. android_frameworks_av: camera/ndk/ndk_vendor/impl/ACameraDevice.h | 2 +-
  135. android_frameworks_av: .../ndk_vendor/tests/AImageReaderVendorTest.cpp | 83 ++-
  136. android_frameworks_av: media/bufferpool/1.0/AccessorImpl.cpp | 9 +-
  137. android_frameworks_av: media/bufferpool/1.0/AccessorImpl.h | 1 +
  138. android_frameworks_av: media/bufferpool/2.0/AccessorImpl.cpp | 32 +-
  139. android_frameworks_av: media/bufferpool/2.0/AccessorImpl.h | 1 +
  140. android_frameworks_av: media/bufferpool/2.0/Android.bp | 28 +-
  141. android_frameworks_av: media/bufferpool/2.0/ClientManager.cpp | 29 +
  142. android_frameworks_av: .../2.0/include/bufferpool/ClientManager.h | 8 +-
  143. android_frameworks_av: media/codec2/components/aac/C2SoftAacEnc.cpp | 68 +-
  144. android_frameworks_av: media/codec2/components/aac/C2SoftAacEnc.h | 2 +-
  145. android_frameworks_av: media/codec2/components/aom/Android.bp | 8 +-
  146. android_frameworks_av: media/codec2/components/aom/C2SoftAomDec.cpp | 4 +-
  147. android_frameworks_av: media/codec2/components/avc/C2SoftAvcDec.cpp | 29 +-
  148. android_frameworks_av: media/codec2/components/avc/C2SoftAvcDec.h | 2 +-
  149. android_frameworks_av: media/codec2/components/g711/C2SoftG711Dec.cpp | 2 +-
  150. android_frameworks_av: media/codec2/components/gav1/Android.bp | 20 +
  151. android_frameworks_av: media/codec2/components/gav1/C2SoftGav1Dec.cpp | 792 +++++++++++++++++++++
  152. android_frameworks_av: media/codec2/components/gav1/C2SoftGav1Dec.h | 77 ++
  153. android_frameworks_av: media/codec2/components/hevc/C2SoftHevcDec.cpp | 28 +-
  154. android_frameworks_av: media/codec2/components/hevc/C2SoftHevcDec.h | 2 +-
  155. android_frameworks_av: media/codec2/hidl/1.0/utils/Android.bp | 8 +-
  156. android_frameworks_av: media/codec2/hidl/1.0/utils/types.cpp | 5 +
  157. android_frameworks_av: .../audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp | 4 +
  158. android_frameworks_av: .../hidl/1.0/vts/functional/common/README.md | 43 +-
  159. android_frameworks_av: .../functional/common/media_c2_hidl_test_common.h | 2 +-
  160. android_frameworks_av: media/codec2/hidl/client/Android.bp | 2 +-
  161. android_frameworks_av: media/codec2/hidl/client/client.cpp | 108 +--
  162. android_frameworks_av: .../hidl/client/include/codec2/hidl/client.h | 12 +-
  163. android_frameworks_av: media/codec2/sfplugin/CCodec.cpp | 20 +-
  164. android_frameworks_av: media/codec2/sfplugin/CCodecBufferChannel.cpp | 20 +-
  165. android_frameworks_av: media/codec2/sfplugin/CCodecConfig.cpp | 35 +-
  166. android_frameworks_av: media/codec2/sfplugin/CCodecConfig.h | 2 +
  167. android_frameworks_av: media/codec2/sfplugin/PipelineWatcher.cpp | 2 +-
  168. android_frameworks_av: media/codec2/vndk/Android.bp | 2 +-
  169. android_frameworks_av: media/codec2/vndk/C2Buffer.cpp | 80 +--
  170. android_frameworks_av: media/codec2/vndk/C2Store.cpp | 3 +-
  171. android_frameworks_av: .../src/client/AudioStreamInternalCapture.cpp | 8 +-
  172. android_frameworks_av: .../libaaudio/src/client/IsochronousClockModel.cpp | 101 ++-
  173. android_frameworks_av: media/libaaudio/src/client/IsochronousClockModel.h | 37 +-
  174. android_frameworks_av: .../libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 99 ++-
  175. android_frameworks_av: media/libeffects/lvm/wrapper/Bundle/EffectBundle.h | 8 +
  176. android_frameworks_av: media/libmedia/IResourceManagerService.cpp | 30 +-
  177. android_frameworks_av: .../include/media/IResourceManagerService.h | 6 +-
  178. android_frameworks_av: media/libmedia/include/media/MediaResource.h | 5 +-
  179. android_frameworks_av: media/libmedia/xsd/vts/Android.bp | 1 +
  180. android_frameworks_av: media/libmedia/xsd/vts/ValidateMediaProfiles.cpp | 12 +-
  181. android_frameworks_av: media/libstagefright/ACodec.cpp | 25 +-
  182. android_frameworks_av: media/libstagefright/MPEG4Writer.cpp | 7 +-
  183. android_frameworks_av: media/libstagefright/MediaCodec.cpp | 143 +++-
  184. android_frameworks_av: media/libstagefright/MediaMuxer.cpp | 14 +-
  185. android_frameworks_av: media/libstagefright/TEST_MAPPING | 3 +
  186. android_frameworks_av: .../include/media/stagefright/BatteryChecker.h | 47 ++
  187. android_frameworks_av: .../include/media/stagefright/MediaCodec.h | 16 +-
  188. android_frameworks_av: .../include/media/stagefright/MediaWriter.h | 4 +
  189. android_frameworks_av: media/libstagefright/tests/Android.bp | 18 +
  190. android_frameworks_av: media/libstagefright/tests/BatteryChecker_test.cpp | 242 +++++++
  191. android_frameworks_av: .../libstagefright/timedtext/TextDescriptions2.cpp | 2 +-
  192. android_frameworks_av: media/libstagefright/xmlparser/api/current.txt | 5 +
  193. android_frameworks_av: media/libstagefright/xmlparser/media_codecs.xsd | 7 +
  194. android_frameworks_av: media/ndk/NdkImage.cpp | 24 +-
  195. android_frameworks_av: media/ndk/NdkImagePriv.h | 2 +-
  196. android_frameworks_av: media/ndk/NdkImageReader.cpp | 16 +-
  197. android_frameworks_av: media/ndk/NdkImageReaderPriv.h | 6 +-
  198. android_frameworks_av: media/ndk/NdkMediaDrm.cpp | 2 +-
  199. android_frameworks_av: media/utils/Android.bp | 1 +
  200. android_frameworks_av: media/utils/ServiceUtilities.cpp | 5 +-
  201. android_frameworks_av: media/utils/include/mediautils/ServiceUtilities.h | 6 +
  202. android_frameworks_av: services/audioflinger/AudioFlinger.cpp | 3 +-
  203. android_frameworks_av: services/audioflinger/Effects.cpp | 4 +-
  204. android_frameworks_av: services/audioflinger/RecordTracks.h | 41 +-
  205. android_frameworks_av: services/audioflinger/Threads.cpp | 87 ++-
  206. android_frameworks_av: services/audioflinger/Threads.h | 4 +-
  207. android_frameworks_av: services/audioflinger/TrackBase.h | 2 +
  208. android_frameworks_av: services/audioflinger/Tracks.cpp | 115 ++-
  209. android_frameworks_av: .../common/managerdefinitions/src/HwModule.cpp | 3 +-
  210. android_frameworks_av: .../managerdefault/AudioPolicyManager.cpp | 9 +-
  211. android_frameworks_av: .../audiopolicy/service/AudioPolicyService.cpp | 132 +++-
  212. android_frameworks_av: services/camera/libcameraservice/CameraService.cpp | 34 +-
  213. android_frameworks_av: .../common/CameraProviderManager.cpp | 63 +-
  214. android_frameworks_av: .../common/CameraProviderManager.h | 10 +-
  215. android_frameworks_av: .../common/DepthPhotoProcessor.cpp | 2 +-
  216. android_frameworks_av: .../libcameraservice/device3/Camera3Device.cpp | 24 +-
  217. android_frameworks_av: .../libcameraservice/device3/Camera3Device.h | 1 +
  218. android_frameworks_av: .../tests/CameraProviderManagerTest.cpp | 34 +-
  219. android_frameworks_av: services/mediacodec/main_codecservice.cpp | 4 +-
  220. android_frameworks_av: services/mediacodec/registrant/Android.bp | 3 +-
  221. android_frameworks_av: .../ResourceManagerService.cpp | 212 ++++--
  222. android_frameworks_av: .../mediaresourcemanager/ResourceManagerService.h | 30 +-
  223. android_frameworks_av: services/mediaresourcemanager/TEST_MAPPING | 10 +
  224. android_frameworks_av: services/mediaresourcemanager/test/Android.bp | 2 +
  225. android_frameworks_av: .../test/ResourceManagerService_test.cpp | 279 +++++++-
  226. android_frameworks_av: 94 files changed, 3030 insertions(+), 560 deletions(-)
  227. android_frameworks_av: create mode 100644 media/codec2/components/gav1/Android.bp
  228. android_frameworks_av: create mode 100644 media/codec2/components/gav1/C2SoftGav1Dec.cpp
  229. android_frameworks_av: create mode 100644 media/codec2/components/gav1/C2SoftGav1Dec.h
  230. android_frameworks_av: create mode 100644 media/libstagefright/include/media/stagefright/BatteryChecker.h
  231. android_frameworks_av: create mode 100644 media/libstagefright/tests/BatteryChecker_test.cpp
  232. android_frameworks_av: create mode 100644 services/mediaresourcemanager/TEST_MAPPING
  233. android_frameworks_opt_telephony:From https://source.codeaurora.org/quic/la/platform/frameworks/opt/telephony
  234. android_frameworks_opt_telephony: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  235. android_frameworks_opt_telephony:Merge made by the 'recursive' strategy.
  236. android_frameworks_opt_telephony: .../internal/telephony/CellBroadcastHandler.java | 4 +-
  237. android_frameworks_opt_telephony: .../telephony/CellularNetworkValidator.java | 37 +++-
  238. android_frameworks_opt_telephony: .../internal/telephony/DefaultPhoneNotifier.java | 3 +-
  239. android_frameworks_opt_telephony: .../android/internal/telephony/GsmCdmaPhone.java | 24 ++-
  240. android_frameworks_opt_telephony: .../internal/telephony/InboundSmsHandler.java | 42 ++--
  241. android_frameworks_opt_telephony: .../internal/telephony/InboundSmsTracker.java | 15 +-
  242. android_frameworks_opt_telephony: .../android/internal/telephony/LocaleTracker.java | 30 ++-
  243. android_frameworks_opt_telephony: .../telephony/MultiSimSettingController.java | 156 ++++++++++++--
  244. android_frameworks_opt_telephony: src/java/com/android/internal/telephony/Phone.java | 23 ++
  245. android_frameworks_opt_telephony: .../telephony/PhoneConfigurationManager.java | 4 +-
  246. android_frameworks_opt_telephony: .../android/internal/telephony/PhoneSwitcher.java | 165 ++++++++-------
  247. android_frameworks_opt_telephony: src/java/com/android/internal/telephony/RIL.java | 63 +++++-
  248. android_frameworks_opt_telephony: .../internal/telephony/RadioIndication.java | 4 +-
  249. android_frameworks_opt_telephony: .../internal/telephony/ServiceStateTracker.java | 100 +++++++--
  250. android_frameworks_opt_telephony: .../telephony/SmsBroadcastUndelivered.java | 21 +-
  251. android_frameworks_opt_telephony: .../android/internal/telephony/SmsController.java | 2 +-
  252. android_frameworks_opt_telephony: .../internal/telephony/SubscriptionController.java | 124 +++++++----
  253. android_frameworks_opt_telephony: .../telephony/SubscriptionInfoUpdater.java | 101 +++++----
  254. android_frameworks_opt_telephony: .../telephony/TelephonyComponentFactory.java | 8 +-
  255. android_frameworks_opt_telephony: .../android/internal/telephony/WapPushOverSms.java | 18 +-
  256. android_frameworks_opt_telephony: .../telephony/cdma/CdmaInboundSmsHandler.java | 3 +-
  257. android_frameworks_opt_telephony: .../telephony/cdnr/CarrierDisplayNameResolver.java | 10 +-
  258. android_frameworks_opt_telephony: .../telephony/dataconnection/ApnSettingUtils.java | 4 +-
  259. android_frameworks_opt_telephony: .../telephony/dataconnection/DataConnection.java | 37 ++--
  260. android_frameworks_opt_telephony: .../dataconnection/DataEnabledOverride.java | 51 ++++-
  261. android_frameworks_opt_telephony: .../dataconnection/DataEnabledSettings.java | 29 ++-
  262. android_frameworks_opt_telephony: .../dataconnection/DataServiceManager.java | 57 ++++-
  263. android_frameworks_opt_telephony: .../telephony/dataconnection/DcTracker.java | 29 +--
  264. android_frameworks_opt_telephony: .../emergency/EmergencyNumberTracker.java | 52 ++++-
  265. android_frameworks_opt_telephony: .../internal/telephony/euicc/EuiccController.java | 3 +-
  266. android_frameworks_opt_telephony: .../telephony/imsphone/ImsPhoneCallTracker.java | 11 +
  267. android_frameworks_opt_telephony: .../telephony/imsphone/ImsPhoneMmiCode.java | 2 +
  268. android_frameworks_opt_telephony: .../internal/telephony/uicc/IccRecords.java | 18 ++
  269. android_frameworks_opt_telephony: .../telephony/uicc/UiccCarrierPrivilegeRules.java | 4 +-
  270. android_frameworks_opt_telephony: .../internal/telephony/uicc/UiccProfile.java | 16 +-
  271. android_frameworks_opt_telephony: .../android/internal/telephony/uicc/UiccSlot.java | 7 +
  272. android_frameworks_opt_telephony: .../internal/telephony/uicc/euicc/EuiccCard.java | 51 ++++-
  273. android_frameworks_opt_telephony: .../util/NotificationChannelController.java | 8 +
  274. android_frameworks_opt_telephony: .../telephony/CellularNetworkValidatorTest.java | 232 +++++++++++++++++++++
  275. android_frameworks_opt_telephony: .../internal/telephony/FakeTelephonyProvider.java | 5 +-
  276. android_frameworks_opt_telephony: .../internal/telephony/GsmCdmaPhoneTest.java | 24 ++-
  277. android_frameworks_opt_telephony: .../internal/telephony/InboundSmsTrackerTest.java | 10 +-
  278. android_frameworks_opt_telephony: .../internal/telephony/LocaleTrackerTest.java | 80 ++++++-
  279. android_frameworks_opt_telephony: .../telephony/MultiSimSettingControllerTest.java | 82 +++++++-
  280. android_frameworks_opt_telephony: .../telephony/PhoneSubInfoControllerTest.java | 3 +
  281. android_frameworks_opt_telephony: .../internal/telephony/PhoneSwitcherTest.java | 126 ++++++++++-
  282. android_frameworks_opt_telephony: .../com/android/internal/telephony/RILTest.java | 45 +++-
  283. android_frameworks_opt_telephony: .../telephony/ServiceStateTrackerTest.java | 28 ++-
  284. android_frameworks_opt_telephony: .../telephony/SubscriptionControllerTest.java | 3 +
  285. android_frameworks_opt_telephony: .../telephony/SubscriptionInfoUpdaterTest.java | 48 +++++
  286. android_frameworks_opt_telephony: .../telephony/TelephonyPermissionsTest.java | 20 +-
  287. android_frameworks_opt_telephony: .../android/internal/telephony/TelephonyTest.java | 4 +
  288. android_frameworks_opt_telephony: .../internal/telephony/WapPushOverSmsTest.java | 10 +-
  289. android_frameworks_opt_telephony: .../telephony/cdma/CdmaInboundSmsHandlerTest.java | 13 +-
  290. android_frameworks_opt_telephony: .../dataconnection/DataEnabledOverrideTest.java | 5 +-
  291. android_frameworks_opt_telephony: .../dataconnection/DataEnabledSettingsTest.java | 2 +-
  292. android_frameworks_opt_telephony: .../emergency/EmergencyNumberTrackerTest.java | 108 +++++++++-
  293. android_frameworks_opt_telephony: .../telephony/euicc/EuiccControllerTest.java | 6 +-
  294. android_frameworks_opt_telephony: .../telephony/gsm/GsmInboundSmsHandlerTest.java | 159 ++++++++++----
  295. android_frameworks_opt_telephony: .../imsphone/ImsPhoneCallTrackerTest.java | 42 ++++
  296. android_frameworks_opt_telephony: .../telephony/mocks/TelephonyRegistryMock.java | 7 +-
  297. android_frameworks_opt_telephony: .../internal/telephony/uicc/UiccProfileTest.java | 16 ++
  298. android_frameworks_opt_telephony: .../telephony/uicc/euicc/EuiccCardTest.java | 69 ++++++
  299. android_frameworks_opt_telephony: 63 files changed, 2084 insertions(+), 399 deletions(-)
  300. android_frameworks_opt_telephony: create mode 100644 tests/telephonytests/src/com/android/internal/telephony/CellularNetworkValidatorTest.java
  301. android_hardware_interfaces:From https://source.codeaurora.org/quic/la/platform/hardware/interfaces
  302. android_hardware_interfaces: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  303. android_hardware_interfaces:Merge made by the 'recursive' strategy.
  304. android_hardware_interfaces: .../default/common/include/vhal_v2_0/VmsUtils.h | 14 +-
  305. android_hardware_interfaces: .../vehicle/2.0/default/common/src/VmsUtils.cpp | 51 +--
  306. android_hardware_interfaces: .../vehicle/2.0/default/tests/VmsUtils_test.cpp | 107 +++--
  307. android_hardware_interfaces: drm/1.1/vts/functional/drm_hal_clearkey_test.cpp | 8 +-
  308. android_hardware_interfaces: gnss/1.1/vts/functional/gnss_hal_test.cpp | 28 ++
  309. android_hardware_interfaces: gnss/1.1/vts/functional/gnss_hal_test.h | 6 +
  310. android_hardware_interfaces: gnss/1.1/vts/functional/gnss_hal_test_cases.cpp | 30 +-
  311. android_hardware_interfaces: .../vts/functional/VtsHalGnssV2_0TargetTest.cpp | 1 -
  312. android_hardware_interfaces: gnss/2.0/vts/functional/gnss_hal_test.cpp | 4 +-
  313. android_hardware_interfaces: gnss/2.0/vts/functional/gnss_hal_test.h | 24 +-
  314. android_hardware_interfaces: gnss/2.0/vts/functional/gnss_hal_test_cases.cpp | 430 ++++++++++++++++++++-
  315. android_hardware_interfaces: media/omx/1.0/vts/functional/README.md | 10 +-
  316. android_hardware_interfaces: .../vts/functional/common/media_hidl_test_common.h | 2 +-
  317. android_hardware_interfaces: radio/1.2/vts/functional/radio_hidl_hal_test.cpp | 21 +-
  318. android_hardware_interfaces: radio/1.4/vts/functional/radio_hidl_hal_api.cpp | 67 ++--
  319. android_hardware_interfaces: radio/1.4/vts/functional/radio_hidl_hal_test.cpp | 6 +
  320. android_hardware_interfaces: radio/1.4/vts/functional/radio_response.cpp | 2 +-
  321. android_hardware_interfaces: sensors/1.0/vts/functional/Android.bp | 4 +
  322. android_hardware_interfaces: .../vts/functional/VtsHalSensorsV1_0TargetTest.cpp | 2 -
  323. android_hardware_interfaces: sensors/2.0/vts/functional/Android.bp | 4 +
  324. android_hardware_interfaces: .../vts/functional/SensorsHidlEnvironmentV2_0.cpp | 8 +
  325. android_hardware_interfaces: .../vts/functional/SensorsHidlEnvironmentV2_0.h | 12 +
  326. android_hardware_interfaces: .../vts/functional/VtsHalSensorsV2_0TargetTest.cpp | 202 +++++++---
  327. android_hardware_interfaces: sensors/common/vts/utils/Android.bp | 4 +
  328. android_hardware_interfaces: sensors/common/vts/utils/GrallocWrapper.cpp | 365 +++++++++--------
  329. android_hardware_interfaces: .../vts/utils/SensorsHidlEnvironmentBase.cpp | 4 +-
  330. android_hardware_interfaces: .../common/vts/utils/SensorsTestSharedMemory.cpp | 31 +-
  331. android_hardware_interfaces: .../include/sensors-vts-utils/GrallocWrapper.h | 65 ++--
  332. android_hardware_interfaces: wifi/1.3/default/wifi_status_util.cpp | 4 +
  333. android_hardware_interfaces: .../1.0/vts/functional/hostapd_hidl_test.cpp | 9 +-
  334. android_hardware_interfaces: .../1.1/vts/functional/hostapd_hidl_test.cpp | 18 +-
  335. android_hardware_interfaces: 31 files changed, 1127 insertions(+), 416 deletions(-)
  336. android_hardware_libhardware:From https://source.codeaurora.org/quic/la/platform/hardware/libhardware
  337. android_hardware_libhardware: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  338. android_hardware_libhardware:Merge made by the 'recursive' strategy.
  339. android_hardware_libhardware: modules/sensors/Android.mk | 2 --
  340. android_hardware_libhardware: 1 file changed, 2 deletions(-)
  341. android_hardware_nxp_nfc:From https://source.codeaurora.org/quic/la/platform/hardware/nxp/nfc
  342. android_hardware_nxp_nfc: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  343. android_hardware_nxp_nfc:Already up to date.
  344. android_hardware_qcom_bootctrl:From https://source.codeaurora.org/quic/la/platform/hardware/qcom/bootctrl
  345. android_hardware_qcom_bootctrl: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  346. android_hardware_qcom_bootctrl:Already up to date.
  347. android_libcore:From https://source.codeaurora.org/quic/la/platform/libcore
  348. android_libcore: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  349. android_libcore:Merge made by the 'recursive' strategy.
  350. android_libcore: expectations/knownfailures.txt | 7 +++++++
  351. android_libcore: support/src/test/java/libcore/java/security/CpuFeatures.java | 2 +-
  352. android_libcore: 2 files changed, 8 insertions(+), 1 deletion(-)
  353. android_packages_apps_Messaging:From https://source.codeaurora.org/quic/la/platform/packages/apps/Messaging
  354. android_packages_apps_Messaging: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  355. android_packages_apps_Messaging:Already up to date.
  356. android_packages_apps_Nfc:From https://source.codeaurora.org/quic/la/platform/packages/apps/Nfc
  357. android_packages_apps_Nfc: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  358. android_packages_apps_Nfc:Merge made by the 'recursive' strategy.
  359. android_packages_apps_Nfc: nci/jni/NativeNfcManager.cpp | 31 +++++++++++++------------------
  360. android_packages_apps_Nfc: nci/jni/NativeNfcTag.cpp | 21 ++++++++++++++++++++-
  361. android_packages_apps_Nfc: res/values-de/strings.xml | 2 +-
  362. android_packages_apps_Nfc: res/values-pt/strings.xml | 2 +-
  363. android_packages_apps_Nfc: src/com/android/nfc/NfcService.java | 17 +++++++++++++----
  364. android_packages_apps_Nfc: 5 files changed, 48 insertions(+), 25 deletions(-)
  365. android_packages_apps_PackageInstaller:From https://source.codeaurora.org/quic/la/platform/packages/apps/PackageInstaller
  366. android_packages_apps_PackageInstaller: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  367. android_packages_apps_PackageInstaller:Merge made by the 'recursive' strategy.
  368. android_packages_apps_PackageInstaller: res/layout/request_role_view.xml | 8 +-
  369. android_packages_apps_PackageInstaller: res/values-b+sr+Latn/strings.xml | 2 +-
  370. android_packages_apps_PackageInstaller: res/values-be/strings.xml | 2 +-
  371. android_packages_apps_PackageInstaller: res/values-ca/strings.xml | 8 +-
  372. android_packages_apps_PackageInstaller: res/values-de/strings.xml | 2 +-
  373. android_packages_apps_PackageInstaller: res/values-es-rUS/strings.xml | 2 +-
  374. android_packages_apps_PackageInstaller: res/values-eu/strings.xml | 2 +-
  375. android_packages_apps_PackageInstaller: res/values-fr/strings.xml | 2 +-
  376. android_packages_apps_PackageInstaller: res/values-hi/strings.xml | 128 ++++++++++-----------
  377. android_packages_apps_PackageInstaller: res/values-in/strings.xml | 4 +-
  378. android_packages_apps_PackageInstaller: res/values-ja/strings.xml | 6 +-
  379. android_packages_apps_PackageInstaller: res/values-kn/strings.xml | 2 +-
  380. android_packages_apps_PackageInstaller: res/values-mr/strings.xml | 4 +-
  381. android_packages_apps_PackageInstaller: res/values-my/strings.xml | 4 +-
  382. android_packages_apps_PackageInstaller: res/values-nl/strings.xml | 2 +-
  383. android_packages_apps_PackageInstaller: res/values-pt-rBR/strings.xml | 2 +-
  384. android_packages_apps_PackageInstaller: res/values-pt/strings.xml | 2 +-
  385. android_packages_apps_PackageInstaller: res/values-sl/strings.xml | 2 +-
  386. android_packages_apps_PackageInstaller: res/values-sq/strings.xml | 2 +-
  387. android_packages_apps_PackageInstaller: res/values-sr/strings.xml | 2 +-
  388. android_packages_apps_PackageInstaller: res/values-ta-television/strings.xml | 6 +-
  389. android_packages_apps_PackageInstaller: res/values-ta/strings.xml | 6 +-
  390. android_packages_apps_PackageInstaller: res/values-te/strings.xml | 8 +-
  391. android_packages_apps_PackageInstaller: res/values-vi/strings.xml | 2 +-
  392. android_packages_apps_PackageInstaller: res/values-zh-rCN/strings.xml | 6 +-
  393. android_packages_apps_PackageInstaller: res/values/overlayable.xml | 1 +
  394. android_packages_apps_PackageInstaller: res/values/styles.xml | 19 ++-
  395. android_packages_apps_PackageInstaller: res/values/themes.xml | 3 +
  396. android_packages_apps_PackageInstaller: src/com/android/packageinstaller/Constants.java | 7 ++
  397. android_packages_apps_PackageInstaller: .../permission/service/LocationAccessCheck.java | 62 +++++++++-
  398. android_packages_apps_PackageInstaller: .../service/PermissionControllerServiceImpl.java | 18 ++-
  399. android_packages_apps_PackageInstaller: .../RuntimePermissionsUpgradeController.java | 64 +++++++++--
  400. android_packages_apps_PackageInstaller: .../ui/handheld/AppPermissionFragment.java | 2 +-
  401. android_packages_apps_PackageInstaller: .../ui/handheld/ReviewPermissionsFragment.java | 6 +-
  402. android_packages_apps_PackageInstaller: .../role/model/BrowserRoleBehavior.java | 4 +-
  403. android_packages_apps_PackageInstaller: .../role/model/HomeRoleBehavior.java | 11 +-
  404. android_packages_apps_PackageInstaller: .../android/packageinstaller/role/model/Role.java | 17 +++
  405. android_packages_apps_PackageInstaller: .../packageinstaller/role/model/RoleBehavior.java | 9 ++
  406. android_packages_apps_PackageInstaller: .../role/service/RoleControllerServiceImpl.java | 6 +-
  407. android_packages_apps_PackageInstaller: .../role/ui/RequestRoleFragment.java | 52 +++++----
  408. android_packages_apps_PackageInstaller: .../packageinstaller/role/ui/RoleLiveData.java | 3 +
  409. android_packages_apps_PackageInstaller: 41 files changed, 330 insertions(+), 170 deletions(-)
  410. android_packages_apps_SettingsIntelligence:From https://source.codeaurora.org/quic/la/platform/packages/apps/SettingsIntelligence
  411. android_packages_apps_SettingsIntelligence: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  412. android_packages_apps_SettingsIntelligence:Already up to date.
  413. android_packages_apps_ThemePicker:From https://source.codeaurora.org/quic/la/platform/packages/apps/ThemePicker
  414. android_packages_apps_ThemePicker: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  415. android_packages_apps_ThemePicker:Merge made by the 'recursive' strategy.
  416. android_packages_apps_ThemePicker: res/drawable/ic_colorize_24px.xml | 4 +-
  417. android_packages_apps_ThemePicker: res/drawable/ic_font.xml | 4 +-
  418. android_packages_apps_ThemePicker: res/drawable/ic_nav_wallpaper.xml | 4 +-
  419. android_packages_apps_ThemePicker: res/drawable/ic_shapes_24px.xml | 4 +-
  420. android_packages_apps_ThemePicker: res/drawable/ic_wifi_24px.xml | 4 +-
  421. android_packages_apps_ThemePicker: res/layout/theme_color_option.xml | 4 +-
  422. android_packages_apps_ThemePicker: res/values-es-rUS/strings.xml | 2 +-
  423. android_packages_apps_ThemePicker: res/values-in/strings.xml | 2 +-
  424. android_packages_apps_ThemePicker: res/values-land/dimens.xml | 1 +
  425. android_packages_apps_ThemePicker: res/values/dimens.xml | 2 +
  426. android_packages_apps_ThemePicker: .../customization/model/ResourcesApkProvider.java | 4 +-
  427. android_packages_apps_ThemePicker: .../model/theme/DefaultThemeProvider.java | 13 +-
  428. android_packages_apps_ThemePicker: .../customization/model/theme/ThemeBundle.java | 2 +-
  429. android_packages_apps_ThemePicker: .../model/theme/custom/ThemeComponentOption.java | 8 +-
  430. android_packages_apps_ThemePicker: .../module/StatsLogUserEventLogger.java | 30 +++--
  431. android_packages_apps_ThemePicker: .../customization/module/WallpaperStatsLog.java | 147 +++++++++++++++++++++
  432. android_packages_apps_ThemePicker: .../customization/picker/theme/ThemeFragment.java | 6 +-
  433. android_packages_apps_ThemePicker: .../picker/theme/ThemePreviewPage.java | 13 +-
  434. android_packages_apps_ThemePicker: .../wallpaper/asset/ThemeBundleThumbAsset.java | 108 +++++++++++++++
  435. android_packages_apps_ThemePicker: 19 files changed, 322 insertions(+), 40 deletions(-)
  436. android_packages_apps_ThemePicker: create mode 100644 src/com/android/customization/module/WallpaperStatsLog.java
  437. android_packages_apps_ThemePicker: create mode 100644 src/com/google/android/apps/wallpaper/asset/ThemeBundleThumbAsset.java
  438. android_packages_providers_MediaProvider:From https://source.codeaurora.org/quic/la/platform/packages/providers/MediaProvider
  439. android_packages_providers_MediaProvider: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  440. android_packages_providers_MediaProvider:Merge made by the 'recursive' strategy.
  441. android_packages_providers_MediaProvider: res/values-fr/strings.xml | 2 +-
  442. android_packages_providers_MediaProvider: .../providers/media/LocalCallingIdentity.java | 6 ++++--
  443. android_packages_providers_MediaProvider: .../providers/media/MediaDocumentsProvider.java | 6 +++---
  444. android_packages_providers_MediaProvider: .../providers/media/RingtonePickerActivity.java | 20 +++++++++++++++-----
  445. android_packages_providers_MediaProvider: 4 files changed, 23 insertions(+), 11 deletions(-)
  446. android_packages_services_Telephony:From https://source.codeaurora.org/quic/la/platform/packages/services/Telephony
  447. android_packages_services_Telephony: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  448. android_packages_services_Telephony:Removing res/values-sw360dp/dimens.xml
  449. android_packages_services_Telephony:Removing res/values-sw345dp/dimens.xml
  450. android_packages_services_Telephony:Merge made by the 'recursive' strategy.
  451. android_packages_services_Telephony: AndroidManifest.xml | 1 +
  452. android_packages_services_Telephony: assets/eri_311480_BA01450000000000.xml | 90 ++++++++++
  453. android_packages_services_Telephony: ecc/input/eccdata.txt | 5 +-
  454. android_packages_services_Telephony: ecc/output/eccdata | Bin 1674 -> 1667 bytes
  455. android_packages_services_Telephony: res/drawable/btn_emergency_information.xml | 6 +-
  456. android_packages_services_Telephony: res/drawable/btn_emergency_shortcuts.xml | 2 +-
  457. android_packages_services_Telephony: res/drawable/ic_sim_card.xml | 25 +++
  458. android_packages_services_Telephony: res/drawable/phone_type_icon_background.xml | 4 +-
  459. android_packages_services_Telephony: res/layout/emergency_dialer.xml | 4 +-
  460. android_packages_services_Telephony: res/layout/emergency_information.xml | 16 +-
  461. android_packages_services_Telephony: res/layout/emergency_shortcut_button.xml | 22 ++-
  462. android_packages_services_Telephony: res/layout/emergency_shortcut_buttons_group.xml | 15 +-
  463. android_packages_services_Telephony: res/values-af/strings.xml | 9 +-
  464. android_packages_services_Telephony: res/values-am/strings.xml | 7 +
  465. android_packages_services_Telephony: res/values-ar/strings.xml | 43 +++--
  466. android_packages_services_Telephony: res/values-as/strings.xml | 7 +
  467. android_packages_services_Telephony: res/values-az/strings.xml | 7 +
  468. android_packages_services_Telephony: res/values-b+sr+Latn/strings.xml | 11 +-
  469. android_packages_services_Telephony: res/values-be/strings.xml | 19 ++-
  470. android_packages_services_Telephony: res/values-bg/strings.xml | 13 +-
  471. android_packages_services_Telephony: res/values-bn/strings.xml | 25 ++-
  472. android_packages_services_Telephony: res/values-bs/strings.xml | 17 +-
  473. android_packages_services_Telephony: res/values-ca/strings.xml | 11 +-
  474. android_packages_services_Telephony: res/values-cs/strings.xml | 7 +
  475. android_packages_services_Telephony: res/values-da/strings.xml | 7 +
  476. android_packages_services_Telephony: res/values-de/strings.xml | 23 ++-
  477. android_packages_services_Telephony: res/values-el/strings.xml | 9 +-
  478. android_packages_services_Telephony: res/values-en-rAU/strings.xml | 7 +
  479. android_packages_services_Telephony: res/values-en-rCA/strings.xml | 7 +
  480. android_packages_services_Telephony: res/values-en-rGB/strings.xml | 7 +
  481. android_packages_services_Telephony: res/values-en-rIN/strings.xml | 7 +
  482. android_packages_services_Telephony: res/values-en-rXC/strings.xml | 7 +
  483. android_packages_services_Telephony: res/values-es-rUS/strings.xml | 15 +-
  484. android_packages_services_Telephony: res/values-es/strings.xml | 11 +-
  485. android_packages_services_Telephony: res/values-et/strings.xml | 11 +-
  486. android_packages_services_Telephony: res/values-eu/strings.xml | 19 ++-
  487. android_packages_services_Telephony: res/values-fa/strings.xml | 9 +-
  488. android_packages_services_Telephony: res/values-fi/strings.xml | 7 +
  489. android_packages_services_Telephony: res/values-fr-rCA/strings.xml | 9 +-
  490. android_packages_services_Telephony: res/values-fr/strings.xml | 9 +-
  491. android_packages_services_Telephony: res/values-gl/strings.xml | 13 +-
  492. android_packages_services_Telephony: res/values-gu/strings.xml | 9 +-
  493. android_packages_services_Telephony: res/values-h535dp/dimens.xml | 63 +++++++
  494. android_packages_services_Telephony: res/values-h590dp/dimens.xml | 63 +++++++
  495. android_packages_services_Telephony: res/values-h720dp/dimens.xml | 63 +++++++
  496. android_packages_services_Telephony: res/values-hi/strings.xml | 27 +--
  497. android_packages_services_Telephony: res/values-hr/strings.xml | 9 +-
  498. android_packages_services_Telephony: res/values-hu/strings.xml | 13 +-
  499. android_packages_services_Telephony: res/values-hy/strings.xml | 9 +-
  500. android_packages_services_Telephony: res/values-in/strings.xml | 31 ++--
  501. android_packages_services_Telephony: res/values-is/strings.xml | 7 +
  502. android_packages_services_Telephony: res/values-it/strings.xml | 7 +
  503. android_packages_services_Telephony: res/values-iw/strings.xml | 15 +-
  504. android_packages_services_Telephony: res/values-ja/strings.xml | 7 +
  505. android_packages_services_Telephony: res/values-ka/strings.xml | 7 +
  506. android_packages_services_Telephony: res/values-kk/strings.xml | 13 +-
  507. android_packages_services_Telephony: res/values-km/strings.xml | 9 +-
  508. android_packages_services_Telephony: res/values-kn/strings.xml | 7 +
  509. android_packages_services_Telephony: res/values-ko/strings.xml | 9 +-
  510. android_packages_services_Telephony: res/values-ky/strings.xml | 9 +-
  511. android_packages_services_Telephony: res/values-lo/strings.xml | 11 +-
  512. android_packages_services_Telephony: res/values-lt/strings.xml | 7 +
  513. android_packages_services_Telephony: res/values-lv/strings.xml | 7 +
  514. android_packages_services_Telephony: res/values-mk/strings.xml | 9 +-
  515. android_packages_services_Telephony: res/values-ml/strings.xml | 9 +-
  516. android_packages_services_Telephony: res/values-mn/strings.xml | 7 +
  517. android_packages_services_Telephony: res/values-mr/strings.xml | 17 +-
  518. android_packages_services_Telephony: res/values-ms/strings.xml | 7 +
  519. android_packages_services_Telephony: res/values-my/strings.xml | 17 +-
  520. android_packages_services_Telephony: res/values-nb/strings.xml | 11 +-
  521. android_packages_services_Telephony: res/values-ne/strings.xml | 7 +
  522. android_packages_services_Telephony: res/values-night/colors.xml | 28 ++++
  523. android_packages_services_Telephony: res/values-night/styles.xml | 40 +++++
  524. android_packages_services_Telephony: res/values-nl/strings.xml | 13 +-
  525. android_packages_services_Telephony: res/values-or/strings.xml | 7 +
  526. android_packages_services_Telephony: res/values-pa/strings.xml | 9 +-
  527. android_packages_services_Telephony: res/values-pl/strings.xml | 9 +-
  528. android_packages_services_Telephony: res/values-pt-rPT/strings.xml | 23 ++-
  529. android_packages_services_Telephony: res/values-pt/strings.xml | 13 +-
  530. android_packages_services_Telephony: res/values-ro/strings.xml | 21 ++-
  531. android_packages_services_Telephony: res/values-ru/strings.xml | 11 +-
  532. android_packages_services_Telephony: res/values-si/strings.xml | 7 +
  533. android_packages_services_Telephony: res/values-sk/strings.xml | 9 +-
  534. android_packages_services_Telephony: res/values-sl/strings.xml | 7 +
  535. android_packages_services_Telephony: res/values-sq/strings.xml | 7 +
  536. android_packages_services_Telephony: res/values-sr/strings.xml | 11 +-
  537. android_packages_services_Telephony: res/values-sv/strings.xml | 9 +-
  538. android_packages_services_Telephony: res/values-sw/strings.xml | 9 +-
  539. android_packages_services_Telephony: res/values-sw345dp/dimens.xml | 24 ---
  540. android_packages_services_Telephony: res/values-sw360dp/dimens.xml | 24 ---
  541. android_packages_services_Telephony: res/values-ta/strings.xml | 9 +-
  542. android_packages_services_Telephony: res/values-te/strings.xml | 19 ++-
  543. android_packages_services_Telephony: res/values-th/strings.xml | 7 +
  544. android_packages_services_Telephony: res/values-tl/strings.xml | 9 +-
  545. android_packages_services_Telephony: res/values-tr/strings.xml | 7 +
  546. android_packages_services_Telephony: res/values-uk/strings.xml | 9 +-
  547. android_packages_services_Telephony: res/values-ur/strings.xml | 9 +-
  548. android_packages_services_Telephony: res/values-uz/strings.xml | 7 +
  549. android_packages_services_Telephony: res/values-vi/strings.xml | 13 +-
  550. android_packages_services_Telephony: res/values-zh-rCN/strings.xml | 7 +
  551. android_packages_services_Telephony: res/values-zh-rHK/strings.xml | 7 +
  552. android_packages_services_Telephony: res/values-zh-rTW/strings.xml | 7 +
  553. android_packages_services_Telephony: res/values-zu/strings.xml | 9 +
  554. android_packages_services_Telephony: res/values/colors.xml | 12 +-
  555. android_packages_services_Telephony: res/values/dimens.xml | 86 ++++++----
  556. android_packages_services_Telephony: res/values/strings.xml | 20 +++
  557. android_packages_services_Telephony: res/values/styles.xml | 39 +++--
  558. android_packages_services_Telephony: sip/res/values-ar/strings.xml | 2 +-
  559. android_packages_services_Telephony: sip/res/values-b+sr+Latn/strings.xml | 2 +-
  560. android_packages_services_Telephony: sip/res/values-be/strings.xml | 6 +-
  561. android_packages_services_Telephony: sip/res/values-bn/strings.xml | 12 +-
  562. android_packages_services_Telephony: sip/res/values-es/strings.xml | 8 +-
  563. android_packages_services_Telephony: sip/res/values-eu/strings.xml | 6 +-
  564. android_packages_services_Telephony: sip/res/values-fa/strings.xml | 2 +-
  565. android_packages_services_Telephony: sip/res/values-fr/strings.xml | 2 +-
  566. android_packages_services_Telephony: sip/res/values-hi/strings.xml | 4 +-
  567. android_packages_services_Telephony: sip/res/values-hy/strings.xml | 8 +-
  568. android_packages_services_Telephony: sip/res/values-in/strings.xml | 4 +-
  569. android_packages_services_Telephony: sip/res/values-it/strings.xml | 2 +-
  570. android_packages_services_Telephony: sip/res/values-iw/strings.xml | 6 +-
  571. android_packages_services_Telephony: sip/res/values-ka/strings.xml | 2 +-
  572. android_packages_services_Telephony: sip/res/values-km/strings.xml | 6 +-
  573. android_packages_services_Telephony: sip/res/values-kn/strings.xml | 4 +-
  574. android_packages_services_Telephony: sip/res/values-ky/strings.xml | 10 +-
  575. android_packages_services_Telephony: sip/res/values-lo/strings.xml | 2 +-
  576. android_packages_services_Telephony: sip/res/values-ml/strings.xml | 4 +-
  577. android_packages_services_Telephony: sip/res/values-mn/strings.xml | 2 +-
  578. android_packages_services_Telephony: sip/res/values-mr/strings.xml | 8 +-
  579. android_packages_services_Telephony: sip/res/values-my/strings.xml | 2 +-
  580. android_packages_services_Telephony: sip/res/values-nl/strings.xml | 4 +-
  581. android_packages_services_Telephony: sip/res/values-pt/strings.xml | 2 +-
  582. android_packages_services_Telephony: sip/res/values-sr/strings.xml | 2 +-
  583. android_packages_services_Telephony: sip/res/values-sw/strings.xml | 12 +-
  584. android_packages_services_Telephony: sip/res/values-te/strings.xml | 6 +-
  585. android_packages_services_Telephony: sip/res/values-tl/strings.xml | 6 +-
  586. android_packages_services_Telephony: sip/res/values-uk/strings.xml | 6 +-
  587. android_packages_services_Telephony: sip/res/values-uz/strings.xml | 4 +-
  588. android_packages_services_Telephony: sip/res/values-vi/strings.xml | 10 +-
  589. android_packages_services_Telephony: sip/res/values-zh-rCN/strings.xml | 4 +-
  590. android_packages_services_Telephony: src/com/android/phone/CallFeaturesSetting.java | 12 +-
  591. android_packages_services_Telephony: src/com/android/phone/CarrierConfigLoader.java | 21 ++-
  592. android_packages_services_Telephony: src/com/android/phone/EmergencyDialer.java | 5 -
  593. android_packages_services_Telephony: src/com/android/phone/EmergencyInfoGroup.java | 15 --
  594. android_packages_services_Telephony: src/com/android/phone/NotificationMgr.java | 135 +++++++++++++--
  595. android_packages_services_Telephony: src/com/android/phone/PhoneGlobals.java | 132 ++++++++++++---
  596. android_packages_services_Telephony: src/com/android/phone/PhoneInterfaceManager.java | 161 ++++++++++++++++--
  597. android_packages_services_Telephony: src/com/android/phone/ShortcutViewUtils.java | 74 ++++++++-
  598. android_packages_services_Telephony: .../settings/AccessibilitySettingsFragment.java | 30 +++-
  599. android_packages_services_Telephony: .../settings/PhoneAccountSettingsFragment.java | 13 +-
  600. android_packages_services_Telephony: .../phone/settings/TtyModeListPreference.java | 31 ++++
  601. android_packages_services_Telephony: .../android/phone/vvm/RemoteVvmTaskManager.java | 5 +
  602. android_packages_services_Telephony: .../services/telephony/DisconnectCauseUtil.java | 14 ++
  603. android_packages_services_Telephony: .../android/services/telephony/GsmConnection.java | 3 +-
  604. android_packages_services_Telephony: .../android/services/telephony/ImsConference.java | 22 ++-
  605. android_packages_services_Telephony: .../services/telephony/TelephonyConnection.java | 4 +-
  606. android_packages_services_Telephony: .../services/telephony/ImsConferenceTest.java | 183 +++++++++++++++++++++
  607. android_packages_services_Telephony: 156 files changed, 2114 insertions(+), 492 deletions(-)
  608. android_packages_services_Telephony: create mode 100644 assets/eri_311480_BA01450000000000.xml
  609. android_packages_services_Telephony: create mode 100644 res/drawable/ic_sim_card.xml
  610. android_packages_services_Telephony: create mode 100644 res/values-h535dp/dimens.xml
  611. android_packages_services_Telephony: create mode 100644 res/values-h590dp/dimens.xml
  612. android_packages_services_Telephony: create mode 100644 res/values-h720dp/dimens.xml
  613. android_packages_services_Telephony: create mode 100644 res/values-night/colors.xml
  614. android_packages_services_Telephony: delete mode 100644 res/values-sw345dp/dimens.xml
  615. android_packages_services_Telephony: delete mode 100644 res/values-sw360dp/dimens.xml
  616. android_prebuilts_build-tools:From https://source.codeaurora.org/quic/la/platform/prebuilts/build-tools
  617. android_prebuilts_build-tools: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  618. android_prebuilts_build-tools:Already up to date.
  619. android_system_bt:From https://source.codeaurora.org/quic/la/platform/system/bt
  620. android_system_bt: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  621. android_system_bt:Merge made by the 'recursive' strategy.
  622. android_system_bt: binder/android/bluetooth/IBluetoothPan.aidl | 2 +-
  623. android_system_bt: bta/av/bta_av_aact.cc | 10 +++----
  624. android_system_bt: bta/av/bta_av_main.cc | 6 +++--
  625. android_system_bt: bta/hearing_aid/hearing_aid.cc | 7 +++++
  626. android_system_bt: btcore/src/device_class.cc | 4 ++-
  627. android_system_bt: btcore/test/device_class_test.cc | 39 ++++++++++++++++-----------
  628. android_system_bt: btif/include/btif_keystore.h | 8 ------
  629. android_system_bt: btif/src/btif_config.cc | 4 +--
  630. android_system_bt: btif/src/btif_dm.cc | 17 +++---------
  631. android_system_bt: btif/src/btif_keystore.cc | 4 ---
  632. android_system_bt: profile/avrcp/connection_handler.cc | 2 --
  633. android_system_bt: stack/btm/btm_ble_bgconn.cc | 19 ++++++++-----
  634. android_system_bt: stack/btm/btm_ble_connection_establishment.cc | 1 +
  635. android_system_bt: stack/btm/btm_ble_gap.cc | 1 +
  636. android_system_bt: stack/gatt/gatt_main.cc | 3 +++
  637. android_system_bt: stack/l2cap/l2c_link.cc | 8 ++++--
  638. android_system_bt: stack/sdp/sdp_discovery.cc | 23 +++++++++++-----
  639. android_system_bt: 17 files changed, 89 insertions(+), 69 deletions(-)
  640. android_system_core:From https://source.codeaurora.org/quic/la/platform/system/core
  641. android_system_core: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  642. android_system_core:Merge made by the 'recursive' strategy.
  643. android_system_core: adb/client/commandline.cpp | 18 +-
  644. android_system_core: fs_mgr/fs_mgr.cpp | 22 +-
  645. android_system_core: init/reboot_utils.cpp | 20 +-
  646. android_system_core: .../libdmabufinfo/include/dmabufinfo/dmabufinfo.h | 6 +
  647. android_system_core: libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp | 275 +++++++++++++--------
  648. android_system_core: libmeminfo/pageacct.cpp | 8 +-
  649. android_system_core: libmeminfo/procmeminfo.cpp | 88 ++++---
  650. android_system_core: libmeminfo/tools/procrank.cpp | 2 +-
  651. android_system_core: libmeminfo/vts/AndroidTest.xml | 1 +
  652. android_system_core: lmkd/lmkd.c | 60 +++++
  653. android_system_core: rootdir/etc/ld.config.txt | 22 +-
  654. android_system_core: rootdir/etc/ld.config.vndk_lite.txt | 1 +
  655. android_system_core: rootdir/init.rc | 4 +
  656. android_system_core: rootdir/update_and_install_ld_config.mk | 7 +-
  657. android_system_core: usbd/usbd.cpp | 7 +-
  658. android_system_core: 15 files changed, 378 insertions(+), 163 deletions(-)
  659. android_system_sepolicy:From https://source.codeaurora.org/quic/la/platform/system/sepolicy
  660. android_system_sepolicy: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  661. android_system_sepolicy:Merge made by the 'recursive' strategy.
  662. android_system_sepolicy: prebuilts/api/29.0/private/dexoptanalyzer.te | 2 +-
  663. android_system_sepolicy: prebuilts/api/29.0/private/genfs_contexts | 2 ++
  664. android_system_sepolicy: prebuilts/api/29.0/private/system_server.te | 1 +
  665. android_system_sepolicy: prebuilts/api/29.0/public/domain.te | 2 +-
  666. android_system_sepolicy: prebuilts/api/29.0/public/property_contexts | 2 ++
  667. android_system_sepolicy: prebuilts/api/29.0/public/service.te | 2 +-
  668. android_system_sepolicy: prebuilts/api/29.0/public/toolbox.te | 4 ++++
  669. android_system_sepolicy: private/dexoptanalyzer.te | 2 +-
  670. android_system_sepolicy: private/genfs_contexts | 2 ++
  671. android_system_sepolicy: private/system_server.te | 1 +
  672. android_system_sepolicy: public/domain.te | 2 +-
  673. android_system_sepolicy: public/property_contexts | 2 ++
  674. android_system_sepolicy: public/service.te | 2 +-
  675. android_system_sepolicy: public/toolbox.te | 4 ++++
  676. android_system_sepolicy: 14 files changed, 24 insertions(+), 6 deletions(-)
  677. android_system_vold:From https://source.codeaurora.org/quic/la/platform/system/vold
  678. android_system_vold: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  679. android_system_vold:Merge made by the 'recursive' strategy.
  680. android_system_vold: Checkpoint.cpp | 7 +++++++
  681. android_system_vold: FsCrypt.cpp | 19 +++++++++++++------
  682. android_system_vold: FsCrypt.h | 2 +-
  683. android_system_vold: VoldNativeService.cpp | 2 +-
  684. android_system_vold: secdiscard.cpp | 4 ++++
  685. android_system_vold: 5 files changed, 26 insertions(+), 8 deletions(-)
  686. android_vendor_codeaurora_commonsys_telephony:From https://source.codeaurora.org/quic/la/platform/vendor/codeaurora/telephony
  687. android_vendor_codeaurora_commonsys_telephony: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  688. android_vendor_codeaurora_commonsys_telephony:Already up to date!
  689. android_vendor_codeaurora_commonsys_telephony:Merge made by the 'recursive' strategy.
  690. android_vendor_qcom_opensource_commonsys_bluetooth:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/bluetooth
  691. android_vendor_qcom_opensource_commonsys_bluetooth: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  692. android_vendor_qcom_opensource_commonsys_bluetooth:Already up to date.
  693. android_vendor_qcom_opensource_commonsys_bluetooth_ext:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/bluetooth_ext
  694. android_vendor_qcom_opensource_commonsys_bluetooth_ext: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  695. android_vendor_qcom_opensource_commonsys_bluetooth_ext:Merge made by the 'recursive' strategy.
  696. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/Android.bp | 18 +-
  697. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/ar/bta_ar_ext.cc | 126 +
  698. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/ar/bta_ar_int_ext.h | 54 +
  699. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_aact.cc | 4623 +++++++++++++++++++
  700. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_act.cc | 2873 ++++++++++++
  701. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_api.cc | 807 ++++
  702. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_cfg.cc | 238 +
  703. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_ci.cc | 93 +
  704. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_int.h | 975 ++++
  705. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_main.cc | 1793 ++++++++
  706. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/avk/bta_avk_ssm.cc | 710 +++
  707. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/include/bta_avk_api.h | 944 ++++
  708. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/include/bta_avk_ci.h | 63 +
  709. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/bta/include/bta_avk_co.h | 286 ++
  710. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/btif/Android.bp | 7 +
  711. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/btif/co/bta_avk_co.cc | 1934 ++++++++
  712. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/btif/include/btif_avk.h | 567 +++
  713. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/btif/include/btif_avk_co.h | 96 +
  714. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/btif/src/btif_avk.cc | 6433 +++++++++++++++++++++++++++
  715. android_vendor_qcom_opensource_commonsys_bluetooth_ext: system_bt_ext/btif/src/btif_avk_rc.cc | 7153 ++++++++++++++++++++++++++++++
  716. android_vendor_qcom_opensource_commonsys_bluetooth_ext: 20 files changed, 29792 insertions(+), 1 deletion(-)
  717. android_vendor_qcom_opensource_commonsys_bluetooth_ext: mode change 100644 => 100755 system_bt_ext/bta/Android.bp
  718. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/ar/bta_ar_ext.cc
  719. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/ar/bta_ar_int_ext.h
  720. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/avk/bta_avk_aact.cc
  721. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/avk/bta_avk_act.cc
  722. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100644 system_bt_ext/bta/avk/bta_avk_api.cc
  723. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/avk/bta_avk_cfg.cc
  724. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100644 system_bt_ext/bta/avk/bta_avk_ci.cc
  725. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/avk/bta_avk_int.h
  726. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/avk/bta_avk_main.cc
  727. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100644 system_bt_ext/bta/avk/bta_avk_ssm.cc
  728. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/bta/include/bta_avk_api.h
  729. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100644 system_bt_ext/bta/include/bta_avk_ci.h
  730. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100644 system_bt_ext/bta/include/bta_avk_co.h
  731. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/btif/co/bta_avk_co.cc
  732. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/btif/include/btif_avk.h
  733. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100644 system_bt_ext/btif/include/btif_avk_co.h
  734. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/btif/src/btif_avk.cc
  735. android_vendor_qcom_opensource_commonsys_bluetooth_ext: create mode 100755 system_bt_ext/btif/src/btif_avk_rc.cc
  736. android_vendor_qcom_opensource_commonsys_system_bt:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/system/bt
  737. android_vendor_qcom_opensource_commonsys_system_bt: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  738. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging stack/include/avdt_api.h
  739. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging stack/btm/btm_acl.cc
  740. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging stack/avdt/avdt_ccb_act.cc
  741. android_vendor_qcom_opensource_commonsys_system_bt:CONFLICT (content): Merge conflict in stack/avdt/avdt_ccb_act.cc
  742. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging internal_include/bt_target.h
  743. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging btif/src/btif_dm.cc
  744. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging btif/src/btif_av.cc
  745. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging btif/src/btif_a2dp_source.cc
  746. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging btif/src/btif_a2dp.cc
  747. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging bta/av/bta_av_main.cc
  748. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging bta/av/bta_av_int.h
  749. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging bta/av/bta_av_act.cc
  750. android_vendor_qcom_opensource_commonsys_system_bt:Auto-merging bta/av/bta_av_aact.cc
  751. android_vendor_qcom_opensource_commonsys_system_bt:Automatic merge failed; fix conflicts and then commit the result.
  752. android_vendor_qcom-opensource_core-utils:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/core-utils
  753. android_vendor_qcom-opensource_core-utils: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  754. android_vendor_qcom-opensource_core-utils:Merge made by the 'recursive' strategy.
  755. android_vendor_qcom-opensource_core-utils: build/build.sh | 4 ++--
  756. android_vendor_qcom-opensource_core-utils: 1 file changed, 2 insertions(+), 2 deletions(-)
  757. android_vendor_qcom-opensource_dataservices:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/dataservices
  758. android_vendor_qcom-opensource_dataservices: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  759. android_vendor_qcom-opensource_dataservices:Already up to date!
  760. android_vendor_qcom-opensource_dataservices:Merge made by the 'recursive' strategy.
  761. android_vendor_qcom-opensource_interfaces:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/interfaces
  762. android_vendor_qcom-opensource_interfaces: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  763. android_vendor_qcom-opensource_interfaces:Already up to date!
  764. android_vendor_qcom-opensource_interfaces:Merge made by the 'recursive' strategy.
  765. android_vendor_qcom-opensource_power:From https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/power
  766. android_vendor_qcom-opensource_power: * tag LA.UM.8.8.1.r1-01100-QCS605.0 -> FETCH_HEAD
  767. android_vendor_qcom-opensource_power:Removing service.cpp
  768. android_vendor_qcom-opensource_power:CONFLICT (rename/add): Rename power-common.c->power.c in 47678727d5ea9c6b68cce4f8074d6c0282158492. Added power.c in HEAD
  769. android_vendor_qcom-opensource_power:Auto-merging power.c
  770. android_vendor_qcom-opensource_power:Removing android.hardware.power@1.2-service.rc
  771. android_vendor_qcom-opensource_power:Removing Power.h
  772. android_vendor_qcom-opensource_power:Removing Power.cpp
  773. android_vendor_qcom-opensource_power:Auto-merging Android.mk
  774. android_vendor_qcom-opensource_power:CONFLICT (content): Merge conflict in Android.mk
  775. android_vendor_qcom-opensource_power:Automatic merge failed; fix conflicts and then commit the result.
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!