Enable com.google.android.feature.CONTEXTUAL_SEARCH feature

Change-Id: Id72c2e81494f793d773cfc5de24cb15eeaaaf5e9

build/gapps.sh

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

cicd/Dockerfile

@@ -1,11 +1,5 @@
 FROM ubuntu:latest
 MAINTAINER LuK1337 <priv.luk@gmail.com>
 
-RUN <<EOF
-apt update
-apt -y install curl python3 python3-parse python3-requests unzip
-
-curl --output aapt2.jar https://dl.google.com/android/maven2/com/android/tools/build/aapt2/8.12.0-alpha05-12782657/aapt2-8.12.0-alpha05-12782657-linux.jar
-unzip -d /usr/bin aapt2.jar aapt2
-rm aapt2.jar
-EOF
+RUN apt update
+RUN apt -y install aapt python3 python3-parse python3-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-23.0/core/res/AndroidManifest.xml'
+    'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-22.0/core/res/AndroidManifest.xml'
 ANDROID_XML_NS = '{http://schemas.android.com/apk/res/android}'
 privileged_permissions = set()
 privileged_permission_mask = {'privileged', 'signature'}

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

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

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

@@ -103,7 +103,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MANAGE_CLOUDSEARCH"/>
         <permission name="android.permission.MANAGE_ROLLBACKS"/>
         <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.permission.PACKAGE_VERIFICATION_AGENT"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
@@ -121,6 +120,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.UPDATE_DEVICE_STATS"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
         <permission name="com.android.permission.USE_INSTALLER_V2"/>
+        <permission name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD"/>
         <permission name="com.google.android.settings.setup.dock.RUN_DOCK_SETUP"/>
     </privapp-permissions>
 
@@ -195,9 +195,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MODIFY_QUIET_MODE"/>
         <permission name="android.permission.OBSERVE_APP_USAGE"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.QUERY_USERS"/>
         <permission name="android.permission.READ_DREAM_STATE"/>
-        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>
         <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
         <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
@@ -214,11 +212,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
     <privapp-permissions package="com.google.android.configupdater">
         <permission name="android.permission.UPDATE_CONFIG"/>
     </privapp-permissions>
-    <privapp-permissions package="com.google.android.deskclock">
-        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
-        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
-        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
-    </privapp-permissions>
+
     <privapp-permissions package="com.google.android.gms">
         <permission name="android.permission.ACCESS_BROADCAST_RESPONSE_STATS"/>
         <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
@@ -258,11 +252,9 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.LOCATION_BYPASS"/>
         <permission name="android.permission.LOCATION_HARDWARE"/>
         <permission name="android.permission.LOCK_DEVICE"/>
-        <permission name="android.permission.MANAGE_ADVANCED_PROTECTION_MODE"/>
         <permission name="android.permission.MANAGE_FACTORY_RESET_PROTECTION"/>
         <permission name="android.permission.MANAGE_GAME_ACTIVITY"/>
         <permission name="android.permission.MANAGE_GAME_MODE"/>
-        <permission name="android.permission.MANAGE_INTRUSION_DETECTION_STATE"/>
         <permission name="android.permission.MANAGE_ROLLBACKS"/>
         <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
         <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
@@ -290,7 +282,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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_INTRUSION_DETECTION_STATE"/>
         <permission name="android.permission.READ_LOGS"/>
         <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
         <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
@@ -312,7 +303,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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.SETUP_FSVERITY"/>
         <permission name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED"/>
         <permission name="android.permission.SET_LOW_POWER_STANDBY_PORTS"/>
         <permission name="android.permission.SET_TIME"/>
@@ -320,7 +310,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
         <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE"/>
         <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"/>
@@ -376,7 +365,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MANAGE_USB"/>
         <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
         <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED"/>
         <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
@@ -388,11 +376,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.BIND_APPWIDGET"/>
         <permission name="android.permission.CALL_PRIVILEGED"/>
         <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
         <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
         <permission name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>
-        <permission name="android.permission.EXECUTE_APP_FUNCTIONS"/>
         <permission name="android.permission.GLOBAL_SEARCH"/>
         <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
         <deny-permission name="android.permission.INTERACT_ACROSS_USERS"/>
@@ -400,7 +385,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MANAGE_USB"/>
         <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
         <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
         <permission name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO"/>
@@ -410,7 +394,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE"/>
         <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"/>

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"/>

common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml

@@ -8,7 +8,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
     <privapp-permissions package="com.android.emergency">
         <permission name="android.permission.CALL_PRIVILEGED"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>

overlay/GmsOverlay/apktool.yml

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

overlay/GmsSettingsOverlay/apktool.yml

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

overlay/GmsSettingsProviderOverlay/apktool.yml

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

overlay/GmsSetupWizardOverlay/apktool.yml

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

proprietary-files-arm64-nongrouper.txt

@@ -1,4 +1,4 @@
-product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|69055955ef86dec796baf155f9ba14c2df29ef44
+product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|474ca0e1fb0e6340b647142b3f493055fcb3990f
 product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk;PRESIGNED
 product/app/talkback/talkback.apk;PRESIGNED
 product/priv-app/Velvet/Velvet.apk;PRESIGNED

proprietary-files-arm64-tangorpro.txt

@@ -1 +1 @@
-product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|782eb1875dd7944634899eeb1f8c10dee6456bd9
+product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|bb7c2f3fadfee4dda509daba285fec3dfffeed7e

proprietary-files-common.txt

@@ -2,7 +2,7 @@ product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED
 product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED|ec9673f50e4c4dfd2bfcb784d2d8082ef48d1e23
 product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2
 
-product/priv-app/AndroidAutoStub/AndroidAutoStub.apk;PRESIGNED|54d8dfc8f4633194b11eff1c23ff4632892634e3
+product/priv-app/AndroidAutoStub/AndroidAutoStub.apk;PRESIGNED
 product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
 
 product/framework/com.google.android.dialer.support.jar;PRESIGNED
@@ -10,7 +10,7 @@ product/framework/com.google.android.dialer.support.jar;PRESIGNED
 product/etc/default-permissions/default-permissions-google.xml
 product/etc/default-permissions/default-permissions-mtg.xml|b0e11fec4c6d134e205a856733bc89d95f2f24c9
 
-product/etc/init/gapps.rc|29368f8d6b85b8d6f0b5a262432aae12ad75173d
+product/etc/init/gapps.rc|1b9e076965fe08a03cf90fed0e96f2aa4ac90c0e
 
 product/etc/permissions/com.google.android.dialer.support.xml
 product/etc/permissions/privapp-permissions-google-product.xml