Merge branch 'epic340-a15-a15_bringup' into 'a15' (67a8f559) · Commits · e / os / android_packages_apps_Updater

.gitignore

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,9 +5,7 @@
	.DS_Store		.DS_Store
	/build		/build
	/captures		/captures
	/system_libs/*.jar
	/keystore.properties		/keystore.properties
	.externalNativeBuild		.externalNativeBuild
	.cxx		.cxx
	*.jks
	local.properties		local.properties

app/Android.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10,8 +10,8 @@ android_app {
	// Include SettingsLib and its dependencies		// Include SettingsLib and its dependencies
	defaults: ["SettingsLibDefaults"],		defaults: ["SettingsLibDefaults"],

	srcs: ["src/main/java/*/.java"],		srcs: ["src/main/java/*/.java", "src/main/java/*/.kt"],
	resource_dirs: ["src/main/res"],		resource_dirs: ["src/main/res", "src/main/res_aosp"],
	manifest: "src/main/AndroidManifest.xml",		manifest: "src/main/AndroidManifest.xml",

	platform_apis: true,		platform_apis: true,
	@@ -33,6 +33,7 @@ android_app {
	"androidx.preference_preference",		"androidx.preference_preference",
	"androidx.recyclerview_recyclerview",		"androidx.recyclerview_recyclerview",
	"com.google.android.material_material",		"com.google.android.material_material",
			"elib",
	],		],

	optimize: {		optimize: {

app/build.gradle.kts

+29 −18

Original line number	Original line	Diff line number	Diff line
	@@ -14,15 +14,15 @@ apply {

	buildscript {		buildscript {
	repositories {		repositories {
	maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.2/.m2")		maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/main/.m2")
	}		}

	dependencies {		dependencies {
	classpath("org.lineageos:gradle-generatebp:+")		classpath("org.lineageos:gradle-generatebp:1.23")
	}		}
	}		}

	val keystorePropertiesFile = rootProject.file("keystore.properties")		val keystorePropertiesFile = rootProject.file("platform.keystore")
	val keystoreProperties = Properties().apply {		val keystoreProperties = Properties().apply {
	if (keystorePropertiesFile.exists()) {		if (keystorePropertiesFile.exists()) {
	load(keystorePropertiesFile.inputStream())		load(keystorePropertiesFile.inputStream())
	@@ -30,12 +30,18 @@ val keystoreProperties = Properties().apply {
	}		}

	android {		android {
	compileSdk = 33		compileSdk = 35

			sourceSets {
			getByName("main") {
			res.srcDirs("src/main/res", "src/main/res_studio")
			}
			}

	defaultConfig {		defaultConfig {
	applicationId = "org.lineageos.updater"		applicationId = "org.lineageos.updater"
	minSdk = 32		minSdk = 35
	targetSdk = 33		targetSdk = 35
	versionCode = 1		versionCode = 1
	versionName = "1.0"		versionName = "1.0"
	}		}
	@@ -51,22 +57,25 @@ android {
	)		)
	}		}
	getByName("debug") {		getByName("debug") {
	// Append .dev to package name so we won't conflict with AOSP build.		signingConfig = signingConfigs.getByName("debug")
	applicationIdSuffix = ".dev"
	}		}
	}		}

	compileOptions {		compileOptions {
	sourceCompatibility = JavaVersion.VERSION_11		sourceCompatibility = JavaVersion.VERSION_21
	targetCompatibility = JavaVersion.VERSION_11		targetCompatibility = JavaVersion.VERSION_21
	}		}

	kotlinOptions {		kotlinOptions {
	jvmTarget = "11"		jvmTarget = "21"
			}

			buildFeatures {
			buildConfig = true
	}		}

	signingConfigs {		signingConfigs {
	create("release") {		getByName("debug") {
	(keystoreProperties["keyAlias"] as String?)?.let {		(keystoreProperties["keyAlias"] as String?)?.let {
	keyAlias = it		keyAlias = it
	}		}
	@@ -87,14 +96,16 @@ android {
	dependencies {		dependencies {
	compileOnly(fileTree(mapOf("dir" to "../system_libs", "include" to listOf("*.jar"))))		compileOnly(fileTree(mapOf("dir" to "../system_libs", "include" to listOf("*.jar"))))

	implementation("androidx.core:core-ktx:1.9.0")		implementation("androidx.core:core-ktx:1.16.0")
	implementation("androidx.appcompat:appcompat:1.6.1")		implementation("androidx.appcompat:appcompat:1.7.0")
	implementation("androidx.cardview:cardview:1.0.0")		implementation("androidx.cardview:cardview:1.0.0")
	implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")		implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0")
	implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")		implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
	implementation("androidx.preference:preference:1.2.0")		implementation("androidx.preference:preference-ktx:1.2.1")
	implementation("androidx.recyclerview:recyclerview:1.2.1")		implementation("androidx.recyclerview:recyclerview:1.4.0")
	implementation("com.google.android.material:material:1.9.0-alpha01")		implementation("com.google.android.material:material:1.12.0")

			implementation("foundation.e:elib:0.0.1-alpha11")
	}		}

	configure<GenerateBpPluginExtension> {		configure<GenerateBpPluginExtension> {

app/privapp_whitelist_org.lineageos.updater.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,11 @@
	-->		-->
	<permissions>		<permissions>
	<privapp-permissions package="org.lineageos.updater">		<privapp-permissions package="org.lineageos.updater">
			<permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
	<permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>		<permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
	<permission name="android.permission.REBOOT"/>		<permission name="android.permission.REBOOT"/>
	<permission name="android.permission.RECOVERY"/>		<permission name="android.permission.RECOVERY"/>
	<permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>		<permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
			<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
	</privapp-permissions>		</privapp-permissions>
	</permissions>		</permissions>

app/src/main/AndroidManifest.xml

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11,8 +11,11 @@
	<uses-permission android:name="android.permission.REBOOT" />		<uses-permission android:name="android.permission.REBOOT" />
	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
	<uses-permission android:name="android.permission.RECOVERY" />		<uses-permission android:name="android.permission.RECOVERY" />
			<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
	<uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />		<uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
	<uses-permission android:name="android.permission.WAKE_LOCK" />		<uses-permission android:name="android.permission.WAKE_LOCK" />
			<uses-permission android:name="android.permission.WRITE_SETTINGS" />
			<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

	<application		<application
	android:allowBackup="false"		android:allowBackup="false"