diff --git a/LICENSE b/LICENSE
index cdec959c8d679837df7ffb7bc79839189a661c38..dd240aca7aa468fa93939ba95ad422a477f2f121 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
Copyright 2011-15 The CyanogenMod Project
2017 The LineageOS Project
+ 2019-21 E FOUNDATION
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk
index 97948f38cdc61674309e6c4750e26cc574debbb8..00c6cb2ce899dd3670be44c3c82bd8416a9abd3c 100644
--- a/bootanimation/Android.mk
+++ b/bootanimation/Android.mk
@@ -15,27 +15,56 @@
# limitations under the License.
#
+ifeq ($(TARGET_USES_MURENA_BOOTANIMATION),true)
+ ifeq ($(shell [ $(TARGET_SCREEN_WIDTH) -gt $(TARGET_SCREEN_HEIGHT) ] && echo true),true)
+ BOOTANIMATION_TAR = bootanimation_murena_land.tar
+ else
+ BOOTANIMATION_TAR = bootanimation_murena.tar
+ endif
+ BOOTANIMATION_FPS := 30
+else
+ BOOTANIMATION_TAR = bootanimation.tar
+ BOOTANIMATION_FPS := 60
+endif
+
TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip
$(TARGET_GENERATED_BOOTANIMATION): INTERMEDIATES := $(call intermediates-dir-for,BOOTANIMATION,bootanimation)
$(TARGET_GENERATED_BOOTANIMATION): $(SOONG_ZIP)
@echo "Building bootanimation.zip"
@rm -rf $(dir $@)
@mkdir -p $(INTERMEDIATES)
- $(hide) tar xfp vendor/lineage/bootanimation/bootanimation.tar -C $(INTERMEDIATES)
- $(hide) if [ $(TARGET_SCREEN_HEIGHT) -lt $(TARGET_SCREEN_WIDTH) ]; then \
+ $(hide) tar xfp vendor/lineage/bootanimation/$(BOOTANIMATION_TAR) -C $(INTERMEDIATES)
+ $(hide) \
+ if [ $(TARGET_SCREEN_WIDTH) -gt $(TARGET_SCREEN_HEIGHT) ]; then \
IMAGEWIDTH=$(TARGET_SCREEN_HEIGHT); \
+ IMAGEHEIGHT=$(TARGET_SCREEN_WIDTH); \
else \
IMAGEWIDTH=$(TARGET_SCREEN_WIDTH); \
+ IMAGEHEIGHT=$(TARGET_SCREEN_HEIGHT); \
fi; \
IMAGESCALEWIDTH=$$IMAGEWIDTH; \
- IMAGESCALEHEIGHT=$$(expr $$IMAGESCALEWIDTH / 3); \
+ if [ "$(TARGET_USES_MURENA_BOOTANIMATION)" = "true" ]; then \
+ IMAGESCALEHEIGHT=$$IMAGEHEIGHT; \
+ else \
+ IMAGESCALEHEIGHT=$$(expr $$IMAGESCALEWIDTH / 3); \
+ fi; \
if [ "$(TARGET_BOOTANIMATION_HALF_RES)" = "true" ]; then \
IMAGEWIDTH="$$(expr "$$IMAGEWIDTH" / 2)"; \
fi; \
- IMAGEHEIGHT=$$(expr $$IMAGEWIDTH / 3); \
- RESOLUTION="$$IMAGEWIDTH"x"$$IMAGEHEIGHT"; \
+ if [ "$(TARGET_USES_MURENA_BOOTANIMATION)" != "true" ]; then \
+ IMAGEHEIGHT=$$(expr $$IMAGEWIDTH / 3); \
+ fi; \
+ if [ $(TARGET_SCREEN_WIDTH) -gt $(TARGET_SCREEN_HEIGHT) ]; then \
+ RESOLUTION="$$IMAGEHEIGHT"x"$$IMAGEWIDTH"; \
+ TMP=$$IMAGESCALEHEIGHT; \
+ IMAGESCALEHEIGHT=$$IMAGESCALEWIDTH; \
+ IMAGESCALEWIDTH=$$TMP; \
+ else \
+ RESOLUTION="$$IMAGEWIDTH"x"$$IMAGEHEIGHT"; \
+ fi; \
prebuilts/tools-lineage/${HOST_OS}-x86/bin/mogrify -resize $$RESOLUTION -colors 256 $(INTERMEDIATES)/*/*.png; \
- echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT 60" > $(INTERMEDIATES)/desc.txt; \
+ BOOTANIMFPS=$(BOOTANIMATION_FPS); \
+ echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT $$BOOTANIMFPS" > $(INTERMEDIATES)/desc.txt; \
cat vendor/lineage/bootanimation/desc.txt >> $(INTERMEDIATES)/desc.txt
$(hide) $(SOONG_ZIP) -L 0 -o $@ -C $(INTERMEDIATES) -D $(INTERMEDIATES)
diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar
index 14d5606215d77b922ab9047fdf71e7d464bb1513..60b99131f161a70b5f0fb2d9e646ce9da1fc8d1f 100644
Binary files a/bootanimation/bootanimation.tar and b/bootanimation/bootanimation.tar differ
diff --git a/bootanimation/bootanimation_murena.tar b/bootanimation/bootanimation_murena.tar
new file mode 100644
index 0000000000000000000000000000000000000000..870d9a31e9a7aefa28a010fc4a6da43a6cd0b2c2
Binary files /dev/null and b/bootanimation/bootanimation_murena.tar differ
diff --git a/bootanimation/bootanimation_murena_land.tar b/bootanimation/bootanimation_murena_land.tar
new file mode 100644
index 0000000000000000000000000000000000000000..8ecfc4dc25cb7c8c631bd93f5d94d857732ef47f
Binary files /dev/null and b/bootanimation/bootanimation_murena_land.tar differ
diff --git a/build/target/product/lineage_sdk_phone_arm64.mk b/build/target/product/lineage_sdk_phone_arm64.mk
index a1f5afa847eb1db221c37b4d231f7eceaa5f3c71..988d50036b2e3005fb9a583970b0c151ee7a9e13 100644
--- a/build/target/product/lineage_sdk_phone_arm64.mk
+++ b/build/target/product/lineage_sdk_phone_arm64.mk
@@ -15,6 +15,9 @@
$(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_arm64.mk)
$(call inherit-product, vendor/lineage/build/target/product/lineage_sdk_phone_arm64_board.mk)
+# Inherit tablet common Lineage stuff
+$(call inherit-product, vendor/lineage/config/tablet.mk)
+
include vendor/lineage/build/target/product/lineage_generic_target.mk
# Always build modules from source
@@ -25,7 +28,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
# Overrides
PRODUCT_NAME := lineage_sdk_phone_arm64
-PRODUCT_MODEL := LineageOS Android SDK built for arm64
+PRODUCT_MODEL := /e/ os Android SDK built for arm64
PRODUCT_SDK_ADDON_NAME := lineage
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := vendor/lineage/build/target/product/source.properties
diff --git a/build/target/product/lineage_sdk_phone_x86_64.mk b/build/target/product/lineage_sdk_phone_x86_64.mk
index 59fe59d4b1caa170510ba5ee1ebc5305375db5dc..fa7af98032fd62c5dd7afcf9d9568a7c78241675 100644
--- a/build/target/product/lineage_sdk_phone_x86_64.mk
+++ b/build/target/product/lineage_sdk_phone_x86_64.mk
@@ -17,6 +17,9 @@ $(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_x8
include vendor/lineage/build/target/product/lineage_generic_target.mk
include device/generic/goldfish/board/kernel/x86_64.mk
+# Inherit tablet common Lineage stuff
+$(call inherit-product, vendor/lineage/config/tablet.mk)
+
# Always build modules from source
PRODUCT_MODULE_BUILD_FROM_SOURCE := true
@@ -25,7 +28,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
# Overrides
PRODUCT_NAME := lineage_sdk_phone_x86_64
-PRODUCT_MODEL := LineageOS Android SDK built for x86_64
+PRODUCT_MODEL := /e/ os Android SDK built for x86_64
PRODUCT_SDK_ADDON_NAME := lineage
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := $(LOCAL_PATH)/source.properties
diff --git a/build/target/product/security/lineage.x509.pem b/build/target/product/security/lineage.x509.pem
deleted file mode 100644
index edbe469525be21f89ca6610cecf033ff8a0c4001..0000000000000000000000000000000000000000
--- a/build/target/product/security/lineage.x509.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDszCCApugAwIBAgIJAOEEE8dzw8VPMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQHDAdTZWF0dGxlMRIw
-EAYDVQQKDAlMaW5lYWdlT1MxEjAQBgNVBAsMCUxpbmVhZ2VPUzESMBAGA1UEAwwJ
-TGluZWFnZU9TMB4XDTE3MDEwNzA0MjEyNVoXDTQ0MDUyNTA0MjEyNVowcDELMAkG
-A1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUx
-EjAQBgNVBAoMCUxpbmVhZ2VPUzESMBAGA1UECwwJTGluZWFnZU9TMRIwEAYDVQQD
-DAlMaW5lYWdlT1MwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmTdPh
-+EIDj/A/Z7jpvwlTD8KRPLU+NlTHjsINvIsecRNijKWrwIYFYMtELBtR+Yttzl5Z
-xJA38n9k9IrvBJCrmRBvCAeiEw4aizqs2DTmVvCFS2Amd7ZsAHsUwtDCjQ3GE0He
-ZI2HnbWannnhKIhzGjuxxh+1j3JawHHeErYQk97MVoWsJHTO4s8i8ORL8ghBDZHF
-0fYKp5RVSIIrrXVqcOD+F8g/NeX6Wb5N0rRGBI+bQjMhhv8KpH7TnCEN6f2YHFVx
-nsjzDKrEQVwhYF8T9X0OzfBoLEhOlFZ0jevoDi8uCxz0f7ldkv/0Zz4W9jeB87LH
-zUuQQEGr6134UFmZAgMBAAGjUDBOMB0GA1UdDgQWBBRyljIn1mxMTV+gkWrCLHk8
-1F9DXDAfBgNVHSMEGDAWgBRyljIn1mxMTV+gkWrCLHk81F9DXDAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCKJH4ByccucWfewkmT8j9TnAdhjCgZ7k0+
-rpbSgxc66+ESRpQFxMSAUu8exy8pSawGd7SerFBVvqL+dajdPfyLPM+I+xDEoMJ3
-ncKGHoC0RRKMGEhc4rS090/wOJJHZZtThlcjdND5vybMwmHngzl8o4CNWhneJvjb
-hNkqxocrC9vGCsdo5Kx00ULn8sXVwcq7yl0bqtuSMlKxm6CVA3DVVnB8N8OZyTam
-fgj9F0jOpWVtit1/ohd+1jB5bY3g+ulXCydKBFkJhNXAZf4welNG61SWLkH1gNGk
-SEYxEuLV9JGjm7n5oqDKxYVcKKNfvbGtSmrqsq6i+QVuc/xIdzfr
------END CERTIFICATE-----
-
diff --git a/build/tasks/bacon.mk b/build/tasks/bacon.mk
index 272a4b8efa60ff2f6c3f935bb6567b79df77782d..589f97faca108484f111c26d72b78f1ba0852615 100644
--- a/build/tasks/bacon.mk
+++ b/build/tasks/bacon.mk
@@ -16,13 +16,15 @@
# -----------------------------------------------------------------
# Lineage OTA update package
-LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(LINEAGE_VERSION).zip
+LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/e-$(LINEAGE_VERSION).zip
+MD5 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/md5sum
SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum
$(LINEAGE_TARGET_PACKAGE): $(INTERNAL_OTA_PACKAGE_TARGET)
$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(LINEAGE_TARGET_PACKAGE)
$(hide) $(SHA256) $(LINEAGE_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LINEAGE_TARGET_PACKAGE).sha256sum
+ $(hide) $(MD5) $(LINEAGE_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LINEAGE_TARGET_PACKAGE).md5sum
@echo "Package Complete: $(LINEAGE_TARGET_PACKAGE)" >&2
.PHONY: bacon
diff --git a/config/common.mk b/config/common.mk
index 21bb7812c25c87a409d07c2741a3f1781685a1a8..88dee6ed3c33d52d3913953823b1fe093880ac0c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -267,12 +267,11 @@ CUSTOM_LOCALES += \
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/crowdin/overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/crowdin/overlay
-PRODUCT_EXTRA_RECOVERY_KEYS += \
- vendor/lineage/build/target/product/security/lineage
-
include vendor/lineage/config/version.mk
-include vendor/lineage-priv/keys/keys.mk
-include $(WORKSPACE)/build_env/image-auto-bits.mk
--include vendor/lineage/config/partner_gms.mk
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/common.mk)
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 08619d9d64e79340d72dcff40eedf23acf17cf2d..07e6dd622497c914cf989f602cefe871c9867de3 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -8,11 +8,6 @@ include vendor/lineage/config/aosp_audio.mk
# Include Lineage audio files
include vendor/lineage/config/lineage_audio.mk
-# Default notification/alarm sounds
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.config.notification_sound=Argon.ogg \
- ro.config.alarm_alert=Hassium.ogg
-
# Apps
PRODUCT_PACKAGES += \
AvatarPicker \
@@ -35,7 +30,7 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \
endif
PRODUCT_PACKAGES += \
- TrebuchetOverlay
+ BlissLauncherOverlay
# Charger
PRODUCT_PACKAGES += \
@@ -73,6 +68,7 @@ PRODUCT_PACKAGES += \
IconPackVictorLauncherOverlay \
IconPackVictorSettingsOverlay \
IconPackVictorSystemUIOverlay \
+ IconShapeCircleOverlay \
IconShapePebbleOverlay \
IconShapeRoundedRectOverlay \
IconShapeSquareOverlay \
@@ -83,7 +79,19 @@ PRODUCT_PACKAGES += \
# Legal
PRODUCT_SYSTEM_PROPERTIES += \
- ro.lineagelegal.url=https://lineageos.org/legal
+ ro.lineagelegal.url=https://lineageos.org/legal \
+ ro.elegal.url=https://e.foundation/legal
+
+ifdef CI_PIPELINE_ID
+ PRODUCT_SYSTEM_PROPERTIES += \
+ ro.cm.build.pipeline.id=$(CI_PIPELINE_ID)
+endif
+
+ifdef CI_PIPELINE_IID
+ PRODUCT_SYSTEM_PROPERTIES += \
+ ro.cm.build.pipeline.iid=$(CI_PIPELINE_IID)
+endif
+
# Media
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -111,3 +119,6 @@ PRODUCT_PACKAGES += \
LineageBlackTheme \
ThemePicker \
ThemesStub
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/common_mobile.mk)
diff --git a/config/common_mobile_full.mk b/config/common_mobile_full.mk
index 22b1acf2f9d30123a9c21a86150bec980c2af4ae..99cc6bc8aa0bdd56e7bcb3ae3e8e3a5adee952da 100644
--- a/config/common_mobile_full.mk
+++ b/config/common_mobile_full.mk
@@ -21,7 +21,7 @@ PRODUCT_PACKAGES += \
Aperture
endif
-ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
+ifeq ($(TARGET_INCLUDES_AUDIOFX),true)
PRODUCT_PACKAGES += \
AudioFX
endif
diff --git a/config/partner_gms.mk b/config/partner_gms.mk
deleted file mode 100644
index e754da30d40afda12492bdb0dd54db9929db4f8c..0000000000000000000000000000000000000000
--- a/config/partner_gms.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-ifeq ($(WITH_GMS),true)
- # Special handling for Android TV
- ifeq ($(PRODUCT_IS_ATV),true)
- ifneq (,$(wildcard vendor/partner_gms-tv))
- ifneq ($(GMS_MAKEFILE),)
- # Specify the GMS makefile you want to use, for example:
- # - gms.mk - default Android TV GMS
- # - gms_gtv.mk - default Google TV GMS
- # - gms_minimal.mk - minimal Android TV GMS
- $(call inherit-product, vendor/partner_gms-tv/products/$(GMS_MAKEFILE))
- else
- $(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk)
- endif
- $(call inherit-product-if-exists, vendor/partner_gms-tv/products/mainline_modules.mk)
- endif
- # Special handling for Android Automotive
- else ifeq ($(PRODUCT_IS_AUTOMOTIVE),true)
- ifneq (,$(wildcard vendor/partner_gms-car))
- ifneq ($(GMS_MAKEFILE),)
- $(call inherit-product, vendor/partner_gms-car/products/$(GMS_MAKEFILE))
- else
- $(call inherit-product-if-exists, vendor/partner_gms-car/products/gms.mk)
- endif
- endif
- else
- ifneq (,$(wildcard vendor/partner_gms))
- # Specify the GMS makefile you want to use, for example:
- # - fi.mk - Project Fi
- # - gms.mk - default GMS
- # - gms_go.mk - low ram devices
- # - gms_go_2gb.mk - low ram devices (2GB)
- # - gms_64bit_only.mk - devices supporting 64-bit only
- # - gms_minimal.mk - minimal GMS
- ifneq ($(GMS_MAKEFILE),)
- $(call inherit-product, vendor/partner_gms/products/$(GMS_MAKEFILE))
- else
- $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
- endif
- endif
-
- ifneq (,$(wildcard vendor/partner_modules))
- # Specify the mainline module makefile you want to use, for example:
- # - mainline_modules.mk - updatable apex
- # - mainline_modules_flatten_apex.mk - flatten apex
- # - mainline_modules_low_ram.mk - low ram devices
- ifneq ($(MAINLINE_MODULES_MAKEFILE),)
- $(call inherit-product, vendor/partner_modules/build/$(MAINLINE_MODULES_MAKEFILE))
- endif
- endif
- endif
-endif
diff --git a/config/tablet.mk b/config/tablet.mk
index cb5a6ce619bafff51fb75b3f5e6c64798d8c54a7..3cdc6c7f5a6eb3192829d3491c283581eafbc80e 100644
--- a/config/tablet.mk
+++ b/config/tablet.mk
@@ -6,3 +6,5 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Tablet-specific overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/tablet
+
+USE_TABLET_BACKGROUNDS := true
\ No newline at end of file
diff --git a/config/telephony.mk b/config/telephony.mk
index 0c6ebba88de3311046181caa58b872e5d41c8502..b153a1ef512e0ea9c81c8cbb72619ab5103b0616 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -16,10 +16,6 @@ PRODUCT_PACKAGES += \
messaging \
Stk
-# Default ringtone
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.config.ringtone=Orion.ogg
-
# Tethering - allow without requiring a provisioning app
# (for devices that check this)
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -28,3 +24,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
# Disable mobile data by default
PRODUCT_PRODUCT_PROPERTIES += \
ro.com.android.mobiledata=false
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/telephony.mk)
diff --git a/config/version.mk b/config/version.mk
index a142fdb21876c6b0fc6daf8a661e2863cdca86c4..136344b18c23e5a6993010c1de500d4b0bc54d20 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,5 +1,16 @@
-PRODUCT_VERSION_MAJOR = 22
-PRODUCT_VERSION_MINOR = 2
+ANDROID_LETTER := a15
+PRODUCT_VERSION_MAJOR = 3
+PRODUCT_VERSION_MINOR = 0
+PRODUCT_VERSION_MAINTENANCE := 0
+PRODUCT_PRERELEASE_STRING =
+
+ifdef PRODUCT_PRERELEASE
+ ifdef PRODUCT_PRERELEASE_VERSION
+ PRODUCT_PRERELEASE_STRING = -$(PRODUCT_PRERELEASE).$(PRODUCT_PRERELEASE_VERSION)
+ else
+ PRODUCT_PRERELEASE_STRING = -$(PRODUCT_PRERELEASE)
+ endif
+endif
ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d_%H%M%S)
@@ -18,7 +29,7 @@ ifndef LINEAGE_BUILDTYPE
endif
# Filter out random types, so it'll reset to UNOFFICIAL
-ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(LINEAGE_BUILDTYPE)),)
+ifeq ($(filter test community official partner,$(LINEAGE_BUILDTYPE)),)
LINEAGE_BUILDTYPE := UNOFFICIAL
LINEAGE_EXTRAVERSION :=
endif
@@ -29,17 +40,22 @@ ifeq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
endif
endif
-LINEAGE_VERSION_SUFFIX := $(LINEAGE_BUILD_DATE)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
+LINEAGE_VERSION_SUFFIX := $(LINEAGE_BUILD_DATE)$(CI_PIPELINE_ID)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
# Internal version
-LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_VERSION_SUFFIX)
+ifeq ($(PRODUCT_VERSION_MAINTENANCE),0)
+ LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX)
+else
+ PRODUCT_VERSION_OPTIONAL := .$(PRODUCT_VERSION_MAINTENANCE)
+ LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX)
+endif
# Display version
-LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR)-$(LINEAGE_VERSION_SUFFIX)
+LINEAGE_DISPLAY_VERSION := $(LINEAGE_VERSION)
# LineageOS version properties
PRODUCT_SYSTEM_PROPERTIES += \
ro.lineage.version=$(LINEAGE_VERSION) \
ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION) \
- ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
+ ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(PRODUCT_VERSION_OPTIONAL) \
ro.lineage.releasetype=$(LINEAGE_BUILDTYPE)
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png
index c38e6e0d3710e63ecbb42bdf0a481d59f53e5255..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
index a60c013e77b7b874895d8893a2842220e821a367..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..ee2faf266f5a019b52e018c05809135577c395b0 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..ee2faf266f5a019b52e018c05809135577c395b0 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png
index 4134452c2f09a43de5cf0175e70a653ec80ff56e..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..da284b8161ea294c22713312d8dc6451d725c5c8 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png
index 0eceece7d96e9453933cac839886ce8956f21ca3..da284b8161ea294c22713312d8dc6451d725c5c8 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 7ab09ba58bd13522e0040a6ceae35ba86017ea63..4959398b464c347b8cfef92ff214cc27f4652f23 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -38,8 +38,6 @@
- com.google.android.gms
- com.android.location.fused
-
- - org.microg.nlp
@@ -53,6 +51,9 @@
- com.shannon.imsservice
- com.mediatek.ims
+
+ - org.microg.nlp.backend.ichnaea
+ - org.microg.nlp.backend.nominatim
4
-
- "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"
+
+ M 78.9068 100.0425 H 21.0206 c -11.6647 0 -21.1077 -9.4484 -21.1077 -21.12 V 21.12 C 0.03 9.4484 9.473 0 21.1377 0 h 57.7688 c 11.6647 0 21.1077 9.4484 21.1077 21.12 v 57.8023 C 100.0146 90.5941 90.5719 100.0425 78.9068 100.0425 z
- true
+ false
false
@@ -143,14 +144,6 @@
true
-
- 2
-
true
@@ -169,6 +162,9 @@
should also be non-empty.-->
com.android.contacts
+
+ foundation.e.camera/net.sourceforge.opencamera.qr.QrScannerActivity
+
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimens.xml b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c78bb7a35abcec6022621ab13bb07ca4aabaa35c
--- /dev/null
+++ b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ 4dp
+
+ 4dp
+
+ 8dp
+
+ 1000dp
+
+ 28dp
+
+ 20dp
+
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
index 37c5f13e501d9ca536051e850a20bceb5a7ea3d8..56398aa873878f7353714f0812568d0055f0081a 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
@@ -34,5 +34,6 @@
- com.android.messaging
- com.google.android.setupwizard
- org.lineageos.setupwizard
+ - foundation.e.blisslauncher
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
index 0099c83bb5a9375ac8debb23af8e09ae39720fc9..978a7f4e71688c3f5c7dca7b0baf97340f437494 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
@@ -32,5 +32,6 @@
- com.android.dialer
- com.google.android.apps.messaging
- com.android.messaging
+ - foundation.e.blisslauncher
diff --git a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
index 0c3e41697c1a0577040b037b65830ea7627f6872..16298140a7622344072345b9ff29c83bf76e53b5 100644
--- a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
+++ b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
@@ -18,7 +18,7 @@
-->
- org.lineageos.etar/com.android.calendar.AllInOneActivity
+ foundation.e.calendar/com.android.calendar.AllInOneActivity
com.android.deskclock/com.android.deskclock.DeskClockApplication
diff --git a/overlay/common/packages/apps/Settings/res/values/strings.xml b/overlay/common/packages/apps/Settings/res/values/strings.xml
deleted file mode 100644
index 93758ea376e05ff2bcdaa82d6adec11150f04204..0000000000000000000000000000000000000000
--- a/overlay/common/packages/apps/Settings/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- https://support.google.com/wallet/answer/1347934
-
-
- https://support.google.com
-
-
diff --git a/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml b/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
index 27c587ae987c5124ecf277198616330da78fda63..d43d31178d34047c055e7a9996b3eefbf29718dd 100644
--- a/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
+++ b/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
@@ -60,5 +60,8 @@
- backup_and_restore/backup_transport_future_timeout_millis=900000
- backup_and_restore/backup_transport_callback_timeout_millis=900000
+
+
+ - window_manager/splash_screen_exception_list=foundation.e.accountmanager,foundation.e.pwaplayer
diff --git a/overlay/rro_packages/TrebuchetOverlay/Android.bp b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
similarity index 81%
rename from overlay/rro_packages/TrebuchetOverlay/Android.bp
rename to overlay/rro_packages/BlissLauncherOverlay/Android.bp
index 833e0d8f2c2352a6502e28eb8b3bb95cf56c58a4..12cb08515c879f78546324e9e3c62fa9a7c27ead 100644
--- a/overlay/rro_packages/TrebuchetOverlay/Android.bp
+++ b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
@@ -4,6 +4,6 @@
//
runtime_resource_overlay {
- name: "TrebuchetOverlay",
+ name: "BlissLauncherOverlay",
product_specific: true,
}
diff --git a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
similarity index 72%
rename from overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
rename to overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
index b87512af0772a2d5013cba64bda11985ea6cc0a1..1f2b84651890caa61f8efd230a994cefc29b2c06 100644
--- a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
@@ -4,10 +4,10 @@
SPDX-License-Identifier: Apache-2.0
-->
+ package="foundation.e.blisslauncher.overlay">
+ android:targetPackage="foundation.e.blisslauncher" />
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
similarity index 75%
rename from overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
rename to overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
index 401fc9d5e1cee1684648d3d711ce42e37f5a1a46..285d09c4ae79f80ab6fb536b69a73d9c0b72a4a9 100644
--- a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
@@ -19,4 +19,7 @@
com.android.wallpaper
+ foundation.e.calendar/com.android.calendar.AllInOneActivity
+ com.android.deskclock/com.android.deskclock.DeskClockApplication
+
diff --git a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
index aef5c9ca1131053143bd6c7ceb926d4f4350b972..26c8e2cdb8cc765b9ce7b21b5350ec12c54348c1 100644
--- a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
+++ b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
@@ -19,4 +19,16 @@
true
+
+ http://connectivity.murena.io
+
+
+ https://connectivity.murena.io
+
+
+
+ - http://204.murena.io
+ - http://murena.io/generate_204
+
+
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index bb31920ee627901f6a47716f249d4064a53ef442..6b19496bd95332035427940b14d0cb2a3dfa634c 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -7,7 +7,7 @@ export C=/tmp/backupdir
export SYSDEV="$(readlink -nf "$2")"
export SYSFS="$3"
export TMPDIR=/tmp
-export V=22
+export V=15
export ADDOND_VERSION=3
@@ -48,7 +48,7 @@ if [ ! -r $S/build.prop ]; then
echo "Backup/restore is not possible. Partition is probably empty"
return 1
fi
-if ! grep -q "^ro.lineage.version=$V.*" $S/build.prop; then
+if ! grep -q "^ro.build.version.release=$V.*" $S/build.prop; then
echo "Backup/restore is not possible. Incompatible ROM version: $V"
return 2
fi
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index ef2da79c70512902724a626d0bf73dcb394cf114..a371da39241c3338ec0319dd2fc896969b9df001 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -5,7 +5,7 @@
export S=/system
export C=/postinstall/tmp/backupdir
-export V=22
+export V=15
export ADDOND_VERSION=3
@@ -56,7 +56,7 @@ if [ ! -r /system/build.prop ]; then
echo "Backup/restore is not possible. Partition is probably empty"
return 1
fi
-if ! grep -q "^ro.lineage.version=$V.*" /system/build.prop; then
+if ! grep -q "^ro.build.version.release=$V.*" /system/build.prop; then
echo "Backup/restore is not possible. Incompatible ROM version: $V"
return 2
fi
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 1970a1ff22a92c2d97cc9a9971ee5bffccd95fc3..cd9e0f136814fef24cabb4fabb587cf7fd725c30 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -183,9 +183,13 @@
+
-
+
+
+
+
@@ -202,25 +206,25 @@
-
-
-
+
+
+
-
+
@@ -819,8 +823,8 @@
-
-
+
+
@@ -1053,6 +1057,7 @@
+
@@ -1071,6 +1076,10 @@
+
+
+
+
@@ -1475,6 +1484,9 @@
+
+
+
diff --git a/release/aconfig/bp1a/Android.bp b/release/aconfig/bp1a/Android.bp
index 15e8822c0f6f4466534da83ea16977352f6aa799..05d2d30bc6676053c41a1444f971f88dd21e7625 100644
--- a/release/aconfig/bp1a/Android.bp
+++ b/release/aconfig/bp1a/Android.bp
@@ -17,6 +17,11 @@ aconfig_value_set {
name: "aconfig_value_set-lineage-bp1a",
values: [
"aconfig-values-bp1a-android.hardware.biometrics-all",
+ "aconfig-values-bp1a-android.multiuser-all",
+ "aconfig-values-bp1a-android.os-all",
+ "aconfig-values-bp1a-com.android.intentresolver-all",
+ "aconfig-values-bp1a-com.android.launcher3-all",
+ "aconfig-values-bp1a-com.android.permission.flags-all",
"aconfig-values-bp1a-com.android.window.flags-all",
],
}
diff --git a/release/aconfig/bp1a/android.multiuser/Android.bp b/release/aconfig/bp1a/android.multiuser/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..47a570698942436327a6f135e756b19be7c4b3fb
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-bp1a-android.multiuser-all",
+ package: "android.multiuser",
+ srcs: [
+ "*_flag_values.textproto",
+ ]
+}
diff --git a/release/aconfig/bp1a/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..fed8c55777e9fc7de85f957f919249ef95a767d3
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "allow_resolver_sheet_for_private_space"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/block_private_space_creation_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/block_private_space_creation_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..23c59e25cc4d1e742228e94800b3e9c277e2d5c1
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/block_private_space_creation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "block_private_space_creation"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/delete_private_space_from_reset_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/delete_private_space_from_reset_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..f132355a03da3b811331184891923237bcaef88d
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/delete_private_space_from_reset_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "delete_private_space_from_reset"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/disable_private_space_items_on_home_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/disable_private_space_items_on_home_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..5613088f1dbbb931cc900f5c21437fd2e3d4276c
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/disable_private_space_items_on_home_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "disable_private_space_items_on_home"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..7ad708335eaf69c5829ea00fb73949fc6b649242
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "enable_biometrics_to_unlock_private_space"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..89dbc4a2a88eccc2e9db92486500fd93952ab6c7
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "enable_private_space_autolock_on_restarts"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/enable_private_space_features_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/enable_private_space_features_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..8649e5b73844b61d1111bcdf16e625a830882779
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/enable_private_space_features_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "enable_private_space_features"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..eb6c5f063aa0040c6f63fc4ca88145c9ce74df6f
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "enable_private_space_intent_redirection"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..fe2a3c9ca705a0c9e7fd4cd6347b654110162150
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "fix_large_display_private_space_settings"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..760c524dc4293cd170719c7aaeb22e2de08e08e9
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "handle_interleaved_settings_for_private_space"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/ignore_restrictions_when_deleting_private_profile_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/ignore_restrictions_when_deleting_private_profile_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..4a48fe6f333bc31f670eeef30c02bd77ed03e412
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/ignore_restrictions_when_deleting_private_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "ignore_restrictions_when_deleting_private_profile"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..5050fcde2f05ae536408ddc07e9acf5768d46fe9
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "modify_private_space_secondary_unlock_setup_flow"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/private_space_search_illustration_config_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/private_space_search_illustration_config_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..da4e46e37ad67a324cf2f6072e9d46f80dd5f36b
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/private_space_search_illustration_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "private_space_search_illustration_config"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/show_custom_unlock_title_inside_private_profile_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/show_custom_unlock_title_inside_private_profile_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..0f31e267d3699b2f1947e73d62fba0bf27e37ad3
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/show_custom_unlock_title_inside_private_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "show_custom_unlock_title_inside_private_profile"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/support_autolock_for_private_space_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/support_autolock_for_private_space_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..e16b0e4840e310992358b7a212e5124fe522c1fd
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/support_autolock_for_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "support_autolock_for_private_space"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto b/release/aconfig/bp1a/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..154abb997693dcb17aa23acd2b031e508ea53630
--- /dev/null
+++ b/release/aconfig/bp1a/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.multiuser"
+ name: "use_private_space_icon_in_biometric_prompt"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/android.os/Android.bp b/release/aconfig/bp1a/android.os/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..4160bce13cad49acfb2bfaf171461f67a45c9700
--- /dev/null
+++ b/release/aconfig/bp1a/android.os/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-bp1a-android.os-all",
+ package: "android.os",
+ srcs: [
+ "*_flag_values.textproto",
+ ],
+}
diff --git a/release/aconfig/bp1a/android.os/allow_private_profile_flag_values.textproto b/release/aconfig/bp1a/android.os/allow_private_profile_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..79bf3fdba8ad2b15b1b13ca716aeff7e68562200
--- /dev/null
+++ b/release/aconfig/bp1a/android.os/allow_private_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "android.os"
+ name: "allow_private_profile"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.intentresolver/Android.bp b/release/aconfig/bp1a/com.android.intentresolver/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..3d812369cd51865d9129ae00e8cca30844a505e7
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.intentresolver/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-bp1a-com.android.intentresolver-all",
+ package: "com.android.intentresolver",
+ srcs: [
+ "*_flag_values.textproto",
+ ]
+}
diff --git a/release/aconfig/bp1a/com.android.intentresolver/enable_private_profile_flag_values.textproto b/release/aconfig/bp1a/com.android.intentresolver/enable_private_profile_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..687a299de8c1ef43d2b82ce7e1dc9f8ecb863694
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.intentresolver/enable_private_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.intentresolver"
+ name: "enable_private_profile"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto b/release/aconfig/bp1a/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..b34a7bdc234ea2616e83b3277051095d1cb59f30
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.intentresolver"
+ name: "fix_private_space_locked_on_restart"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/Android.bp b/release/aconfig/bp1a/com.android.launcher3/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..159c9a49c762d58a1ccf70770d9ff4713ec57286
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-bp1a-com.android.launcher3-all",
+ package: "com.android.launcher3",
+ srcs: [
+ "*_flag_values.textproto",
+ ]
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/enable_private_space_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/enable_private_space_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..0e9310fdb2bc4ff35240f052489679dca22dc21f
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/enable_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "enable_private_space"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..db5dfd123850e72ef28403b4c2740be6ed13dbf1
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "enable_private_space_install_shortcut"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..4165e87f0c4c0b2474558bfcbc849ff9b0ff436e
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "private_space_add_floating_mask_view"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/private_space_animation_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/private_space_animation_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..dd289b9b87bb9167a8b0a86cc986a87982a04226
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/private_space_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "private_space_animation"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/private_space_app_installer_button_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/private_space_app_installer_button_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..267bf57a984f1ee9d4bc5ca941f26f54dd9d2630
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/private_space_app_installer_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "private_space_app_installer_button"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..c24603eaf591657e1f41fad27cb2487fd55a4c22
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "private_space_restrict_accessibility_drag"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..b94992fc563381772fee88ec19acf0636c097aff
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "private_space_restrict_item_drag"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto b/release/aconfig/bp1a/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..95a4454a0e7d8ed61538846dc74d1112eccbe20a
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.launcher3"
+ name: "private_space_sys_apps_separation"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.permission.flags/Android.bp b/release/aconfig/bp1a/com.android.permission.flags/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..ce9c7d50004a0bdc4374623a5bf5cb209951c498
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.permission.flags/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-bp1a-com.android.permission.flags-all",
+ package: "com.android.permission.flags",
+ srcs: [
+ "*_flag_values.textproto",
+ ]
+}
diff --git a/release/aconfig/bp1a/com.android.permission.flags/private_profile_supported_flag_values.textproto b/release/aconfig/bp1a/com.android.permission.flags/private_profile_supported_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..323154a3167712de0f3526c250c0cff8b6857eab
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.permission.flags/private_profile_supported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.permission.flags"
+ name: "private_profile_supported"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.permission.flags/private_profile_title_api_flag_values.textproto b/release/aconfig/bp1a/com.android.permission.flags/private_profile_title_api_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..93b74643755d9998e2f78a3040dd5e0d6c2083dd
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.permission.flags/private_profile_title_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.permission.flags"
+ name: "private_profile_title_api"
+ state: DISABLED
+ permission: READ_ONLY
+}
diff --git a/tools/apns-conf.xsd b/tools/apns-conf.xsd
index 4dbb06f37cc3bd26bbeaffe68850a1cc0bdf4f00..81ba6f0a5bbd8f72918a2d3cf65f15e0a515fb97 100644
--- a/tools/apns-conf.xsd
+++ b/tools/apns-conf.xsd
@@ -115,7 +115,7 @@
-
+