xtrnaw7@fedora01:/data/develop/android/OmniROM_14.0$ time ../get_aosp_patches.sh get_aosp_patches.sh 1.0.0.0- add an Android security patch to the local repos with a custom ROM Updating the repositories in the directory "/data/develop/android/OmniROM_14.0" ... Retrieving the current repo config ... Retrieving the list of available git tags for the security patches ... Creating the temporary repo "/data/develop/android/OmniROM_14.0/manifest" .... Cloning into '/data/develop/android/OmniROM_14.0/manifest'... The current config of the local repository is: The Android version used is "14" The platform security patch is now "2023-12-05" The BUILD_ID is now "UQ1A.231205.015" The Default Revision is now "android-14.0.0_r17" The available tags are: android-14.0.0_r1 android-14.0.0_r2 android-14.0.0_r3 android-14.0.0_r4 android-14.0.0_r5 android-14.0.0_r6 android-14.0.0_r7 android-14.0.0_r8 android-14.0.0_r9 android-14.0.0_r10 android-14.0.0_r11 android-14.0.0_r12 android-14.0.0_r13 android-14.0.0_r14 android-14.0.0_r15 android-14.0.0_r16 android-14.0.0_r17 android-14.0.0_r18 android-14.0.0_r19 android-14.0.0_r20 android-14.0.0_r21 Please enter the tag that should be merged (enter "list" to view the tags available in the repository) : android-14.0.0_r21 Merging the tag "android-14.0.0_r21" into the branch "android-14.0" Updating the repositories in the directory "/data/develop/android/OmniROM_14.0" The used AOSP repositories are: https://android.googlesource.com/platform https://android.googlesource.com The default remote repository is : "omnirom" The used git parameter are: "" Enter to continue with the merge: Processing the repositories listed in the manifest "/data/develop/android/OmniROM_14.0/.repo/manifests/omni-aosp.xml" with the remote repo "omnirom" ... ----------------------------------------------------------------- Processing the repository "build/make" ... Checking if the AOSP repository for "build/make" exists .... Using the AOSP repository "https://android.googlesource.com/platform/build" for the local repository "build/make" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/build" ... From https://android.googlesource.com/platform/build * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Merge made by the 'ort' strategy. core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "build/soong" ... Checking if the AOSP repository for "build/soong" exists .... Using the AOSP repository "https://android.googlesource.com/platform/build/soong" for the local repository "build/soong" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/build/soong" ... From https://android.googlesource.com/platform/build/soong * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "bionic" ... Checking if the AOSP repository for "bionic" exists .... Using the AOSP repository "https://android.googlesource.com/platform/bionic" for the local repository "bionic" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/bionic" ... From https://android.googlesource.com/platform/bionic * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "device/google/gs101" ... Checking if the AOSP repository for "device/google/gs101" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/gs101" for the local repository "device/google/gs101" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/gs101" ... From https://android.googlesource.com/device/google/gs101 * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "device/google/gs101-sepolicy" ... Checking if the AOSP repository for "device/google/gs101-sepolicy" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/gs101-sepolicy" for the local repository "device/google/gs101-sepolicy" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/gs101-sepolicy" ... From https://android.googlesource.com/device/google/gs101-sepolicy * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "device/google/gs201" ... Checking if the AOSP repository for "device/google/gs201" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/gs201" for the local repository "device/google/gs201" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/gs201" ... From https://android.googlesource.com/device/google/gs201 * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging BoardConfig-common.mk Auto-merging conf/fstab.gs201.in CONFLICT (content): Merge conflict in conf/fstab.gs201.in Auto-merging conf/init.gs201.rc Auto-merging device.mk CONFLICT (content): Merge conflict in device.mk Auto-merging device_framework_matrix_product.xml CONFLICT (content): Merge conflict in device_framework_matrix_product.xml Auto-merging manifest-gralloc3.xml Auto-merging manifest.xml CONFLICT (content): Merge conflict in manifest.xml Auto-merging overlay/frameworks/base/core/res/res/values/config.xml CONFLICT (content): Merge conflict in overlay/frameworks/base/core/res/res/values/config.xml Recorded preimage for 'conf/fstab.gs201.in' Recorded preimage for 'device.mk' Recorded preimage for 'device_framework_matrix_product.xml' Recorded preimage for 'manifest.xml' Recorded preimage for 'overlay/frameworks/base/core/res/res/values/config.xml' Automatic merge failed; fix conflicts and then commit the result. The RC is 1 Conflicts found -- new tag not merged ----------------------------------------------------------------- Processing the repository "device/google/gs201-sepolicy" ... Checking if the AOSP repository for "device/google/gs201-sepolicy" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/gs201-sepolicy" for the local repository "device/google/gs201-sepolicy" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/gs201-sepolicy" ... From https://android.googlesource.com/device/google/gs201-sepolicy * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging whitechapel_pro/keys.conf CONFLICT (content): Merge conflict in whitechapel_pro/keys.conf Auto-merging whitechapel_pro/mac_permissions.xml CONFLICT (content): Merge conflict in whitechapel_pro/mac_permissions.xml Auto-merging whitechapel_pro/radio.te CONFLICT (content): Merge conflict in whitechapel_pro/radio.te Recorded preimage for 'whitechapel_pro/keys.conf' Recorded preimage for 'whitechapel_pro/mac_permissions.xml' Recorded preimage for 'whitechapel_pro/radio.te' Automatic merge failed; fix conflicts and then commit the result. The RC is 1 Conflicts found -- new tag not merged ----------------------------------------------------------------- Processing the repository "device/google/gs-common" ... Checking if the AOSP repository for "device/google/gs-common" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/gs-common" for the local repository "device/google/gs-common" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/gs-common" ... From https://android.googlesource.com/device/google/gs-common * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "device/google/pantah" ... Checking if the AOSP repository for "device/google/pantah" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/pantah" for the local repository "device/google/pantah" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/pantah" ... From https://android.googlesource.com/device/google/pantah * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging device-cheetah.mk Auto-merging device-panther.mk Auto-merging location/gps.xml Auto-merging location/gps.xml.c10 Auto-merging location/gps.xml.p10 Auto-merging location/gps_user.xml Auto-merging location/gps_user.xml.c10 Auto-merging location/gps_user.xml.p10 Merge made by the 'ort' strategy. .../aidl_config/audio_platform_configuration.xml | 121 +++++ .../audio_platform_configuration_aidl.xml | 76 --- .../aidl_config/audio_policy_configuration.xml | 201 -------- audio/cheetah/aidl_config/mixer_paths_aidl.xml | 561 +++++++++++++++++++-- audio/cheetah/audio-tables.mk | 3 +- .../config/audio_platform_configuration.xml | 2 +- audio/cheetah/tuning/bluenote/recording.gatf | Bin 184768 -> 184768 bytes .../cheetah/tuning/fortemedia_stereo/BLUETOOTH.dat | Bin 276978 -> 276978 bytes .../tuning/fortemedia_stereo/BLUETOOTH.mods | 278 +++++----- audio/cheetah/tuning/fortemedia_stereo/HANDSET.dat | Bin 255674 -> 255674 bytes .../cheetah/tuning/fortemedia_stereo/HANDSET.mods | 126 ++--- .../cheetah/tuning/fortemedia_stereo/HANDSFREE.dat | Bin 117198 -> 117198 bytes .../tuning/fortemedia_stereo/HANDSFREE.mods | 46 +- audio/cheetah/tuning/fortemedia_stereo/HEADSET.dat | Bin 426106 -> 426106 bytes .../cheetah/tuning/fortemedia_stereo/HEADSET.mods | 162 +++--- .../aidl_config/audio_platform_configuration.xml | 121 +++++ .../audio_platform_configuration_aidl.xml | 76 --- .../aidl_config/audio_policy_configuration.xml | 203 -------- audio/panther/aidl_config/mixer_paths_aidl.xml | 561 +++++++++++++++++++-- audio/panther/audio-tables.mk | 3 +- .../config/audio_platform_configuration.xml | 2 +- audio/panther/tuning/bluenote/recording.gatf | Bin 184768 -> 184768 bytes .../panther/tuning/fortemedia_stereo/BLUETOOTH.dat | Bin 276978 -> 276978 bytes .../tuning/fortemedia_stereo/BLUETOOTH.mods | 278 +++++----- audio/panther/tuning/fortemedia_stereo/HANDSET.dat | Bin 255674 -> 255674 bytes .../panther/tuning/fortemedia_stereo/HANDSET.mods | 126 ++--- .../panther/tuning/fortemedia_stereo/HANDSFREE.dat | Bin 117198 -> 117198 bytes .../tuning/fortemedia_stereo/HANDSFREE.mods | 46 +- audio/panther/tuning/fortemedia_stereo/HEADSET.dat | Bin 426106 -> 426106 bytes .../panther/tuning/fortemedia_stereo/HEADSET.mods | 162 +++--- .../base/packages/SystemUI/res/values/dimens.xml | 6 +- conf/init.pantah.rc | 1 + device-cheetah.mk | 38 +- device-cloudripper.mk | 11 +- device-panther.mk | 37 +- location/gps.xml | 8 +- location/gps.xml.c10 | 8 +- location/gps.xml.p10 | 8 +- location/gps_user.xml | 6 +- location/gps_user.xml.c10 | 6 +- location/gps_user.xml.p10 | 6 +- nfc/libnfc-hal-st-debug.conf | 164 ------ .../res/values-h800dp/dimens.xml | 0 .../base/packages/SystemUI/res/values/dimens.xml | 6 +- powerhint-cheetah.json | 422 ++-------------- powerhint-panther.json | 422 ++-------------- wifi/BoardConfig-wifi.mk | 2 + 47 files changed, 1992 insertions(+), 2313 deletions(-) create mode 100644 audio/cheetah/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml delete mode 100644 audio/cheetah/aidl_config/audio_policy_configuration.xml create mode 100644 audio/panther/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/panther/aidl_config/audio_platform_configuration_aidl.xml delete mode 100644 audio/panther/aidl_config/audio_policy_configuration.xml delete mode 100644 nfc/libnfc-hal-st-debug.conf rename panther/overlay/frameworks/base/packages/SystemUI/{ => customization}/res/values-h800dp/dimens.xml (100%) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "device/google/raviole" ... Checking if the AOSP repository for "device/google/raviole" exists .... Using the AOSP repository "https://android.googlesource.com/device/google/raviole" for the local repository "device/google/raviole" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/device/google/raviole" ... From https://android.googlesource.com/device/google/raviole * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging device-oriole.mk Merge made by the 'ort' strategy. device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "external/drm_hwcomposer" ... Checking if the AOSP repository for "external/drm_hwcomposer" exists .... Using the AOSP repository "https://android.googlesource.com/platform/external/drm_hwcomposer" for the local repository "external/drm_hwcomposer" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/external/drm_hwcomposer" ... From https://android.googlesource.com/platform/external/drm_hwcomposer * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "external/libdrm" ... Checking if the AOSP repository for "external/libdrm" exists .... Using the AOSP repository "https://android.googlesource.com/platform/external/libdrm" for the local repository "external/libdrm" The remote repository for this repo is "aosp" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/external/libdrm" ... From https://android.googlesource.com/platform/external/libdrm * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "external/wpa_supplicant_8" ... Checking if the AOSP repository for "external/wpa_supplicant_8" exists .... Using the AOSP repository "https://android.googlesource.com/platform/external/wpa_supplicant_8" for the local repository "external/wpa_supplicant_8" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/external/wpa_supplicant_8" ... From https://android.googlesource.com/platform/external/wpa_supplicant_8 * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "frameworks/av" ... Checking if the AOSP repository for "frameworks/av" exists .... Using the AOSP repository "https://android.googlesource.com/platform/frameworks/av" for the local repository "frameworks/av" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/frameworks/av" ... From https://android.googlesource.com/platform/frameworks/av * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Merge made by the 'ort' strategy. media/codec2/sfplugin/utils/Codec2BufferUtils.cpp | 4 ++-- media/libstagefright/colorconversion/ColorConverter.cpp | 3 ++- media/libstagefright/rtsp/JitterCalculator.cpp | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "frameworks/base" ... Checking if the AOSP repository for "frameworks/base" exists .... Using the AOSP repository "https://android.googlesource.com/platform/frameworks/base" for the local repository "frameworks/base" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/frameworks/base" ... From https://android.googlesource.com/platform/frameworks/base * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging core/java/android/app/LoadedApk.java Auto-merging core/res/AndroidManifest.xml Merge made by the 'ort' strategy. core/java/android/app/ActivityThread.java | 62 ++++++- core/java/android/app/ApplicationExitInfo.java | 36 ++++ core/java/android/app/IActivityManager.aidl | 10 ++ core/java/android/app/LoadedApk.java | 13 +- core/java/android/os/Binder.java | 26 +++ core/java/android/os/IBinderCallback.java | 34 ++++ .../android/internal/os/BinderfsStatsReader.java | 108 ++++++++++++ core/jni/android_util_Binder.cpp | 10 +- core/res/AndroidManifest.xml | 4 + .../internal/os/BinderfsStatsReaderTest.java | 192 +++++++++++++++++++++ .../wm/shell/splitscreen/StageCoordinator.java | 36 +++- .../wm/shell/transition/DefaultMixedHandler.java | 21 ++- .../navigationbar/gestural/BackPanelController.kt | 56 +++--- .../companion/CompanionDeviceManagerService.java | 8 +- .../server/accounts/AccountManagerService.java | 17 +- .../android/server/am/ActivityManagerService.java | 34 +++- .../com/android/server/am/CachedAppOptimizer.java | 176 ++++++++++++++++++- .../com/android/server/pm/UserManagerService.java | 23 ++- services/java/com/android/server/SystemServer.java | 9 + .../tests/servicestests/res/xml/user_100_v9.xml | 20 +++ .../server/pm/UserManagerServiceUserInfoTest.java | 56 +++++- 21 files changed, 899 insertions(+), 52 deletions(-) create mode 100644 core/java/android/os/IBinderCallback.java create mode 100644 core/java/com/android/internal/os/BinderfsStatsReader.java create mode 100644 core/tests/coretests/src/com/android/internal/os/BinderfsStatsReaderTest.java create mode 100644 services/tests/servicestests/res/xml/user_100_v9.xml The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "frameworks/native" ... Checking if the AOSP repository for "frameworks/native" exists .... Using the AOSP repository "https://android.googlesource.com/platform/frameworks/native" for the local repository "frameworks/native" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/frameworks/native" ... From https://android.googlesource.com/platform/frameworks/native * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Merge made by the 'ort' strategy. services/gpuservice/GpuService.cpp | 1 + 1 file changed, 1 insertion(+) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "frameworks/opt/telephony" ... Checking if the AOSP repository for "frameworks/opt/telephony" exists .... Using the AOSP repository "https://android.googlesource.com/platform/frameworks/opt/telephony" for the local repository "frameworks/opt/telephony" The remote repository for this repo is "aosp" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/frameworks/opt/telephony" ... From https://android.googlesource.com/platform/frameworks/opt/telephony * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "hardware/interfaces" ... Checking if the AOSP repository for "hardware/interfaces" exists .... Using the AOSP repository "https://android.googlesource.com/platform/hardware/interfaces" for the local repository "hardware/interfaces" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/hardware/interfaces" ... From https://android.googlesource.com/platform/hardware/interfaces * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "hardware/libhardware" ... Checking if the AOSP repository for "hardware/libhardware" exists .... Using the AOSP repository "https://android.googlesource.com/platform/hardware/libhardware" for the local repository "hardware/libhardware" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/hardware/libhardware" ... From https://android.googlesource.com/platform/hardware/libhardware * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "hardware/google/pixel-sepolicy" ... Checking if the AOSP repository for "hardware/google/pixel-sepolicy" exists .... Using the AOSP repository "https://android.googlesource.com/platform/hardware/google/pixel-sepolicy" for the local repository "hardware/google/pixel-sepolicy" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/hardware/google/pixel-sepolicy" ... From https://android.googlesource.com/platform/hardware/google/pixel-sepolicy * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Merge made by the 'ort' strategy. The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "packages/apps/Contacts" ... Checking if the AOSP repository for "packages/apps/Contacts" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/apps/Contacts" for the local repository "packages/apps/Contacts" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/apps/Contacts" ... From https://android.googlesource.com/platform/packages/apps/Contacts * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/apps/Dialer" ... Checking if the AOSP repository for "packages/apps/Dialer" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/apps/Dialer" for the local repository "packages/apps/Dialer" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/apps/Dialer" ... From https://android.googlesource.com/platform/packages/apps/Dialer * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/apps/Launcher3" ... Checking if the AOSP repository for "packages/apps/Launcher3" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/apps/Launcher3" for the local repository "packages/apps/Launcher3" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/apps/Launcher3" ... From https://android.googlesource.com/platform/packages/apps/Launcher3 * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging src/com/android/launcher3/config/FeatureFlags.java Merge made by the 'ort' strategy. .../quickstep/interaction/AllSetActivity.java | 20 +++++++++++++++++++- src/com/android/launcher3/config/FeatureFlags.java | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "packages/apps/Messaging" ... Checking if the AOSP repository for "packages/apps/Messaging" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/apps/Messaging" for the local repository "packages/apps/Messaging" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/apps/Messaging" ... From https://android.googlesource.com/platform/packages/apps/Messaging * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/apps/Settings" ... Checking if the AOSP repository for "packages/apps/Settings" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/apps/Settings" for the local repository "packages/apps/Settings" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/apps/Settings" ... From https://android.googlesource.com/platform/packages/apps/Settings * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging src/com/android/settings/DefaultRingtonePreference.java Auto-merging src/com/android/settings/RingtonePreference.java Merge made by the 'ort' strategy. .../settings/DefaultRingtonePreference.java | 11 +-- src/com/android/settings/RingtonePreference.java | 83 ++++++++++++++++++++++ .../NotificationAccessConfirmationActivity.java | 20 ++++++ .../app/NotificationSoundPreference.java | 12 +++- .../settings/DefaultRingtonePreferenceTest.java | 81 +++++++++++++++++++-- 5 files changed, 192 insertions(+), 15 deletions(-) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "packages/apps/SettingsIntelligence" ... Checking if the AOSP repository for "packages/apps/SettingsIntelligence" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/apps/SettingsIntelligence" for the local repository "packages/apps/SettingsIntelligence" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/apps/SettingsIntelligence" ... From https://android.googlesource.com/platform/packages/apps/SettingsIntelligence * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/inputmethods/LatinIME" ... Checking if the AOSP repository for "packages/inputmethods/LatinIME" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/inputmethods/LatinIME" for the local repository "packages/inputmethods/LatinIME" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/inputmethods/LatinIME" ... From https://android.googlesource.com/platform/packages/inputmethods/LatinIME * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/services/Telecomm" ... Checking if the AOSP repository for "packages/services/Telecomm" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/services/Telecomm" for the local repository "packages/services/Telecomm" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/services/Telecomm" ... From https://android.googlesource.com/platform/packages/services/Telecomm * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/services/Telephony" ... Checking if the AOSP repository for "packages/services/Telephony" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/services/Telephony" for the local repository "packages/services/Telephony" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/services/Telephony" ... From https://android.googlesource.com/platform/packages/services/Telephony * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "system/core" ... Checking if the AOSP repository for "system/core" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/core" for the local repository "system/core" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/core" ... From https://android.googlesource.com/platform/system/core * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Auto-merging fastboot/device/utility.cpp CONFLICT (add/add): Merge conflict in fastboot/device/utility.cpp Auto-merging fs_mgr/fs_mgr_fstab.cpp CONFLICT (content): Merge conflict in fs_mgr/fs_mgr_fstab.cpp Auto-merging fs_mgr/include_fstab/fstab/fstab.h CONFLICT (content): Merge conflict in fs_mgr/include_fstab/fstab/fstab.h Auto-merging healthd/Android.bp CONFLICT (content): Merge conflict in healthd/Android.bp Auto-merging healthd/BatteryMonitor.cpp CONFLICT (content): Merge conflict in healthd/BatteryMonitor.cpp Auto-merging healthd/healthd_draw.cpp CONFLICT (content): Merge conflict in healthd/healthd_draw.cpp Auto-merging init/Android.bp CONFLICT (content): Merge conflict in init/Android.bp Auto-merging init/devices.cpp CONFLICT (content): Merge conflict in init/devices.cpp Auto-merging init/first_stage_mount.cpp CONFLICT (add/add): Merge conflict in init/first_stage_mount.cpp Auto-merging init/property_service.cpp CONFLICT (content): Merge conflict in init/property_service.cpp Auto-merging init/reboot.cpp CONFLICT (content): Merge conflict in init/reboot.cpp Auto-merging init/service.cpp CONFLICT (content): Merge conflict in init/service.cpp Recorded preimage for 'fastboot/device/utility.cpp' Recorded preimage for 'fs_mgr/fs_mgr_fstab.cpp' Recorded preimage for 'fs_mgr/include_fstab/fstab/fstab.h' Recorded preimage for 'healthd/Android.bp' Recorded preimage for 'healthd/BatteryMonitor.cpp' Recorded preimage for 'healthd/healthd_draw.cpp' Recorded preimage for 'init/Android.bp' Recorded preimage for 'init/devices.cpp' Recorded preimage for 'init/first_stage_mount.cpp' Recorded preimage for 'init/property_service.cpp' Recorded preimage for 'init/reboot.cpp' Recorded preimage for 'init/service.cpp' Automatic merge failed; fix conflicts and then commit the result. The RC is 1 Conflicts found -- new tag not merged ----------------------------------------------------------------- Processing the repository "system/libhidl" ... Checking if the AOSP repository for "system/libhidl" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/libhidl" for the local repository "system/libhidl" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/libhidl" ... From https://android.googlesource.com/platform/system/libhidl * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "system/security" ... Checking if the AOSP repository for "system/security" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/security" for the local repository "system/security" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/security" ... From https://android.googlesource.com/platform/system/security * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "system/sepolicy" ... Checking if the AOSP repository for "system/sepolicy" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/sepolicy" for the local repository "system/sepolicy" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/sepolicy" ... From https://android.googlesource.com/platform/system/sepolicy * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Merge made by the 'ort' strategy. prebuilts/api/34.0/private/compat/33.0/33.0.ignore.cil | 1 + prebuilts/api/34.0/private/genfs_contexts | 1 + prebuilts/api/34.0/private/system_server.te | 4 ++++ prebuilts/api/34.0/public/dumpstate.te | 1 + prebuilts/api/34.0/public/file.te | 1 + private/compat/33.0/33.0.ignore.cil | 1 + private/genfs_contexts | 1 + private/system_server.te | 4 ++++ public/dumpstate.te | 1 + public/file.te | 1 + 10 files changed, 16 insertions(+) The RC is 0 New tag successfully merged ----------------------------------------------------------------- Processing the repository "system/update_engine" ... Checking if the AOSP repository for "system/update_engine" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/update_engine" for the local repository "system/update_engine" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/update_engine" ... From https://android.googlesource.com/platform/system/update_engine * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "system/vold" ... Checking if the AOSP repository for "system/vold" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/vold" for the local repository "system/vold" The remote repository for this repo is "omnirom" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/vold" ... From https://android.googlesource.com/platform/system/vold * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "system/timezone" ... Checking if the AOSP repository for "system/timezone" exists .... Using the AOSP repository "https://android.googlesource.com/platform/system/timezone" for the local repository "system/timezone" The remote repository for this repo is "aosp" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/system/timezone" ... From https://android.googlesource.com/platform/system/timezone * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/modules/Bluetooth" ... Checking if the AOSP repository for "packages/modules/Bluetooth" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/modules/Bluetooth" for the local repository "packages/modules/Bluetooth" The remote repository for this repo is "aosp" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/modules/Bluetooth" ... From https://android.googlesource.com/platform/packages/modules/Bluetooth * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ----------------------------------------------------------------- Processing the repository "packages/modules/Wifi" ... Checking if the AOSP repository for "packages/modules/Wifi" exists .... Using the AOSP repository "https://android.googlesource.com/platform/packages/modules/Wifi" for the local repository "packages/modules/Wifi" The remote repository for this repo is "aosp" Fetching the tag "android-14.0.0_r21" from the AOSP repository "https://android.googlesource.com/platform/packages/modules/Wifi" ... From https://android.googlesource.com/platform/packages/modules/Wifi * tag android-14.0.0_r21 -> FETCH_HEAD The RC is 0 Merging the tag "android-14.0.0_r21" into the branch "" ... Already up to date. The RC is 0 The repository is already up to date ... all repositories processed. ----------------------------------------------------------------- Updating the manifest file "/data/develop/android/OmniROM_14.0/.repo/manifests/default.xml" ... 7c7 < --- > ----------------------------------------------------------------- --- Summary --- 10 repo(s) merged: build/make device/google/pantah device/google/raviole frameworks/av frameworks/base frameworks/native hardware/google/pixel-sepolicy packages/apps/Launcher3 packages/apps/Settings system/sepolicy 3 repo(s) failed: device/google/gs201 device/google/gs201-sepolicy system/core 25 repo(s) already up to date: build/soong bionic device/google/gs101 device/google/gs101-sepolicy device/google/gs-common external/drm_hwcomposer external/libdrm external/wpa_supplicant_8 frameworks/opt/telephony hardware/interfaces hardware/libhardware packages/apps/Contacts packages/apps/Dialer packages/apps/Messaging packages/apps/SettingsIntelligence packages/inputmethods/LatinIME packages/services/Telecomm packages/services/Telephony system/libhidl system/security system/update_engine system/vold system/timezone packages/modules/Bluetooth packages/modules/Wifi ----------------------------------------------------------------- The repository config before starting this script was: The initial Android version used is "14" The initial platform security patch is now "2023-12-05" The initial BUILD_ID is now "UQ1A.231205.015" The initial Default Revision is now "android-14.0.0_r17" The repository config now is: The Android version used is "14" The platform security patch is now "2024-01-05" The BUILD_ID is now "UQ1A.240105.004.A1" The Default Revision is now "android-14.0.0_r21" ----------------------------------------------------------------- real 2m36.631s user 0m26.741s sys 0m6.584s xtrnaw7@fedora01:/data/develop/android/OmniROM_14.0$