Updater: Finish rebranding
Change-Id: Iad04361a80621841fa7071101993cbc7298ce009
diff --git a/app/Android.bp b/app/Android.bp
index 634ad7e..6c667ce 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -1,5 +1,6 @@
//
// Copyright (C) 2022-2023 The LineageOS Project
+// Copyright (C) 2022-2023 The LeafOS Project
//
// SPDX-License-Identifier: Apache-2.0
//
@@ -36,23 +37,28 @@
},
required: [
- "privapp_whitelist_org.lineageos.updater",
- "default-permissions_org.lineageos.updater"
+ "privapp_whitelist_org.leafos.updater",
+ "default-permissions_org.leafos.updater"
+ ],
+
+ aaptflags: [
+ "--rename-manifest-package",
+ "org.leafos.updater",
],
}
prebuilt_etc {
- name: "privapp_whitelist_org.lineageos.updater",
+ name: "privapp_whitelist_org.leafos.updater",
system_ext_specific: true,
sub_dir: "permissions",
- src: "privapp_whitelist_org.lineageos.updater.xml",
+ src: "privapp_whitelist_org.leafos.updater.xml",
filename_from_src: true,
}
prebuilt_etc {
- name: "default-permissions_org.lineageos.updater",
+ name: "default-permissions_org.leafos.updater",
system_ext_specific: true,
sub_dir: "default-permissions",
- src: "default-permissions_org.lineageos.updater.xml",
+ src: "default-permissions_org.leafos.updater.xml",
filename_from_src: true,
}
diff --git a/app/default-permissions_org.lineageos.updater.xml b/app/default-permissions_org.leafos.updater.xml
similarity index 94%
rename from app/default-permissions_org.lineageos.updater.xml
rename to app/default-permissions_org.leafos.updater.xml
index 027d455..4caeb40 100644
--- a/app/default-permissions_org.lineageos.updater.xml
+++ b/app/default-permissions_org.leafos.updater.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<exceptions>
- <exception package="org.lineageos.updater">
+ <exception package="org.leafos.updater">
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
</exception>
diff --git a/app/privapp_whitelist_org.lineageos.updater.xml b/app/privapp_whitelist_org.leafos.updater.xml
similarity index 90%
rename from app/privapp_whitelist_org.lineageos.updater.xml
rename to app/privapp_whitelist_org.leafos.updater.xml
index d88ad9c..3d94233 100644
--- a/app/privapp_whitelist_org.lineageos.updater.xml
+++ b/app/privapp_whitelist_org.leafos.updater.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017-2020 The LineageOS Project
+ Copyright (C) 2022 The LeafOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
limitations under the License.
-->
<permissions>
- <privapp-permissions package="org.lineageos.updater">
+ <privapp-permissions package="org.leafos.updater">
<permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
<permission name="android.permission.REBOOT"/>
<permission name="android.permission.RECOVERY"/>
diff --git a/push-update.sh b/push-update.sh
index 8d4de88..d92aacc 100755
--- a/push-update.sh
+++ b/push-update.sh
@@ -52,8 +52,8 @@
adb shell chmod 664 "$zip_path_device"
# Kill the app before updating the database
-adb shell "killall org.lineageos.updater 2>/dev/null"
-adb shell "sqlite3 /data/data/org.lineageos.updater/databases/updates.db" \
+adb shell "killall org.leafos.updater 2>/dev/null"
+adb shell "sqlite3 /data/data/org.leafos.updater/databases/updates.db" \
"\"INSERT INTO updates (status, path, download_id, timestamp, type, version, size)" \
" VALUES ($status, '$zip_path_device', '$id', $timestamp, '$type', '$version', $size)\""