Add wellbeing.xml

Doesn't seem like x86 GMS exists anymore as it's not available as GSI
nor Android SDK image.

arm64/Android.bp

@@ -56,9 +56,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "MarkupGoogle_v2",
+	name: "MarkupGoogle",
 	owner: "gapps",
-	apk: "proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk",
+	apk: "proprietary/product/app/MarkupGoogle/MarkupGoogle.apk",
 	preprocessed: true,
 	presigned: true,
 	dex_preopt: {

arm64/arm64-vendor.mk

@@ -14,7 +14,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    MarkupGoogle_v2 \
+    MarkupGoogle \
     SpeechServicesByGoogle \
     talkback \
     Velvet \

build/gapps.sh

@@ -8,8 +8,8 @@
 #
 DATE=$(date -u +%Y%m%d_%H%M%S)
 export GAPPS_TOP=$(realpath .)
-ANDROIDV=15.0.0
+ANDROIDV=14.0.0
-SDKV=35
+SDKV=34
 GARCH=$1
 CPUARCH=$GARCH
 [ ! -z "$2" ] && CPUARCH=$2

build/meta/com/google/android/update-binary

@@ -107,7 +107,7 @@ compute_apps_size() {
 remove_big_optional_apps() {
   ui_print "Low resource device detected, removing large extras"
   rm -rf product/app/GoogleTTS
-  rm -rf product/app/MarkupGoogle_v2
+  rm -rf product/app/MarkupGoogle
   rm -rf product/app/SpeechServicesByGoogle
   rm -rf product/app/talkback
   rm -rf product/priv-app/GoogleRestore

cicd/Dockerfile

@@ -2,4 +2,5 @@ FROM ubuntu:latest
 MAINTAINER LuK1337 <priv.luk@gmail.com>
 
 RUN apt update
-RUN apt -y install aapt python3 python3-parse python3-requests
+RUN apt -y install aapt python3 python3-pip
+RUN pip install parse requests

cicd/verify-permissions.py

@@ -37,7 +37,7 @@ os.chdir(sys.path[0])
 
 # Definitions for privileged permissions
 ANDROID_MANIFEST_XML = \
-    'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-22.0/core/res/AndroidManifest.xml'
+    'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-21.0/core/res/AndroidManifest.xml'
 ANDROID_XML_NS = '{http://schemas.android.com/apk/res/android}'
 privileged_permissions = set()
 privileged_permission_mask = {'privileged', 'signature'}
@@ -94,7 +94,7 @@ for partition in partitions:
 
 # Definitions for parsing APKs
 GLOB_APK_STR = '../*/proprietary/{}/priv-app/*/*.apk'
-AAPT_CMD = ['aapt2', 'd', 'permissions']
+AAPT_CMD = ['aapt', 'd', 'permissions']
 
 # Extract requested privileged permissions from all priv-app APKs
 for partition in partitions:
@@ -103,7 +103,8 @@ for partition in partitions:
     # Loop over all the APKs in the partition we want
     for apk in glob(GLOB_APK_STR.format(partition)):
         # Run 'aapt d permissions' on APK
-        aapt_output = subprocess.check_output(AAPT_CMD + [apk]).decode(encoding='UTF-8')
+        aapt_output = subprocess.check_output(AAPT_CMD + [apk],
+                                              stderr=subprocess.STDOUT).decode(encoding='UTF-8')
         lines = aapt_output.splitlines()
         # Extract package name from the output
         # Output looks like:

common/proprietary/product/etc/default-permissions/default-permissions-google.xml

@@ -41,30 +41,4 @@
     <permission name="android.permission.BLUETOOTH_ADVERTISE" fixed="false"/>
   </exception>
 
-  <exception
-    package="com.google.android.deskclock"
-    sha256-cert-digest="F0:FD:6C:5B:41:0F:25:CB:25:C3:B5:33:46:C8:97:2F:AE:30:F8:EE:74:11:DF:91:04:80:AD:6B:2D:60:DB:83">
-    <!-- Notifications -->
-    <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-  </exception>
-
-  <exception
-    package="com.google.android.apps.tachyon"
-    sha256-cert-digest="7C:AA:B6:E6:BA:70:0E:0D:DC:F7:5C:CA:52:B8:C3:B1:9A:3C:7D:23:30:8F:7E:B1:77:A6:4E:B2:47:61:97:BD">
-    <!-- Notifications -->
-    <permission name="android.permission.READ_CONTACTS" fixed="false"/>
-    <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
-    <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
-    <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
-    <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
-    <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-  </exception>
-
- <exception
-    package="com.google.android.apps.photos"
-    sha256-cert-digest="3D:7A:12:23:01:9A:A3:9D:9E:A0:E3:43:6A:B7:C0:89:6B:FB:4F:B6:79:F4:DE:5F:E7:C2:3F:32:6C:8F:99:4A">
-    <permission name="android.permission.ACCESS_MEDIA_LOCATION" fixed="false"/>
-    <permission name="android.permission.READ_MEDIA_IMAGES" fixed="false"/>
-    <permission name="android.permission.READ_MEDIA_VIDEO" fixed="false"/>
-  </exception>
 </exceptions>

common/proprietary/product/etc/default-permissions/default-permissions-mtg.xml

@@ -4,7 +4,6 @@
     package="com.google.android.projection.gearhead"
     sha256-cert-digest="FD:B0:0C:43:DB:DE:8B:51:CB:31:2A:A8:1D:3B:5F:A1:77:13:AD:B9:4B:28:F5:98:D7:7F:8E:B8:9D:AC:EE:DF">
     <!-- Gearhead legacy -->
-    <permission name="android.permission.MODIFY_PHONE_STATE" fixed="false" />
     <permission name="android.permission.READ_PHONE_STATE" fixed="false" />
     <permission name="android.permission.CALL_PHONE" fixed="false" />
     <permission name="android.permission.READ_CALL_LOG" fixed="false" />

common/proprietary/product/etc/init/gapps.rc

@@ -1,3 +1,3 @@
 on init
-    setprop ro.com.google.gmsversion 15_202408
+    setprop ro.com.google.gmsversion 14_202310
     setprop ro.opa.eligible_device true

common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml

@@ -12,11 +12,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
     <privapp-permissions package="com.google.android.apps.messaging">
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
         <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.QUERY_USERS"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>
-        <permission name="android.permission.SATELLITE_COMMUNICATION"/>
         <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
         <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
     </privapp-permissions>
@@ -67,20 +64,17 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
-        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>
         <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"/>
         <permission name="android.permission.SET_SYSTEM_AUDIO_CAPTION"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
         <permission name="android.permission.SYSTEM_CAMERA"/>
         <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.USE_ON_DEVICE_INTELLIGENCE"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.as.oss">
         <permission name="android.permission.READ_RESTRICTED_STATS"/>
-        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.vending">
@@ -107,7 +101,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.PACKAGE_VERIFICATION_AGENT"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.READ_RUNTIME_PROFILES"/>
-        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
         <permission name="android.permission.REBOOT"/>
         <permission name="android.permission.SEND_DEVICE_CUSTOMIZATION_READY"/>
@@ -137,13 +130,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
 
     <privapp-permissions package="com.google.android.apps.carrier.carrierwifi">
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
         <permission name="android.permission.NETWORK_CARRIER_PROVISIONING"/>
-        <permission name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.apps.gcs">
@@ -158,7 +145,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.apps.searchlite">
-        <permission name="android.permission.CALL_PRIVILEGED"/>
         <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
         <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
     </privapp-permissions>
@@ -167,7 +153,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.MANAGE_USERS"/>
         <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.apps.turbo">
@@ -225,7 +210,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.BACKUP"/>
         <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
         <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.CALL_AUDIO_INTERCEPTION"/>
         <permission name="android.permission.CALL_PRIVILEGED"/>
         <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
         <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
@@ -233,7 +217,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
         <permission name="android.permission.CHECK_REMOTE_LOCKSCREEN"/>
         <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
-        <permission name="android.permission.CONFIGURE_FACTORY_RESET_PROTECTION"/>
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
         <permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
         <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
@@ -241,8 +224,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
         <permission name="android.permission.DOMAIN_VERIFICATION_AGENT"/>
         <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.EMERGENCY_INSTALL_PACKAGES"/>
-        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
         <permission name="android.permission.GET_APP_OPS_STATS"/>
         <permission name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE"/>
         <permission name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"/>
@@ -275,18 +256,15 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
         <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.PREPARE_FACTORY_RESET"/>
         <permission name="android.permission.PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE"/>
         <permission name="android.permission.PROVIDE_REMOTE_CREDENTIALS"/>
         <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
         <permission name="android.permission.PROVIDE_TRUST_AGENT"/>
         <permission name="android.permission.READ_DREAM_STATE"/>
-        <permission name="android.permission.READ_DROPBOX_DATA"/>
         <permission name="android.permission.READ_LOGS"/>
         <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
         <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>
         <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
         <permission name="android.permission.REBOOT"/>
@@ -298,13 +276,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.REQUEST_COMPANION_PROFILE_COMPUTER"/>
         <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED"/>
         <permission name="android.permission.RESET_PASSWORD"/>
-        <permission name="android.permission.SATELLITE_COMMUNICATION"/>
         <permission name="android.permission.SCHEDULE_PRIORITIZED_ALARM"/>
         <permission name="android.permission.SCORE_NETWORKS"/>
         <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE"/>
         <permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
-        <permission name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED"/>
-        <permission name="android.permission.SET_LOW_POWER_STANDBY_PORTS"/>
         <permission name="android.permission.SET_TIME"/>
         <permission name="android.permission.SET_TIME_ZONE"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
@@ -313,7 +288,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
         <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
         <permission name="android.permission.TETHER_PRIVILEGED"/>
-        <permission name="android.permission.THREAD_NETWORK_PRIVILEGED"/>
         <permission name="android.permission.TURN_SCREEN_ON"/>
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
         <permission name="android.permission.UPDATE_DEVICE_STATS"/>
@@ -323,9 +297,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
         <permission name="android.permission.WRITE_GSERVICES"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS"/>
-        <permission name="android.permission.THREAD_NETWORK_PRIVILEGED"/>
-        <permission name="android.permission.READ_DROPBOX_DATA"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.gms.supervision">
@@ -387,7 +358,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO"/>
         <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.SET_MEDIA_KEY_LISTENER"/>
         <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER"/>
@@ -396,7 +366,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.STOP_APP_SWITCHES"/>
         <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
         <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.hotwordenrollment.okgoogle">

common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
-    <privapp-permissions package="com.google.android.apps.wellbeing">
-        <permission name="android.permission.QUERY_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.projection.gearhead">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.google.android.googlequicksearchbox">
-        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
         <permission name="android.permission.QUERY_USERS"/>
         <permission name="android.permission.READ_DREAM_STATE"/>
         <permission name="android.permission.WRITE_DREAM_STATE"/>

overlay/GmsOverlay/apktool.yml

@@ -8,8 +8,8 @@ packageInfo:
   renameManifestPackage: null
 resourcesAreCompressed: false
 sdkInfo:
-  minSdkVersion: '35'
+  minSdkVersion: '34'
-  targetSdkVersion: '35'
+  targetSdkVersion: '34'
 sharedLibrary: false
 sparseResources: true
 unknownFiles: {}

overlay/GmsSettingsOverlay/apktool.yml

@@ -8,8 +8,8 @@ packageInfo:
   renameManifestPackage: null
 resourcesAreCompressed: false
 sdkInfo:
-  minSdkVersion: '35'
+  minSdkVersion: '34'
-  targetSdkVersion: '35'
+  targetSdkVersion: '34'
 sharedLibrary: false
 sparseResources: true
 unknownFiles: {}

overlay/GmsSettingsProviderOverlay/apktool.yml

@@ -8,8 +8,8 @@ packageInfo:
   renameManifestPackage: null
 resourcesAreCompressed: false
 sdkInfo:
-  minSdkVersion: '35'
+  minSdkVersion: '34'
-  targetSdkVersion: '35'
+  targetSdkVersion: '34'
 sharedLibrary: false
 sparseResources: true
 unknownFiles: {}

overlay/GmsSetupWizardOverlay/apktool.yml

@@ -8,8 +8,8 @@ packageInfo:
   renameManifestPackage: null
 resourcesAreCompressed: false
 sdkInfo:
-  minSdkVersion: '35'
+  minSdkVersion: '34'
-  targetSdkVersion: '35'
+  targetSdkVersion: '34'
 sharedLibrary: false
 sparseResources: true
 unknownFiles: {}

proprietary-files-arm64-nongrouper.txt

@@ -1,7 +1,7 @@
-product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|474ca0e1fb0e6340b647142b3f493055fcb3990f
+product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|ed68878a8a06ca8c06dbc98441a657168f1b378b
 product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk;PRESIGNED
 product/app/talkback/talkback.apk;PRESIGNED
 product/priv-app/Velvet/Velvet.apk;PRESIGNED
-product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|bb7c2f3fadfee4dda509daba285fec3dfffeed7e
+product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|0251d61f74f0557ccfd0e0424bed31e5828ea4b5
 
 system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED

proprietary-files-common.txt

@@ -14,7 +14,7 @@ product/etc/init/gapps.rc|1b9e076965fe08a03cf90fed0e96f2aa4ac90c0e
 
 product/etc/permissions/com.google.android.dialer.support.xml
 product/etc/permissions/privapp-permissions-google-product.xml
-product/etc/permissions/privapp-permissions-mtg.xml|b8bcdbc95f03e6c3e50a015c092d5a4b3fc878d7
+product/etc/permissions/privapp-permissions-mtg.xml|926d8fbcfbf4711a4bc96777595b70b874ef7334
 
 product/etc/security/fsverity/gms_fsverity_cert.der