* Useful to find differences and potential missing commits
between AOSP tags with different ancestor on repositories
that we have not forked.
One example is this month, switching from Pixel 6
December 2021 tag to qcom Pixel January 2022 tag.
Change-Id: Ib5bafd50c20375368255ad9bbb8ca702c3361652
* This makes repositories end up with inconsistent
git history, requiring force push at some cases.
Just merge normally, if there are no changes we
are going to handle it in a cleaner way.
Change-Id: Ida69e91c1881c52dc6d805a07d870d9fe26d6279
* Merge and commit separately,
to get newline between commit content and Change-Id
* Install prepare-commit-msg git hook, for nicer conflict messages
https://gist.github.com/mikeNG/e55ef8e7a1e5cd596a950386503054fd/
Change-Id: I97370b352ccf4f146b4b6ea89af75e032fb13730
* This script can be used by other callers to merge individual repos
* Get branch name from our variables
* Don't repo sync -d, it removes any local changes we made to merge
scripts. Let's just manually sync before running this script.
Change-Id: I7ddfbfd934908e4a72fc2742753b4c704fa6c5e3
* After addition of _merger.sh, this doesn't really serve much
purpose
* Will write a new script that can actually do automatic merging
based on the vars
Change-Id: I7b58a901e047d95ffb50fb27b7bf3008199283f8
* Forgot to update this in December
* Going to automate merge with this so it won't be an issue going forward
Change-Id: Ic6b41e12498dd86bb0cdb18fb35fc4363d653238
* We can just use different tags for kernel builds ($version-kernel)
to avoid the tag duplication issue
* Manifest(s) excluded since those are edited and tagged manually
Change-Id: I8967e042e7c72d5558eec170d034ebeb6a979946
* Allows re-running the script gracefully
* Always writing other files over and over again is fine,
as they may have changes sometimes, and if they don't then
nothing changes anyway.
Change-Id: Idd164c2d34c249da86e13d55dda304fbfa9c6578
* There's 3 builds
SQ1D.211205.016.A1: Global
SQ1D.211205.016.A4: EMEA carriers
SQ1D.211205.017: US carriers
* Picked global like we usually do, there don't seem to be any
AOSP side diffs between the builds, only vendor / modem.
Change-Id: Iddca5c663512afc7b5669844e72934204470f6c7
* Users have reported that in some cases they were able to edit
APNs on stock, but aren't able to do so here.
* We can just allow editing APNs always
Reference:
https: //cs.android.com/android/platform/superproject/+/master:frameworks/base/telephony/java/android/telephony/CarrierConfigManager.java
Issue: calyxos#599
Issue: calyxos#266
Issue: calyxos#636
Change-Id: I967069a7631e7b26ad9970704dfda5583e0b0fbf
* This will make it work with the naked config
* We can have two different XMLs if needed, where one
could include this config
* Looked for any 'com.google.android.' or Sprint/Verizon
packages and removed those
Change-Id: I3d68c995f855c13231946a5796091936479906e9
* "Fixes" AssertionError assert setting.canonicalName not in all_settings
* The culprit is 'telenor_se'
Change-Id: I9d8c61f2400ecc89f560333ecaba84a739a0bef8
Michael Bestas