From 1c41b2194a92f92dbb18dc67d9d6005f01dfde2b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 22 Jun 2025 03:35:31 +0300 Subject: [PATCH] zumapro: Remove factory configuration Change-Id: Ib46639b684db8f0bbd42be9ffd518e62277d63f0 --- device.mk | 2 +- factory/factory_post_boot/Android.bp | 25 ----- .../factory_post_boot/factory_post_boot.sh | 4 - factory/framework/Android.bp | 15 --- factory/framework/AndroidManifest.xml | 24 ----- .../res/drawable-nodpi/default_wallpaper.png | Bin 22697 -> 0 bytes factory/framework/res/values/config.xml | 33 ------ factory/launcher3/Android.bp | 15 --- factory/launcher3/AndroidManifest.xml | 25 ----- .../res/xml/default_workspace_5x5.xml | 41 -------- factory/settings/Android.bp | 15 --- factory/settings/AndroidManifest.xml | 25 ----- factory/settings/res/values/defaults.xml | 26 ----- factory_common.mk | 99 ------------------ .../SettingsProvider/res/values/defaults.xml | 23 ---- .../apps/PixelLogger/res/values/arrays.xml | 7 -- .../apps/PixelLogger/res/values/config.xml | 10 -- .../PixelLogger/res/values/configmessages.xml | 19 ---- 18 files changed, 1 insertion(+), 407 deletions(-) delete mode 100644 factory/factory_post_boot/Android.bp delete mode 100644 factory/factory_post_boot/factory_post_boot.sh delete mode 100644 factory/framework/Android.bp delete mode 100644 factory/framework/AndroidManifest.xml delete mode 100644 factory/framework/res/drawable-nodpi/default_wallpaper.png delete mode 100644 factory/framework/res/values/config.xml delete mode 100644 factory/launcher3/Android.bp delete mode 100644 factory/launcher3/AndroidManifest.xml delete mode 100644 factory/launcher3/res/xml/default_workspace_5x5.xml delete mode 100644 factory/settings/Android.bp delete mode 100644 factory/settings/AndroidManifest.xml delete mode 100644 factory/settings/res/values/defaults.xml delete mode 100644 factory_common.mk delete mode 100644 overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml delete mode 100644 overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml delete mode 100644 overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml delete mode 100644 overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml diff --git a/device.mk b/device.mk index d14367b..1770391 100644 --- a/device.mk +++ b/device.mk @@ -1166,7 +1166,7 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk ifneq ($(BOARD_WITHOUT_RADIO),true) # RIL extension service -ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) +ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) include device/google/gs-common/pixel_ril/ril.mk endif endif diff --git a/factory/factory_post_boot/Android.bp b/factory/factory_post_boot/Android.bp deleted file mode 100644 index cbbebda..0000000 --- a/factory/factory_post_boot/Android.bp +++ /dev/null @@ -1,25 +0,0 @@ -// -// Copyright (C) 2022 The Android Open Source Project -// -// 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. - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} -sh_binary { - name: "factory_post_boot", - src: "factory_post_boot.sh", - vendor: true, - sub_dir: "factory", -} - diff --git a/factory/factory_post_boot/factory_post_boot.sh b/factory/factory_post_boot/factory_post_boot.sh deleted file mode 100644 index 35b562b..0000000 --- a/factory/factory_post_boot/factory_post_boot.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/vendor/bin/sh - -# Add adbd to nnapi vendor cgroup. (b/222226268) -echo `pidof adbd` > /proc/vendor_sched/groups/nnapi/set_task_group diff --git a/factory/framework/Android.bp b/factory/framework/Android.bp deleted file mode 100644 index b9204cb..0000000 --- a/factory/framework/Android.bp +++ /dev/null @@ -1,15 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "//device/google/zumapro:device_google_zumapro_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: [ - "//device/google/zumapro:device_google_zumapro_license", - ], -} - -runtime_resource_overlay { - name: "FactoryOverlayFrameworkRes", - product_specific: true, -} diff --git a/factory/framework/AndroidManifest.xml b/factory/framework/AndroidManifest.xml deleted file mode 100644 index 73875be..0000000 --- a/factory/framework/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/factory/framework/res/drawable-nodpi/default_wallpaper.png b/factory/framework/res/drawable-nodpi/default_wallpaper.png deleted file mode 100644 index 93b787e3f40db2e87177bb7f11c98491ddefd6cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22697 zcmeI3&5ImG6u@gSh^{7>lb{}k34)?M{r&08#LdpGyW+%Uv*HGVNl$n6ZnHDpV|Qh;Y^PRUpaDyp&9%~EoZymPF$7OC z%#vwWWZg71^VO0f$+{@1qACfB>S&UqDW$=uT%RYus)-*s>y70>I3m@`+ga9iL~(C# zud=6B;$%ydZQB+lMN|}l^bpehD06#4l%DE48Tx79)Jwu{7RFJD`gL3JZdNOoX`s<( z@Lrv6vpEVCr2~3|qu6u1qFj;0PDh+(nP%&FJjkh*>BfE+i|aUzcM}hj?x&_ZTDnX| zH+b74I9j@lqim`xGG}~8)8hNy$fmoSv~$qDC*n5lkT@w}AWsF*-Hx+3-HvC39I11N z(*kE(D$X<=ucU$dg4_N+@nbLaoe=~_4tzy3R7=o2!xm)Ov;`Y$ zmf*=+OEG+_Wd+hOV8Pi$pw%eN+{nXZ{A6^MkOc8n3oEv&30_O_1T8Qv!D>mW;90iq z1=w@3IdWYvpK#s4Nq8Ci%SqhHw@uegQcRa{tvp=AqkT4Dn{NUqoE(!a`-b6TQ?QLd z6*NN+1Y0Hp(`?OjJw^9@+pCHb=HoGu0M)*lkQ~m~bhKt5S%xQ>f+D#}AFZoel3-hb zE9;(SnPxDIRd6vc8tAk z9MwrCHv~x&6k|iy9mQ}IU64#iA}g#vlDyY!CutmHdv1akw#X)|_m7UXVJ0apF6Ku? z>7}OYg%M3JFAx15Hk=*6+jgTZ?AOJi;jn=D}!iEbHR$1B2EtD94WtX-OzPauZnClYq1vgaC@^6k_siI zhk&eTgkx^Ss-~KrFPKUSN$+FRf@)ye-!6q>InRXsR#J+S{{qCk#;5iEM3NjGKo9fB z_?;f6SH>3vVSw;Oz{TgoXaN@kgf9XvJ|9L4xELUO5pePOFj~OH0O5;(i_eGA0xkv! zUj$ryK8zM{F+lht;NtUPw1A5N!WRJ-pAVx2TnrGt2)Ous7%kvpfbd1Y#plCl0T%;= zF9I$;A4Utf7$AHRaPj#tTEN8s;fsKa&xg?hE(Qo+1YCSRj23V)K=>ly;`3p&fQtdb z7XcTa52FQK3=qBuxcGb+E#P8+@I}DI=fh|L7XySZ0xmuuMhmzYAbb&U@%b=Xz{LRJ zi(FjuUcX201EZ5SkJCpvAh&uEYW!r-$MqW>`gler7l+AZ z;nsI^Y(cY(j%N5a6Xca0L23oNHifrfdmB-T?bGgL4icq z0Tf73AVGmdHUbn#P$1ES2n7-pNOT=QfdmB-T?bGgL4gDX64?k)AU%o&(q}gwpt+x) V627^4>qDCER+r8;zB+U1+JA^*q(uM# diff --git a/factory/framework/res/values/config.xml b/factory/framework/res/values/config.xml deleted file mode 100644 index cf85904..0000000 --- a/factory/framework/res/values/config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - false - - - false - - - true - - - diff --git a/factory/launcher3/Android.bp b/factory/launcher3/Android.bp deleted file mode 100644 index 90209a7..0000000 --- a/factory/launcher3/Android.bp +++ /dev/null @@ -1,15 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "//device/google/zumapro:device_google_zumapro_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: [ - "//device/google/zumapro:device_google_zumapro_license", - ], -} - -runtime_resource_overlay { - name: "FactoryOverlayLauncher3", - product_specific: true, -} diff --git a/factory/launcher3/AndroidManifest.xml b/factory/launcher3/AndroidManifest.xml deleted file mode 100644 index 3f28585..0000000 --- a/factory/launcher3/AndroidManifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/factory/launcher3/res/xml/default_workspace_5x5.xml b/factory/launcher3/res/xml/default_workspace_5x5.xml deleted file mode 100644 index ba1427a..0000000 --- a/factory/launcher3/res/xml/default_workspace_5x5.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/factory/settings/Android.bp b/factory/settings/Android.bp deleted file mode 100644 index 0666039..0000000 --- a/factory/settings/Android.bp +++ /dev/null @@ -1,15 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "//device/google/zumapro:device_google_zumapro_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: [ - "//device/google/zumapro:device_google_zumapro_license", - ], -} - -runtime_resource_overlay { - name: "FactoryOverlaySettings", - product_specific: true, -} diff --git a/factory/settings/AndroidManifest.xml b/factory/settings/AndroidManifest.xml deleted file mode 100644 index 72e7838..0000000 --- a/factory/settings/AndroidManifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/factory/settings/res/values/defaults.xml b/factory/settings/res/values/defaults.xml deleted file mode 100644 index b7febd9..0000000 --- a/factory/settings/res/values/defaults.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - 0 - true - false - false - false - confirmed - diff --git a/factory_common.mk b/factory_common.mk deleted file mode 100644 index c390549..0000000 --- a/factory_common.mk +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright 2020 The Android Open-Source Project -# -# 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. -# - -$(call inherit-product, device/google/zumapro/aosp_common.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/factory/pixel/device-factory.mk) - -PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \ - ro.vendor.factory=1 - -# Factory Libraries of Audio -PRODUCT_PACKAGES += audioroute libaudioroutelite - -# Enable fatp by default for factory builds -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.vendor.camera.fatp.enable=1 - -# Disable camera related features for factory builds -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.camera.af.ignore_gyro=1 \ - persist.vendor.camera.multicam.framesync=0 \ - vendor.camera.debug.bypass_face_ssd_processor=1 \ - vendor.camera.debug.csi_ebuf_enable=0 \ - vendor.camera.debug.enable_face_detection=0 \ - vendor.camera.debug.force_dpm_on=0 \ - vendor.camera.debug.force_eis_on=0 \ - vendor.camera.debug.force_eaf_on=0 \ - vendor.camera.debug.force_mesh_warp_on=0 \ - vendor.camera.debug.force_rectiface_node_on=0 \ - vendor.camera.debug.force_steadiface_on=0 \ - vendor.camera.debug.force_tnr_on=0 \ - vendor.camera.debug.force_segmentation_node_on=0 \ - vendor.camera.debug.enable_saliency=0 \ - vendor.camera.debug.force_local_tone_mapping_on=0 \ - vendor.camera.debug.local_tone_mapping_controller_v1.mode=0 \ - vendor.camera.debug.enable_scene_detection=0 \ - vendor.camera.debug.enable_sw_denoise=0 \ - vendor.camera.debug.enable_video_sw_denoise=0 \ - vendor.camera.debug.force_pd_node_on=0 - -# Disable ScreenDecorations for factory builds -PRODUCT_PROPERTY_OVERRIDES += \ - debug.disable_screen_decorations=true - -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms?=80 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_touch_timer_ms=200 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer_ms=1000 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true - -# Disable dimming in factory -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage=2 - - -# factory should always has SELinux permissive -BOARD_BOOTCONFIG += androidboot.selinux=permissive -BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive - -# Disable DebugFS restrictions in factory builds -PRODUCT_SET_DEBUGFS_RESTRICTIONS := false - -# Disable Bluetooth as default in factory build -DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay-factory - -PRODUCT_COPY_FILES += \ - device/google/zumapro/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc - -BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/factory_boost - -# Add factory-friendly changes -PRODUCT_PACKAGES += \ - FactoryOverlaySettings \ - FactoryOverlayLauncher3 \ - FactoryOverlayFrameworkRes \ - factory_post_boot - -# To prevent rebooting due to crashing services -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - init.svc_debug.no_fatal.zygote=true \ - persist.device_config.configuration.disable_rescue_party=true - -# PixelLogger for RF testing -PRODUCT_PACKAGES_DEBUG += \ - PixelLogger \ - -# ModemDiagnosticSystem for desense tool -PRODUCT_PACKAGES += \ - ModemDiagnosticSystem \ diff --git a/overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml deleted file mode 100644 index 3f3258f..0000000 --- a/overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - false - - diff --git a/overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml b/overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml deleted file mode 100644 index 20a8365..0000000 --- a/overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - shannondm - cnss_diag - brcm_gps - - diff --git a/overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml b/overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml deleted file mode 100644 index ee2e1e8..0000000 --- a/overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - shannondm - Built-in Mask #1 - - - cnss_diag.conf - - true - diff --git a/overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml b/overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml deleted file mode 100644 index 578cfc5..0000000 --- a/overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - This will collect audio from your voice calls. Would you like to proceed? - - - This may collect audio from your voice calls. Would you like to proceed? - Pixel_Default.nprf - Built-in Mask #0 - Built-in Mask #1 - Built-in Mask #2 - Built-in Mask #3 - - Privacy Warning - You are loading a user defined logging config. This may collect audio from your voice calls. Would you like to proceed? -