From b3d116a72fa34f82ac1002b89c350deb51939766 Mon Sep 17 00:00:00 2001
From: imbroglius <163344413+imbroglius@users.noreply.github.com>
Date: Mon, 12 Aug 2024 22:44:48 +0200
Subject: [PATCH] Delete patches directory

---
 .../0001-Import-vendor-gapps.patch            |    26 -
 .../0002-Rework-securize-tweak.patch          |   115 -
 ...OKEN_MISSING_REQUIRED_MODULES-to-tru.patch |    21 -
 .../0001-Remove-su-from-vanilla-builds.patch  |    24 -
 ...clude-AOSP-apn-list-on-custom-builds.patch |    39 -
 .../0001-Fix-Trebuchet-tests.patch            |    26 -
 ...-attestation-and-instrumentation-to-.patch |   176 -
 ...pat-Spoof-Pixel-XL-for-Google-Photos.patch |    52 -
 ...03-monet-Use-Style.SPRITZ-by-default.patch |    40 -
 ...d.version.incremental-to-signal-OTA-.patch |   121 -
 .../0005-SystemUI-fix-SliceView-layout.patch  |    29 -
 ...mission.READ_PHONE_STATE-to-manifest.patch |    25 -
 ...Pre-grant-google-restore-permissions.patch |    50 -
 ...Lockscreen-Weather-with-OmniJaws-1-2.patch |   924 -
 ...d-Face-Unlock-with-ParanoidSense-1-2.patch |  2943 --
 ...tly-monet-theme-the-new-volume-panel.patch |    85 -
 ...Lockscreen-Weather-with-OmniJaws-2-2.patch |   772 -
 ...d-Face-Unlock-with-ParanoidSense-2-2.patch |    30 -
 ...ert-Add-support-for-toggling-taskbar.patch |   138 -
 ...0001-misc-Remove-securize-preference.patch |    70 -
 .../0001-Disable-vndklite-handling.patch      |    36 -
 ...m-to-fake-vendor-props-on-a-per-proc.patch |   136 -
 ...t-reboot-if-we-couldn-t-get-bootctrl.patch |    26 -
 .../0001-Remove-init.vndk-nodef.rc.patch      |    75 -
 .../0002-build-Remove-llkd.patch              |    27 -
 ...03-Include-vndk-v28-sepolicy-support.patch |    24 -
 ...ite-build-display-id-to-product-prop.patch |    29 -
 ...-log_level-to-get-actual-selinux-err.patch |    26 -
 ...Make-an-unknown-permission-an-error-.patch |    45 -
 ...e-phh-treble-conflict-with-SELinux-p.patch |   116 -
 ...rtual-block-genfscon-conflict-seen-o.patch |    43 -
 ...rcs-accept-conflict.-Seen-on-Moto-E5.patch |    44 -
 ...6-Allow-mismatches-of-exfat-genfscon.patch |    27 -
 ...-on-Moto-devices-using-unknown-class.patch |    84 -
 ...policy-workaround-on-device-phh-treb.patch |    26 -
 ...ermark_scale_factor-conflict-seen-on.patch |    33 -
 .../0010-Allow-conflict-on-fuseblk.patch      |    25 -
 ...and-Q-behavior-respectively-for-tele.patch |   326 -
 .../0002-Fix-BT-in-call-on-CAF-devices.patch  |   131 -
 ...id-is-hardcoded-support-for-Asus-ZF6.patch |    94 -
 ...orce-load-audio-policy-for-system-si.patch |    61 -
 ...2DP-audio-ports-from-the-primary-HAL.patch |    79 -
 ...again-with-trimmed-audio-port-name-i.patch |    55 -
 ...-property-to-override-default-camera.patch |    62 -
 ...SCO-devices.-Fallback-from-one-to-th.patch |    46 -
 ...phh.samsung.camera_ids-property-to-a.patch |    80 -
 ...rty-to-force-camera-timestamp-source.patch |    45 -
 ...IH-devices-Fix-Earpiece-audio-output.patch |    87 -
 ...e-assigning-legacy-audio-groups-fata.patch |    32 -
 ...-Make-camera-IDs-filter-out-optional.patch |    47 -
 .../0014-Support-Samsung-R-multi-cams.patch   |    67 -
 ...in-a-route-are-valid.-Dont-ignore-th.patch |    27 -
 ...lume-policy-when-none-has-been-found.patch |    37 -
 ...pport-for-audio-HAL-V2-from-the-fram.patch |   152 -
 ...rop-to-change-Samsung-flash-strength.patch |    64 -
 ...gh-pitched-voice-on-Qualcomm-devices.patch |    46 -
 ...broken-mic-while-video-recording-on-.patch |    40 -
 ...sable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch |    28 -
 ...x-echo-on-incoming-or-outgoing-calls.patch |    46 -
 ...0023-Include-Samsung-AIDL-camera-ids.patch |    64 -
 ...ra-modes-declared-in-Samsung-proprie.patch |   106 -
 ...0001-Disable-vendor-mismatch-warning.patch |    38 -
 ...id-autobrightness-if-brightness-valu.patch |    39 -
 ...Fix-env-empty-string-ANDROID_STORAGE.patch |    26 -
 ...uirement-for-visible-flag-to-sdcards.patch |    31 -
 ...h-if-there-is-IR-HAL-is-not-declared.patch |    46 -
 ...istent-property-to-override-the-defa.patch |    59 -
 ...-Show-APN-Settings-for-CDMA-carriers.patch |    25 -
 ...s-so-that-it-works-even-without-qtag.patch |    39 -
 ...-Support-samsung-Pie-and-Q-light-hal.patch |    26 -
 ...samsung-touch-physical-and-hover-pro.patch |    67 -
 ...erriding-the-number-of-work-profiles.patch |    32 -
 ...-wake-up-devices-just-as-well-as-bac.patch |    26 -
 ...e-proximity-sensor-reporting-NaN-as-.patch |    28 -
 ...ange-not-being-complete-on-Samsung-d.patch |    37 -
 ...atch-like-behaviour-for-RRO-java-sid.patch |    64 -
 ...otification-about-console-service-be.patch |    26 -
 ...t-Remove-unused-SystemProperties.set.patch |    95 -
 ...nyManager-bring-back-getNetworkClass.patch |    84 -
 ...-add-API-annotations-for-setTelephon.patch |    41 -
 .../0020-Fix-Wakelock-issue.patch             |    28 -
 ...tect-pick-up-sensor-so-that-an-overl.patch |    50 -
 ...nBuiltInDisplayCutoutRectApproximati.patch |    54 -
 ...t-Fix-backlight-control-on-Galaxy-S9.patch |   121 -
 ...ch-long-press-power-behavior-in-AOSP.patch |    35 -
 ...of-fingerprint-cleanups-needed-on-so.patch |    26 -
 ...ze-boot-animation-to-match-screen-si.patch |    46 -
 ...more-FDE-methods-from-StorageManager.patch |   127 -
 ...e-AVCProfileMain-for-screen-recorder.patch |    30 -
 ...ngerprint-sensors-to-security-strong.patch |    37 -
 ...SehSysInputDev-to-report-screen-stat.patch |   100 -
 ...-constrainNitsAndBacklightArrays-and.patch |    86 -
 ...32-Add-Mediatek-power-hints-on-touch.patch |   127 -
 ...Detect-Moto-dynamic-hardware-feature.patch |    48 -
 ...ateForSlotIndex-in-SubscriptionManag.patch |    40 -
 ...CallingIdentity-variant-with-both-ex.patch |    65 -
 .../0036-Catch-NPE-in-SystemUI.patch          |    31 -
 ...e-Samsung-Power-hal-in-libpowermanag.patch |    27 -
 ...Asus-Samsung-recent-Xiaomi-and-RedMa.patch |   969 -
 ...htness-slider-curve-for-some-devices.patch |    58 -
 .../0040-Ignore-cgroup-creation-errors.patch  |    50 -
 ...use-SW_MACHINE_COVER-rather-than-SW_.patch |    87 -
 ...rt-Removed-IWLAN-legacy-mode-support.patch |    82 -
 ...prop-to-use-linear-backlight-control.patch |    42 -
 ...Samsung-full-brightness-on-their-AID.patch |   110 -
 .../0045-Add-Samsung-sysinput.patch           |    24 -
 ...ff-commonize-refreshing-the-services.patch |   237 -
 ...ices-use-SW_FLIP-0x15-rather-than-SW.patch |    56 -
 ...amsung.hardware.radio.network-V1-jav.patch |    25 -
 ...amsung.hardware.radio-V2.2-java-HIDL.patch |    25 -
 ...spoofing-for-microG-Companion-Servic.patch |   131 -
 ...precated-IRadio-1.4-APIs-and-referen.patch |    88 -
 ...em_server-if-we-fail-to-parse-dynami.patch |    42 -
 ...sable-animation-in-for-sysui-media-c.patch |    34 -
 ...certain-signature-to-install-work-li.patch |    93 -
 ...ed-to-send-a-hack-message-to-HAL-to-.patch |    35 -
 ...n-input-with-a-display-uses-uniqueId.patch |    35 -
 ...n-t-exist-in-O-P-so-detect-its-suppo.patch |    26 -
 ...Samsung-system-permission-on-sensors.patch |    37 -
 ...er-input-as-sensor-exclusively-if-th.patch |    38 -
 ...ide-their-vibrator-HAL-behind-non-de.patch |    30 -
 ...er-Add-support-Samsung-miscpower-HAL.patch |   333 -
 ...008-FOD-support-for-Samsung-and-Asus.patch |   272 -
 ...support-to-fix-broken-Mediatek-gpufr.patch |   295 -
 .../0010-Fix-loading-unnamed-GLES.patch       |    40 -
 .../0011-Increase-SW_MAX-4.patch              |    55 -
 ...le-gpuservice-on-old-BPF-less-kernel.patch |    25 -
 ...eFlinger-Disable-SF-HWC-backpressure.patch |    26 -
 ...s-static-ImsManager.updateImsService.patch |    33 -
 ...roller-Do-not-override-default-calli.patch |    58 -
 ...ot-call-onUssdRelease-for-Huawei-RIL.patch |    34 -
 ...ng-too-long-to-fit-into-a-91-chars-p.patch |    27 -
 ...ic-void-TelephonyMetrics.writeRilSen.patch |    46 -
 ...precated-IRadio-1.4-APIs-and-referen.patch |  1579 -
 ...e-deprecated-HAL-versions-for-IRadio.patch |  8486 ----
 ...ength-for-huawei-kirin-hi6250-hi3670.patch |   193 -
 ...ward-port-support-for-forceCognitive.patch |    39 -
 ...ue-to-setPreferredNetworkType-for-RI.patch |    53 -
 ...-Fix-NPE-with-1.0-and-1.1-CardStatus.patch |    26 -
 ...vert-Block-Binder-thread-until-incom.patch |    54 -
 ...cSlot-ignore-error-if-we-cant-print-.patch |    32 -
 ...rt-Removed-IWLAN-legacy-mode-support.patch |   433 -
 ...ng-AIDL-ISehRadioNetwork.-Fixes-5G-o.patch |   208 -
 ...ng-HIDL-ISehRadio.-Fixes-5G-on-S20-U.patch |   231 -
 ...hen-reading-SMSC-ignore-invalid-SMSC.patch |    48 -
 ...command-to-be-able-to-call-vendor-sp.patch |    31 -
 ...-Fix-light-sensor-crash-on-Xiaomi-13.patch |    36 -
 ...sung-S23-using-stock-properties-beca.patch |    28 -
 ...e-when-there-is-no-hal-but-we-believ.patch |    32 -
 ...-fingerprint-events-they-are-expecte.patch |    40 -
 ...ove-Do-not-validate-option-in-CA-cer.patch |   311 -
 ...ck-if-domain-field-is-not-empty-when.patch |    85 -
 ...-hci-Ignore-unexpected-status-events.patch |    43 -
 ..._interface-Optionally-use-sysbta-HAL.patch |   116 -
 ...n-to-change-eSCO-Transport-Unit-Size.patch |    45 -
 ...en-failing-to-get-real-time-priority.patch |    85 -
 ...es-we-need-to-tell-Audio-HAL-if-we-r.patch |    67 -
 ...o-disable-some-features-commands-sta.patch |   131 -
 ...o-cap-declared-le-vendor-version.-Fo.patch |    58 -
 ...mmand-READ_REMOTE_VERSION_INFORMATIO.patch |    33 -
 ...-load-bpf-programs-for-BPF-less-devi.patch |    34 -
 ...king-BPF-maps-on-old-BPF-less-kernel.patch |   418 -
 ...raffic-indicators-for-legacy-devices.patch |   142 -
 ...ort-for-V-gsi-on-pixel-5-R-base-kern.patch |    44 -
 ...d-add-back-support-for-4.9-T-kernels.patch |    56 -
 .../0006-NetBpfLoad-more-4.9-T-support.patch  |    44 -
 ...netd-Remove-4.14-kernel-restrictions.patch |    34 -
 ...ignore-there-are-some-4.14-without-t.patch |    42 -
 ...pdatable-add-back-abort-on-init-fail.patch |    28 -
 ...ash-when-we-get-no-DeviceLockManager.patch |    29 -
 ...e-DnsHelper-failed-to-init-on-BPF-le.patch |    24 -
 ...phh.wifi_disable_sae-property-to-dis.patch |    37 -
 .../0001-Include-vndk-v28-apex.patch          |    27 -
 ...precated-IRadio-1.4-APIs-and-referen.patch |    86 -
 ...001-Disable-O_DIRECT-for-old-kernels.patch |    54 -
 .../0001-Support-no-bpf-usecase.patch         |    55 -
 ...r-add-back-support-for-4.9-T-kernels.patch |    56 -
 .../0003-bpfloader-more-4.9-T-support.patch   |    44 -
 ...et-system-override-ro.apex.updatable.patch |    36 -
 ...eating-property-tree-if-there-is-a-c.patch |    35 -
 ...tart-console-service-when-debuggable.patch |    31 -
 ...into-recovery-rather-than-bootloader.patch |    29 -
 ...allowed-sdcard-options-based-on-vndk.patch |    43 -
 ...Set-dev-uinput-as-0666-to-fix-finger.patch |    32 -
 ...t-Set-system-xbin-permissions-to-750.patch |    28 -
 ...my-own-OTA-mechanism-going-over-data.patch |   136 -
 ...Keep-allowing-encryptable-fstab-flag.patch |    36 -
 ...lback-FDE-to-no-encryption-and-FDE-F.patch |    38 -
 ...ide-adb-secure-props-so-we-dont-get-.patch |    26 -
 ...0-kernels.-This-is-needed-because-on.patch |    54 -
 ...chdogd-Support-pinging-two-watchdogs.patch |    78 -
 ...d-offline-charger-fix-screen-off-3-3.patch |   229 -
 ...n-legacy-devices-with-encryption-dis.patch |    32 -
 ...are_mnt.-Moto-Razr-2019-look-for-fir.patch |    26 -
 .../0017-Ignore-dm-verity-setup-issues.patch  |    30 -
 ...for-devices-without-cgroupv2-support.patch |    36 -
 ...quota-on-old-devices-but-new-enough-.patch |    32 -
 ...ies-custom-rc-action-prop-validation.patch |    24 -
 ...rs-when-setting-fscrypt-directory.-S.patch |    33 -
 ...sion-of-ro.logd.kernel.-We-do-want-l.patch |    26 -
 ...p-capex-when-there-are-vendor-apexes.patch |    40 -
 ...apex.updatable-actually-set-the-valu.patch |    50 -
 ...0025-If-AVB-fails-ignore-disable-AVB.patch |    62 -
 ...-no-longer-exist-we-ll-deal-with-it-.patch |    53 -
 ...-Bail-out-if-we-can-t-open-directory.patch |    35 -
 .../0001-Disable-vndklite-handling.patch      |    26 -
 ...rin-960-accept-broken-rpfilter-match.patch |    29 -
 ...n-t-fail-on-FTP-conntracking-failing.patch |    45 -
 .../0003-Support-no-bpf-usecase.patch         |    26 -
 ...ase-of-cgroup-bpf-setup-fail-since-s.patch |    26 -
 ...priority-over-NFC-config-file-rather.patch |    29 -
 ...01-Revert-Remove-28.0-compat-support.patch | 34429 ----------------
 ...-kernel-5.10-that-doesn-t-support-bp.patch |    31 -
 .../0001-Allow-deletion-of-symlink.patch      |    25 -
 ...o-create-facedata-shouldn-t-be-fatal.patch |    38 -
 ...003-Don-t-unmount-rw-system.sh-binds.patch |    25 -
 ...nted-with-exfat-kernel-fs-driver-or-.patch |    47 -
 ...ery-voldmanaged-storage-is-adoptable.patch |    25 -
 218 files changed, 63743 deletions(-)
 delete mode 100644 patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch
 delete mode 100644 patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch
 delete mode 100644 patches/personal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch
 delete mode 100644 patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch
 delete mode 100644 patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch
 delete mode 100644 patches/personal/platform_external_robolectric/0001-Fix-Trebuchet-tests.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0001-gmscompat-Change-attestation-and-instrumentation-to-.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0002-gmscompat-Spoof-Pixel-XL-for-Google-Photos.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0003-monet-Use-Style.SPRITZ-by-default.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0004-fw-b-Use-ro.build.version.incremental-to-signal-OTA-.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0005-SystemUI-fix-SliceView-layout.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0006-Add-android.permission.READ_PHONE_STATE-to-manifest.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0007-permissions-Pre-grant-google-restore-permissions.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0008-feat-Add-Lockscreen-Weather-with-OmniJaws-1-2.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch
 delete mode 100644 patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch
 delete mode 100644 patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch
 delete mode 100644 patches/personal/platform_packages_apps_Settings/0002-feat-Add-Face-Unlock-with-ParanoidSense-2-2.patch
 delete mode 100644 patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch
 delete mode 100644 patches/personal/treble_app/0001-misc-Remove-securize-preference.patch
 delete mode 100644 patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
 delete mode 100644 patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch
 delete mode 100644 patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
 delete mode 100644 patches/trebledroid/platform_build/0001-Remove-init.vndk-nodef.rc.patch
 delete mode 100644 patches/trebledroid/platform_build/0002-build-Remove-llkd.patch
 delete mode 100644 patches/trebledroid/platform_build/0003-Include-vndk-v28-sepolicy-support.patch
 delete mode 100644 patches/trebledroid/platform_build/0004-core-sysprop-Write-build-display-id-to-product-prop.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch
 delete mode 100644 patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0016-Use-a-fake-volume-policy-when-none-has-been-found.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0017-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0018-Add-a-prop-to-change-Samsung-flash-strength.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0019-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0020-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0021-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0023-Include-Samsung-AIDL-camera-ids.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_av/0024-Allow-using-camera-modes-declared-in-Samsung-proprie.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0037-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0038-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0039-Fix-brightness-slider-curve-for-some-devices.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0040-Ignore-cgroup-creation-errors.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0041-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0042-Revert-Removed-IWLAN-legacy-mode-support.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0043-Add-a-prop-to-use-linear-backlight-control.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0044-Add-support-for-Samsung-full-brightness-on-their-AID.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0045-Add-Samsung-sysinput.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0046-Bunch-of-FOD-stuff-commonize-refreshing-the-services.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0047-Some-Samsung-devices-use-SW_FLIP-0x15-rather-than-SW.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0048-Include-vendor.samsung.hardware.radio.network-V1-jav.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0049-Include-vendor.samsung.hardware.radio-V2.2-java-HIDL.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0050-Allow-signature-spoofing-for-microG-Companion-Servic.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0051-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0052-Don-t-crash-system_server-if-we-fail-to-parse-dynami.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0053-Add-a-prop-to-disable-animation-in-for-sysui-media-c.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_base/0054-Allow-APKs-of-a-certain-signature-to-install-work-li.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0010-Fix-loading-unnamed-GLES.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0011-Increase-SW_MAX-4.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0012-Disable-gpuservice-on-old-BPF-less-kernel.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_native/0013-SurfaceFlinger-Disable-SF-HWC-backpressure.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0004-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0005-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0006-Revert-Remove-deprecated-HAL-versions-for-IRadio.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0007-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0008-telephony-forward-port-support-for-forceCognitive.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0009-Pass-correct-value-to-setPreferredNetworkType-for-RI.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0010-Fix-NPE-with-1.0-and-1.1-CardStatus.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0011-Conditionally-revert-Block-Binder-thread-until-incom.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0012-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0013-Revert-Removed-IWLAN-legacy-mode-support.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0014-Initialize-Samsung-AIDL-ISehRadioNetwork.-Fixes-5G-o.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0015-Initialize-Samsung-HIDL-ISehRadio.-Fixes-5G-on-S20-U.patch
 delete mode 100644 patches/trebledroid/platform_frameworks_opt_telephony/0016-When-reading-SMSC-ignore-invalid-SMSC.patch
 delete mode 100644 patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch
 delete mode 100644 patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch
 delete mode 100644 patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch
 delete mode 100644 patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
 delete mode 100644 patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
 delete mode 100644 patches/trebledroid/platform_packages_apps_Settings/0003-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch
 delete mode 100644 patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Check-if-domain-field-is-not-empty-when.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0001-gd-hci-Ignore-unexpected-status-events.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0006-Add-properties-to-disable-some-features-commands-sta.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Bluetooth/0008-gd-hci-Ignore-command-READ_REMOTE_VERSION_INFORMATIO.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0002-Support-non-working-BPF-maps-on-old-BPF-less-kernel.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0003-Bring-back-traffic-indicators-for-legacy-devices.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0004-Revert-drop-support-for-V-gsi-on-pixel-5-R-base-kern.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0005-netbpfload-add-back-support-for-4.9-T-kernels.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0006-NetBpfLoad-more-4.9-T-support.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0007-netd-Remove-4.14-kernel-restrictions.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0008-More-bpf-errors-ignore-there-are-some-4.14-without-t.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Connectivity/0009-Revert-netdupdatable-add-back-abort-on-init-fail.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_DnsResolver/0001-Dont-abort-if-the-DnsHelper-failed-to-init-on-BPF-le.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_Wifi/0001-Add-persist.sys.phh.wifi_disable_sae-property-to-dis.patch
 delete mode 100644 patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch
 delete mode 100644 patches/trebledroid/platform_packages_services_Telephony/0001-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
 delete mode 100644 patches/trebledroid/platform_system_apex/0001-Disable-O_DIRECT-for-old-kernels.patch
 delete mode 100644 patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch
 delete mode 100644 patches/trebledroid/platform_system_bpf/0002-bpfloader-add-back-support-for-4.9-T-kernels.patch
 delete mode 100644 patches/trebledroid/platform_system_bpf/0003-bpfloader-more-4.9-T-support.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0002-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0003-init-Do-not-start-console-service-when-debuggable.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0004-Panic-into-recovery-rather-than-bootloader.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0005-Detect-allowed-sdcard-options-based-on-vndk.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0006-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0007-Revert-Set-system-xbin-permissions-to-750.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0008-Add-my-own-OTA-mechanism-going-over-data.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0009-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0010-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0011-Let-system-override-adb-secure-props-so-we-dont-get-.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0012-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0013-watchdogd-Support-pinging-two-watchdogs.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0014-healthd-offline-charger-fix-screen-off-3-3.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0015-Disable-quotas-on-legacy-devices-with-encryption-dis.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0016-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0017-Ignore-dm-verity-setup-issues.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0018-Fix-support-for-devices-without-cgroupv2-support.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0019-Disable-project_quota-on-old-devices-but-new-enough-.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0020-fix-Nubia-6-series-custom-rc-action-prop-validation.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0021-HACK-Ignore-errors-when-setting-fscrypt-directory.-S.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0022-Keep-our-own-version-of-ro.logd.kernel.-We-do-want-l.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0023-Keep-capex-when-there-are-vendor-apexes.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0024-When-setting-ro.apex.updatable-actually-set-the-valu.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0025-If-AVB-fails-ignore-disable-AVB.patch
 delete mode 100644 patches/trebledroid/platform_system_core/0026-Flattened-apexes-no-longer-exist-we-ll-deal-with-it-.patch
 delete mode 100644 patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
 delete mode 100644 patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
 delete mode 100644 patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
 delete mode 100644 patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
 delete mode 100644 patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch
 delete mode 100644 patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch
 delete mode 100644 patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch
 delete mode 100644 patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch
 delete mode 100644 patches/trebledroid/platform_system_sepolicy/0002-Fix-sepolicy-for-kernel-5.10-that-doesn-t-support-bp.patch
 delete mode 100644 patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch
 delete mode 100644 patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
 delete mode 100644 patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
 delete mode 100644 patches/trebledroid/platform_system_vold/0004-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch
 delete mode 100644 patches/trebledroid/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch

diff --git a/patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch b/patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch
deleted file mode 100644
index 6b0bf461..00000000
--- a/patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2bf85c385f0e9c41ab6c33cfab114457275db967 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Tue, 21 Feb 2023 22:51:12 +0000
-Subject: [PATCH 1/3] Import vendor/gapps
-
----
- generate.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/generate.sh b/generate.sh
-index 461eff1..4c7690a 100644
---- a/generate.sh
-+++ b/generate.sh
-@@ -26,7 +26,8 @@ for part in a ab;do
- 		optional_base=""
- 				if [ "$apps" == "gapps" ];then
- 					apps_suffix="g"
--					apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
-+					[[ "$arch" == "a64" ]] && base="arm" || base="arm64"
-+					apps_script="\$(call inherit-product, vendor/gapps/$base/$base-vendor.mk)"
- 					apps_name="with GApps"
- 				fi
- 				if [ "$apps" == "gapps-go" ];then
--- 
-2.34.1
-
diff --git a/patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch b/patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch
deleted file mode 100644
index 49966eb4..00000000
--- a/patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 1423a40a59b5d849e6161a3e7cdf0de003dcbad9 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Wed, 25 Dec 2019 12:34:05 +0200
-Subject: [PATCH 2/3] Rework securize tweak
-
----
- base.mk      |  1 -
- rw-system.sh | 49 ++++++++++++++++++++++++++++++-------------------
- 2 files changed, 30 insertions(+), 20 deletions(-)
-
-diff --git a/base.mk b/base.mk
-index 22525cd..8c0f2be 100644
---- a/base.mk
-+++ b/base.mk
-@@ -177,7 +177,6 @@ PRODUCT_PACKAGES += \
- 	resetprop_phh
- 
- PRODUCT_COPY_FILES += \
--	device/phh/treble/phh-securize.sh:system/bin/phh-securize.sh \
- 	device/phh/treble/files/ota.sh:system/bin/ota.sh \
- 
- PRODUCT_COPY_FILES += \
-diff --git a/rw-system.sh b/rw-system.sh
-index 1e47287..d591190 100644
---- a/rw-system.sh
-+++ b/rw-system.sh
-@@ -768,32 +768,59 @@ copyprop() {
-         resetprop_phh "$1" "$(getprop "$2")"
-     fi
- }
--if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
-     copyprop ro.build.device ro.vendor.build.device
-     copyprop ro.system.build.fingerprint ro.vendor.build.fingerprint
-     copyprop ro.bootimage.build.fingerprint ro.vendor.build.fingerprint
-     copyprop ro.build.fingerprint ro.vendor.build.fingerprint
-+    copyprop ro.system_ext.build.fingerprint ro.vendor.build.fingerprint
-+    copyprop ro.product.build.fingerprint ro.vendor.build.fingerprint
-     copyprop ro.build.device ro.vendor.product.device
-     copyprop ro.product.system.device ro.vendor.product.device
-     copyprop ro.product.device ro.vendor.product.device
-     copyprop ro.product.system.device ro.product.vendor.device
-     copyprop ro.product.device ro.product.vendor.device
-+    copyprop ro.product.system_ext.device ro.vendor.product.device
-+    copyprop ro.product.product.device ro.vendor.product.device
-+    copyprop ro.product.system_ext.device ro.product.vendor.device
-+    copyprop ro.product.product.device ro.product.vendor.device
-     copyprop ro.product.system.name ro.vendor.product.name
-     copyprop ro.product.name ro.vendor.product.name
--    copyprop ro.product.system.name ro.product.vendor.device
--    copyprop ro.product.name ro.product.vendor.device
-+    copyprop ro.product.system.name ro.product.vendor.name
-+    copyprop ro.product.name ro.product.vendor.name
-+    copyprop ro.product.system_ext.name ro.vendor.product.name
-+    copyprop ro.product.product.name ro.vendor.product.name
-+    copyprop ro.product.system_ext.name ro.product.vendor.name
-+    copyprop ro.product.product.name ro.product.vendor.name
-     copyprop ro.system.product.brand ro.vendor.product.brand
-     copyprop ro.product.brand ro.vendor.product.brand
-+    copyprop ro.product.system.brand ro.vendor.product.brand
-+    copyprop ro.product.system_ext.brand ro.vendor.product.brand
-+    copyprop ro.product.product.brand ro.product.vendor.brand
-+    copyprop ro.system.product.brand ro.product.vendor.brand
-+    copyprop ro.product.brand ro.product.vendor.brand
-+    copyprop ro.product.system.brand ro.product.vendor.brand
-+    copyprop ro.product.system_ext.brand ro.product.vendor.brand
-+    copyprop ro.product.product.brand ro.product.vendor.brand
-     copyprop ro.product.system.model ro.vendor.product.model
-     copyprop ro.product.model ro.vendor.product.model
-+    copyprop ro.product.system_ext.model ro.vendor.product.model
-+    copyprop ro.product.product.model ro.vendor.product.model
-     copyprop ro.product.system.model ro.product.vendor.model
-     copyprop ro.product.model ro.product.vendor.model
-     copyprop ro.build.product ro.vendor.product.model
-     copyprop ro.build.product ro.product.vendor.model
-+    copyprop ro.product.system_ext.model ro.product.vendor.model
-+    copyprop ro.product.product.model ro.product.vendor.model
-     copyprop ro.system.product.manufacturer ro.vendor.product.manufacturer
-     copyprop ro.product.manufacturer ro.vendor.product.manufacturer
-+    copyprop ro.product.system.manufacturer ro.vendor.product.manufacturer
-+    copyprop ro.product.product.manufacturer ro.vendor.product.manufacturer
-+    copyprop ro.product.system_ext.manufacturer ro.vendor.product.manufacturer
-     copyprop ro.system.product.manufacturer ro.product.vendor.manufacturer
-     copyprop ro.product.manufacturer ro.product.vendor.manufacturer
-+    copyprop ro.product.system.manufacturer ro.product.vendor.manufacturer
-+    copyprop ro.product.product.manufacturer ro.product.vendor.manufacturer
-+    copyprop ro.product.system_ext.manufacturer ro.product.vendor.manufacturer
-     (getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do
-         [ -n "$v" ] && resetprop_phh ro.build.version.security_patch "$v"
-     done
-@@ -812,22 +839,6 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
- 
-     resetprop_phh ro.adb.secure 1
- 
--    # Hide system/xbin/su
--    mount /mnt/phh/empty_dir /system/xbin
--    mount /mnt/phh/empty_dir /system/app/me.phh.superuser
--    mount /system/phh/empty /system/xbin/phh-su
--else
--    mkdir /mnt/phh/xbin
--    chmod 0755 /mnt/phh/xbin
--    chcon u:object_r:system_file:s0 /mnt/phh/xbin
--
--    #phh-su will bind over this empty file to make a real su
--    touch /mnt/phh/xbin/su
--    chcon u:object_r:system_file:s0 /mnt/phh/xbin/su
--
--    mount -o bind /mnt/phh/xbin /system/xbin
--fi
--
- for abi in "" 64;do
-     f=/vendor/lib$abi/libstagefright_foundation.so
-     if [ -f "$f" ];then
--- 
-2.34.1
-
diff --git a/patches/personal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch b/patches/personal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch
deleted file mode 100644
index 941410ba..00000000
--- a/patches/personal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f122a0b9671501c0b45c4251d7217f607e8f8509 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Fri, 12 Apr 2024 23:59:25 +0000
-Subject: [PATCH 3/3] a64: Set BUILD_BROKEN_MISSING_REQUIRED_MODULES to true
-
----
- tdgsi_a64_ab/BoardConfig.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tdgsi_a64_ab/BoardConfig.mk b/tdgsi_a64_ab/BoardConfig.mk
-index f131e88..72c4c73 100644
---- a/tdgsi_a64_ab/BoardConfig.mk
-+++ b/tdgsi_a64_ab/BoardConfig.mk
-@@ -8,3 +8,4 @@ ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
- BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
- endif
- TARGET_USES_64_BIT_BINDER := true
-+BUILD_BROKEN_MISSING_REQUIRED_MODULES := true
--- 
-2.34.1
-
diff --git a/patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch b/patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch
deleted file mode 100644
index 481ab55e..00000000
--- a/patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c046f10027f788fc6645a7d377f0c9e90ce399e6 Mon Sep 17 00:00:00 2001
-From: Victor Bo <bvoid@yandex.ru>
-Date: Sat, 14 Dec 2019 23:46:34 +0200
-Subject: [PATCH 1/2] Remove su from vanilla builds
-
----
- target/product/base_system.mk | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/target/product/base_system.mk b/target/product/base_system.mk
-index c6ca3dda2c..58d9629a92 100644
---- a/target/product/base_system.mk
-+++ b/target/product/base_system.mk
-@@ -436,7 +436,6 @@ PRODUCT_PACKAGES_DEBUG := \
-     ss \
-     start_with_lockagent \
-     strace \
--    su \
-     sanitizer-status \
-     tracepath \
-     tracepath6 \
--- 
-2.34.1
-
diff --git a/patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch b/patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch
deleted file mode 100644
index 7736a2f0..00000000
--- a/patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 32bd5279405b2013c1152338ab79dca6585983b7 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Tue, 26 Dec 2023 17:01:46 +0000
-Subject: [PATCH 2/2] product: Exclude AOSP apn list on custom builds
-
-Change-Id: I76c8d5ef67de73d4558d350a87a9bc317aaad792
----
- target/product/aosp_product.mk        | 5 -----
- target/product/full_base_telephony.mk | 1 -
- 2 files changed, 6 deletions(-)
-
-diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
-index f72f2dfec4..05bcaefcea 100644
---- a/target/product/aosp_product.mk
-+++ b/target/product/aosp_product.mk
-@@ -35,8 +35,3 @@ PRODUCT_PACKAGES += \
-     preinstalled-packages-platform-aosp-product.xml \
-     ThemePicker \
-     WallpaperPicker \
--
--# Telephony:
--#   Provide a APN configuration to GSI product
--PRODUCT_COPY_FILES += \
--    device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
-diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
-index d8a54cd7f3..5470ad2be5 100644
---- a/target/product/full_base_telephony.mk
-+++ b/target/product/full_base_telephony.mk
-@@ -24,7 +24,6 @@ PRODUCT_VENDOR_PROPERTIES := \
-     ro.com.android.dataroaming?=true
- 
- PRODUCT_COPY_FILES := \
--    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
-     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
- 
- $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
--- 
-2.34.1
-
diff --git a/patches/personal/platform_external_robolectric/0001-Fix-Trebuchet-tests.patch b/patches/personal/platform_external_robolectric/0001-Fix-Trebuchet-tests.patch
deleted file mode 100644
index 4c995dc9..00000000
--- a/patches/personal/platform_external_robolectric/0001-Fix-Trebuchet-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 758b318b6b46c6f66fa9dfc1b10e5b241a3ccd63 Mon Sep 17 00:00:00 2001
-From: Michael Bestas <mkbestas@lineageos.org>
-Date: Sun, 16 Jun 2024 23:07:27 +0300
-Subject: [PATCH] Fix Trebuchet tests
-
-Change-Id: I88830b39a758359445821e2d38a5b27f82a547d7
----
- Android.bp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Android.bp b/Android.bp
-index daef47190..d4c96df6d 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -198,7 +198,7 @@ java_host_for_device {
-       "//frameworks/base/packages/SettingsLib/tests/robotests:__subpackages__",
-       "//frameworks/base/packages/SettingsLib/Spa/screenshot:__subpackages__",
-       "//frameworks/base/packages/SystemUI:__pkg__",
--      "//packages/apps/Launcher3/tests:__pkg__",
-+      "//packages/apps/Trebuchet/tests:__pkg__",
-       "//frameworks/libs/systemui/animationlib:__pkg__",
-       "//frameworks/base/tests/InputScreenshotTest:__subpackages__",
-       "//frameworks/opt/car/setupwizard/library/main/tests/robotests:__pkg__",
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0001-gmscompat-Change-attestation-and-instrumentation-to-.patch b/patches/personal/platform_frameworks_base/0001-gmscompat-Change-attestation-and-instrumentation-to-.patch
deleted file mode 100644
index 53cd225d..00000000
--- a/patches/personal/platform_frameworks_base/0001-gmscompat-Change-attestation-and-instrumentation-to-.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 2804e0c5f6443f0ab18056c86ed4e50faa60af92 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Thu, 9 Nov 2023 12:33:55 +0100
-Subject: [PATCH 01/10] gmscompat: Change attestation and instrumentation to
- pass SafetyNet and Play Integrity API.
-
-Original work by @kdrag0n.
-Updated by many people like @dereference23, @Stallix, @dyneteve, @neobuddy89 and @jhenrique09.
-Adapted by @iceows for his own AOSP A13 GSI.
-Adapted by @ponces based on the work of @chiteroman to pass newest Play Integrity API.
----
- core/java/android/app/Instrumentation.java    |   4 +
- .../internal/gmscompat/AttestationHooks.java  | 100 ++++++++++++++++++
- .../keystore2/AndroidKeyStoreSpi.java         |   3 +
- 3 files changed, 107 insertions(+)
- create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
-
-diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index db216b1a..9445bc1b 100644
---- a/core/java/android/app/Instrumentation.java
-+++ b/core/java/android/app/Instrumentation.java
-@@ -63,6 +63,8 @@ import android.view.WindowManagerGlobal;
- 
- import com.android.internal.content.ReferrerIntent;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.File;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -1351,6 +1353,7 @@ public class Instrumentation {
-         Application app = getFactory(context.getPackageName())
-                 .instantiateApplication(cl, className);
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
-     
-@@ -1368,6 +1371,7 @@ public class Instrumentation {
-             ClassNotFoundException {
-         Application app = (Application)clazz.newInstance();
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
- 
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-new file mode 100644
-index 00000000..cff1250c
---- /dev/null
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -0,0 +1,100 @@
-+/*
-+ * Copyright (C) 2021 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 com.android.internal.gmscompat;
-+
-+import android.app.Application;
-+import android.os.Build;
-+import android.os.Build.VERSION;
-+import android.os.SystemProperties;
-+import android.util.Log;
-+
-+import java.lang.reflect.Field;
-+import java.util.Arrays;
-+
-+/** @hide */
-+public final class AttestationHooks {
-+    private static final String TAG = "GmsCompat/Attestation";
-+    private static final boolean DEBUG = false;
-+
-+    private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PACKAGE_FINSKY = "com.android.vending";
-+    private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
-+
-+    private static volatile boolean sIsGms = false;
-+    private static volatile boolean sIsFinsky = false;
-+
-+    private AttestationHooks() { }
-+
-+    private static void setBuildField(String key, String value) {
-+        try {
-+            Log.i(TAG, "Spoofing Build." + key + " with value \"" + value + "\"");
-+            Field field = Build.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+            field.set(null, value);
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void setVersionField(String key, Object value) {
-+        try {
-+            Log.i(TAG, "Spoofing Build.VERSION." + key + " with value \"" + value + "\"");
-+            Field field = Build.VERSION.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+            field.set(null, value);
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void spoofBuildGms() {
-+        setBuildField("PRODUCT", "sailfish");
-+        setBuildField("DEVICE", "sailfish");
-+        setBuildField("MANUFACTURER", "Google");
-+        setBuildField("BRAND", "google");
-+        setBuildField("MODEL", "Pixel");
-+        setBuildField("FINGERPRINT", "google/sailfish/sailfish:10/QPP3.190404.015/5505587:user/release-keys");
-+        setVersionField("SECURITY_PATCH", "2019-05-05");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-+    }
-+
-+    public static void initApplicationBeforeOnCreate(Application app) {
-+        if (PACKAGE_GMS.equals(app.getPackageName()) &&
-+                PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-+            sIsGms = true;
-+            spoofBuildGms();
-+        }
-+
-+        if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-+            sIsFinsky = true;
-+        }
-+    }
-+
-+    private static boolean isCallerSafetyNet() {
-+        return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
-+                .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-+    }
-+
-+    public static void onEngineGetCertificateChain() {
-+        if (isCallerSafetyNet() || sIsFinsky) {
-+            Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
-+            throw new UnsupportedOperationException();
-+        }
-+    }
-+}
-diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-index e6a63b9c..6a80c14c 100644
---- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-@@ -48,6 +48,7 @@ import android.system.keystore2.ResponseCode;
- import android.util.Log;
- 
- import com.android.internal.annotations.VisibleForTesting;
-+import com.android.internal.gmscompat.AttestationHooks;
- 
- import java.io.ByteArrayInputStream;
- import java.io.IOException;
-@@ -178,6 +179,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
- 
-     @Override
-     public Certificate[] engineGetCertificateChain(String alias) {
-+        AttestationHooks.onEngineGetCertificateChain();
-+
-         KeyEntryResponse response = getKeyMetadata(alias);
- 
-         if (response == null || response.metadata.certificate == null) {
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0002-gmscompat-Spoof-Pixel-XL-for-Google-Photos.patch b/patches/personal/platform_frameworks_base/0002-gmscompat-Spoof-Pixel-XL-for-Google-Photos.patch
deleted file mode 100644
index 23cd1258..00000000
--- a/patches/personal/platform_frameworks_base/0002-gmscompat-Spoof-Pixel-XL-for-Google-Photos.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 482bc6f508e57d21199ee466af827b8e675606a4 Mon Sep 17 00:00:00 2001
-From: vladsendrix <83285656+vladsendrix@users.noreply.github.com>
-Date: Fri, 31 Dec 2021 03:18:04 +0100
-Subject: [PATCH 02/10] gmscompat: Spoof Pixel XL for Google Photos
-
-Change-Id: I905e40625b07ebf500cbb3ce1deadedee2e624c5
----
- .../internal/gmscompat/AttestationHooks.java       | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index cff1250c..dfbf69a0 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -32,6 +32,7 @@ public final class AttestationHooks {
- 
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-     private static final String PACKAGE_FINSKY = "com.android.vending";
-+    private static final String PACKAGE_PHOTOS = "com.google.android.apps.photos";
-     private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
-@@ -74,6 +75,15 @@ public final class AttestationHooks {
-         setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-     }
- 
-+    private static void spoofGooglePhotos() {
-+        setBuildField("PRODUCT", "marlin");
-+        setBuildField("DEVICE", "marlin");
-+        setBuildField("MANUFACTURER", "Google");
-+        setBuildField("BRAND", "google");
-+        setBuildField("MODEL", "Pixel XL");
-+        setBuildField("FINGERPRINT", "google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys");
-+    }
-+
-     public static void initApplicationBeforeOnCreate(Application app) {
-         if (PACKAGE_GMS.equals(app.getPackageName()) &&
-                 PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-@@ -84,6 +94,10 @@ public final class AttestationHooks {
-         if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-             sIsFinsky = true;
-         }
-+
-+        if (PACKAGE_PHOTOS.equals(app.getPackageName())) {
-+            spoofGooglePhotos();
-+        }
-     }
- 
-     private static boolean isCallerSafetyNet() {
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0003-monet-Use-Style.SPRITZ-by-default.patch b/patches/personal/platform_frameworks_base/0003-monet-Use-Style.SPRITZ-by-default.patch
deleted file mode 100644
index 23deb370..00000000
--- a/patches/personal/platform_frameworks_base/0003-monet-Use-Style.SPRITZ-by-default.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 927bb5d5daa4ae48011f9701abb2bbd3b05007a9 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Sun, 26 Feb 2023 22:13:35 +0000
-Subject: [PATCH 03/10] monet: Use Style.SPRITZ by default
-
-Change-Id: Ia44ba56c8daa07033b290de89bb300bda9d39d86
----
- .../com/android/systemui/theme/ThemeOverlayController.java  | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
-index 44c684c3..4869ec42 100644
---- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
-+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
-@@ -153,7 +153,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
-     private float mContrast = 0;
-     // Theme variant: Vibrant, Tonal, Expressive, etc
-     @VisibleForTesting
--    protected Style mThemeStyle = Style.TONAL_SPOT;
-+    protected Style mThemeStyle = Style.SPRITZ;
-     // Accent colors overlay
-     private FabricatedOverlay mSecondaryOverlay;
-     // Neutral system colors overlay
-@@ -862,11 +862,11 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
-                 style = Style.valueOf(
-                         object.getString(ThemeOverlayApplier.OVERLAY_CATEGORY_THEME_STYLE));
-                 if (!validStyles.contains(style)) {
--                    style = Style.TONAL_SPOT;
-+                    style = Style.SPRITZ;
-                 }
-             } catch (JSONException | IllegalArgumentException e) {
-                 Log.i(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
--                style = Style.TONAL_SPOT;
-+                style = Style.SPRITZ;
-             }
-         }
-         return style;
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0004-fw-b-Use-ro.build.version.incremental-to-signal-OTA-.patch b/patches/personal/platform_frameworks_base/0004-fw-b-Use-ro.build.version.incremental-to-signal-OTA-.patch
deleted file mode 100644
index 6be2478b..00000000
--- a/patches/personal/platform_frameworks_base/0004-fw-b-Use-ro.build.version.incremental-to-signal-OTA-.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a293f31f6f239099222ff3e93e9d80da44a0c4ca Mon Sep 17 00:00:00 2001
-From: dhacker29 <dhackerdvm@gmail.com>
-Date: Tue, 24 Nov 2015 01:53:47 -0500
-Subject: [PATCH 04/10] fw/b: Use ro.build.version.incremental to signal OTA
- upgrades
-
-[PeterCxy]: On T, there is a new class PackagePartitions that is
-responsible for detecting updates to not just the system, but also other
-partitions. Most of the fingerprint detection were moved there, and thus
-modifications were made there to use the
-ro.<partition>.build.version.incremental property.
-
-Squash of:
-
-Author: dhacker29 <dhackerdvm@gmail.com>
-Date:   Tue Nov 24 01:53:47 2015 -0500
-    Core: Use ro.build.date to signal mIsUpgrade
-
-    M: We use a static fingerprint that is only changed when a new OEM build is released, so
-       every flash shows Android is starting instead of upgrading.  This will fix that.
-    N: even though we dont have the dexopt sceen on N, this is still needed to delete the
-       correct caches, and grant/deny specific runtime permissions like a true oem update
-       would do.
-       Updated for Nougat By: BeansTown106
-
-    Change-Id: I0e3ed5c8f0351e48944432ae6a0c5194ddeff1fa
-
-Author: Sam Mortimer <sam@mortimer.me.uk>
-Date:   Fri Sep 28 13:45:00 2018 -0700
-    fw/b UserManagerService: Use ro.build.date to signal upgrades
-
-    *) We changed PackageManagerService to use Build.DATE instead of
-       Build.FINGERPRINT to detect upgrade.  Do the same for
-       UserManagerService.
-    *) Affects generation of preboot intent and app data migration.
-
-    Change-Id: I56887b7ca842afdcf3cf84b27b4c04667cf43307
-
-Author: Wang Han <416810799@qq.com>
-Date:   Sat Dec 29 23:33:20 2018 +0800
-    ShortcutService: Use ro.build.date to signal package scanning
-
-     * Affects system apps scanning.
-
-    Change-Id: I5f6d6647929f5b5ae7e820b18e95bf5ed2ec8d1c
-
-Author: maxwen <max.weninger@gmail.com>
-Date:   Tue Nov 19 01:02:01 2019 +0100
-    base: Use ro.build.date to clear cache dirs on update
-
-    instead of using ro.build.fingerprint we explictly need to use ro.build.date
-
-    Change-Id: Ib3e80e58eb8c9a21c108e9f5cd2dbdb7ada8e3a4
-
-Author: maxwen <max.weninger@gmail.com>
-Date:   Wed Oct 28 07:07:10 2020 -0400
-    One more Build.FINGERPRINT to Build.DATE change
-
-    Change-Id: I13dbf3d7f6587d3fcd6591cc0f861b34b6d5561c
-
-Change-Id: If0eb969ba509981f9209ffa37a949d9042ef4c2a
----
- core/java/android/app/admin/SystemUpdateInfo.java             | 4 ++--
- core/java/android/content/pm/PackagePartitions.java           | 4 ++--
- services/core/java/com/android/server/pm/ShortcutService.java | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/java/android/app/admin/SystemUpdateInfo.java b/core/java/android/app/admin/SystemUpdateInfo.java
-index 9e6c91f4..7459b0e0 100644
---- a/core/java/android/app/admin/SystemUpdateInfo.java
-+++ b/core/java/android/app/admin/SystemUpdateInfo.java
-@@ -133,7 +133,7 @@ public final class SystemUpdateInfo implements Parcelable {
-         out.startTag(null, tag);
-         out.attributeLong(null, ATTR_RECEIVED_TIME, mReceivedTime);
-         out.attributeInt(null, ATTR_SECURITY_PATCH_STATE, mSecurityPatchState);
--        out.attribute(null, ATTR_ORIGINAL_BUILD , Build.FINGERPRINT);
-+        out.attribute(null, ATTR_ORIGINAL_BUILD , Build.VERSION.INCREMENTAL);
-         out.endTag(null, tag);
-     }
- 
-@@ -142,7 +142,7 @@ public final class SystemUpdateInfo implements Parcelable {
-     public static SystemUpdateInfo readFromXml(TypedXmlPullParser parser) {
-         // If an OTA has been applied (build fingerprint has changed), discard stale info.
-         final String buildFingerprint = parser.getAttributeValue(null, ATTR_ORIGINAL_BUILD );
--        if (!Build.FINGERPRINT.equals(buildFingerprint)) {
-+        if (!Build.VERSION.INCREMENTAL.equals(buildFingerprint)) {
-             return null;
-         }
-         try {
-diff --git a/core/java/android/content/pm/PackagePartitions.java b/core/java/android/content/pm/PackagePartitions.java
-index ff80e614..8bf0d5ff 100644
---- a/core/java/android/content/pm/PackagePartitions.java
-+++ b/core/java/android/content/pm/PackagePartitions.java
-@@ -129,9 +129,9 @@ public class PackagePartitions {
-         final String[] digestProperties = new String[SYSTEM_PARTITIONS.size() + 1];
-         for (int i = 0; i < SYSTEM_PARTITIONS.size(); i++) {
-             final String partitionName = SYSTEM_PARTITIONS.get(i).getName();
--            digestProperties[i] = "ro." + partitionName + ".build.fingerprint";
-+            digestProperties[i] = "ro." + partitionName + ".build.version.incremental";
-         }
--        digestProperties[SYSTEM_PARTITIONS.size()] = "ro.build.fingerprint"; // build fingerprint
-+        digestProperties[SYSTEM_PARTITIONS.size()] = "ro.build.version.incremental"; // build fingerprint
-         return SystemProperties.digestOf(digestProperties);
-     }
- 
-diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
-index c1ab3f9e..1b0c9917 100644
---- a/services/core/java/com/android/server/pm/ShortcutService.java
-+++ b/services/core/java/com/android/server/pm/ShortcutService.java
-@@ -5230,7 +5230,7 @@ public class ShortcutService extends IShortcutService.Stub {
- 
-     // Injection point.
-     String injectBuildFingerprint() {
--        return Build.FINGERPRINT;
-+        return Build.VERSION.INCREMENTAL;
-     }
- 
-     final void wtf(String message) {
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0005-SystemUI-fix-SliceView-layout.patch b/patches/personal/platform_frameworks_base/0005-SystemUI-fix-SliceView-layout.patch
deleted file mode 100644
index 5b46c5c1..00000000
--- a/patches/personal/platform_frameworks_base/0005-SystemUI-fix-SliceView-layout.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e69cdc79b594a26c7eb42564a5a1fcbb8afca848 Mon Sep 17 00:00:00 2001
-From: Anay Wadhera <anay1018@gmail.com>
-Date: Sun, 13 Nov 2022 10:42:03 -0500
-Subject: [PATCH 05/10] SystemUI: fix SliceView layout
-
-Before: https://imgur.com/a/wIwyMJS
-After: https://imgur.com/a/dJPVMxS
-
-Change-Id: Ib5fb2e3b9c0f3948bc3e88c2333df816bde265f8
----
- packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
-index 7c5dbc24..64657547 100644
---- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
-+++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
-@@ -38,7 +38,7 @@
-               android:id="@+id/row"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"
--              android:orientation="horizontal"
-+              android:orientation="vertical"
-               android:gravity="start"
-     />
- </com.android.keyguard.KeyguardSliceView>
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0006-Add-android.permission.READ_PHONE_STATE-to-manifest.patch b/patches/personal/platform_frameworks_base/0006-Add-android.permission.READ_PHONE_STATE-to-manifest.patch
deleted file mode 100644
index ae2864f2..00000000
--- a/patches/personal/platform_frameworks_base/0006-Add-android.permission.READ_PHONE_STATE-to-manifest.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1d4828950852f5cdbaa1f52ba01c745512d1ca3f Mon Sep 17 00:00:00 2001
-From: Janson Kang <temasek71@gmail.com>
-Date: Mon, 14 Dec 2015 11:13:24 +0800
-Subject: [PATCH 06/10] Add "android.permission.READ_PHONE_STATE" to manifest
-
-Change-Id: I78d90166635bbdf6b74e2a02efc1029387b4ad8d
----
- packages/SystemUI/AndroidManifest.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
-index 12e8f574..774d6cbc 100644
---- a/packages/SystemUI/AndroidManifest.xml
-+++ b/packages/SystemUI/AndroidManifest.xml
-@@ -68,6 +68,7 @@
-     <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
-     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-     <uses-permission android:name="android.permission.READ_PRECISE_PHONE_STATE" />
-     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0007-permissions-Pre-grant-google-restore-permissions.patch b/patches/personal/platform_frameworks_base/0007-permissions-Pre-grant-google-restore-permissions.patch
deleted file mode 100644
index 7e2cd384..00000000
--- a/patches/personal/platform_frameworks_base/0007-permissions-Pre-grant-google-restore-permissions.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7b5640f84acfd11a19c49156a7eb2bcd24eeafc7 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Sun, 5 Mar 2023 17:54:25 +0000
-Subject: [PATCH 07/10] permissions: Pre-grant google restore permissions
-
-Change-Id: I241886b63e0660ef01e7801b273045c3c91d44ea
----
- .../DefaultPermissionGrantPolicy.java         | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
-index f7f76aaa..03ec8f7d 100644
---- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
-+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
-@@ -210,6 +210,15 @@ final class DefaultPermissionGrantPolicy {
-         SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND);
-     }
- 
-+    private static final Set<String> GOOGLE_RESTORE_PERMISSIONS = new ArraySet<>();
-+    static {
-+        GOOGLE_RESTORE_PERMISSIONS.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-+        GOOGLE_RESTORE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-+        GOOGLE_RESTORE_PERMISSIONS.add(Manifest.permission.MANAGE_EXTERNAL_STORAGE);
-+        GOOGLE_RESTORE_PERMISSIONS.add(Manifest.permission.MANAGE_USB);
-+        GOOGLE_RESTORE_PERMISSIONS.add(Manifest.permission.INTERNET);
-+    }
-+
-     private static final Set<String> STORAGE_PERMISSIONS = new ArraySet<>();
-     static {
-         STORAGE_PERMISSIONS.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-@@ -932,6 +941,16 @@ final class DefaultPermissionGrantPolicy {
-         String commonServiceAction = "android.adservices.AD_SERVICES_COMMON_SERVICE";
-         grantPermissionsToSystemPackage(pm, getDefaultSystemHandlerServicePackage(pm,
-                         commonServiceAction, userId), userId, NOTIFICATION_PERMISSIONS);
-+
-+        // Data Restore Tool
-+        grantSystemFixedPermissionsToSystemPackage(pm, "com.google.android.apps.restore", userId, PHONE_PERMISSIONS,
-+                CONTACTS_PERMISSIONS, SMS_PERMISSIONS, GOOGLE_RESTORE_PERMISSIONS);
-+
-+        // Google Play Services
-+        grantPermissionsToSystemPackage(pm, "com.google.android.gms", userId, SENSORS_PERMISSIONS,
-+                CALENDAR_PERMISSIONS, CAMERA_PERMISSIONS, CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
-+                MICROPHONE_PERMISSIONS, NEARBY_DEVICES_PERMISSIONS, PHONE_PERMISSIONS, SMS_PERMISSIONS,
-+                STORAGE_PERMISSIONS);
-     }
- 
-     private String getDefaultSystemHandlerActivityPackageForCategory(PackageManagerWrapper pm,
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0008-feat-Add-Lockscreen-Weather-with-OmniJaws-1-2.patch b/patches/personal/platform_frameworks_base/0008-feat-Add-Lockscreen-Weather-with-OmniJaws-1-2.patch
deleted file mode 100644
index e74006fb..00000000
--- a/patches/personal/platform_frameworks_base/0008-feat-Add-Lockscreen-Weather-with-OmniJaws-1-2.patch
+++ /dev/null
@@ -1,924 +0,0 @@
-From b68c5d1ed8e863c5b567e481b0801c55bac30741 Mon Sep 17 00:00:00 2001
-From: maxwen <max.weninger@gmail.com>
-Date: Fri, 22 Oct 2021 14:55:26 +0200
-Subject: [PATCH 08/10] feat: Add Lockscreen Weather with OmniJaws (1/2)
-
-Based on OmniROM's implementation, updated by @maxwen and adapted by @neobuddy89.
-
-Change-Id: I138c0dc94f08142f6614659037a501d6ae8909b1
-Co-authored-by: maxwen <max.weninger@gmail.com>
-Co-authored-by: Pranav Vashi <neobuddy89@gmail.com>
----
- core/java/android/provider/Settings.java      |  10 +
- .../internal/util/crdroid/OmniJawsClient.java | 437 ++++++++++++++++++
- data/etc/com.android.systemui.xml             |   1 +
- packages/SystemUI/AndroidManifest.xml         |   4 +
- .../layout/current_weather_view.xml           |  59 +++
- .../layout/keyguard_clock_switch.xml          |   6 +
- .../KeyguardClockSwitchController.java        |  52 ++-
- .../KeyguardStatusViewController.java         |   1 +
- .../systemui/crdroid/CurrentWeatherView.java  | 163 +++++++
- 9 files changed, 732 insertions(+), 1 deletion(-)
- create mode 100644 core/java/com/android/internal/util/crdroid/OmniJawsClient.java
- create mode 100644 packages/SystemUI/res-keyguard/layout/current_weather_view.xml
- create mode 100644 packages/SystemUI/src/com/android/systemui/crdroid/CurrentWeatherView.java
-
-diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
-index 51585af1..f8e86e0f 100644
---- a/core/java/android/provider/Settings.java
-+++ b/core/java/android/provider/Settings.java
-@@ -6201,6 +6201,16 @@ public final class Settings {
-          * the setting value. See an example above.
-          */
- 
-+        /**
-+         * @hide
-+         */
-+        public static final String LOCKSCREEN_WEATHER_ENABLED = "lockscreen_weather_enabled";
-+
-+        /**
-+         * @hide
-+         */
-+        public static final String LOCKSCREEN_WEATHER_LOCATION = "lockscreen_weather_location";
-+
-         /**
-          * Keys we no longer back up under the current schema, but want to continue to
-          * process when restoring historical backup datasets.
-diff --git a/core/java/com/android/internal/util/crdroid/OmniJawsClient.java b/core/java/com/android/internal/util/crdroid/OmniJawsClient.java
-new file mode 100644
-index 00000000..26437e03
---- /dev/null
-+++ b/core/java/com/android/internal/util/crdroid/OmniJawsClient.java
-@@ -0,0 +1,437 @@
-+/*
-+* Copyright (C) 2021 The OmniROM Project
-+*
-+* This program is free software: you can redistribute it and/or modify
-+* it under the terms of the GNU General Public License as published by
-+* the Free Software Foundation, either version 2 of the License, or
-+* (at your option) any later version.
-+*
-+* This program is distributed in the hope that it will be useful,
-+* but WITHOUT ANY WARRANTY; without even the implied warranty of
-+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+* GNU General Public License for more details.
-+*
-+* You should have received a copy of the GNU General Public License
-+* along with this program. If not, see <http://www.gnu.org/licenses/>.
-+*
-+*/
-+package com.android.internal.util.crdroid;
-+
-+import java.text.DecimalFormat;
-+import java.text.SimpleDateFormat;
-+import java.util.ArrayList;
-+import java.util.Date;
-+import java.util.List;
-+
-+import android.content.BroadcastReceiver;
-+import android.content.Context;
-+import android.content.Intent;
-+import android.content.IntentFilter;
-+import android.content.pm.PackageManager;
-+import android.content.pm.PackageManager.NameNotFoundException;
-+import android.content.res.Resources;
-+import android.database.ContentObserver;
-+import android.database.Cursor;
-+import android.graphics.Color;
-+import android.graphics.drawable.ColorDrawable;
-+import android.graphics.drawable.Drawable;
-+import android.net.Uri;
-+import android.os.Handler;
-+import android.os.UserHandle;
-+import android.provider.Settings;
-+import android.text.TextUtils;
-+import android.util.Log;
-+
-+public class OmniJawsClient {
-+    private static final String TAG = "OmniJawsClient";
-+    private static final boolean DEBUG = false;
-+    public static final String SERVICE_PACKAGE = "org.omnirom.omnijaws";
-+    public static final Uri WEATHER_URI
-+            = Uri.parse("content://org.omnirom.omnijaws.provider/weather");
-+    public static final Uri SETTINGS_URI
-+            = Uri.parse("content://org.omnirom.omnijaws.provider/settings");
-+    public static final Uri CONTROL_URI
-+            = Uri.parse("content://org.omnirom.omnijaws.provider/control");
-+
-+    private static final String ICON_PACKAGE_DEFAULT = "org.omnirom.omnijaws";
-+    private static final String ICON_PREFIX_DEFAULT = "google";
-+    private static final String ICON_PREFIX_OUTLINE = "outline";
-+    private static final String EXTRA_ERROR = "error";
-+    public static final int EXTRA_ERROR_NETWORK = 0;
-+    public static final int EXTRA_ERROR_LOCATION = 1;
-+    public static final int EXTRA_ERROR_DISABLED = 2;
-+
-+    public static final String[] WEATHER_PROJECTION = new String[]{
-+            "city",
-+            "wind_speed",
-+            "wind_direction",
-+            "condition_code",
-+            "temperature",
-+            "humidity",
-+            "condition",
-+            "forecast_low",
-+            "forecast_high",
-+            "forecast_condition",
-+            "forecast_condition_code",
-+            "time_stamp",
-+            "forecast_date",
-+            "pin_wheel"
-+    };
-+
-+    public static final String[] SETTINGS_PROJECTION = new String[] {
-+            "enabled",
-+            "units",
-+            "provider",
-+            "setup",
-+            "icon_pack"
-+    };
-+
-+    private static final String WEATHER_UPDATE = SERVICE_PACKAGE + ".WEATHER_UPDATE";
-+    private static final String WEATHER_ERROR = SERVICE_PACKAGE + ".WEATHER_ERROR";
-+
-+    private static final DecimalFormat sNoDigitsFormat = new DecimalFormat("0");
-+
-+    public static class WeatherInfo {
-+        public String city;
-+        public String windSpeed;
-+        public String windDirection;
-+        public int conditionCode;
-+        public String temp;
-+        public String humidity;
-+        public String condition;
-+        public Long timeStamp;
-+        public List<DayForecast> forecasts;
-+        public String tempUnits;
-+        public String windUnits;
-+        public String provider;
-+        public String pinWheel;
-+        public String iconPack;
-+
-+        public String toString() {
-+            return city + ":" + new Date(timeStamp) + ": " + windSpeed + ":" + windDirection + ":" +conditionCode + ":" + temp + ":" + humidity + ":" + condition + ":" + tempUnits + ":" + windUnits + ": " + forecasts + ": " + iconPack;
-+        }
-+
-+        public String getLastUpdateTime() {
-+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-+            return sdf.format(new Date(timeStamp));
-+        }
-+    }
-+
-+    public static class DayForecast {
-+        public String low;
-+        public String high;
-+        public int conditionCode;
-+        public String condition;
-+        public String date;
-+
-+        public String toString() {
-+            return "[" + low + ":" + high + ":" +conditionCode + ":" + condition + ":" + date + "]";
-+        }
-+    }
-+
-+    public static interface OmniJawsObserver {
-+        public void weatherUpdated();
-+        public void weatherError(int errorReason);
-+        default public void updateSettings() {};
-+    }
-+
-+    private class WeatherUpdateReceiver extends BroadcastReceiver {
-+        @Override
-+        public void onReceive(final Context context, Intent intent) {
-+            String action = intent.getAction();
-+            for (OmniJawsObserver observer : mObserver) {
-+                if (action.equals(WEATHER_UPDATE)) {
-+                    observer.weatherUpdated();
-+                }
-+                if (action.equals(WEATHER_ERROR)) {
-+                    int errorReason = intent.getIntExtra(EXTRA_ERROR, 0);
-+                    observer.weatherError(errorReason);
-+                }
-+            }
-+        }
-+    }
-+
-+    private Context mContext;
-+    private WeatherInfo mCachedInfo;
-+    private Resources mRes;
-+    private String mPackageName;
-+    private String mIconPrefix;
-+    private String mSettingIconPackage;
-+    private boolean mMetric;
-+    private List<OmniJawsObserver> mObserver;
-+    private WeatherUpdateReceiver mReceiver;
-+
-+    public OmniJawsClient(Context context) {
-+        mContext = context;
-+        mObserver = new ArrayList<OmniJawsObserver>();
-+    }
-+
-+    public Intent getSettingsIntent() {
-+        if (isOmniJawsServiceInstalled()) {
-+            Intent settings = new Intent(Intent.ACTION_MAIN)
-+                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".SettingsActivity");
-+            return settings;
-+        }
-+        return null;
-+    }
-+
-+    public Intent getWeatherActivityIntent() {
-+        if (isOmniJawsServiceInstalled()) {
-+            Intent settings = new Intent(Intent.ACTION_MAIN)
-+                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".WeatherActivity");
-+            return settings;
-+        }
-+        return null;
-+    }
-+
-+    public WeatherInfo getWeatherInfo() {
-+        return mCachedInfo;
-+    }
-+
-+    private static String getFormattedValue(float value) {
-+        if (Float.isNaN(value)) {
-+            return "-";
-+        }
-+        String formatted = sNoDigitsFormat.format(value);
-+        if (formatted.equals("-0")) {
-+            formatted = "0";
-+        }
-+        return formatted;
-+    }
-+
-+    public void queryWeather() {
-+        if (!isOmniJawsEnabled()) {
-+            Log.w(TAG, "queryWeather while disabled");
-+            mCachedInfo = null;
-+            return;
-+        }
-+        try {
-+            mCachedInfo = null;
-+            Cursor c = mContext.getContentResolver().query(WEATHER_URI, WEATHER_PROJECTION,
-+                    null, null, null);
-+            if (c != null) {
-+                try {
-+                    int count = c.getCount();
-+                    if (count > 0) {
-+                        mCachedInfo = new WeatherInfo();
-+                        List<DayForecast> forecastList = new ArrayList<DayForecast>();
-+                        int i = 0;
-+                        for (i = 0; i < count; i++) {
-+                            c.moveToPosition(i);
-+                            if (i == 0) {
-+                                mCachedInfo.city = c.getString(0);
-+                                mCachedInfo.windSpeed = getFormattedValue(c.getFloat(1));
-+                                mCachedInfo.windDirection = String.valueOf(c.getInt(2)) + "\u00b0";
-+                                mCachedInfo.conditionCode = c.getInt(3);
-+                                mCachedInfo.temp = getFormattedValue(c.getFloat(4));
-+                                mCachedInfo.humidity = c.getString(5);
-+                                mCachedInfo.condition = c.getString(6);
-+                                mCachedInfo.timeStamp = Long.valueOf(c.getString(11));
-+                                mCachedInfo.pinWheel = c.getString(13);
-+                            } else {
-+                                DayForecast day = new DayForecast();
-+                                day.low = getFormattedValue(c.getFloat(7));
-+                                day.high = getFormattedValue(c.getFloat(8));
-+                                day.condition = c.getString(9);
-+                                day.conditionCode = c.getInt(10);
-+                                day.date = c.getString(12);
-+                                forecastList.add(day);
-+                            }
-+                        }
-+                        mCachedInfo.forecasts = forecastList;
-+                    }
-+                } finally {
-+                    c.close();
-+                }
-+            }
-+            c = mContext.getContentResolver().query(SETTINGS_URI, SETTINGS_PROJECTION,
-+                        null, null, null);
-+            if (c != null) {
-+                try {
-+                    int count = c.getCount();
-+                    if (count == 1) {
-+                        c.moveToPosition(0);
-+                        mMetric = c.getInt(1) == 0;
-+                        if (mCachedInfo != null) {
-+                            mCachedInfo.tempUnits = getTemperatureUnit();
-+                            mCachedInfo.windUnits = getWindUnit();
-+                            mCachedInfo.provider = c.getString(2);
-+                            mCachedInfo.iconPack = c.getString(4);
-+                        }
-+                    }
-+                } finally {
-+                    c.close();
-+                }
-+            }
-+
-+            if (DEBUG) Log.d(TAG, "queryWeather " + mCachedInfo);
-+            updateSettings();
-+        } catch (Exception e) {
-+            Log.e(TAG, "queryWeather", e);
-+        }
-+    }
-+
-+    private void loadDefaultIconsPackage() {
-+        mPackageName = ICON_PACKAGE_DEFAULT;
-+        mIconPrefix = ICON_PREFIX_DEFAULT;
-+        mSettingIconPackage = mPackageName + "." + mIconPrefix;
-+        if (DEBUG) Log.d(TAG, "Load default icon pack " + mSettingIconPackage + " " + mPackageName + " " + mIconPrefix);
-+        try {
-+            PackageManager packageManager = mContext.getPackageManager();
-+            mRes = packageManager.getResourcesForApplication(mPackageName);
-+        } catch (Exception e) {
-+            mRes = null;
-+        }
-+        if (mRes == null) {
-+            Log.w(TAG, "No default package found");
-+        }
-+    }
-+
-+    private Drawable getDefaultConditionImage() {
-+        String packageName = ICON_PACKAGE_DEFAULT;
-+        String iconPrefix = ICON_PREFIX_DEFAULT;
-+
-+        try {
-+            PackageManager packageManager = mContext.getPackageManager();
-+            Resources res = packageManager.getResourcesForApplication(packageName);
-+            if (res != null) {
-+                int resId = res.getIdentifier(iconPrefix + "_na", "drawable", packageName);
-+                Drawable d = res.getDrawable(resId);
-+                if (d != null) {
-+                    return d;
-+                }
-+            }
-+        } catch (Exception e) {
-+        }
-+        // absolute absolute fallback
-+        Log.w(TAG, "No default package found");
-+        return new ColorDrawable(Color.RED);
-+    }
-+
-+    private void loadCustomIconPackage() {
-+        if (DEBUG) Log.d(TAG, "Load custom icon pack " + mSettingIconPackage);
-+        int idx = mSettingIconPackage.lastIndexOf(".");
-+        mPackageName = mSettingIconPackage.substring(0, idx);
-+        mIconPrefix = mSettingIconPackage.substring(idx + 1);
-+        if (DEBUG) Log.d(TAG, "Load custom icon pack " + mPackageName + " " + mIconPrefix);
-+        try {
-+            PackageManager packageManager = mContext.getPackageManager();
-+            mRes = packageManager.getResourcesForApplication(mPackageName);
-+        } catch (Exception e) {
-+            mRes = null;
-+        }
-+        if (mRes == null) {
-+            Log.w(TAG, "Icon pack loading failed - loading default");
-+            loadDefaultIconsPackage();
-+        }
-+    }
-+
-+    public Drawable getWeatherConditionImage(int conditionCode) {
-+        try {
-+            int resId = mRes.getIdentifier(mIconPrefix + "_" + conditionCode, "drawable", mPackageName);
-+            Drawable d = mRes.getDrawable(resId);
-+            if (d != null) {
-+                return d;
-+            }
-+            Log.w(TAG, "Failed to get condition image for " + conditionCode + " use default");
-+            resId = mRes.getIdentifier(mIconPrefix + "_na", "drawable", mPackageName);
-+            d = mRes.getDrawable(resId);
-+            if (d != null) {
-+                return d;
-+            }
-+        } catch(Exception e) {
-+            Log.e(TAG, "getWeatherConditionImage", e);
-+        }
-+        Log.w(TAG, "Failed to get condition image for " + conditionCode);
-+        return getDefaultConditionImage();
-+    }
-+
-+    public boolean isOmniJawsServiceInstalled() {
-+        return isAvailableApp(SERVICE_PACKAGE);
-+    }
-+
-+    public boolean isOmniJawsEnabled() {
-+        if (!isOmniJawsServiceInstalled()) {
-+            return false;
-+        }
-+        try {
-+            final Cursor c = mContext.getContentResolver().query(SETTINGS_URI, SETTINGS_PROJECTION,
-+                    null, null, null);
-+            if (c != null) {
-+                int count = c.getCount();
-+                if (count == 1) {
-+                    c.moveToPosition(0);
-+                    boolean enabled = c.getInt(0) == 1;
-+                    return enabled;
-+                }
-+            }
-+        } catch (Exception e) {
-+            Log.e(TAG, "isOmniJawsEnabled", e);
-+        }
-+        return false;
-+    }
-+
-+    private String getTemperatureUnit() {
-+        return "\u00b0" + (mMetric ? "C" : "F");
-+    }
-+
-+    private String getWindUnit() {
-+        return mMetric ? "km/h":"mph";
-+    }
-+
-+    private void updateSettings() {
-+        final String iconPack = mCachedInfo != null ? mCachedInfo.iconPack : null;
-+        if (TextUtils.isEmpty(iconPack)) {
-+            loadDefaultIconsPackage();
-+        } else if (mSettingIconPackage == null || !iconPack.equals(mSettingIconPackage)) {
-+            mSettingIconPackage = iconPack;
-+            loadCustomIconPackage();
-+        }
-+    }
-+
-+    private boolean isAvailableApp(String packageName) {
-+        final PackageManager pm = mContext.getPackageManager();
-+        try {
-+            pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
-+            int enabled = pm.getApplicationEnabledSetting(packageName);
-+            return enabled != PackageManager.COMPONENT_ENABLED_STATE_DISABLED &&
-+                    enabled != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
-+        } catch (NameNotFoundException e) {
-+            return false;
-+        }
-+    }
-+
-+    public void addObserver(OmniJawsObserver observer) {
-+        if (mObserver.size() == 0) {
-+            if (mReceiver != null) {
-+                try {
-+                    mContext.unregisterReceiver(mReceiver);
-+                } catch (Exception e) {
-+                }
-+            }
-+            mReceiver = new WeatherUpdateReceiver();
-+            IntentFilter filter = new IntentFilter();
-+            filter.addAction(WEATHER_UPDATE);
-+            filter.addAction(WEATHER_ERROR);
-+            if (DEBUG) Log.d(TAG, "registerReceiver");
-+            mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
-+        }
-+        mObserver.add(observer);
-+    }
-+
-+    public void removeObserver(OmniJawsObserver observer) {
-+        mObserver.remove(observer);
-+        if (mObserver.size() == 0 && mReceiver != null) {
-+            try {
-+                if (DEBUG) Log.d(TAG, "unregisterReceiver");
-+                mContext.unregisterReceiver(mReceiver);
-+            } catch (Exception e) {
-+            }
-+            mReceiver = null;
-+        }
-+    }
-+
-+    public boolean isOutlineIconPackage() {
-+        return mIconPrefix.equals(ICON_PREFIX_OUTLINE);
-+    }
-+}
-diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
-index ce2543a4..ef330da9 100644
---- a/data/etc/com.android.systemui.xml
-+++ b/data/etc/com.android.systemui.xml
-@@ -16,6 +16,7 @@
-   -->
- <permissions>
-     <privapp-permissions package="com.android.systemui">
-+        <permission name="android.permission.ACCESS_FINE_LOCATION"/>
-         <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-         <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/>
-         <permission name="android.permission.BATTERY_STATS"/>
-diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
-index 774d6cbc..86a8a2a0 100644
---- a/packages/SystemUI/AndroidManifest.xml
-+++ b/packages/SystemUI/AndroidManifest.xml
-@@ -364,6 +364,10 @@
-     <!-- Listen to (dis-)connection of external displays and enable / disable them. -->
-     <uses-permission android:name="android.permission.MANAGE_DISPLAYS" />
- 
-+    <!-- OmniJaws -->
-+    <uses-permission android:name="org.omnirom.omnijaws.READ_WEATHER" />
-+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-+
-     <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />
-     <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />
-     <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" />
-diff --git a/packages/SystemUI/res-keyguard/layout/current_weather_view.xml b/packages/SystemUI/res-keyguard/layout/current_weather_view.xml
-new file mode 100644
-index 00000000..502df830
---- /dev/null
-+++ b/packages/SystemUI/res-keyguard/layout/current_weather_view.xml
-@@ -0,0 +1,59 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+     Copyright (C) 2023 crDroid Android 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.
-+-->
-+<com.android.systemui.crdroid.CurrentWeatherView
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    android:layout_width="match_parent"
-+    android:layout_height="wrap_content"
-+    android:layout_gravity="start"
-+    android:gravity="center_vertical"
-+    android:clipToPadding="false"
-+    android:paddingStart="@dimen/below_clock_padding_start">
-+
-+    <LinearLayout
-+        android:id="@+id/current"
-+        android:layout_width="match_parent"
-+        android:layout_height="wrap_content"
-+        android:gravity="center_vertical"
-+        android:orientation="horizontal" >
-+
-+        <TextView
-+            android:id="@+id/left_text"
-+            android:layout_width="wrap_content"
-+            android:layout_height="wrap_content"
-+            android:textColor="?attr/wallpaperTextColor"
-+            android:ellipsize="end"
-+            android:singleLine="true"
-+            android:paddingEnd="8dp"
-+            style="@style/TextAppearance.Keyguard.Secondary" />
-+
-+        <ImageView
-+            android:id="@+id/current_image"
-+            android:layout_width="@dimen/widget_icon_size"
-+            android:layout_height="@dimen/widget_icon_size"
-+            android:scaleType="centerInside"/>
-+
-+        <TextView
-+            android:id="@+id/right_text"
-+            android:layout_width="wrap_content"
-+            android:layout_height="wrap_content"
-+            android:textColor="?attr/wallpaperTextColor"
-+            android:singleLine="true"
-+            android:paddingStart="8dp"
-+            style="@style/TextAppearance.Keyguard.Secondary" />
-+    </LinearLayout>
-+
-+</com.android.systemui.crdroid.CurrentWeatherView>
-diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
-index fc9c917c..5b26e314 100644
---- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
-+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
-@@ -56,6 +56,12 @@
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
- 
-+        <include layout="@layout/current_weather_view"
-+            android:id="@+id/weather_container"
-+            android:layout_width="match_parent"
-+            android:layout_height="wrap_content"
-+            android:visibility="gone" />
-+
-       <com.android.systemui.statusbar.phone.NotificationIconContainer
-           android:id="@+id/left_aligned_notification_icon_container"
-           android:layout_width="match_parent"
-diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-index e621ffe4..6015604e 100644
---- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-@@ -27,6 +27,7 @@ import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLE
- import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;
- 
- import android.annotation.Nullable;
-+import android.content.ContentResolver;
- import android.database.ContentObserver;
- import android.os.UserHandle;
- import android.provider.Settings;
-@@ -39,7 +40,9 @@ import android.widget.LinearLayout;
- import androidx.annotation.NonNull;
- import androidx.annotation.VisibleForTesting;
- 
-+import com.android.systemui.Dependency;
- import com.android.systemui.Dumpable;
-+import com.android.systemui.crdroid.CurrentWeatherView;
- import com.android.systemui.dagger.qualifiers.Background;
- import com.android.systemui.dagger.qualifiers.Main;
- import com.android.systemui.dump.DumpManager;
-@@ -64,6 +67,7 @@ import com.android.systemui.statusbar.notification.shared.NotificationIconContai
- import com.android.systemui.statusbar.notification.stack.AnimationProperties;
- import com.android.systemui.statusbar.phone.NotificationIconAreaController;
- import com.android.systemui.statusbar.phone.NotificationIconContainer;
-+import com.android.systemui.tuner.TunerService;
- import com.android.systemui.util.ViewController;
- import com.android.systemui.util.concurrency.DelayableExecutor;
- import com.android.systemui.util.settings.SecureSettings;
-@@ -81,9 +85,12 @@ import kotlinx.coroutines.DisposableHandle;
-  * Injectable controller for {@link KeyguardClockSwitch}.
-  */
- public class KeyguardClockSwitchController extends ViewController<KeyguardClockSwitch>
--        implements Dumpable {
-+        implements Dumpable, TunerService.Tunable {
-     private static final String TAG = "KeyguardClockSwitchController";
- 
-+    private static final String LOCKSCREEN_WEATHER_ENABLED =
-+            "system:" + Settings.System.LOCKSCREEN_WEATHER_ENABLED;
-+
-     private final StatusBarStateController mStatusBarStateController;
-     private final ClockRegistry mClockRegistry;
-     private final KeyguardSliceViewController mKeyguardSliceViewController;
-@@ -94,6 +101,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
-     private final ClockEventController mClockEventController;
-     private final LogBuffer mLogBuffer;
-     private final NotificationIconContainerAlwaysOnDisplayViewBinder mNicViewBinder;
-+    private final TunerService mTunerService;
-     private FrameLayout mSmallClockFrame; // top aligned clock
-     private FrameLayout mLargeClockFrame; // centered clock
- 
-@@ -115,6 +123,9 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
-     private final KeyguardUnlockAnimationController mKeyguardUnlockAnimationController;
-     private final InWindowLauncherUnlockAnimationManager mInWindowLauncherUnlockAnimationManager;
- 
-+    private CurrentWeatherView mCurrentWeatherView;
-+    private boolean mShowWeather;
-+
-     private boolean mShownOnSecondaryDisplay = false;
-     private boolean mOnlyClock = false;
-     private boolean mIsActiveDreamLockscreenHosted = false;
-@@ -209,6 +220,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
-             @Override
-             public void onAvailableClocksChanged() { }
-         };
-+
-+        mTunerService = Dependency.get(TunerService.class);
-     }
- 
-     /**
-@@ -250,12 +263,15 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
-             mLargeClockFrame = mView.findViewById(R.id.lockscreen_clock_view_large);
-         }
- 
-+        mCurrentWeatherView = mView.findViewById(R.id.weather_container);
- 
-         if (!mOnlyClock) {
-             mDumpManager.unregisterDumpable(getClass().getSimpleName()); // unregister previous
-             mDumpManager.registerDumpable(getClass().getSimpleName(), this);
-         }
- 
-+        mTunerService.addTunable(this, LOCKSCREEN_WEATHER_ENABLED);
-+
-         if (mFeatureFlags.isEnabled(LOCKSCREEN_WALLPAPER_DREAM_ENABLED)) {
-             mStatusArea = mView.findViewById(R.id.keyguard_status_area);
-             collectFlow(mStatusArea, mKeyguardInteractor.isActiveDreamLockscreenHosted(),
-@@ -291,6 +307,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
-         mKeyguardDateWeatherViewInvisibility =
-                 mView.getResources().getInteger(R.integer.keyguard_date_weather_view_invisibility);
- 
-+        updateWeatherView();
-+
-         if (mShownOnSecondaryDisplay) {
-             mView.setLargeClockOnSecondaryDisplay(true);
-             mClockEventController.setLargeClockOnSecondaryDisplay(true);
-@@ -364,6 +382,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
- 
-     @Override
-     protected void onViewDetached() {
-+        mTunerService.removeTunable(this);
-         mClockRegistry.unregisterClockChangeListener(mClockChangedListener);
-         mClockEventController.unregisterListeners();
-         setClock(null);
-@@ -377,6 +396,37 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
-                 mKeyguardUnlockAnimationListener);
-     }
- 
-+    @Override
-+    public void onTuningChanged(String key, String newValue) {
-+        switch (key) {
-+            case LOCKSCREEN_WEATHER_ENABLED:
-+                mShowWeather =
-+                        TunerService.parseIntegerSwitch(newValue, false);
-+                updateWeatherView();
-+                break;
-+            default:
-+                break;
-+        }
-+    }
-+
-+    public void updateWeatherView() {
-+        mUiExecutor.execute(() -> {
-+            final ContentResolver resolver = getContext().getContentResolver();
-+            mShowWeather = Settings.System.getIntForUser(resolver,
-+                    Settings.System.LOCKSCREEN_WEATHER_ENABLED, 0,
-+                    UserHandle.USER_CURRENT) != 0;
-+            if (mCurrentWeatherView != null) {
-+                if (mShowWeather && !mOnlyClock) {
-+                    mCurrentWeatherView.enableUpdates();
-+                    mCurrentWeatherView.setVisibility(View.VISIBLE);
-+                } else {
-+                    mCurrentWeatherView.disableUpdates();
-+                    mCurrentWeatherView.setVisibility(View.GONE);
-+                }
-+            }
-+        });
-+    }
-+
-     void onLocaleListChanged() {
-         if (mSmartspaceController.isEnabled()) {
-             removeViewsFromStatusArea();
-diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-index c0ae4a1f..9f71ed70 100644
---- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-@@ -436,6 +436,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
-             if (visible) {
-                 if (DEBUG) Slog.v(TAG, "refresh statusview visible:true");
-                 refreshTime();
-+                mKeyguardClockSwitchController.updateWeatherView();
-             }
-         }
-     };
-diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/CurrentWeatherView.java b/packages/SystemUI/src/com/android/systemui/crdroid/CurrentWeatherView.java
-new file mode 100644
-index 00000000..9e4eb16e
---- /dev/null
-+++ b/packages/SystemUI/src/com/android/systemui/crdroid/CurrentWeatherView.java
-@@ -0,0 +1,163 @@
-+/*
-+ * Copyright (C) 2023 crDroid Android 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 com.android.systemui.crdroid;
-+
-+import android.content.Context;
-+import android.database.ContentObserver;
-+import android.graphics.drawable.Drawable;
-+import android.os.Handler;
-+import android.os.UserHandle;
-+import android.provider.Settings;
-+import android.util.AttributeSet;
-+import android.view.View;
-+import android.widget.ImageView;
-+import android.widget.FrameLayout;
-+import android.widget.TextView;
-+
-+import com.android.internal.util.crdroid.OmniJawsClient;
-+import com.android.systemui.res.R;
-+
-+public class CurrentWeatherView extends FrameLayout implements OmniJawsClient.OmniJawsObserver {
-+
-+    static final String TAG = "SystemUI:CurrentWeatherView";
-+
-+    private ImageView mCurrentImage;
-+    private OmniJawsClient mWeatherClient;
-+    private OmniJawsClient.WeatherInfo mWeatherInfo;
-+    private TextView mLeftText;
-+    private TextView mRightText;
-+
-+    private SettingsObserver mSettingsObserver;
-+
-+    private boolean mShowWeatherLocation;
-+
-+    public CurrentWeatherView(Context context) {
-+        this(context, null);
-+    }
-+
-+    public CurrentWeatherView(Context context, AttributeSet attrs) {
-+        this(context, attrs, 0);
-+    }
-+
-+    public CurrentWeatherView(Context context, AttributeSet attrs, int defStyle) {
-+        super(context, attrs, defStyle);
-+        if (mWeatherClient == null) {
-+            mWeatherClient = new OmniJawsClient(context);
-+        }
-+    }
-+
-+    public void enableUpdates() {
-+        if (mWeatherClient != null) {
-+            mWeatherClient.addObserver(this);
-+            queryAndUpdateWeather();
-+        }
-+    }
-+
-+    public void disableUpdates() {
-+        if (mWeatherClient != null) {
-+            mWeatherClient.removeObserver(this);
-+        }
-+    }
-+
-+    @Override
-+    protected void onFinishInflate() {
-+        super.onFinishInflate();
-+        mCurrentImage  = (ImageView) findViewById(R.id.current_image);
-+        mLeftText = (TextView) findViewById(R.id.left_text);
-+        mRightText = (TextView) findViewById(R.id.right_text);
-+        if (mSettingsObserver == null) {
-+            mSettingsObserver = new SettingsObserver(new Handler());
-+            mSettingsObserver.observe();
-+        }
-+    }
-+
-+    private void setErrorView() {
-+        mCurrentImage.setImageDrawable(null);
-+        mLeftText.setText("");
-+        mRightText.setText("");
-+    }
-+
-+    @Override
-+    public void weatherError(int errorReason) {
-+        // since this is shown in ambient and lock screen
-+        // it would look bad to show every error since the
-+        // screen-on revovery of the service had no chance
-+        // to run fast enough
-+        // so only show the disabled state
-+        if (errorReason == OmniJawsClient.EXTRA_ERROR_DISABLED) {
-+            mWeatherInfo = null;
-+            setErrorView();
-+        }
-+    }
-+
-+    @Override
-+    public void weatherUpdated() {
-+        queryAndUpdateWeather();
-+    }
-+
-+    @Override
-+    public void updateSettings() {
-+        queryAndUpdateWeather();
-+    }
-+
-+    private void queryAndUpdateWeather() {
-+        try {
-+            if (mWeatherClient == null || !mWeatherClient.isOmniJawsEnabled()) {
-+                return;
-+            }
-+            mWeatherClient.queryWeather();
-+            mWeatherInfo = mWeatherClient.getWeatherInfo();
-+            if (mWeatherInfo != null) {
-+                Drawable d = mWeatherClient.getWeatherConditionImage(mWeatherInfo.conditionCode);
-+                mCurrentImage.setImageDrawable(d);
-+                mRightText.setText(mWeatherInfo.temp + mWeatherInfo.tempUnits);
-+                mLeftText.setText(mWeatherInfo.city);
-+                mLeftText.setVisibility(mShowWeatherLocation ? View.VISIBLE : View.GONE);
-+            }
-+        } catch(Exception e) {
-+            // Do nothing
-+        }
-+    }
-+
-+    class SettingsObserver extends ContentObserver {
-+        SettingsObserver(Handler handler) {
-+            super(handler);
-+        }
-+
-+        void observe() {
-+            getContext().getContentResolver().registerContentObserver(Settings.System.getUriFor(
-+                    Settings.System.LOCKSCREEN_WEATHER_LOCATION), false, this,
-+                    UserHandle.USER_ALL);
-+            updateWeatherSettings();
-+        }
-+
-+        void unobserve() {
-+            getContext().getContentResolver().unregisterContentObserver(this);
-+        }
-+
-+        void updateWeatherSettings() {
-+            mShowWeatherLocation = Settings.System.getIntForUser(getContext().getContentResolver(),
-+                    Settings.System.LOCKSCREEN_WEATHER_LOCATION,
-+                    0, UserHandle.USER_CURRENT) != 0;
-+            mLeftText.setVisibility(mShowWeatherLocation ? View.VISIBLE : View.GONE);
-+        }
-+
-+        @Override
-+        public void onChange(boolean selfChange) {
-+            updateWeatherSettings();
-+        }
-+    }
-+}
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch b/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch
deleted file mode 100644
index f18d37c4..00000000
--- a/patches/personal/platform_frameworks_base/0009-feat-Add-Face-Unlock-with-ParanoidSense-1-2.patch
+++ /dev/null
@@ -1,2943 +0,0 @@
-From bf2cd94c2f900ea898d8531694a7b326ef9fe089 Mon Sep 17 00:00:00 2001
-From: Chris Crump <chriscrawford893@gmail.com>
-Date: Tue, 1 Nov 2022 17:27:48 -0400
-Subject: [PATCH 09/10] feat: Add Face Unlock with ParanoidSense (1/2)
-
-Based on AOSPA's implementation and adapted by @ghostrider-reborn
-
-Co-authored-by: Chris Crump <chriscrawford893@gmail.com>
-Co-authored-by: Adithya R <gh0strider.2k18.reborn@gmail.com>
-Change-Id: I05fa784d9f7f978be9f5944900a97ad7df19f59e
----
- .../privacy/AppOpsPrivacyItemMonitor.kt       |    8 +
- .../phone/BiometricUnlockController.java      |    2 +-
- .../phone/KeyguardBypassController.kt         |   11 +-
- services/core/Android.bp                      |    1 +
- .../biometrics/sensors/face/FaceService.java  |   34 +-
- .../face/sense/BiometricTestSessionImpl.java  |  229 ++++
- .../face/sense/FaceAuthenticationClient.java  |  228 ++++
- .../sensors/face/sense/FaceEnrollClient.java  |  138 ++
- .../sense/FaceGenerateChallengeClient.java    |  111 ++
- .../face/sense/FaceGetFeatureClient.java      |  101 ++
- .../face/sense/FaceInternalCleanupClient.java |   70 ++
- .../sense/FaceInternalEnumerateClient.java    |   58 +
- .../sensors/face/sense/FaceRemovalClient.java |   63 +
- .../face/sense/FaceResetLockoutClient.java    |   82 ++
- .../face/sense/FaceRevokeChallengeClient.java |   55 +
- .../face/sense/FaceSetFeatureClient.java      |   93 ++
- .../sense/FaceUpdateActiveUserClient.java     |   84 ++
- .../sensors/face/sense/SenseProvider.java     | 1110 +++++++++++++++++
- .../sensors/face/sense/SenseUtils.java        |   61 +
- .../sensors/face/sense/TestHal.java           |  144 +++
- 20 files changed, 2667 insertions(+), 16 deletions(-)
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java
- create mode 100644 services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java
-
-diff --git a/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt b/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
-index fedbdec1..cc4ce05a 100644
---- a/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
-+++ b/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
-@@ -95,6 +95,10 @@ class AppOpsPrivacyItemMonitor @Inject constructor(
-                 if (code in OPS_LOCATION && !locationAvailable) {
-                     return
-                 }
-+                // Hide incoming chip from sense caller package
-+                if (packageName == "co.aospa.sense") {
-+                    return
-+                }
-                 if (userTracker.userProfiles.any { it.id == UserHandle.getUserId(uid) } ||
-                         code in USER_INDEPENDENT_OPS) {
-                     logger.logUpdatedItemFromAppOps(code, uid, packageName, active)
-@@ -219,6 +223,10 @@ class AppOpsPrivacyItemMonitor @Inject constructor(
-             AppOpsManager.OP_RECORD_AUDIO -> PrivacyType.TYPE_MICROPHONE
-             else -> return null
-         }
-+        // Hide incoming chip from sense caller package
-+        if (appOpItem.packageName == "co.aospa.sense") {
-+            return null
-+        }
-         val app = PrivacyApplication(appOpItem.packageName, appOpItem.uid)
-         return PrivacyItem(type, app, appOpItem.timeStartedElapsed, appOpItem.isDisabled)
-     }
-diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
-index 97fc35a0..1d4069ae 100644
---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
-+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
-@@ -618,7 +618,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
-         final boolean unlockingAllowed =
-                 mUpdateMonitor.isUnlockingWithBiometricAllowed(isStrongBiometric);
-         final boolean deviceDreaming = mUpdateMonitor.isDreaming();
--        final boolean bypass = mKeyguardBypassController.getBypassEnabled()
-+        final boolean bypass = mKeyguardBypassController.getBypassEnabledBiometric()
-                 || mAuthController.isUdfpsFingerDown();
- 
-         logCalculateModeForPassiveAuth(unlockingAllowed, deviceInteractive, isKeyguardShowing,
-diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
-index a3d316b6..866bc590 100644
---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
-+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
-@@ -107,6 +107,8 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
-             notifyListeners()
-         }
- 
-+    var bypassEnabledBiometric: Boolean = false
-+
-     var bouncerShowing: Boolean = false
-     var altBouncerShowing: Boolean = false
-     var launchingAffordance: Boolean = false
-@@ -163,7 +165,7 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
-                 com.android.internal.R.bool.config_faceAuthDismissesKeyguard)) 1 else 0
- 
-         tunerService.addTunable({ key, _ ->
--            bypassEnabled = tunerService.getValue(key, dismissByDefault) != 0
-+            bypassEnabledBiometric = tunerService.getValue(key, dismissByDefault) != 0
-         }, Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD)
- 
-         lockscreenUserManager.addUserChangedListener(
-@@ -200,8 +202,8 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
-         biometricSourceType: BiometricSourceType,
-         isStrongBiometric: Boolean
-     ): Boolean {
--        if (biometricSourceType == BiometricSourceType.FACE && bypassEnabled) {
--            val can = canBypass()
-+        if (bypassEnabledBiometric) {
-+            val can = biometricSourceType != BiometricSourceType.FACE || canBypass()
-             if (!can && (isPulseExpanding || qsExpanded)) {
-                 pendingUnlock = PendingUnlock(biometricSourceType, isStrongBiometric)
-             }
-@@ -225,7 +227,7 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
-      * If keyguard can be dismissed because of bypass.
-      */
-     fun canBypass(): Boolean {
--        if (bypassEnabled) {
-+        if (bypassEnabledBiometric) {
-             return when {
-                 bouncerShowing -> true
-                 altBouncerShowing -> true
-@@ -258,6 +260,7 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
-             pw.println("  mPendingUnlock: $pendingUnlock")
-         }
-         pw.println("  bypassEnabled: $bypassEnabled")
-+        pw.println("  bypassEnabledBiometric: $bypassEnabledBiometric")
-         pw.println("  canBypass: ${canBypass()}")
-         pw.println("  bouncerShowing: $bouncerShowing")
-         pw.println("  altBouncerShowing: $altBouncerShowing")
-diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 69089d3a..680669ff 100644
---- a/services/core/Android.bp
-+++ b/services/core/Android.bp
-@@ -263,6 +263,7 @@ java_library_static {
-         "vendor.oplus.hardware.biometrics.fingerprint-V2.1-java",
-         "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
-         "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
-+        "vendor.aospa.biometrics.face",
- 
-         //AIDL
-         "vendor.samsung.hardware.sysinput-V1-java",
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java
-index 7ee2a7ab..6ada92b5 100644
---- a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java
-@@ -26,6 +26,7 @@ import android.app.ActivityManager;
- import android.content.Context;
- import android.hardware.biometrics.AuthenticationStateListener;
- import android.hardware.biometrics.BiometricsProtoEnums;
-+import android.hardware.biometrics.SensorProperties;
- import android.hardware.biometrics.IBiometricSensorReceiver;
- import android.hardware.biometrics.IBiometricService;
- import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
-@@ -39,6 +40,7 @@ import android.hardware.face.Face;
- import android.hardware.face.FaceAuthenticateOptions;
- import android.hardware.face.FaceEnrollOptions;
- import android.hardware.face.FaceSensorConfigurations;
-+import android.hardware.face.FaceSensorProperties;
- import android.hardware.face.FaceSensorPropertiesInternal;
- import android.hardware.face.FaceServiceReceiver;
- import android.hardware.face.IFaceAuthenticatorsRegisteredCallback;
-@@ -73,6 +75,8 @@ import com.android.server.biometrics.sensors.LockoutResetDispatcher;
- import com.android.server.biometrics.sensors.LockoutTracker;
- import com.android.server.biometrics.sensors.face.aidl.FaceProvider;
- import com.android.server.biometrics.sensors.face.hidl.Face10;
-+import com.android.server.biometrics.sensors.face.sense.SenseProvider;
-+import com.android.server.biometrics.sensors.face.sense.SenseUtils;
- 
- import com.google.android.collect.Lists;
- 
-@@ -692,24 +696,32 @@ public class FaceService extends SystemService {
-             return providers;
-         }
- 
-+        private List<ServiceProvider> getSenseProviders() {
-+            final List<ServiceProvider> providers = new ArrayList<>();
-+            if (SenseUtils.canUseProvider()) {
-+                FaceSensorPropertiesInternal props = new FaceSensorPropertiesInternal(
-+                        SenseProvider.DEVICE_ID,
-+                        SensorProperties.STRENGTH_WEAK,
-+                        1, /** maxEnrollmentsPerUser **/
-+                        new ArrayList(),
-+                        FaceSensorProperties.TYPE_RGB,
-+                        false, /** supportsFaceDetection **/
-+                        false, /** supportsSelfIllumination **/
-+                        false); /** resetLockoutRequiresChallenge **/
-+                SenseProvider provider = new SenseProvider(getContext(), mBiometricStateCallback, props, mLockoutResetDispatcher);
-+                providers.add(provider);
-+            }
-+            return providers;
-+        }
-+
-         @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)
-         public void registerAuthenticators(
-                 @NonNull List<FaceSensorPropertiesInternal> hidlSensors) {
-             super.registerAuthenticators_enforcePermission();
- 
-             mRegistry.registerAll(() -> {
--                List<String> aidlSensors = new ArrayList<>();
--                final String[] instances = mAidlInstanceNameSupplier.get();
--                if (instances != null) {
--                    aidlSensors.addAll(Lists.newArrayList(instances));
--                }
--
--                final Pair<List<FaceSensorPropertiesInternal>, List<String>>
--                        filteredInstances = filterAvailableHalInstances(hidlSensors, aidlSensors);
--
-                 final List<ServiceProvider> providers = new ArrayList<>();
--                providers.addAll(getHidlProviders(filteredInstances.first));
--                providers.addAll(getAidlProviders(filteredInstances.second));
-+                providers.addAll(getSenseProviders());
-                 return providers;
-             });
-         }
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java
-new file mode 100644
-index 00000000..c1122a20
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java
-@@ -0,0 +1,229 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.hardware.biometrics.ITestSession;
-+import android.hardware.biometrics.ITestSessionCallback;
-+import android.hardware.face.Face;
-+import android.hardware.face.FaceAuthenticationFrame;
-+import android.hardware.face.FaceEnrollFrame;
-+import android.hardware.face.FaceEnrollOptions;
-+import android.hardware.face.IFaceServiceReceiver;
-+import android.os.Binder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.sensors.BaseClientMonitor;
-+import com.android.server.biometrics.sensors.BiometricStateCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.face.FaceUtils;
-+
-+import java.util.List;
-+import java.util.Random;
-+
-+/**
-+ * A test session implementation for {@link SenseProvider}. See
-+ * {@link android.hardware.biometrics.BiometricTestSession}.
-+ */
-+public class BiometricTestSessionImpl extends ITestSession.Stub {
-+
-+    private static final String TAG = "face/sense/BiometricTestSessionImpl";
-+
-+    @NonNull private final Context mContext;
-+    private final int mSensorId;
-+    @NonNull private final ITestSessionCallback mCallback;
-+    @NonNull private final Random mRandom;
-+
-+    @NonNull private final SenseProvider.HalResultController mHalResultController;
-+    @NonNull private final SenseProvider mSenseProvider;
-+
-+    /**
-+     * Internal receiver currently only used for enroll. Results do not need to be forwarded to the
-+     * test, since enrollment is a platform-only API. The authentication path is tested through
-+     * the public BiometricPrompt APIs and does not use this receiver.
-+     */
-+    private final IFaceServiceReceiver mReceiver = new IFaceServiceReceiver.Stub() {
-+        @Override
-+        public void onEnrollResult(Face face, int remaining) {
-+
-+        }
-+
-+        @Override
-+        public void onAcquired(int acquireInfo, int vendorCode) {
-+
-+        }
-+
-+        @Override
-+        public void onAuthenticationSucceeded(Face face, int userId, boolean isStrongBiometric) {
-+
-+        }
-+
-+        @Override
-+        public void onFaceDetected(int sensorId, int userId, boolean isStrongBiometric) {
-+
-+        }
-+
-+        @Override
-+        public void onAuthenticationFailed() {
-+
-+        }
-+
-+        @Override
-+        public void onError(int error, int vendorCode) {
-+
-+        }
-+
-+        @Override
-+        public void onRemoved(Face face, int remaining) {
-+
-+        }
-+
-+        @Override
-+        public void onFeatureSet(boolean success, int feature) {
-+
-+        }
-+
-+        @Override
-+        public void onFeatureGet(boolean success, int[] features, boolean[] featureState) {
-+
-+        }
-+
-+        @Override
-+        public void onChallengeGenerated(int sensorId, int userId, long challenge) {
-+
-+        }
-+
-+        @Override
-+        public void onAuthenticationFrame(FaceAuthenticationFrame frame) {
-+
-+        }
-+
-+        @Override
-+        public void onEnrollmentFrame(FaceEnrollFrame frame) {
-+
-+        }
-+    };
-+
-+    BiometricTestSessionImpl(@NonNull Context context, int sensorId,
-+            @NonNull ITestSessionCallback callback, @NonNull SenseProvider provider,
-+            @NonNull SenseProvider.HalResultController halResultController) {
-+        mContext = context;
-+        mSensorId = sensorId;
-+        mCallback = callback;
-+        mSenseProvider = provider;
-+        mHalResultController = halResultController;
-+        mRandom = new Random();
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void setTestHalEnabled(boolean enabled) {
-+        super.setTestHalEnabled_enforcePermission();
-+
-+        mSenseProvider.setTestHalEnabled(enabled);
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void startEnroll(int userId) {
-+        super.startEnroll_enforcePermission();
-+
-+        mSenseProvider.scheduleEnroll(mSensorId, new Binder(), new byte[69], userId, mReceiver,
-+                mContext.getOpPackageName(), new int[0] /* disabledFeatures */,
-+                null /* previewSurface */, false /* debugConsent */,
-+                (new FaceEnrollOptions.Builder()).build());
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void finishEnroll(int userId) {
-+        super.finishEnroll_enforcePermission();
-+
-+        mHalResultController.onEnrollResult(1, userId, 0);
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void acceptAuthentication(int userId) {
-+        super.acceptAuthentication_enforcePermission();
-+
-+        // Fake authentication with any of the existing faces
-+        List<Face> faces = FaceUtils.getInstance(mSensorId)
-+                .getBiometricsForUser(mContext, userId);
-+        if (faces.isEmpty()) {
-+            Slog.w(TAG, "No faces, returning");
-+            return;
-+        }
-+        final int fid = faces.get(0).getBiometricId();
-+        byte[] hat = {0};
-+        mHalResultController.onAuthenticated(0 /* deviceId */, userId, hat);
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void rejectAuthentication(int userId) {
-+        super.rejectAuthentication_enforcePermission();
-+
-+        mHalResultController.onAuthenticated(0 /* deviceId */, userId, null);
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void notifyAcquired(int userId, int acquireInfo) {
-+        super.notifyAcquired_enforcePermission();
-+
-+        mHalResultController.onAcquired(userId, 0 /* deviceId */, 0 /* vendorCode */);
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void notifyError(int userId, int errorCode) {
-+        super.notifyError_enforcePermission();
-+
-+        mHalResultController.onError(0 /* deviceId */, 0 /* vendorCode */);
-+    }
-+
-+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
-+    @Override
-+    public void cleanupInternalState(int userId) {
-+        super.cleanupInternalState_enforcePermission();
-+
-+        mSenseProvider.scheduleInternalCleanup(mSensorId, userId, new ClientMonitorCallback() {
-+            @Override
-+            public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
-+                try {
-+                    mCallback.onCleanupStarted(clientMonitor.getTargetUserId());
-+                } catch (RemoteException e) {
-+                    Slog.e(TAG, "Remote exception", e);
-+                }
-+            }
-+
-+            @Override
-+            public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
-+                    boolean success) {
-+                try {
-+                    mCallback.onCleanupFinished(clientMonitor.getTargetUserId());
-+                } catch (RemoteException e) {
-+                    Slog.e(TAG, "Remote exception", e);
-+                }
-+            }
-+        });
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java
-new file mode 100644
-index 00000000..118970dc
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java
-@@ -0,0 +1,228 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.content.res.Resources;
-+import android.hardware.SensorPrivacyManager;
-+import android.hardware.biometrics.BiometricAuthenticator;
-+import android.hardware.biometrics.BiometricConstants;
-+import android.hardware.biometrics.BiometricFaceConstants;
-+import android.hardware.biometrics.BiometricManager.Authenticators;
-+import android.hardware.biometrics.face.V1_0.IBiometricsFace;
-+import android.hardware.face.FaceAuthenticateOptions;
-+import android.hardware.face.FaceManager;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.internal.R;
-+import com.android.server.biometrics.Utils;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.AuthenticationClient;
-+import com.android.server.biometrics.sensors.BiometricNotificationUtils;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
-+import com.android.server.biometrics.sensors.LockoutTracker;
-+import com.android.server.biometrics.sensors.PerformanceTracker;
-+import com.android.server.biometrics.sensors.face.UsageStats;
-+
-+import java.util.ArrayList;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+/**
-+ * Face-specific authentication client supporting the {@link android.hardware.biometrics.face.V1_0}
-+ * HIDL interface.
-+ */
-+class FaceAuthenticationClient
-+        extends AuthenticationClient<ISenseService, FaceAuthenticateOptions> {
-+
-+    private static final String TAG = "FaceAuthenticationClient";
-+
-+    private final UsageStats mUsageStats;
-+
-+    private final int[] mBiometricPromptIgnoreList;
-+    private final int[] mBiometricPromptIgnoreListVendor;
-+    private final int[] mKeyguardIgnoreList;
-+    private final int[] mKeyguardIgnoreListVendor;
-+
-+    private int mLastAcquire;
-+
-+    FaceAuthenticationClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon,
-+            @NonNull IBinder token, long requestId,
-+            @NonNull ClientMonitorCallbackConverter listener, long operationId,
-+            boolean restricted, @NonNull FaceAuthenticateOptions options, int cookie,
-+            boolean requireConfirmation,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
-+            boolean isStrongBiometric, @NonNull LockoutTracker lockoutTracker,
-+            @NonNull UsageStats usageStats, boolean allowBackgroundAuthentication,
-+            @Authenticators.Types int sensorStrength) {
-+        super(context, lazyDaemon, token, listener, operationId, restricted,
-+                options, cookie, requireConfirmation, logger, biometricContext,
-+                isStrongBiometric, null /* taskStackListener */,
-+                lockoutTracker, allowBackgroundAuthentication, true /* shouldVibrate */,
-+                sensorStrength);
-+        setRequestId(requestId);
-+        mUsageStats = usageStats;
-+
-+        final Resources resources = getContext().getResources();
-+        mBiometricPromptIgnoreList = resources.getIntArray(
-+                R.array.config_face_acquire_biometricprompt_ignorelist);
-+        mBiometricPromptIgnoreListVendor = resources.getIntArray(
-+                R.array.config_face_acquire_vendor_biometricprompt_ignorelist);
-+        mKeyguardIgnoreList = resources.getIntArray(
-+                R.array.config_face_acquire_keyguard_ignorelist);
-+        mKeyguardIgnoreListVendor = resources.getIntArray(
-+                R.array.config_face_acquire_vendor_keyguard_ignorelist);
-+    }
-+
-+    @Override
-+    public void start(@NonNull ClientMonitorCallback callback) {
-+        super.start(callback);
-+        mState = STATE_STARTED;
-+    }
-+
-+    @NonNull
-+    @Override
-+    protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
-+        return new ClientMonitorCompositeCallback(
-+                getLogger().getAmbientLightProbe(true /* startWithClient */), callback);
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            getFreshDaemon().authenticate(mOperationId);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception when requesting auth", e);
-+            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    @Override
-+    protected void stopHalOperation() {
-+        try {
-+            getFreshDaemon().cancel();
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception when requesting cancel", e);
-+            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    @Override
-+    public boolean wasUserDetected() {
-+        // Do not provide haptic feedback if the user was not detected, and an error (usually
-+        // ERROR_TIMEOUT) is received.
-+        return mLastAcquire != FaceManager.FACE_ACQUIRED_NOT_DETECTED
-+                && mLastAcquire != FaceManager.FACE_ACQUIRED_SENSOR_DIRTY;
-+    }
-+
-+    @Override
-+    protected void handleLifecycleAfterAuth(boolean authenticated) {
-+        // For face, the authentication lifecycle ends either when
-+        // 1) Authenticated == true
-+        // 2) Error occurred
-+        // 3) Authenticated == false
-+        mCallback.onClientFinished(this, true /* success */);
-+    }
-+
-+    @Override
-+    public @LockoutTracker.LockoutMode int handleFailedAttempt(int userId) {
-+        @LockoutTracker.LockoutMode final int lockoutMode =
-+                getLockoutTracker().getLockoutModeForUser(userId);
-+        final PerformanceTracker performanceTracker =
-+                PerformanceTracker.getInstanceForSensorId(getSensorId());
-+        if (lockoutMode == LockoutTracker.LOCKOUT_PERMANENT) {
-+            performanceTracker.incrementPermanentLockoutForUser(userId);
-+        } else if (lockoutMode == LockoutTracker.LOCKOUT_TIMED) {
-+            performanceTracker.incrementTimedLockoutForUser(userId);
-+        }
-+
-+        return lockoutMode;
-+    }
-+
-+    @Override
-+    public void onAuthenticated(BiometricAuthenticator.Identifier identifier,
-+            boolean authenticated, ArrayList<Byte> token) {
-+        super.onAuthenticated(identifier, authenticated, token);
-+
-+        mState = STATE_STOPPED;
-+        mUsageStats.addEvent(new UsageStats.AuthenticationEvent(
-+                getStartTimeMs(),
-+                System.currentTimeMillis() - getStartTimeMs() /* latency */,
-+                authenticated,
-+                0 /* error */,
-+                0 /* vendorError */,
-+                getTargetUserId()));
-+    }
-+
-+    @Override
-+    public void onError(@BiometricConstants.Errors int error, int vendorCode) {
-+        mUsageStats.addEvent(new UsageStats.AuthenticationEvent(
-+                getStartTimeMs(),
-+                System.currentTimeMillis() - getStartTimeMs() /* latency */,
-+                false /* authenticated */,
-+                error,
-+                vendorCode,
-+                getTargetUserId()));
-+
-+        super.onError(error, vendorCode);
-+    }
-+
-+    private int[] getAcquireIgnorelist() {
-+        return isBiometricPrompt() ? mBiometricPromptIgnoreList : mKeyguardIgnoreList;
-+    }
-+
-+    private int[] getAcquireVendorIgnorelist() {
-+        return isBiometricPrompt() ? mBiometricPromptIgnoreListVendor : mKeyguardIgnoreListVendor;
-+    }
-+
-+    private boolean shouldSend(int acquireInfo, int vendorCode) {
-+        if (acquireInfo == FaceManager.FACE_ACQUIRED_VENDOR) {
-+            return !Utils.listContains(getAcquireVendorIgnorelist(), vendorCode);
-+        } else {
-+            return !Utils.listContains(getAcquireIgnorelist(), acquireInfo);
-+        }
-+    }
-+
-+    @Override
-+    public void onAcquired(int acquireInfo, int vendorCode) {
-+        mLastAcquire = acquireInfo;
-+
-+        if (acquireInfo == FaceManager.FACE_ACQUIRED_RECALIBRATE) {
-+            BiometricNotificationUtils.showReEnrollmentNotification(getContext());
-+        }
-+        @LockoutTracker.LockoutMode final int lockoutMode =
-+                getLockoutTracker().getLockoutModeForUser(getTargetUserId());
-+        if (lockoutMode == LockoutTracker.LOCKOUT_NONE) {
-+            PerformanceTracker pt = PerformanceTracker.getInstanceForSensorId(getSensorId());
-+            pt.incrementAcquireForUser(getTargetUserId(), isCryptoOperation());
-+        }
-+
-+        final boolean shouldSend = shouldSend(acquireInfo, vendorCode);
-+        onAcquiredInternal(acquireInfo, vendorCode, shouldSend);
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java
-new file mode 100644
-index 00000000..3b4e21f7
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java
-@@ -0,0 +1,138 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.annotation.Nullable;
-+import android.content.Context;
-+import android.hardware.biometrics.BiometricFaceConstants;
-+import android.hardware.face.Face;
-+import android.hardware.face.FaceEnrollOptions;
-+import android.hardware.face.FaceManager;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+import android.view.Surface;
-+
-+import com.android.internal.R;
-+import com.android.server.biometrics.Utils;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.BiometricUtils;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
-+import com.android.server.biometrics.sensors.EnrollClient;
-+
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceEnrollClient extends EnrollClient<ISenseService> {
-+
-+    private static final String TAG = "FaceEnrollClient";
-+
-+    @NonNull private final int[] mDisabledFeatures;
-+    @NonNull private final int[] mEnrollIgnoreList;
-+    @NonNull private final int[] mEnrollIgnoreListVendor;
-+
-+    FaceEnrollClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
-+            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,
-+            @NonNull byte[] hardwareAuthToken, @NonNull String owner, long requestId,
-+            @NonNull BiometricUtils<Face> utils, @NonNull int[] disabledFeatures, int timeoutSec,
-+            @Nullable Surface previewSurface, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
-+            @NonNull FaceEnrollOptions options) {
-+        super(context, lazyDaemon, token, listener, userId, hardwareAuthToken, owner, utils,
-+                timeoutSec, sensorId, false /* shouldVibrate */, logger, biometricContext,
-+                BiometricFaceConstants.reasonToMetric(options.getEnrollReason()));
-+        setRequestId(requestId);
-+        mDisabledFeatures = Arrays.copyOf(disabledFeatures, disabledFeatures.length);
-+        mEnrollIgnoreList = getContext().getResources()
-+                .getIntArray(R.array.config_face_acquire_enroll_ignorelist);
-+        mEnrollIgnoreListVendor = getContext().getResources()
-+                .getIntArray(R.array.config_face_acquire_vendor_enroll_ignorelist);
-+
-+        Slog.w(TAG, "EnrollOptions "
-+                + FaceEnrollOptions.enrollReasonToString(options.getEnrollReason()));
-+    }
-+
-+    @NonNull
-+    @Override
-+    protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
-+        return new ClientMonitorCompositeCallback(
-+                getLogger().getAmbientLightProbe(true /* startWithClient */), callback);
-+    }
-+
-+    @Override
-+    protected boolean hasReachedEnrollmentLimit() {
-+        final int limit = getContext().getResources().getInteger(
-+                com.android.internal.R.integer.config_faceMaxTemplatesPerUser);
-+        final int enrolled = mBiometricUtils.getBiometricsForUser(getContext(), getTargetUserId())
-+                .size();
-+        if (enrolled >= limit) {
-+            Slog.w(TAG, "Too many faces registered, user: " + getTargetUserId());
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    @Override
-+    public void onAcquired(int acquireInfo, int vendorCode) {
-+        final boolean shouldSend;
-+        if (acquireInfo == FaceManager.FACE_ACQUIRED_VENDOR) {
-+            shouldSend = !Utils.listContains(mEnrollIgnoreListVendor, vendorCode);
-+        } else {
-+            shouldSend = !Utils.listContains(mEnrollIgnoreList, acquireInfo);
-+        }
-+        onAcquiredInternal(acquireInfo, vendorCode, shouldSend);
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        final ArrayList<Byte> token = new ArrayList<>();
-+        for (byte b : mHardwareAuthToken) {
-+            token.add(Byte.valueOf(b));
-+        }
-+        final ArrayList<Integer> disabledFeatures = new ArrayList<>();
-+        for (int disabledFeature : mDisabledFeatures) {
-+            disabledFeatures.add(disabledFeature);
-+        }
-+
-+        try {
-+            getFreshDaemon().enroll(SenseUtils.toByteArray(token), mTimeoutSec, SenseUtils.toIntArray(disabledFeatures));
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception when requesting enroll", e);
-+            onError(BiometricFaceConstants.FACE_ERROR_UNABLE_TO_PROCESS, 0 /* vendorCode */);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    @Override
-+    protected void stopHalOperation() {
-+        try {
-+            getFreshDaemon().cancel();
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception when requesting cancel", e);
-+            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java
-new file mode 100644
-index 00000000..9a9414ff
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java
-@@ -0,0 +1,111 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.hardware.face.IFaceServiceReceiver;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.internal.util.Preconditions;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.GenerateChallengeClient;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISenseService> {
-+
-+    private static final String TAG = "FaceGenerateChallengeClient";
-+    static final int CHALLENGE_TIMEOUT_SEC = 600; // 10 minutes
-+    private static final ClientMonitorCallback EMPTY_CALLBACK = new ClientMonitorCallback() {
-+    };
-+
-+    private final long mCreatedAt;
-+    private List<IFaceServiceReceiver> mWaiting;
-+    private Long mChallengeResult;
-+
-+    FaceGenerateChallengeClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon, @NonNull IBinder token,
-+            @NonNull ClientMonitorCallbackConverter listener, int userId, @NonNull String owner,
-+            int sensorId, @NonNull BiometricLogger logger,
-+            @NonNull BiometricContext biometricContext, long now) {
-+        super(context, lazyDaemon, token, listener, userId, owner, sensorId, logger,
-+                biometricContext);
-+        mCreatedAt = now;
-+        mWaiting = new ArrayList<>();
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        mChallengeResult = null;
-+        try {
-+            mChallengeResult = Long.valueOf(getFreshDaemon().generateChallenge(CHALLENGE_TIMEOUT_SEC));
-+            // send the result to the original caller via mCallback and any waiting callers
-+            // that called reuseResult
-+            sendChallengeResult(getListener(), mCallback);
-+            for (IFaceServiceReceiver receiver : mWaiting) {
-+                sendChallengeResult(new ClientMonitorCallbackConverter(receiver), EMPTY_CALLBACK);
-+            }
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "generateChallenge failed", e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        } finally {
-+            mWaiting = null;
-+        }
-+    }
-+
-+    /** @return An arbitrary time value for caching provided to the constructor. */
-+    public long getCreatedAt() {
-+        return mCreatedAt;
-+    }
-+
-+    /**
-+     * Reuse the result of this operation when it is available. The receiver will be notified
-+     * immediately if a challenge has already been generated.
-+     *
-+     * @param receiver receiver to be notified of challenge result
-+     */
-+    public void reuseResult(@NonNull IFaceServiceReceiver receiver) {
-+        if (mWaiting != null) {
-+            mWaiting.add(receiver);
-+        } else {
-+            sendChallengeResult(new ClientMonitorCallbackConverter(receiver), EMPTY_CALLBACK);
-+        }
-+    }
-+
-+    private void sendChallengeResult(@NonNull ClientMonitorCallbackConverter receiver,
-+            @NonNull ClientMonitorCallback ownerCallback) {
-+        Preconditions.checkState(mChallengeResult != null, "result not available");
-+        try {
-+            receiver.onChallengeGenerated(getSensorId(), getTargetUserId(), mChallengeResult);
-+            ownerCallback.onClientFinished(this, true /* success */);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception", e);
-+            ownerCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java
-new file mode 100644
-index 00000000..fc3b8223
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java
-@@ -0,0 +1,101 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.annotation.Nullable;
-+import android.content.Context;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.BiometricsProto;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.HalClientMonitor;
-+
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceGetFeatureClient extends HalClientMonitor<ISenseService> {
-+
-+    private static final String TAG = "FaceGetFeatureClient";
-+
-+    private final int mFeature;
-+    private final int mFaceId;
-+    private boolean mValue;
-+
-+    FaceGetFeatureClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
-+            @NonNull IBinder token, @Nullable ClientMonitorCallbackConverter listener, int userId,
-+            @NonNull String owner, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
-+            int feature, int faceId) {
-+        super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,
-+                logger, biometricContext);
-+        mFeature = feature;
-+        mFaceId = faceId;
-+    }
-+
-+    @Override
-+    public void unableToStart() {
-+        try {
-+            if (getListener() != null) {
-+                getListener().onFeatureGet(false /* success */, new int[0], new boolean[0]);
-+            }
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Unable to send error", e);
-+        }
-+    }
-+
-+    @Override
-+    public void start(@NonNull ClientMonitorCallback callback) {
-+        super.start(callback);
-+        startHalOperation();
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            final boolean result = getFreshDaemon().getFeature(mFeature, mFaceId);
-+            int[] features = new int[1];
-+            features[0] = mFeature;
-+            boolean[] featureState = {result};
-+            mValue = result;
-+
-+            if (getListener() != null) {
-+                getListener().onFeatureGet(result, features, featureState);
-+            }
-+            mCallback.onClientFinished(this, true /* success */);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Unable to getFeature", e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    boolean getValue() {
-+        return mValue;
-+    }
-+
-+    @Override
-+    public int getProtoEnum() {
-+        return BiometricsProto.CM_GET_FEATURE;
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java
-new file mode 100644
-index 00000000..bd696fd6
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java
-@@ -0,0 +1,70 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.hardware.face.Face;
-+import android.os.IBinder;
-+
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.BiometricUtils;
-+import com.android.server.biometrics.sensors.InternalCleanupClient;
-+import com.android.server.biometrics.sensors.InternalEnumerateClient;
-+import com.android.server.biometrics.sensors.RemovalClient;
-+
-+import java.util.List;
-+import java.util.Map;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+class FaceInternalCleanupClient extends InternalCleanupClient<Face, ISenseService> {
-+
-+    FaceInternalCleanupClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon, int userId, @NonNull String owner,
-+            int sensorId, @NonNull BiometricLogger logger,
-+            @NonNull BiometricContext biometricContext,
-+            @NonNull BiometricUtils<Face> utils, @NonNull Map<Integer, Long> authenticatorIds) {
-+        super(context, lazyDaemon, userId, owner, sensorId, logger, biometricContext,
-+                utils, authenticatorIds);
-+    }
-+
-+    @Override
-+    protected InternalEnumerateClient<ISenseService> getEnumerateClient(Context context,
-+            Supplier<ISenseService> lazyDaemon, IBinder token, int userId, String owner,
-+            List<Face> enrolledList, BiometricUtils<Face> utils, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext) {
-+        return new FaceInternalEnumerateClient(context, lazyDaemon, token, userId, owner,
-+                enrolledList, utils, sensorId, logger, biometricContext);
-+    }
-+
-+    @Override
-+    protected RemovalClient<Face, ISenseService> getRemovalClient(Context context,
-+            Supplier<ISenseService> lazyDaemon, IBinder token,
-+            int biometricId, int userId, String owner, BiometricUtils<Face> utils, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
-+            Map<Integer, Long> authenticatorIds) {
-+        // Internal remove does not need to send results to anyone. Cleanup (enumerate + remove)
-+        // is all done internally.
-+        return new FaceRemovalClient(context, lazyDaemon, token,
-+                null /* ClientMonitorCallbackConverter */, biometricId, userId, owner, utils,
-+                sensorId, logger, biometricContext, authenticatorIds);
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java
-new file mode 100644
-index 00000000..c9f0a028
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.hardware.face.Face;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.BiometricUtils;
-+import com.android.server.biometrics.sensors.InternalEnumerateClient;
-+
-+import java.util.List;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+class FaceInternalEnumerateClient extends InternalEnumerateClient<ISenseService> {
-+    private static final String TAG = "FaceInternalEnumerateClient";
-+
-+    FaceInternalEnumerateClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon, @NonNull IBinder token, int userId,
-+            @NonNull String owner, @NonNull List<Face> enrolledList,
-+            @NonNull BiometricUtils<Face> utils, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext) {
-+        super(context, lazyDaemon, token, userId, owner, enrolledList, utils, sensorId,
-+                logger, biometricContext);
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            getFreshDaemon().enumerate();
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception when requesting enumerate", e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java
-new file mode 100644
-index 00000000..93e72863
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java
-@@ -0,0 +1,63 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.hardware.face.Face;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.BiometricUtils;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.RemovalClient;
-+
-+import java.util.Map;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+class FaceRemovalClient extends RemovalClient<Face, ISenseService> {
-+    private static final String TAG = "FaceRemovalClient";
-+
-+    private final int mBiometricId;
-+
-+    FaceRemovalClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
-+            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,
-+            int biometricId, int userId, @NonNull String owner, @NonNull BiometricUtils<Face> utils,
-+            int sensorId, @NonNull BiometricLogger logger,
-+            @NonNull BiometricContext biometricContext,
-+            @NonNull Map<Integer, Long> authenticatorIds) {
-+        super(context, lazyDaemon, token, listener, userId, owner, utils, sensorId, logger,
-+                biometricContext, authenticatorIds);
-+        mBiometricId = biometricId;
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            getFreshDaemon().remove(mBiometricId);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Remote exception when requesting remove", e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java
-new file mode 100644
-index 00000000..ab791d0b
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java
-@@ -0,0 +1,82 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.BiometricsProto;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.HalClientMonitor;
-+
-+import java.util.ArrayList;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceResetLockoutClient extends HalClientMonitor<ISenseService> {
-+
-+    private static final String TAG = "FaceResetLockoutClient";
-+
-+    private final byte[] mHardwareAuthToken;
-+
-+    FaceResetLockoutClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon, int userId, String owner, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
-+            @NonNull byte[] hardwareAuthToken) {
-+        super(context, lazyDaemon, null /* token */, null /* listener */, userId, owner,
-+                0 /* cookie */, sensorId, logger, biometricContext);
-+
-+        mHardwareAuthToken = (byte[]) hardwareAuthToken.clone();
-+    }
-+
-+    @Override
-+    public void unableToStart() {
-+        // Nothing to do here
-+    }
-+
-+    @Override
-+    public void start(@NonNull ClientMonitorCallback callback) {
-+        super.start(callback);
-+        startHalOperation();
-+    }
-+
-+    public boolean interruptsPrecedingClients() {
-+        return true;
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            getFreshDaemon().resetLockout(mHardwareAuthToken);
-+            mCallback.onClientFinished(this, true /* success */);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Unable to reset lockout", e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    @Override
-+    public int getProtoEnum() {
-+        return BiometricsProto.CM_RESET_LOCKOUT;
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java
-new file mode 100644
-index 00000000..7f42df49
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java
-@@ -0,0 +1,55 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.RevokeChallengeClient;
-+
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceRevokeChallengeClient extends RevokeChallengeClient<ISenseService> {
-+
-+    private static final String TAG = "FaceRevokeChallengeClient";
-+
-+    FaceRevokeChallengeClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon, @NonNull IBinder token,
-+            int userId, @NonNull String owner, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext) {
-+        super(context, lazyDaemon, token, userId, owner, sensorId, logger, biometricContext);
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            getFreshDaemon().revokeChallenge();
-+            mCallback.onClientFinished(this, true /* success */);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "revokeChallenge failed", e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java
-new file mode 100644
-index 00000000..65f17d5a
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.os.IBinder;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.BiometricsProto;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.HalClientMonitor;
-+
-+import java.util.ArrayList;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceSetFeatureClient extends HalClientMonitor<ISenseService> {
-+
-+    private static final String TAG = "FaceSetFeatureClient";
-+
-+    private final int mFeature;
-+    private final boolean mEnabled;
-+    private final byte[] mHardwareAuthToken;
-+    private final int mFaceId;
-+
-+    FaceSetFeatureClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
-+            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,
-+            @NonNull String owner, int sensorId,
-+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
-+            int feature, boolean enabled, byte[] hardwareAuthToken, int faceId) {
-+        super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,
-+                logger, biometricContext);
-+        mFeature = feature;
-+        mEnabled = enabled;
-+        mFaceId = faceId;
-+
-+        mHardwareAuthToken = (byte[]) hardwareAuthToken.clone();
-+    }
-+
-+    @Override
-+    public void unableToStart() {
-+        try {
-+            getListener().onFeatureSet(false /* success */, mFeature);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Unable to send error", e);
-+        }
-+    }
-+
-+    @Override
-+    public void start(@NonNull ClientMonitorCallback callback) {
-+        super.start(callback);
-+
-+        startHalOperation();
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            getFreshDaemon().setFeature(mFeature, mEnabled, mHardwareAuthToken, mFaceId);
-+            getListener().onFeatureSet(true, mFeature);
-+            mCallback.onClientFinished(this, true /* success */);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Unable to set feature: " + mFeature + " to enabled: " + mEnabled, e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    @Override
-+    public int getProtoEnum() {
-+        return BiometricsProto.CM_SET_FEATURE;
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java
-new file mode 100644
-index 00000000..08c07506
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.content.Context;
-+import android.os.Environment;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.BiometricsProto;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.HalClientMonitor;
-+
-+import java.io.File;
-+import java.util.Map;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+
-+public class FaceUpdateActiveUserClient extends HalClientMonitor<ISenseService> {
-+    private static final String TAG = "FaceUpdateActiveUserClient";
-+    private static final String FACE_DATA_DIR = "facedata";
-+
-+    private final boolean mHasEnrolledBiometrics;
-+    @NonNull private final Map<Integer, Long> mAuthenticatorIds;
-+
-+    FaceUpdateActiveUserClient(@NonNull Context context,
-+            @NonNull Supplier<ISenseService> lazyDaemon, int userId, @NonNull String owner,
-+            int sensorId, @NonNull BiometricLogger logger,
-+            @NonNull BiometricContext biometricContext, boolean hasEnrolledBiometrics,
-+            @NonNull Map<Integer, Long> authenticatorIds) {
-+        super(context, lazyDaemon, null /* token */, null /* listener */, userId, owner,
-+                0 /* cookie */, sensorId, logger, biometricContext);
-+        mHasEnrolledBiometrics = hasEnrolledBiometrics;
-+        mAuthenticatorIds = authenticatorIds;
-+    }
-+
-+    @Override
-+    public void start(@NonNull ClientMonitorCallback callback) {
-+        super.start(callback);
-+        startHalOperation();
-+    }
-+
-+    @Override
-+    public void unableToStart() {
-+        // Nothing to do here
-+    }
-+
-+    @Override
-+    protected void startHalOperation() {
-+        try {
-+            final ISenseService daemon = getFreshDaemon();
-+            mAuthenticatorIds.put(getTargetUserId(),
-+                    mHasEnrolledBiometrics ? daemon.getAuthenticatorId() : 0L);
-+            mCallback.onClientFinished(this, true /* success */);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Failed to setActiveUser: " + e);
-+            mCallback.onClientFinished(this, false /* success */);
-+        }
-+    }
-+
-+    @Override
-+    public int getProtoEnum() {
-+        return BiometricsProto.CM_UPDATE_ACTIVE_USER;
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java
-new file mode 100644
-index 00000000..3f899c69
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java
-@@ -0,0 +1,1110 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.annotation.Nullable;
-+import android.app.ActivityManager;
-+import android.app.SynchronousUserSwitchObserver;
-+import android.app.UserSwitchObserver;
-+import android.content.ComponentName;
-+import android.content.Context;
-+import android.content.Intent;
-+import android.content.ServiceConnection;
-+import android.content.pm.PackageManager;
-+import android.content.pm.ResolveInfo;
-+import android.content.pm.UserInfo;
-+import android.hardware.biometrics.BiometricConstants;
-+import android.hardware.biometrics.BiometricFaceConstants;
-+import android.hardware.biometrics.BiometricsProtoEnums;
-+import android.hardware.biometrics.ITestSession;
-+import android.hardware.biometrics.ITestSessionCallback;
-+import android.hardware.biometrics.face.V1_0.IBiometricsFace;
-+import android.hardware.face.Face;
-+import android.hardware.face.FaceAuthenticateOptions;
-+import android.hardware.face.FaceEnrollOptions;
-+import android.hardware.face.FaceSensorPropertiesInternal;
-+import android.hardware.face.IFaceServiceReceiver;
-+import android.os.Binder;
-+import android.os.Handler;
-+import android.os.IBinder;
-+import android.os.Looper;
-+import android.os.RemoteException;
-+import android.os.UserHandle;
-+import android.os.UserManager;
-+import android.provider.Settings;
-+import android.util.Slog;
-+import android.util.SparseArray;
-+import android.util.proto.ProtoOutputStream;
-+import android.view.Surface;
-+
-+import com.android.internal.annotations.VisibleForTesting;
-+import com.android.server.biometrics.AuthenticationStatsBroadcastReceiver;
-+import com.android.server.biometrics.AuthenticationStatsCollector;
-+import com.android.server.biometrics.SensorServiceStateProto;
-+import com.android.server.biometrics.SensorStateProto;
-+import com.android.server.biometrics.UserStateProto;
-+import com.android.server.biometrics.Utils;
-+import com.android.server.biometrics.log.BiometricContext;
-+import com.android.server.biometrics.log.BiometricLogger;
-+import com.android.server.biometrics.sensors.AcquisitionClient;
-+import com.android.server.biometrics.sensors.AuthenticationConsumer;
-+import com.android.server.biometrics.sensors.BaseClientMonitor;
-+import com.android.server.biometrics.sensors.BiometricNotificationUtils;
-+import com.android.server.biometrics.sensors.BiometricScheduler;
-+import com.android.server.biometrics.sensors.BiometricStateCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallback;
-+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
-+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
-+import com.android.server.biometrics.sensors.EnumerateConsumer;
-+import com.android.server.biometrics.sensors.ErrorConsumer;
-+import com.android.server.biometrics.sensors.LockoutResetDispatcher;
-+import com.android.server.biometrics.sensors.LockoutTracker;
-+import com.android.server.biometrics.sensors.PerformanceTracker;
-+import com.android.server.biometrics.sensors.RemovalConsumer;
-+import com.android.server.biometrics.sensors.face.FaceUtils;
-+import com.android.server.biometrics.sensors.face.LockoutHalImpl;
-+import com.android.server.biometrics.sensors.face.ServiceProvider;
-+import com.android.server.biometrics.sensors.face.UsageStats;
-+
-+import org.json.JSONArray;
-+import org.json.JSONException;
-+import org.json.JSONObject;
-+
-+import java.io.FileDescriptor;
-+import java.io.PrintWriter;
-+import java.time.Clock;
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.concurrent.atomic.AtomicLong;
-+import java.util.function.Supplier;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+import vendor.aospa.biometrics.face.ISenseServiceReceiver;
-+
-+public class SenseProvider implements ServiceProvider {
-+
-+    private static final String TAG = "SenseProvider";
-+
-+    private static final String BIND_SENSE_ACTION = "co.aospa.sense.BIND";
-+    private static final String PACKAGE_NAME = "co.aospa.sense";
-+    private static final String SERVICE_NAME = "co.aospa.sense.SenseService";
-+
-+    public static final int DEVICE_ID = 1008;
-+    private static final int ENROLL_TIMEOUT_SEC = 75;
-+    private static final int GENERATE_CHALLENGE_REUSE_INTERVAL_MILLIS = 60 * 1000;
-+    private static final int GENERATE_CHALLENGE_COUNTER_TTL_MILLIS =
-+            FaceGenerateChallengeClient.CHALLENGE_TIMEOUT_SEC * 1000;
-+    @VisibleForTesting
-+    public static Clock sSystemClock = Clock.systemUTC();
-+
-+    private boolean mIsBinding;
-+    private boolean mTestHalEnabled;
-+
-+    @NonNull private final FaceSensorPropertiesInternal mSensorProperties;
-+    @NonNull private final BiometricStateCallback mBiometricStateCallback;
-+    @NonNull private final Context mContext;
-+    @NonNull private final BiometricScheduler mScheduler;
-+    @NonNull private final Handler mHandler;
-+    @NonNull private final Supplier<ISenseService> mLazyDaemon;
-+    @NonNull private final LockoutHalImpl mLockoutTracker;
-+    @NonNull private final UsageStats mUsageStats;
-+    @NonNull private final Map<Integer, Long> mAuthenticatorIds;
-+    @Nullable private IBiometricsFace mDaemon;
-+    @NonNull private final HalResultController mHalResultController;
-+    @NonNull private final BiometricContext mBiometricContext;
-+    @Nullable
-+    private AuthenticationStatsCollector mAuthenticationStatsCollector;
-+    SparseArray<ISenseService> mServices;
-+    // for requests that do not use biometric prompt
-+    @NonNull private final AtomicLong mRequestCounter = new AtomicLong(0);
-+    private int mCurrentUserId = UserHandle.USER_NULL;
-+    private final int mSensorId;
-+    private final List<Long> mGeneratedChallengeCount = new ArrayList<>();
-+    private FaceGenerateChallengeClient mGeneratedChallengeCache = null;
-+
-+    private final UserSwitchObserver mUserSwitchObserver = new SynchronousUserSwitchObserver() {
-+        @Override
-+        public void onUserSwitching(int newUserId) {
-+            mCurrentUserId = newUserId;
-+            ISenseService service = getDaemon();
-+            if (service == null) {
-+                bindService(mCurrentUserId);
-+            }
-+        }
-+    };
-+
-+    public static class HalResultController extends ISenseServiceReceiver.Stub {
-+        /**
-+         * Interface to sends results to the HalResultController's owner.
-+         */
-+        public interface Callback {
-+            /**
-+             * Invoked when the HAL sends ERROR_HW_UNAVAILABLE.
-+             */
-+            void onHardwareUnavailable();
-+        }
-+
-+        private final int mSensorId;
-+        @NonNull private final Context mContext;
-+        @NonNull private final Handler mHandler;
-+        @NonNull private final BiometricScheduler mScheduler;
-+        @Nullable private Callback mCallback;
-+        @NonNull private final LockoutHalImpl mLockoutTracker;
-+        @NonNull private final LockoutResetDispatcher mLockoutResetDispatcher;
-+
-+
-+        HalResultController(int sensorId, @NonNull Context context, @NonNull Handler handler,
-+                @NonNull BiometricScheduler scheduler, @NonNull LockoutHalImpl lockoutTracker,
-+                @NonNull LockoutResetDispatcher lockoutResetDispatcher) {
-+            mSensorId = sensorId;
-+            mContext = context;
-+            mHandler = handler;
-+            mScheduler = scheduler;
-+            mLockoutTracker = lockoutTracker;
-+            mLockoutResetDispatcher = lockoutResetDispatcher;
-+        }
-+
-+        public void setCallback(@Nullable Callback callback) {
-+            mCallback = callback;
-+        }
-+
-+        @Override
-+        public void onEnrollResult(int faceId, int userId, int remaining) {
-+            mHandler.post(() -> {
-+                final CharSequence name = FaceUtils.getLegacyInstance(mSensorId)
-+                        .getUniqueName(mContext, userId);
-+                final Face face = new Face(name, faceId, Long.valueOf(DEVICE_ID));
-+
-+                final BaseClientMonitor client = mScheduler.getCurrentClient();
-+                if (!(client instanceof FaceEnrollClient)) {
-+                    Slog.e(TAG, "onEnrollResult for non-enroll client: "
-+                            + Utils.getClientName(client));
-+                    return;
-+                }
-+
-+                final FaceEnrollClient enrollClient = (FaceEnrollClient) client;
-+                enrollClient.onEnrollResult(face, remaining);
-+            });
-+        }
-+
-+        @Override
-+        public void onAuthenticated(int faceId, int userId, byte[] token) {
-+            mHandler.post(() -> {
-+                final BaseClientMonitor client = mScheduler.getCurrentClient();
-+                if (!(client instanceof AuthenticationConsumer)) {
-+                    Slog.e(TAG, "onAuthenticated for non-authentication consumer: "
-+                            + Utils.getClientName(client));
-+                    return;
-+                }
-+
-+                final AuthenticationConsumer authenticationConsumer =
-+                        (AuthenticationConsumer) client;
-+                final boolean authenticated = faceId != 0;
-+                final Face face = new Face("", faceId, DEVICE_ID);
-+                authenticationConsumer.onAuthenticated(face, authenticated, SenseUtils.toByteArrayList(token));
-+            });
-+        }
-+
-+        @Override
-+        public void onAcquired(int userId, int acquiredInfo, int vendorCode) {
-+            mHandler.post(() -> {
-+                final BaseClientMonitor client = mScheduler.getCurrentClient();
-+                if (!(client instanceof AcquisitionClient)) {
-+                    Slog.e(TAG, "onAcquired for non-acquire client: "
-+                            + Utils.getClientName(client));
-+                    return;
-+                }
-+
-+                final AcquisitionClient<?> acquisitionClient =
-+                        (AcquisitionClient<?>) client;
-+                acquisitionClient.onAcquired(acquiredInfo, vendorCode);
-+            });
-+        }
-+
-+        @Override
-+        public void onError(int error, int vendorCode) {
-+            mHandler.post(() -> {
-+                final BaseClientMonitor client = mScheduler.getCurrentClient();
-+                Slog.d(TAG, "handleError"
-+                        + ", client: " + (client != null ? client.getOwnerString() : null)
-+                        + ", error: " + error
-+                        + ", vendorCode: " + vendorCode);
-+                if (!(client instanceof ErrorConsumer)) {
-+                    Slog.e(TAG, "onError for non-error consumer: " + Utils.getClientName(
-+                            client));
-+                    return;
-+                }
-+
-+                final ErrorConsumer errorConsumer = (ErrorConsumer) client;
-+                errorConsumer.onError(error, vendorCode);
-+
-+                if (error == BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE) {
-+                    Slog.e(TAG, "Got ERROR_HW_UNAVAILABLE");
-+                    if (mCallback != null) {
-+                        mCallback.onHardwareUnavailable();
-+                    }
-+                }
-+            });
-+        }
-+
-+        @Override
-+        public void onRemoved(int[] faceIds, int userId) {
-+            mHandler.post(() -> {
-+                final BaseClientMonitor client = mScheduler.getCurrentClient();
-+                if (!(client instanceof RemovalConsumer)) {
-+                    Slog.e(TAG, "onRemoved for non-removal consumer: "
-+                            + Utils.getClientName(client));
-+                    return;
-+                }
-+
-+                final RemovalConsumer removalConsumer = (RemovalConsumer) client;
-+
-+                if (faceIds.length > 0) {
-+                    // Convert to old fingerprint-like behavior, where remove() receives
-+                    // one removal at a time. This way, remove can share some more common code.
-+                    for (int i = 0; i < faceIds.length; i++) {
-+                        final int id = faceIds[i];
-+                        final Face face = new Face("", id, Long.valueOf(DEVICE_ID));
-+                        final int remaining = (faceIds.length - i) - 1;
-+                        Slog.d(TAG, "Removed, faceId: " + id + ", remaining: " + remaining);
-+                        removalConsumer.onRemoved(face, remaining);
-+                    }
-+                } else {
-+                    removalConsumer.onRemoved(null, 0 /* remaining */);
-+                }
-+
-+                Settings.Secure.putIntForUser(mContext.getContentResolver(),
-+                        Settings.Secure.FACE_UNLOCK_RE_ENROLL, 0, UserHandle.USER_CURRENT);
-+            });
-+        }
-+
-+        @Override
-+        public void onEnumerate(int[] faceIds, int userId) {
-+            mHandler.post(() -> {
-+                final BaseClientMonitor client = mScheduler.getCurrentClient();
-+                if (!(client instanceof EnumerateConsumer)) {
-+                    Slog.e(TAG, "onEnumerate for non-enumerate consumer: "
-+                            + Utils.getClientName(client));
-+                    return;
-+                }
-+
-+                final EnumerateConsumer enumerateConsumer = (EnumerateConsumer) client;
-+
-+                if (faceIds.length > 0) {
-+                    // Convert to old fingerprint-like behavior, where enumerate() receives one
-+                    // template at a time. This way, enumerate can share some more common code.
-+                    for (int i = 0; i < faceIds.length; i++) {
-+                        final Face face = new Face("", faceIds[i], Long.valueOf(DEVICE_ID));
-+                        enumerateConsumer.onEnumerationResult(face, (faceIds.length - i) - 1);
-+                    }
-+                } else {
-+                    // For face, the HIDL contract is to receive an empty list when there are no
-+                    // templates enrolled. Send a null identifier since we don't consume them
-+                    // anywhere, and send remaining == 0 so this code can be shared with Face@1.1
-+                    enumerateConsumer.onEnumerationResult(null /* identifier */, 0);
-+                }
-+            });
-+        }
-+
-+        @Override
-+        public void onLockoutChanged(long duration) {
-+            mHandler.post(() -> {
-+                Slog.d(TAG, "onLockoutChanged: " + duration);
-+                final @LockoutTracker.LockoutMode int lockoutMode;
-+                if (duration == 0) {
-+                    lockoutMode = LockoutTracker.LOCKOUT_NONE;
-+                } else if (duration == -1 || duration == Long.MAX_VALUE) {
-+                    lockoutMode = LockoutTracker.LOCKOUT_PERMANENT;
-+                } else {
-+                    lockoutMode = LockoutTracker.LOCKOUT_TIMED;
-+                }
-+
-+                mLockoutTracker.setCurrentUserLockoutMode(lockoutMode);
-+
-+                if (duration == 0) {
-+                    mLockoutResetDispatcher.notifyLockoutResetCallbacks(mSensorId);
-+                }
-+            });
-+        }
-+    }
-+
-+    @VisibleForTesting
-+    public SenseProvider(@NonNull Context context,
-+            @NonNull BiometricStateCallback biometricStateCallback,
-+            @NonNull FaceSensorPropertiesInternal sensorProps,
-+            @NonNull LockoutResetDispatcher lockoutResetDispatcher,
-+            @NonNull BiometricScheduler scheduler) {
-+        mServices = new SparseArray<>();
-+        mIsBinding = false;
-+        mSensorProperties = sensorProps;
-+        mContext = context;
-+        mBiometricStateCallback = biometricStateCallback;
-+        mSensorId = sensorProps.sensorId;
-+        mScheduler = scheduler;
-+        mHandler = new Handler(Looper.getMainLooper());
-+        mBiometricContext = BiometricContext.getInstance(context);
-+        mUsageStats = new UsageStats(context);
-+        mAuthenticatorIds = new HashMap<>();
-+        mLazyDaemon = SenseProvider.this::getDaemon;
-+        mLockoutTracker = new LockoutHalImpl();
-+        mHalResultController = new HalResultController(sensorProps.sensorId, context, mHandler,
-+                mScheduler, mLockoutTracker, lockoutResetDispatcher);
-+        mHalResultController.setCallback(() -> {
-+            mDaemon = null;
-+            mCurrentUserId = UserHandle.USER_NULL;
-+        });
-+        mCurrentUserId = ActivityManager.getCurrentUser();
-+
-+        AuthenticationStatsBroadcastReceiver mBroadcastReceiver =
-+                new AuthenticationStatsBroadcastReceiver(
-+                        mContext,
-+                        BiometricsProtoEnums.MODALITY_FACE,
-+                        (AuthenticationStatsCollector collector) -> {
-+                            Slog.d(TAG, "Initializing AuthenticationStatsCollector");
-+                            mAuthenticationStatsCollector = collector;
-+                        });
-+
-+        try {
-+            ActivityManager.getService().registerUserSwitchObserver(mUserSwitchObserver, TAG);
-+        } catch (RemoteException e) {
-+            Slog.e(TAG, "Unable to register user switch observer");
-+        }
-+    }
-+
-+    public SenseProvider(Context context, BiometricStateCallback biometricStateCallback, FaceSensorPropertiesInternal sensorProps, LockoutResetDispatcher lockoutResetDispatcher) {
-+        this(context, biometricStateCallback, sensorProps, lockoutResetDispatcher, new BiometricScheduler(0, null));
-+    }
-+
-+    private synchronized ISenseService getDaemon() {
-+        if (mTestHalEnabled) {
-+            final TestHal testHal = new TestHal(mContext, mSensorId);
-+            testHal.setCallback(mHalResultController);
-+            return testHal;
-+        }
-+
-+        ISenseService service = getService(mCurrentUserId);
-+        if (service == null) {
-+            bindService(mCurrentUserId);
-+        }
-+        return service;
-+    }
-+
-+    @Override
-+    public boolean containsSensor(int sensorId) {
-+        return mSensorId == sensorId;
-+    }
-+
-+    @Override
-+    @NonNull
-+    public List<FaceSensorPropertiesInternal> getSensorProperties() {
-+        final List<FaceSensorPropertiesInternal> properties = new ArrayList<>();
-+        properties.add(mSensorProperties);
-+        return properties;
-+    }
-+
-+    @NonNull
-+    @Override
-+    public FaceSensorPropertiesInternal getSensorProperties(int sensorId) {
-+        return mSensorProperties;
-+    }
-+
-+    @Override
-+    @NonNull
-+    public List<Face> getEnrolledFaces(int sensorId, int userId) {
-+        return FaceUtils.getLegacyInstance(mSensorId).getBiometricsForUser(mContext, userId);
-+    }
-+
-+    @Override
-+    public boolean hasEnrollments(int sensorId, int userId) {
-+        return !getEnrolledFaces(sensorId, userId).isEmpty();
-+    }
-+
-+    @Override
-+    @LockoutTracker.LockoutMode
-+    public int getLockoutModeForUser(int sensorId, int userId) {
-+        return mLockoutTracker.getLockoutModeForUser(userId);
-+    }
-+
-+    @Override
-+    public long getAuthenticatorId(int sensorId, int userId) {
-+        return mAuthenticatorIds.getOrDefault(userId, 0L);
-+    }
-+
-+    @Override
-+    public boolean isHardwareDetected(int sensorId) {
-+        return getDaemon() != null;
-+    }
-+
-+    private boolean isGeneratedChallengeCacheValid() {
-+        return mGeneratedChallengeCache != null
-+                && sSystemClock.millis() - mGeneratedChallengeCache.getCreatedAt()
-+                < GENERATE_CHALLENGE_REUSE_INTERVAL_MILLIS;
-+    }
-+
-+    private void incrementChallengeCount() {
-+        mGeneratedChallengeCount.add(0, sSystemClock.millis());
-+    }
-+
-+    private int decrementChallengeCount() {
-+        final long now = sSystemClock.millis();
-+        // ignore values that are old in case generate/revoke calls are not matched
-+        // this doesn't ensure revoke if calls are mismatched but it keeps the list from growing
-+        mGeneratedChallengeCount.removeIf(x -> now - x > GENERATE_CHALLENGE_COUNTER_TTL_MILLIS);
-+        if (!mGeneratedChallengeCount.isEmpty()) {
-+            mGeneratedChallengeCount.remove(0);
-+        }
-+        return mGeneratedChallengeCount.size();
-+    }
-+
-+    /**
-+     * {@link IBiometricsFace} only supports a single in-flight challenge but there are cases where
-+     * two callers both need challenges (e.g. resetLockout right before enrollment).
-+     */
-+    @Override
-+    public void scheduleGenerateChallenge(int sensorId, int userId, @NonNull IBinder token,
-+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                try {
-+                    receiver.onChallengeGenerated(sensorId, userId, 0L);
-+                    return;
-+                } catch (RemoteException e) {
-+                    e.printStackTrace();
-+                    return;
-+                }
-+            }
-+            incrementChallengeCount();
-+
-+            if (isGeneratedChallengeCacheValid()) {
-+                Slog.d(TAG, "Current challenge is cached and will be reused");
-+                mGeneratedChallengeCache.reuseResult(receiver);
-+                return;
-+            }
-+
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,
-+                    mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), userId,
-+                    opPackageName, mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext, sSystemClock.millis());
-+            mGeneratedChallengeCache = client;
-+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
-+                @Override
-+                public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
-+                    if (client != clientMonitor) {
-+                        Slog.e(TAG, "scheduleGenerateChallenge onClientStarted, mismatched client."
-+                                + " Expecting: " + client + ", received: " + clientMonitor);
-+                    }
-+                }
-+            });
-+        });
-+    }
-+
-+    @Override
-+    public void scheduleRevokeChallenge(int sensorId, int userId, @NonNull IBinder token,
-+            @NonNull String opPackageName, long challenge) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                return;
-+            }
-+            final boolean shouldRevoke = decrementChallengeCount() == 0;
-+            if (!shouldRevoke) {
-+                Slog.w(TAG, "scheduleRevokeChallenge skipped - challenge still in use: "
-+                        + mGeneratedChallengeCount);
-+                return;
-+            }
-+
-+            Slog.d(TAG, "scheduleRevokeChallenge executing - no active clients");
-+            mGeneratedChallengeCache = null;
-+
-+            final FaceRevokeChallengeClient client = new FaceRevokeChallengeClient(mContext,
-+                    mLazyDaemon, token, userId, opPackageName, mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext);
-+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
-+                @Override
-+                public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
-+                        boolean success) {
-+                    if (client != clientMonitor) {
-+                        Slog.e(TAG, "scheduleRevokeChallenge, mismatched client."
-+                                + "Expecting: " + client + ", received: " + clientMonitor);
-+                    }
-+                }
-+            });
-+        });
-+    }
-+
-+    @Override
-+    public long scheduleEnroll(int sensorId, @NonNull IBinder token,
-+            @NonNull byte[] hardwareAuthToken, int userId, @NonNull IFaceServiceReceiver receiver,
-+            @NonNull String opPackageName, @NonNull int[] disabledFeatures,
-+            @Nullable Surface previewSurface, boolean debugConsent,
-+            @NonNull FaceEnrollOptions options) {
-+        final long id = mRequestCounter.incrementAndGet();
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                try {
-+                    receiver.onError(2, 0);
-+                    return;
-+                } catch (RemoteException e) {
-+                    e.printStackTrace();
-+                    return;
-+                }
-+            }
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            BiometricNotificationUtils.cancelFaceReEnrollNotification(mContext);
-+
-+            final FaceEnrollClient client = new FaceEnrollClient(mContext, mLazyDaemon, token,
-+                    new ClientMonitorCallbackConverter(receiver), userId, hardwareAuthToken,
-+                    opPackageName, id, FaceUtils.getLegacyInstance(mSensorId), disabledFeatures,
-+                    ENROLL_TIMEOUT_SEC, previewSurface, mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_ENROLL,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext, options);
-+
-+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
-+                @Override
-+                public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
-+                    mBiometricStateCallback.onClientStarted(clientMonitor);
-+                }
-+
-+                @Override
-+                public void onBiometricAction(int action) {
-+                    mBiometricStateCallback.onBiometricAction(action);
-+                }
-+
-+                @Override
-+                public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
-+                        boolean success) {
-+                    mBiometricStateCallback.onClientFinished(clientMonitor, success);
-+                    if (success) {
-+                        // Update authenticatorIds
-+                        scheduleUpdateActiveUserWithoutHandler(client.getTargetUserId());
-+                    }
-+                }
-+            });
-+        });
-+        return id;
-+    }
-+
-+    @Override
-+    public void cancelEnrollment(int sensorId, @NonNull IBinder token, long requestId) {
-+        mHandler.post(() -> mScheduler.cancelEnrollment(token, requestId));
-+    }
-+
-+    @Override
-+    public long scheduleFaceDetect(@NonNull IBinder token,
-+            @NonNull ClientMonitorCallbackConverter callback,
-+            @NonNull FaceAuthenticateOptions options, int statsClient) {
-+        throw new IllegalStateException("Face detect not supported by IBiometricsFace@1.0. Did you"
-+                + "forget to check the supportsFaceDetection flag?");
-+    }
-+
-+    @Override
-+    public void cancelFaceDetect(int sensorId, @NonNull IBinder token, long requestId) {
-+        throw new IllegalStateException("Face detect not supported by IBiometricsFace@1.0. Did you"
-+                + "forget to check the supportsFaceDetection flag?");
-+    }
-+
-+    @Override
-+    public void scheduleAuthenticate(@NonNull IBinder token, long operationId,
-+            int cookie, @NonNull ClientMonitorCallbackConverter receiver,
-+            @NonNull FaceAuthenticateOptions options, long requestId, boolean restricted,
-+            int statsClient, boolean allowBackgroundAuthentication) {
-+        mHandler.post(() -> {
-+            final int userId = options.getUserId();
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                try {
-+                    receiver.onError(1008, 0, 1, 0);
-+                    return;
-+                } catch (RemoteException e) {
-+                    e.printStackTrace();
-+                    return;
-+                }
-+            }
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final boolean isStrongBiometric = Utils.isStrongBiometric(mSensorId);
-+            final FaceAuthenticationClient client = new FaceAuthenticationClient(mContext,
-+                    mLazyDaemon, token, requestId, receiver, operationId, restricted,
-+                    options, cookie, false /* requireConfirmation */,
-+                    createLogger(BiometricsProtoEnums.ACTION_AUTHENTICATE, statsClient),
-+                    mBiometricContext, isStrongBiometric, mLockoutTracker,
-+                    mUsageStats, allowBackgroundAuthentication,
-+                    Utils.getCurrentStrength(mSensorId));
-+            mScheduler.scheduleClientMonitor(client);
-+        });
-+    }
-+
-+    @Override
-+    public long scheduleAuthenticate(@NonNull IBinder token, long operationId,
-+            int cookie, @NonNull ClientMonitorCallbackConverter receiver,
-+            @NonNull FaceAuthenticateOptions options, boolean restricted,
-+            int statsClient, boolean allowBackgroundAuthentication) {
-+        final long id = mRequestCounter.incrementAndGet();
-+
-+        scheduleAuthenticate(token, operationId, cookie, receiver,
-+                options, id, restricted, statsClient, allowBackgroundAuthentication);
-+
-+        return id;
-+    }
-+
-+    @Override
-+    public void cancelAuthentication(int sensorId, @NonNull IBinder token, long requestId) {
-+        mHandler.post(() -> mScheduler.cancelAuthenticationOrDetection(token, requestId));
-+    }
-+
-+    @Override
-+    public void scheduleRemove(int sensorId, @NonNull IBinder token, int faceId, int userId,
-+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                try {
-+                    receiver.onError(1, 0);
-+                    return;
-+                } catch (RemoteException e) {
-+                    e.printStackTrace();
-+                    return;
-+                }
-+            }
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final FaceRemovalClient client = new FaceRemovalClient(mContext, mLazyDaemon, token,
-+                    new ClientMonitorCallbackConverter(receiver), faceId, userId, opPackageName,
-+                    FaceUtils.getLegacyInstance(mSensorId), mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_REMOVE,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext, mAuthenticatorIds);
-+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
-+        });
-+    }
-+
-+    @Override
-+    public void scheduleRemoveAll(int sensorId, @NonNull IBinder token, int userId,
-+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                try {
-+                    receiver.onError(1, 0);
-+                    return;
-+                } catch (RemoteException e) {
-+                    e.printStackTrace();
-+                    return;
-+                }
-+            }
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            // For IBiometricsFace@1.0, remove(0) means remove all enrollments
-+            final FaceRemovalClient client = new FaceRemovalClient(mContext, mLazyDaemon, token,
-+                    new ClientMonitorCallbackConverter(receiver), 0 /* faceId */, userId,
-+                    opPackageName,
-+                    FaceUtils.getLegacyInstance(mSensorId), mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_REMOVE,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext, mAuthenticatorIds);
-+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
-+        });
-+    }
-+
-+    @Override
-+    public void scheduleResetLockout(int sensorId, int userId, @NonNull byte[] hardwareAuthToken) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+            }
-+            if (getEnrolledFaces(sensorId, userId).isEmpty()) {
-+                Slog.w(TAG, "Ignoring lockout reset, no templates enrolled for user: " + userId);
-+                return;
-+            }
-+
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final FaceResetLockoutClient client = new FaceResetLockoutClient(mContext,
-+                    mLazyDaemon, userId, mContext.getOpPackageName(), mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext, hardwareAuthToken);
-+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
-+        });
-+    }
-+
-+    @Override
-+    public void scheduleSetFeature(int sensorId, @NonNull IBinder token, int userId, int feature,
-+            boolean enabled, @NonNull byte[] hardwareAuthToken,
-+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                return;
-+            }
-+            final List<Face> faces = getEnrolledFaces(sensorId, userId);
-+            if (faces.isEmpty()) {
-+                Slog.w(TAG, "Ignoring setFeature, no templates enrolled for user: " + userId);
-+                return;
-+            }
-+
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final int faceId = faces.get(0).getBiometricId();
-+            final FaceSetFeatureClient client = new FaceSetFeatureClient(mContext,
-+                    mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), userId,
-+                    opPackageName, mSensorId, BiometricLogger.ofUnknown(mContext),
-+                    mBiometricContext,
-+                    feature, enabled, hardwareAuthToken, faceId);
-+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
-+        });
-+    }
-+
-+    @Override
-+    public void scheduleGetFeature(int sensorId, @NonNull IBinder token, int userId, int feature,
-+            @Nullable ClientMonitorCallbackConverter listener, @NonNull String opPackageName) {
-+        mHandler.post(() -> {
-+            if (getDaemon() == null) {
-+                bindService(mCurrentUserId);
-+                if (listener != null) {
-+                    try {
-+                        listener.onError(1008, 0, 1, 0);
-+                        return;
-+                    } catch (RemoteException e) {
-+                        e.printStackTrace();
-+                        return;
-+                    }
-+                }
-+                return;
-+            }
-+            final List<Face> faces = getEnrolledFaces(sensorId, userId);
-+            if (faces.isEmpty()) {
-+                Slog.w(TAG, "Ignoring getFeature, no templates enrolled for user: " + userId);
-+                return;
-+            }
-+
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final int faceId = faces.get(0).getBiometricId();
-+            final FaceGetFeatureClient client = new FaceGetFeatureClient(mContext, mLazyDaemon,
-+                    token, listener, userId, opPackageName, mSensorId,
-+                    BiometricLogger.ofUnknown(mContext), mBiometricContext,
-+                    feature, faceId);
-+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
-+                @Override
-+                public void onClientFinished(
-+                        @NonNull BaseClientMonitor clientMonitor, boolean success) {
-+                    if (success && feature == BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION) {
-+                        final int settingsValue = client.getValue() ? 1 : 0;
-+                        Slog.d(TAG, "Updating attention value for user: " + userId
-+                                + " to value: " + settingsValue);
-+                        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-+                                Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
-+                                settingsValue, userId);
-+                    }
-+                }
-+            });
-+        });
-+    }
-+
-+    private void scheduleInternalCleanup(int userId,
-+            @Nullable ClientMonitorCallback callback) {
-+        mHandler.post(() -> {
-+            scheduleUpdateActiveUserWithoutHandler(userId);
-+
-+            final FaceInternalCleanupClient client = new FaceInternalCleanupClient(mContext,
-+                    mLazyDaemon, userId, mContext.getOpPackageName(), mSensorId,
-+                    createLogger(BiometricsProtoEnums.ACTION_ENUMERATE,
-+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                    mBiometricContext,
-+                    FaceUtils.getLegacyInstance(mSensorId), mAuthenticatorIds);
-+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCompositeCallback(callback,
-+                    mBiometricStateCallback));
-+        });
-+    }
-+
-+    @Override
-+    public void scheduleInternalCleanup(int sensorId, int userId,
-+            @Nullable ClientMonitorCallback callback) {
-+        scheduleInternalCleanup(userId, mBiometricStateCallback);
-+    }
-+
-+    @Override
-+    public void scheduleInternalCleanup(int sensorId, int userId,
-+            @Nullable ClientMonitorCallback callback, boolean favorHalEnrollments) {
-+        scheduleInternalCleanup(userId, mBiometricStateCallback);
-+    }
-+
-+    @Override
-+    public void startPreparedClient(int sensorId, int cookie) {
-+        mHandler.post(() -> {
-+            mScheduler.startPreparedClient(cookie);
-+        });
-+    }
-+
-+    @Override
-+    public void dumpProtoState(int sensorId, ProtoOutputStream proto,
-+            boolean clearSchedulerBuffer) {
-+        final long sensorToken = proto.start(SensorServiceStateProto.SENSOR_STATES);
-+
-+        proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
-+        proto.write(SensorStateProto.MODALITY, SensorStateProto.FACE);
-+        proto.write(SensorStateProto.CURRENT_STRENGTH,
-+                Utils.getCurrentStrength(mSensorProperties.sensorId));
-+        proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer));
-+
-+        for (UserInfo user : UserManager.get(mContext).getUsers()) {
-+            final int userId = user.getUserHandle().getIdentifier();
-+
-+            final long userToken = proto.start(SensorStateProto.USER_STATES);
-+            proto.write(UserStateProto.USER_ID, userId);
-+            proto.write(UserStateProto.NUM_ENROLLED, FaceUtils.getLegacyInstance(mSensorId)
-+                    .getBiometricsForUser(mContext, userId).size());
-+            proto.end(userToken);
-+        }
-+
-+        proto.write(SensorStateProto.RESET_LOCKOUT_REQUIRES_HARDWARE_AUTH_TOKEN,
-+                mSensorProperties.resetLockoutRequiresHardwareAuthToken);
-+        proto.write(SensorStateProto.RESET_LOCKOUT_REQUIRES_CHALLENGE,
-+                mSensorProperties.resetLockoutRequiresChallenge);
-+
-+        proto.end(sensorToken);
-+    }
-+
-+    @Override
-+    public void dumpProtoMetrics(int sensorId, FileDescriptor fd) {
-+    }
-+
-+    @Override
-+    public void dumpInternal(int sensorId, PrintWriter pw) {
-+        PerformanceTracker performanceTracker =
-+                PerformanceTracker.getInstanceForSensorId(mSensorId);
-+
-+        JSONObject dump = new JSONObject();
-+        try {
-+            dump.put("service", TAG);
-+
-+            JSONArray sets = new JSONArray();
-+            for (UserInfo user : UserManager.get(mContext).getUsers()) {
-+                final int userId = user.getUserHandle().getIdentifier();
-+                final int c = FaceUtils.getLegacyInstance(mSensorId)
-+                        .getBiometricsForUser(mContext, userId).size();
-+                JSONObject set = new JSONObject();
-+                set.put("id", userId);
-+                set.put("count", c);
-+                set.put("accept", performanceTracker.getAcceptForUser(userId));
-+                set.put("reject", performanceTracker.getRejectForUser(userId));
-+                set.put("acquire", performanceTracker.getAcquireForUser(userId));
-+                set.put("lockout", performanceTracker.getTimedLockoutForUser(userId));
-+                set.put("permanentLockout", performanceTracker.getPermanentLockoutForUser(userId));
-+                // cryptoStats measures statistics about secure face transactions
-+                // (e.g. to unlock password storage, make secure purchases, etc.)
-+                set.put("acceptCrypto", performanceTracker.getAcceptCryptoForUser(userId));
-+                set.put("rejectCrypto", performanceTracker.getRejectCryptoForUser(userId));
-+                set.put("acquireCrypto", performanceTracker.getAcquireCryptoForUser(userId));
-+                sets.put(set);
-+            }
-+
-+            dump.put("prints", sets);
-+        } catch (JSONException e) {
-+            Slog.e(TAG, "dump formatting failure", e);
-+        }
-+        pw.println(dump);
-+        pw.println("HAL deaths since last reboot: " + performanceTracker.getHALDeathCount());
-+
-+        mScheduler.dump(pw);
-+        mUsageStats.print(pw);
-+    }
-+
-+    private void scheduleLoadAuthenticatorIds() {
-+        // Note that this can be performed on the scheduler (as opposed to being done immediately
-+        // when the HAL is (re)loaded, since
-+        // 1) If this is truly the first time it's being performed (e.g. system has just started),
-+        //    this will be run very early and way before any applications need to generate keys.
-+        // 2) If this is being performed to refresh the authenticatorIds (e.g. HAL crashed and has
-+        //    just been reloaded), the framework already has a cache of the authenticatorIds. This
-+        //    is safe because authenticatorIds only change when A) new template has been enrolled,
-+        //    or B) all templates are removed.
-+        mHandler.post(() -> {
-+            for (UserInfo user : UserManager.get(mContext).getAliveUsers()) {
-+                final int targetUserId = user.id;
-+                if (!mAuthenticatorIds.containsKey(targetUserId)) {
-+                    scheduleUpdateActiveUserWithoutHandler(targetUserId);
-+                }
-+            }
-+        });
-+    }
-+
-+    /**
-+     * Schedules the {@link FaceUpdateActiveUserClient} without posting the work onto the handler.
-+     * Many/most APIs are user-specific. However, the HAL requires explicit "setActiveUser"
-+     * invocation prior to authenticate/enroll/etc. Thus, internally we usually want to schedule
-+     * this operation on the same lambda/runnable as those operations so that the ordering is
-+     * correct.
-+     */
-+    private void scheduleUpdateActiveUserWithoutHandler(int targetUserId) {
-+        final boolean hasEnrolled = !getEnrolledFaces(mSensorId, targetUserId).isEmpty();
-+        final FaceUpdateActiveUserClient client = new FaceUpdateActiveUserClient(mContext,
-+                mLazyDaemon, targetUserId, mContext.getOpPackageName(), mSensorId,
-+                createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
-+                        BiometricsProtoEnums.CLIENT_UNKNOWN),
-+                mBiometricContext, hasEnrolled, mAuthenticatorIds);
-+        mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
-+            @Override
-+            public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
-+                    boolean success) {
-+                if (success) {
-+                    mCurrentUserId = targetUserId;
-+                } else {
-+                    Slog.w(TAG, "Failed to change user, still: " + mCurrentUserId);
-+                }
-+            }
-+        });
-+    }
-+
-+    public class SenseServiceConnection implements ServiceConnection {
-+        private int mUserId;
-+
-+        public SenseServiceConnection(int userId) {
-+            mUserId = userId;
-+        }
-+
-+        @Override
-+        public void onServiceConnected(ComponentName className, IBinder service) {
-+            Slog.d(TAG, "Service connected : " + mUserId);
-+            ISenseService senseService = ISenseService.Stub.asInterface(service);
-+            if (senseService != null) {
-+                synchronized (mServices) {
-+                    try {
-+                        senseService.setCallback(mHalResultController);
-+                        mServices.put(mUserId, senseService);
-+                        mHandler.post(() -> {
-+                            updateSchedule();
-+                        });
-+                    } catch (RemoteException e) {
-+                        e.printStackTrace();
-+                    }
-+                    mIsBinding = false;
-+                }
-+            }
-+        }
-+
-+        public void updateSchedule() {
-+            scheduleInternalCleanup(mUserId, null);
-+            scheduleGetFeature(mSensorId, new Binder(), mUserId, 1, null, mContext.getOpPackageName());
-+        }
-+
-+        @Override
-+        public void onServiceDisconnected(ComponentName className) {
-+            Slog.d(TAG, "Service disconnected : " + mUserId);
-+            mServices.remove(mUserId);
-+            mIsBinding = false;
-+            if (mUserId == mCurrentUserId) {
-+                mHandler.post(() -> {
-+                    updateResetSchedule();
-+                });
-+            }
-+            mContext.unbindService(this);
-+        }
-+
-+        public void updateResetSchedule() {
-+            BaseClientMonitor client = mScheduler.getCurrentClient();
-+            if (client != null && (client instanceof ErrorConsumer)) {
-+                ErrorConsumer errorConsumer = (ErrorConsumer) client;
-+                errorConsumer.onError(5, 0);
-+            }
-+            bindService(mUserId);
-+            mScheduler.recordCrashState();
-+            mScheduler.reset();
-+        }
-+    }
-+
-+    private boolean isServiceEnabled() {
-+        PackageManager pm = mContext.getPackageManager();
-+        Intent intent = new Intent(BIND_SENSE_ACTION);
-+        intent.setClassName(PACKAGE_NAME, SERVICE_NAME);
-+        ResolveInfo info = pm.resolveService(intent, 131072);
-+        if (info != null && info.serviceInfo.isEnabled()) {
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    private ISenseService getService(int userId) {
-+        if (userId == -10000) {
-+            scheduleUpdateActiveUserWithoutHandler(ActivityManager.getCurrentUser());
-+        }
-+        return mServices.get(mCurrentUserId);
-+    }
-+
-+    public boolean bindService(int userId) {
-+        Slog.d(TAG, "bindService " + userId);
-+        if (!isServiceEnabled()) {
-+            Slog.d(TAG, "Service disabled");
-+            return false;
-+        } else if (mIsBinding) {
-+            Slog.d(TAG, "Service is binding");
-+            return true;
-+        } else {
-+            if (userId != -10000 && getService(userId) == null) {
-+                try {
-+                    Intent intent = new Intent(BIND_SENSE_ACTION);
-+                    intent.setClassName(PACKAGE_NAME, SERVICE_NAME);
-+                    boolean result = mContext.bindServiceAsUser(intent, new SenseServiceConnection(userId), 1, UserHandle.of(userId));
-+                    if (result) {
-+                        mIsBinding = true;
-+                    }
-+                    return result;
-+                } catch (SecurityException e) {
-+                    e.printStackTrace();
-+                }
-+            }
-+            return false;
-+        }
-+    }
-+
-+    private BiometricLogger createLogger(int statsAction, int statsClient) {
-+        return new BiometricLogger(mContext, BiometricsProtoEnums.MODALITY_FACE,
-+                statsAction, statsClient, mAuthenticationStatsCollector);
-+    }
-+
-+    /**
-+     * Sends a debug message to the HAL with the provided FileDescriptor and arguments.
-+     */
-+    public void dumpHal(int sensorId, @NonNull FileDescriptor fd, @NonNull String[] args) { }
-+
-+    void setTestHalEnabled(boolean enabled) {
-+        mTestHalEnabled = enabled;
-+    }
-+
-+    @NonNull
-+    @Override
-+    public ITestSession createTestSession(int sensorId, @NonNull ITestSessionCallback callback,
-+            @NonNull String opPackageName) {
-+        return new BiometricTestSessionImpl(mContext, mSensorId, callback, this,
-+                mHalResultController);
-+    }
-+}
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java
-new file mode 100644
-index 00000000..9e49fa1e
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java
-@@ -0,0 +1,61 @@
-+/*
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.os.SystemProperties;
-+
-+import java.util.ArrayList;
-+
-+public class SenseUtils {
-+
-+    public static boolean canUseProvider() {
-+        return SystemProperties.getBoolean("ro.face.sense_service", false);
-+    }
-+
-+    public static ArrayList<Byte> toByteArrayList(byte[] in) {
-+        if (in == null) {
-+            return null;
-+        }
-+        ArrayList<Byte> out = new ArrayList<>(in.length);
-+        for (byte c : in) {
-+            out.add(Byte.valueOf(c));
-+        }
-+        return out;
-+    }
-+
-+    public static byte[] toByteArray(ArrayList<Byte> in) {
-+        if (in == null) {
-+            return null;
-+        }
-+        byte[] out = new byte[in.size()];
-+        for (int i = 0; i < in.size(); i++) {
-+            out[i] = in.get(i).byteValue();
-+        }
-+        return out;
-+    }
-+
-+    public static int[] toIntArray(ArrayList<Integer> in) {
-+        if (in == null) {
-+            return null;
-+        }
-+        int[] out = new int[in.size()];
-+        for (int i = 0; i < in.size(); i++) {
-+            out[i] = in.get(i).intValue();
-+        }
-+        return out;
-+    }
-+}
-\ No newline at end of file
-diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java
-new file mode 100644
-index 00000000..0499bc51
---- /dev/null
-+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java
-@@ -0,0 +1,144 @@
-+/*
-+ * Copyright (C) 2020 The Android Open Source Project
-+ * Copyright (C) 2023 Paranoid Android
-+ *
-+ * 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 com.android.server.biometrics.sensors.face.sense;
-+
-+import android.annotation.NonNull;
-+import android.annotation.Nullable;
-+import android.content.Context;
-+import android.hardware.biometrics.face.V1_0.FaceError;
-+import android.hardware.biometrics.face.V1_0.OptionalBool;
-+import android.hardware.biometrics.face.V1_0.OptionalUint64;
-+import android.hardware.biometrics.face.V1_0.Status;
-+import android.hardware.face.Face;
-+import android.os.RemoteException;
-+import android.util.Slog;
-+
-+import com.android.server.biometrics.sensors.face.FaceUtils;
-+
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+
-+import vendor.aospa.biometrics.face.ISenseService;
-+import vendor.aospa.biometrics.face.ISenseServiceReceiver;
-+
-+public class TestHal extends ISenseService.Stub {
-+    private static final String TAG = "face.hidl.TestHal";
-+
-+    @NonNull
-+    private final Context mContext;
-+    private final int mSensorId;
-+
-+    @Nullable
-+    private ISenseServiceReceiver mCallback;
-+    private int mUserId;
-+
-+    TestHal(@NonNull Context context, int sensorId) {
-+        mContext = context;
-+        mSensorId = sensorId;
-+    }
-+
-+    @Override
-+    public void setCallback(ISenseServiceReceiver clientCallback) {
-+        mCallback = clientCallback;
-+    }
-+
-+    @Override
-+    public long generateChallenge(int challengeTimeoutSec) {
-+        Slog.w(TAG, "generateChallenge");
-+        return 0L;
-+    }
-+
-+    @Override
-+    public void enroll(byte[] hat, int timeoutSec, int[] disabledFeatures) {
-+        Slog.w(TAG, "enroll");
-+    }
-+
-+    @Override
-+    public int revokeChallenge() {
-+        return 0;
-+    }
-+
-+    @Override
-+    public void setFeature(int feature, boolean enabled, byte[] token, int faceId) { }
-+
-+    @Override
-+    public boolean getFeature(int feature, int faceId) {
-+        return false;
-+    }
-+
-+    @Override
-+    public int getFeatureCount() throws RemoteException {
-+        return 0;
-+    }
-+
-+    @Override
-+    public int getAuthenticatorId() {
-+        return 0;
-+    }
-+
-+    @Override
-+    public void cancel() throws RemoteException {
-+        if (mCallback != null) {
-+            mCallback.onError(0 /* deviceId */, 0 /* vendorCode */);
-+        }
-+    }
-+
-+    @Override
-+    public int enumerate() throws RemoteException {
-+        Slog.w(TAG, "enumerate");
-+        if (mCallback != null) {
-+            mCallback.onEnumerate(new int[0], 0 /* userId */);
-+        }
-+        return 0;
-+    }
-+
-+    @Override
-+    public void remove(int faceId) throws RemoteException {
-+        Slog.w(TAG, "remove");
-+        if (mCallback != null) {
-+            if (faceId == 0) {
-+                List<Face> faces = FaceUtils.getInstance(mSensorId).getBiometricsForUser(mContext, mUserId);
-+                if (faces.size() <= 0) {
-+                    mCallback.onError(6, 0);
-+                    return;
-+                }
-+                int[] faceIds = new int[faces.size()];
-+                for (int i = 0; i < faces.size(); i++) {
-+                    Face face = faces.get(i);
-+                    faceIds[i] = face.getBiometricId();
-+                }
-+
-+                mCallback.onRemoved(faceIds, mUserId);
-+            } else {
-+                mCallback.onRemoved(new int[]{faceId}, mUserId);
-+            }
-+        }
-+    }
-+
-+    @Override
-+    public void authenticate(long operationId) {
-+        Slog.w(TAG, "authenticate");
-+    }
-+
-+    @Override
-+    public void resetLockout(byte[] hat) {
-+        Slog.w(TAG, "resetLockout");
-+    }
-+
-+}
--- 
-2.34.1
-
diff --git a/patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch b/patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch
deleted file mode 100644
index d35a0f4a..00000000
--- a/patches/personal/platform_frameworks_base/0010-SystemUI-Correctly-monet-theme-the-new-volume-panel.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 117afed975ebfb70a916c3f5c8a64da0eaa2f208 Mon Sep 17 00:00:00 2001
-From: Ido Ben-Hur <idoybh2@gmail.com>
-Date: Wed, 19 Jun 2024 20:44:06 +0300
-Subject: [PATCH 10/10] SystemUI: Correctly monet theme the new volume panel
-
----
- .../src/com/android/compose/PlatformSlider.kt    | 16 ++++++++--------
- .../button/ui/composable/ButtonComponent.kt      |  6 +++---
- .../ui/composable/ToggleButtonComponent.kt       |  8 ++++----
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt b/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt
-index ef15c846..5ed83805 100644
---- a/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt
-+++ b/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt
-@@ -300,10 +300,10 @@ object PlatformSliderDefaults {
- @Composable
- private fun lightThemePlatformSliderColors() =
-     PlatformSliderColors(
--        trackColor = MaterialTheme.colorScheme.tertiaryContainer,
--        indicatorColor = LocalAndroidColorScheme.current.tertiaryFixedDim,
--        iconColor = MaterialTheme.colorScheme.onTertiaryContainer,
--        labelColor = MaterialTheme.colorScheme.onTertiaryContainer,
-+        trackColor = MaterialTheme.colorScheme.primaryContainer,
-+        indicatorColor = LocalAndroidColorScheme.current.primaryFixedDim,
-+        iconColor = MaterialTheme.colorScheme.onPrimaryContainer,
-+        labelColor = MaterialTheme.colorScheme.onPrimaryContainer,
-         disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-         disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-         disabledIconColor = MaterialTheme.colorScheme.outline,
-@@ -314,10 +314,10 @@ private fun lightThemePlatformSliderColors() =
- @Composable
- private fun darkThemePlatformSliderColors() =
-     PlatformSliderColors(
--        trackColor = MaterialTheme.colorScheme.onTertiary,
--        indicatorColor = LocalAndroidColorScheme.current.onTertiaryFixedVariant,
--        iconColor = MaterialTheme.colorScheme.onTertiaryContainer,
--        labelColor = MaterialTheme.colorScheme.onTertiaryContainer,
-+        trackColor = MaterialTheme.colorScheme.onPrimary,
-+        indicatorColor = LocalAndroidColorScheme.current.onPrimaryFixedVariant,
-+        iconColor = MaterialTheme.colorScheme.onPrimaryContainer,
-+        labelColor = MaterialTheme.colorScheme.onPrimaryContainer,
-         disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-         disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-         disabledIconColor = MaterialTheme.colorScheme.outline,
-diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt
-index 5f7bd47f..68ff0a88 100644
---- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt
-+++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt
-@@ -60,10 +60,10 @@ class ButtonComponent(
-         ) {
-             Expandable(
-                 modifier = Modifier.height(64.dp).fillMaxWidth(),
--                color = MaterialTheme.colorScheme.primaryContainer,
-+                color = MaterialTheme.colorScheme.primary,
-                 shape = RoundedCornerShape(28.dp),
--                contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
--                borderStroke = BorderStroke(8.dp, MaterialTheme.colorScheme.surface),
-+                contentColor = MaterialTheme.colorScheme.onPrimary,
-+                borderStroke = BorderStroke(8.dp, MaterialTheme.colorScheme.primary),
-                 onClick = onClick,
-             ) {
-                 Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt
-index dfee684c..8991426e 100644
---- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt
-+++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt
-@@ -62,10 +62,10 @@ class ToggleButtonComponent(
-                 shape = RoundedCornerShape(28.dp),
-                 colors =
-                     IconButtonDefaults.outlinedIconToggleButtonColors(
--                        containerColor = MaterialTheme.colorScheme.surface,
--                        contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
--                        checkedContainerColor = MaterialTheme.colorScheme.primaryContainer,
--                        checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
-+                        containerColor = MaterialTheme.colorScheme.primary,
-+                        contentColor = MaterialTheme.colorScheme.onPrimary,
-+                        checkedContainerColor = MaterialTheme.colorScheme.secondary,
-+                        checkedContentColor = MaterialTheme.colorScheme.onSecondary,
-                     ),
-                 border = BorderStroke(8.dp, MaterialTheme.colorScheme.surface),
-             ) {
--- 
-2.34.1
-
diff --git a/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch b/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch
deleted file mode 100644
index 6c64aa1e..00000000
--- a/patches/personal/platform_packages_apps_Settings/0001-feat-Add-Lockscreen-Weather-with-OmniJaws-2-2.patch
+++ /dev/null
@@ -1,772 +0,0 @@
-From 40d398a214a711e648a10cb7310ce3f17606675b Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Sun, 12 Nov 2023 11:24:17 +0000
-Subject: [PATCH 1/2] feat: Add Lockscreen Weather with OmniJaws (2/2)
-
-Based on OmniROM's implementation, updated by @maxwen and adapted by @neobuddy89.
-
-Change-Id: I138c0dc94f08142f6614659037a501d6ae8909b1
-Co-authored-by: maxwen <max.weninger@gmail.com>
-Co-authored-by: Pranav Vashi <neobuddy89@gmail.com>
----
- res/values/attrs.xml                          |  13 +
- res/values/strings.xml                        |  10 +
- res/xml/security_lockscreen_settings.xml      |  25 +
- .../custom/preference/ConstraintsHelper.java  | 430 ++++++++++++++++++
- .../SelfRemovingSwitchPreference.java         | 104 +++++
- .../SystemSettingSwitchPreference.java        |  53 +++
- .../security/LockscreenDashboardFragment.java |  26 ++
- 7 files changed, 661 insertions(+)
- create mode 100644 src/com/android/settings/custom/preference/ConstraintsHelper.java
- create mode 100644 src/com/android/settings/custom/preference/SelfRemovingSwitchPreference.java
- create mode 100644 src/com/android/settings/custom/preference/SystemSettingSwitchPreference.java
-
-diff --git a/res/values/attrs.xml b/res/values/attrs.xml
-index 200253a..5289822 100644
---- a/res/values/attrs.xml
-+++ b/res/values/attrs.xml
-@@ -203,4 +203,17 @@
-     <declare-styleable name="BackgroundPreference">
-         <attr name="background" format="reference" />
-     </declare-styleable>
-+
-+    <declare-styleable name="lineage_SelfRemovingPreference">
-+        <attr name="requiresPackage" format="string" />
-+        <attr name="requiresFeature" format="string" />
-+        <attr name="requiresConfig" format="string" />
-+        <attr name="requiresConfigMask" format="integer" />
-+        <attr name="requiresProperty" format="string" />
-+        <attr name="requiresOwner" format="boolean" />
-+        <attr name="requiresAction" format="string" />
-+        <attr name="requiresService" format="string" />
-+        <attr name="replacesKey" format="string" />
-+        <attr name="minSummaryLines" format="integer" />
-+    </declare-styleable>
- </resources>
-diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 0622daa..48d68fc 100644
---- a/res/values/strings.xml
-+++ b/res/values/strings.xml
-@@ -12056,6 +12056,16 @@
-         <item quantity="other"><xliff:g id="first">%1$s</xliff:g>, <xliff:g id="second">%2$s</xliff:g></item>
-     </plurals>
- 
-+    <!-- Weather -->
-+    <string name="weather_category_title">Weather</string>
-+    <string name="weather_settings_title">Weather settings</string>
-+    <string name="weather_settings_summary">Setup icon pack and weather service</string>
-+    <string name="lockscreen_weather_title">Weather condition</string>
-+    <string name="lockscreen_weather_summary">Display current weather condition and temperature</string>
-+    <string name="lockscreen_weather_enabled_info">Requires weather service to be enabled</string>
-+    <string name="lockscreen_weather_location_title">Weather location</string>
-+    <string name="lockscreen_weather_location_summary">Display current weather location</string>
-+
-     <!-- Title for RTT setting. [CHAR LIMIT=NONE] -->
-     <string name="rtt_settings_title"></string>
-     <!-- Subtext for showing the option of RTT setting. [CHAR LIMIT=NONE] -->
-diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
-index cb1ce44..b968908 100644
---- a/res/xml/security_lockscreen_settings.xml
-+++ b/res/xml/security_lockscreen_settings.xml
-@@ -79,6 +79,31 @@
-             android:title="@string/lockscreen_double_line_clock_setting_toggle"
-             android:summary="@string/lockscreen_double_line_clock_summary"
-             settings:controller="com.android.settings.display.LockscreenClockPreferenceController" />
-+
-+        <PreferenceCategory android:title="@string/weather_category_title">
-+
-+            <com.android.settings.custom.preference.SystemSettingSwitchPreference
-+                android:key="lockscreen_weather_enabled"
-+                android:title="@string/lockscreen_weather_title"
-+                android:summary="@string/lockscreen_weather_summary" />
-+
-+            <com.android.settings.custom.preference.SystemSettingSwitchPreference
-+                android:key="lockscreen_weather_location"
-+                android:title="@string/lockscreen_weather_location_title"
-+                android:summary="@string/lockscreen_weather_location_summary"
-+                android:dependency="lockscreen_weather_enabled" />
-+
-+            <Preference
-+                android:title="@string/weather_settings_title"
-+                android:summary="@string/weather_settings_summary">
-+                <intent
-+                    android:action="android.intent.action.MAIN"
-+                    android:targetPackage="org.omnirom.omnijaws"
-+                    android:targetClass="org.omnirom.omnijaws.SettingsActivity" />
-+            </Preference>
-+
-+        </PreferenceCategory>
-+
-     </PreferenceCategory>
- 
-     <PreferenceCategory
-diff --git a/src/com/android/settings/custom/preference/ConstraintsHelper.java b/src/com/android/settings/custom/preference/ConstraintsHelper.java
-new file mode 100644
-index 0000000..9583b6d
---- /dev/null
-+++ b/src/com/android/settings/custom/preference/ConstraintsHelper.java
-@@ -0,0 +1,430 @@
-+/*
-+ * Copyright (C) 2016 The CyanogenMod Project
-+ *               2017,2019-2020 The LineageOS 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 com.android.settings.custom.preference;
-+
-+import android.content.Context;
-+import android.content.Intent;
-+import android.content.pm.ApplicationInfo;
-+import android.content.pm.PackageInfo;
-+import android.content.pm.PackageManager;
-+import android.content.pm.ResolveInfo;
-+import android.content.res.TypedArray;
-+import android.os.IBinder;
-+import android.os.ServiceManager;
-+import android.os.SystemProperties;
-+import android.os.UserHandle;
-+import android.telephony.TelephonyManager;
-+import android.util.ArraySet;
-+import android.util.AttributeSet;
-+import android.util.Log;
-+import android.util.TypedValue;
-+import android.widget.TextView;
-+
-+import androidx.preference.Preference;
-+import androidx.preference.PreferenceGroup;
-+import androidx.preference.PreferenceManager;
-+import androidx.preference.PreferenceViewHolder;
-+
-+import java.util.Arrays;
-+import java.util.List;
-+import java.util.Objects;
-+import java.util.Set;
-+
-+import com.android.settings.R;
-+
-+/**
-+ * Helpers for checking if a device supports various features.
-+ *
-+ * @hide
-+ */
-+public class ConstraintsHelper {
-+
-+    private static final String TAG = "ConstraintsHelper";
-+
-+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.VERBOSE);
-+
-+    private final Context mContext;
-+
-+    private final AttributeSet mAttrs;
-+
-+    private final Preference mPref;
-+
-+    private boolean mAvailable = true;
-+
-+    private boolean mVerifyIntent = true;
-+
-+    private int mSummaryMinLines = -1;
-+
-+    private String[] mReplacesKey = null;
-+
-+    public ConstraintsHelper(Context context, AttributeSet attrs, Preference pref) {
-+        mContext = context;
-+        mAttrs = attrs;
-+        mPref = pref;
-+
-+        TypedArray a = context.getResources().obtainAttributes(attrs,
-+                R.styleable.lineage_SelfRemovingPreference);
-+        mSummaryMinLines = a.getInteger(R.styleable.lineage_SelfRemovingPreference_minSummaryLines, -1);
-+        String replacesKey = a.getString(R.styleable.lineage_SelfRemovingPreference_replacesKey);
-+        if (replacesKey != null) {
-+            mReplacesKey = replacesKey.split("\\|");
-+        }
-+        setAvailable(checkConstraints());
-+
-+        Log.d(TAG, "construct key=" + mPref.getKey() + " available=" + mAvailable);
-+    }
-+
-+    public void setAvailable(boolean available) {
-+        mAvailable = available;
-+        if (!available) {
-+            Graveyard.get(mContext).addTombstone(mPref.getKey());
-+        }
-+    }
-+
-+    public boolean isAvailable() {
-+        return mAvailable;
-+    }
-+
-+    public void setVerifyIntent(boolean verifyIntent) {
-+        mVerifyIntent = verifyIntent;
-+    }
-+
-+    private PreferenceGroup getParent(Preference preference) {
-+        return getParent(mPref.getPreferenceManager().getPreferenceScreen(), preference);
-+    }
-+
-+    private PreferenceGroup getParent(PreferenceGroup root, Preference preference) {
-+        for (int i = 0; i < root.getPreferenceCount(); i++) {
-+            Preference p = root.getPreference(i);
-+            if (p == preference)
-+                return root;
-+            if (PreferenceGroup.class.isInstance(p)) {
-+                PreferenceGroup parent = getParent((PreferenceGroup) p, preference);
-+                if (parent != null)
-+                    return parent;
-+            }
-+        }
-+        return null;
-+    }
-+
-+    private boolean isNegated(String key) {
-+        return key != null && key.startsWith("!");
-+    }
-+
-+    private void checkIntent() {
-+        Intent i = mPref.getIntent();
-+        if (i != null) {
-+            if (!resolveIntent(mContext, i)) {
-+                Graveyard.get(mContext).addTombstone(mPref.getKey());
-+                mAvailable = false;
-+            }
-+        }
-+    }
-+
-+    private boolean checkConstraints() {
-+        if (mAttrs == null) {
-+            return true;
-+        }
-+
-+        TypedArray a = mContext.getResources().obtainAttributes(mAttrs,
-+                R.styleable.lineage_SelfRemovingPreference);
-+
-+        try {
-+
-+            // Check if the current user is an owner
-+            boolean rOwner = a.getBoolean(R.styleable.lineage_SelfRemovingPreference_requiresOwner, false);
-+            if (rOwner && UserHandle.myUserId() != UserHandle.USER_SYSTEM) {
-+                return false;
-+            }
-+
-+            // Check if a specific package is installed
-+            String rPackage = a.getString(R.styleable.lineage_SelfRemovingPreference_requiresPackage);
-+            if (rPackage != null) {
-+                boolean negated = isNegated(rPackage);
-+                if (negated) {
-+                    rPackage = rPackage.substring(1);
-+                }
-+                boolean available = isPackageInstalled(mContext, rPackage, false);
-+                if (available == negated) {
-+                    return false;
-+                }
-+            }
-+
-+            // Check if an intent can be resolved to handle the given action
-+            String rAction = a.getString(R.styleable.lineage_SelfRemovingPreference_requiresAction);
-+            if (rAction != null) {
-+                boolean negated = isNegated(rAction);
-+                if (negated) {
-+                    rAction = rAction.substring(1);
-+                }
-+                boolean available = resolveIntent(mContext, rAction);
-+                if (available == negated) {
-+                    return false;
-+                }
-+            }
-+
-+            // Check if a system feature is available
-+            String rFeature = a.getString(R.styleable.lineage_SelfRemovingPreference_requiresFeature);
-+            if (rFeature != null) {
-+                boolean negated = isNegated(rFeature);
-+                if (negated) {
-+                    rFeature = rFeature.substring(1);
-+                }
-+                boolean available = hasSystemFeature(mContext, rFeature);
-+                if (available == negated) {
-+                    return false;
-+                }
-+            }
-+
-+            // Check a boolean system property
-+            String rProperty = a.getString(R.styleable.lineage_SelfRemovingPreference_requiresProperty);
-+            if (rProperty != null) {
-+                boolean negated = isNegated(rProperty);
-+                if (negated) {
-+                    rProperty = rProperty.substring(1);
-+                }
-+                String value = SystemProperties.get(rProperty);
-+                boolean available = value != null && Boolean.parseBoolean(value);
-+                if (available == negated) {
-+                    return false;
-+                }
-+            }
-+
-+            // Check a config resource. This can be a bool, string or integer.
-+            // The preference is removed if any of the following are true:
-+            // * A bool resource is false.
-+            // * A string resource is null.
-+            // * An integer resource is zero.
-+            // * An integer is non-zero and when bitwise logically ANDed with
-+            //   attribute requiresConfigMask, the result is zero.
-+            TypedValue tv = a.peekValue(R.styleable.lineage_SelfRemovingPreference_requiresConfig);
-+            if (tv != null && tv.resourceId != 0) {
-+                if (tv.type == TypedValue.TYPE_STRING &&
-+                        mContext.getResources().getString(tv.resourceId) == null) {
-+                    return false;
-+                } else if (tv.type == TypedValue.TYPE_INT_BOOLEAN && tv.data == 0) {
-+                    return false;
-+                } else if (tv.type == TypedValue.TYPE_INT_DEC) {
-+                    int mask = a.getInt(
-+                            R.styleable.lineage_SelfRemovingPreference_requiresConfigMask, -1);
-+                    if (tv.data == 0 || (mask >= 0 && (tv.data & mask) == 0)) {
-+                        return false;
-+                    }
-+                }
-+            }
-+
-+            // Check a system service
-+            String rService = a.getString(
-+                    R.styleable.lineage_SelfRemovingPreference_requiresService);
-+            if (rService != null) {
-+                boolean negated = isNegated(rService);
-+                if (negated) {
-+                    rService = rService.substring(1);
-+                }
-+                IBinder value = ServiceManager.getService(rService);
-+                boolean available = value != null;
-+                if (available == negated) {
-+                    return false;
-+                }
-+            }
-+        } finally {
-+            a.recycle();
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Returns whether the device supports a particular feature
-+     */
-+    public static boolean hasSystemFeature(Context context, String feature) {
-+        return context.getPackageManager().hasSystemFeature(feature);
-+    }
-+
-+    /**
-+     * Returns whether the device is voice-capable (meaning, it is also a phone).
-+     */
-+    public static boolean isVoiceCapable(Context context) {
-+        TelephonyManager telephony =
-+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-+        return telephony != null && telephony.isVoiceCapable();
-+    }
-+
-+    /**
-+     * Checks if a package is installed. Set the ignoreState argument to true if you don't
-+     * care if the package is enabled/disabled.
-+     */
-+    public static boolean isPackageInstalled(Context context, String pkg, boolean ignoreState) {
-+        if (pkg != null) {
-+            try {
-+                PackageInfo pi = context.getPackageManager().getPackageInfo(pkg, 0);
-+                if (!pi.applicationInfo.enabled && !ignoreState) {
-+                    return false;
-+                }
-+            } catch (PackageManager.NameNotFoundException e) {
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+
-+    /**
-+     * Checks if a package is available to handle the given action.
-+     */
-+    public static boolean resolveIntent(Context context, Intent intent) {
-+        if (DEBUG) Log.d(TAG, "resolveIntent " + Objects.toString(intent));
-+        // check whether the target handler exist in system
-+        PackageManager pm = context.getPackageManager();
-+        List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent,
-+                PackageManager.MATCH_SYSTEM_ONLY,
-+                UserHandle.myUserId());
-+        for (ResolveInfo resolveInfo : results) {
-+            // check is it installed in system.img, exclude the application
-+            // installed by user
-+            if (DEBUG) Log.d(TAG, "resolveInfo: " + Objects.toString(resolveInfo));
-+            if ((resolveInfo.activityInfo.applicationInfo.flags &
-+                    ApplicationInfo.FLAG_SYSTEM) != 0) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-+    public static boolean resolveIntent(Context context, String action) {
-+        return resolveIntent(context, new Intent(action));
-+    }
-+
-+    public static int getAttr(Context context, int attr, int fallbackAttr) {
-+        TypedValue value = new TypedValue();
-+        context.getTheme().resolveAttribute(attr, value, true);
-+        if (value.resourceId != 0) {
-+            return attr;
-+        }
-+        return fallbackAttr;
-+    }
-+
-+    public void onAttached() {
-+        checkIntent();
-+
-+        if (isAvailable() && mReplacesKey != null) {
-+            Graveyard.get(mContext).addTombstones(mReplacesKey);
-+        }
-+
-+        Graveyard.get(mContext).summonReaper(mPref.getPreferenceManager());
-+    }
-+
-+    public void onBindViewHolder(PreferenceViewHolder holder) {
-+        if (!isAvailable()) {
-+            return;
-+        }
-+
-+        if (mSummaryMinLines > 0) {
-+            TextView textView = (TextView) holder.itemView.findViewById(android.R.id.summary);
-+            if (textView != null) {
-+                textView.setMinLines(mSummaryMinLines);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * If we want to keep this at the preference level vs the fragment level, we need to
-+     * collate all the preferences that need to be removed when attached to the
-+     * hierarchy, then purge them all when loading is complete. The Graveyard keeps track
-+     * of this, and will reap the dead when onAttached is called.
-+     */
-+    private static class Graveyard {
-+
-+        private Set<String> mDeathRow = new ArraySet<>();
-+
-+        private static Graveyard sInstance;
-+
-+        private final Context mContext;
-+
-+        private Graveyard(Context context) {
-+            mContext = context;
-+        }
-+
-+        public synchronized static Graveyard get(Context context) {
-+            if (sInstance == null) {
-+                sInstance = new Graveyard(context);
-+            }
-+            return sInstance;
-+        }
-+
-+        public void addTombstone(String pref) {
-+            synchronized (mDeathRow) {
-+                mDeathRow.add(pref);
-+            }
-+        }
-+
-+        public void addTombstones(String[] prefs) {
-+            synchronized (mDeathRow) {
-+                mDeathRow.addAll(Arrays.asList(prefs));
-+            }
-+        }
-+
-+        private PreferenceGroup getParent(Preference p1, Preference p2) {
-+            return getParent(p1.getPreferenceManager().getPreferenceScreen(), p2);
-+        }
-+
-+        private PreferenceGroup getParent(PreferenceGroup root, Preference preference) {
-+            for (int i = 0; i < root.getPreferenceCount(); i++) {
-+                Preference p = root.getPreference(i);
-+                if (p == preference)
-+                    return root;
-+                if (PreferenceGroup.class.isInstance(p)) {
-+                    PreferenceGroup parent = getParent((PreferenceGroup) p, preference);
-+                    if (parent != null)
-+                        return parent;
-+                }
-+            }
-+            return null;
-+        }
-+
-+        private void hidePreference(PreferenceManager mgr, Preference pref) {
-+            pref.setVisible(false);
-+            // Hide the group if nothing is visible
-+            final PreferenceGroup group = getParent(pref, pref);
-+            boolean allHidden = true;
-+            for (int i = 0; i < group.getPreferenceCount(); i++) {
-+                if (group.getPreference(i).isVisible()) {
-+                    allHidden = false;
-+                    break;
-+                }
-+            }
-+            if (allHidden) {
-+                group.setVisible(false);
-+            }
-+        }
-+
-+        public void summonReaper(PreferenceManager mgr) {
-+            synchronized (mDeathRow) {
-+                Set<String> notReadyForReap = new ArraySet<>();
-+                for (String dead : mDeathRow) {
-+                    Preference deadPref = mgr.findPreference(dead);
-+                    if (deadPref != null) {
-+                        hidePreference(mgr, deadPref);
-+                    } else {
-+                        notReadyForReap.add(dead);
-+                    }
-+                }
-+                mDeathRow = notReadyForReap;
-+            }
-+        }
-+    }
-+}
-diff --git a/src/com/android/settings/custom/preference/SelfRemovingSwitchPreference.java b/src/com/android/settings/custom/preference/SelfRemovingSwitchPreference.java
-new file mode 100644
-index 0000000..5ba32e5
---- /dev/null
-+++ b/src/com/android/settings/custom/preference/SelfRemovingSwitchPreference.java
-@@ -0,0 +1,104 @@
-+/*
-+ * Copyright (C) 2016 The CyanogenMod Project
-+ * Copyright (C) 2018 The LineageOS 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 com.android.settings.custom.preference;
-+
-+import android.content.Context;
-+import android.util.AttributeSet;
-+
-+import androidx.preference.PreferenceDataStore;
-+import androidx.preference.PreferenceViewHolder;
-+import androidx.preference.SwitchPreference;
-+
-+/**
-+ * A SwitchPreference which can automatically remove itself from the hierarchy
-+ * based on constraints set in XML.
-+ */
-+public abstract class SelfRemovingSwitchPreference extends SwitchPreference {
-+
-+    private final ConstraintsHelper mConstraints;
-+
-+    public SelfRemovingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
-+        super(context, attrs, defStyle);
-+        mConstraints = new ConstraintsHelper(context, attrs, this);
-+        setPreferenceDataStore(new DataStore());
-+    }
-+
-+    public SelfRemovingSwitchPreference(Context context, AttributeSet attrs) {
-+        super(context, attrs);
-+        mConstraints = new ConstraintsHelper(context, attrs, this);
-+        setPreferenceDataStore(new DataStore());
-+    }
-+
-+    public SelfRemovingSwitchPreference(Context context) {
-+        super(context);
-+        mConstraints = new ConstraintsHelper(context, null, this);
-+        setPreferenceDataStore(new DataStore());
-+    }
-+
-+    @Override
-+    public void onAttached() {
-+        super.onAttached();
-+        mConstraints.onAttached();
-+    }
-+
-+    @Override
-+    public void onBindViewHolder(PreferenceViewHolder holder) {
-+        super.onBindViewHolder(holder);
-+        mConstraints.onBindViewHolder(holder);
-+    }
-+
-+    public void setAvailable(boolean available) {
-+        mConstraints.setAvailable(available);
-+    }
-+
-+    public boolean isAvailable() {
-+        return mConstraints.isAvailable();
-+    }
-+
-+    protected abstract boolean isPersisted();
-+    protected abstract void putBoolean(String key, boolean value);
-+    protected abstract boolean getBoolean(String key, boolean defaultValue);
-+
-+    @Override
-+    protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue) {
-+        final boolean checked;
-+        if (!restorePersistedValue || !isPersisted()) {
-+            boolean defValue = defaultValue == null ? false : (boolean) defaultValue;
-+            checked = getBoolean(getKey(), defValue);
-+            if (shouldPersist()) {
-+                persistBoolean(checked);
-+            }
-+        } else {
-+            // Note: the default is not used because to have got here
-+            // isPersisted() must be true.
-+            checked = getBoolean(getKey(), false /* not used */);
-+        }
-+        setChecked(checked);
-+    }
-+
-+    private class DataStore extends PreferenceDataStore {
-+        @Override
-+        public void putBoolean(String key, boolean value) {
-+            SelfRemovingSwitchPreference.this.putBoolean(key, value);
-+        }
-+
-+        @Override
-+        public boolean getBoolean(String key, boolean defaultValue) {
-+            return SelfRemovingSwitchPreference.this.getBoolean(key, defaultValue);
-+        }
-+    }
-+}
-diff --git a/src/com/android/settings/custom/preference/SystemSettingSwitchPreference.java b/src/com/android/settings/custom/preference/SystemSettingSwitchPreference.java
-new file mode 100644
-index 0000000..b6a4654
---- /dev/null
-+++ b/src/com/android/settings/custom/preference/SystemSettingSwitchPreference.java
-@@ -0,0 +1,53 @@
-+/*
-+ * Copyright (C) 2013 The CyanogenMod Project
-+ * Copyright (C) 2018 The LineageOS 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 com.android.settings.custom.preference;
-+
-+import android.content.Context;
-+import android.provider.Settings;
-+import android.os.UserHandle;
-+import android.util.AttributeSet;
-+
-+public class SystemSettingSwitchPreference extends SelfRemovingSwitchPreference {
-+
-+    public SystemSettingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
-+        super(context, attrs, defStyle);
-+    }
-+
-+    public SystemSettingSwitchPreference(Context context, AttributeSet attrs) {
-+        super(context, attrs);
-+    }
-+
-+    public SystemSettingSwitchPreference(Context context) {
-+        super(context);
-+    }
-+
-+    @Override
-+    protected boolean isPersisted() {
-+        return Settings.System.getString(getContext().getContentResolver(), getKey()) != null;
-+    }
-+
-+    @Override
-+    protected void putBoolean(String key, boolean value) {
-+        Settings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
-+    }
-+
-+    @Override
-+    protected boolean getBoolean(String key, boolean defaultValue) {
-+        return Settings.System.getIntForUser(getContext().getContentResolver(),
-+                key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
-+    }
-+}
-diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
-index 2e4a1f2..320ce9f 100644
---- a/src/com/android/settings/security/LockscreenDashboardFragment.java
-+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
-@@ -30,6 +30,9 @@ import android.os.Looper;
- import android.provider.Settings;
- 
- import androidx.annotation.VisibleForTesting;
-+import androidx.preference.Preference;
-+
-+import com.android.internal.util.crdroid.OmniJawsClient;
- 
- import com.android.settings.R;
- import com.android.settings.dashboard.DashboardFragment;
-@@ -70,12 +73,16 @@ public class LockscreenDashboardFragment extends DashboardFragment
-     static final String KEY_ADD_USER_FROM_LOCK_SCREEN =
-             "security_lockscreen_add_users_when_locked";
- 
-+    private static final String KEY_WEATHER = "lockscreen_weather_enabled";
- 
-     private AmbientDisplayConfiguration mConfig;
-     private OwnerInfoPreferenceController mOwnerInfoPreferenceController;
-     @VisibleForTesting
-     ContentObserver mControlsContentObserver;
- 
-+    private Preference mWeather;
-+    private OmniJawsClient mWeatherClient;
-+
-     @Override
-     public int getMetricsCategory() {
-         return SettingsEnums.SETTINGS_LOCK_SCREEN_PREFERENCES;
-@@ -94,6 +101,10 @@ public class LockscreenDashboardFragment extends DashboardFragment
-                 R.string.locked_work_profile_notification_title);
-         replaceEnterpriseStringTitle("security_setting_lock_screen_notif_work_header",
-                 WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER, R.string.profile_section_header);
-+
-+        mWeather = (Preference) findPreference(KEY_WEATHER);
-+        mWeatherClient = new OmniJawsClient(getContext());
-+        updateWeatherSettings();
-     }
- 
-     @Override
-@@ -193,4 +204,19 @@ public class LockscreenDashboardFragment extends DashboardFragment
-                             .isAvailable();
-                 }
-             };
-+
-+    private void updateWeatherSettings() {
-+        if (mWeatherClient == null || mWeather == null) return;
-+
-+        boolean weatherEnabled = mWeatherClient.isOmniJawsEnabled();
-+        mWeather.setEnabled(weatherEnabled);
-+        mWeather.setSummary(weatherEnabled ? R.string.lockscreen_weather_summary :
-+            R.string.lockscreen_weather_enabled_info);
-+    }
-+
-+    @Override
-+    public void onResume() {
-+        super.onResume();
-+        updateWeatherSettings();
-+    }
- }
--- 
-2.34.1
-
diff --git a/patches/personal/platform_packages_apps_Settings/0002-feat-Add-Face-Unlock-with-ParanoidSense-2-2.patch b/patches/personal/platform_packages_apps_Settings/0002-feat-Add-Face-Unlock-with-ParanoidSense-2-2.patch
deleted file mode 100644
index 4b724848..00000000
--- a/patches/personal/platform_packages_apps_Settings/0002-feat-Add-Face-Unlock-with-ParanoidSense-2-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 56b2c38a22681db6ad2caec74506beb0cff4856d Mon Sep 17 00:00:00 2001
-From: Chris Crump <chriscrawford893@gmail.com>
-Date: Fri, 17 Mar 2023 20:48:46 +0100
-Subject: [PATCH 2/2] feat: Add Face Unlock with ParanoidSense (2/2)
-
-Based on AOSPA's implementation and adapted by @ghostrider-reborn
-
-Co-authored-by: Chris Crump <chriscrawford893@gmail.com>
-Co-authored-by: Adithya R <gh0strider.2k18.reborn@gmail.com>
-Change-Id: I05fa784d9f7f978be9f5944900a97ad7df19f59e
----
- AndroidManifest.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index aed51f3..52eeeab 100644
---- a/AndroidManifest.xml
-+++ b/AndroidManifest.xml
-@@ -2663,7 +2663,7 @@
-             android:screenOrientation="portrait"/>
- 
-         <activity android:name=".biometrics.face.FaceEnrollFinish"
--            android:exported="false"
-+            android:exported="true"
-             android:screenOrientation="portrait"/>
- 
-         <activity android:name=".biometrics.BiometricHandoffActivity"
--- 
-2.34.1
-
diff --git a/patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch b/patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch
deleted file mode 100644
index 2b49c438..00000000
--- a/patches/personal/platform_packages_apps_Trebuchet/0001-Revert-Add-support-for-toggling-taskbar.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 8048cee6ad85dfe3cc5dcd30005ffbeff4d9c0b4 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Tue, 26 Mar 2024 16:32:07 +0000
-Subject: [PATCH] Revert "Add support for toggling taskbar"
-
-This reverts commit 5a0709789f1665a9f3b3c843865c90d5dda53c7f.
----
- Android.bp                                    |  1 -
- .../launcher3/taskbar/TaskbarManager.java     | 23 ++-----------------
- .../com/android/quickstep/SystemUiProxy.java  | 12 ----------
- src/com/android/launcher3/DeviceProfile.java  |  6 +----
- 4 files changed, 3 insertions(+), 39 deletions(-)
-
-diff --git a/Android.bp b/Android.bp
-index 8c1298c52b..d987f16bea 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -213,7 +213,6 @@ android_library {
-         "com_android_wm_shell_flags_lib",
-         "android.appwidget.flags-aconfig-java",
-         "com.android.window.flags.window-aconfig-java",
--        "org.lineageos.platform"
-     ],
-     sdk_version: "current",
-     min_sdk_version: min_launcher3_sdk_version,
-diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
-index d7baf50cda..ecbc7e7fdc 100644
---- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
-+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
-@@ -77,8 +77,6 @@ import com.android.systemui.shared.system.QuickStepContract;
- import com.android.systemui.unfold.UnfoldTransitionProgressProvider;
- import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider;
- 
--import lineageos.providers.LineageSettings;
--
- import java.io.PrintWriter;
- import java.util.StringJoiner;
- 
-@@ -111,9 +109,6 @@ public class TaskbarManager {
-     private static final Uri NAV_BAR_KIDS_MODE = Settings.Secure.getUriFor(
-             Settings.Secure.NAV_BAR_KIDS_MODE);
- 
--    private static final Uri ENABLE_TASKBAR_URI = LineageSettings.System.getUriFor(
--            LineageSettings.System.ENABLE_TASKBAR);
--
-     private final Context mContext;
-     private final @Nullable Context mNavigationBarPanelContext;
-     private final DeviceStateManager mDeviceStateManager;
-@@ -157,7 +152,6 @@ public class TaskbarManager {
-         }
-     }
-     private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> recreateTaskbar();
--    private final SettingsCache.OnChangeListener mEnableTaskBarListener;
- 
-     private boolean mUserUnlocked = false;
- 
-@@ -330,18 +324,6 @@ public class TaskbarManager {
-                 .register(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener);
-         SettingsCache.INSTANCE.get(mContext)
-                 .register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener);
--        mEnableTaskBarListener = c -> {
--            // Create the illusion of this taking effect immediately
--            // Also needed because TaskbarManager inits before SystemUiProxy on start
--            boolean enabled = LineageSettings.System.getInt(mContext.getContentResolver(),
--                    LineageSettings.System.ENABLE_TASKBAR, 0) == 1;
--            SystemUiProxy.INSTANCE.get(mContext).setTaskbarEnabled(enabled);
--
--            // Restart launcher
--            System.exit(0);
--        };
--        SettingsCache.INSTANCE.get(mContext)
--                .register(ENABLE_TASKBAR_URI, mEnableTaskBarListener);
-         Log.d(TASKBAR_NOT_DESTROYED_TAG, "registering component callbacks from constructor.");
-         mContext.registerComponentCallbacks(mComponentCallbacks);
-         mShutdownReceiver.register(mContext, Intent.ACTION_SHUTDOWN);
-@@ -500,10 +482,9 @@ public class TaskbarManager {
-                 + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null)
-                 + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION
-                 + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent));
--            SystemUiProxy sysui = SystemUiProxy.INSTANCE.get(mContext);
--            sysui.setTaskbarEnabled(isTaskbarEnabled);
-             if (!isTaskbarEnabled) {
--                sysui.notifyTaskbarStatus(/* visible */ false, /* stashed */ false);
-+                SystemUiProxy.INSTANCE.get(mContext)
-+                    .notifyTaskbarStatus(/* visible */ false, /* stashed */ false);
-                 return;
-             }
- 
-diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
-index 24db2edc78..72f67fc544 100644
---- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
-+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
-@@ -498,18 +498,6 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle {
-         }
-     }
- 
--    @Override
--    public void setTaskbarEnabled(boolean enabled) {
--        if (mSystemUiProxy != null) {
--            try {
--                mSystemUiProxy.setTaskbarEnabled(enabled);
--            } catch (RemoteException e) {
--                Log.w(TAG, "Failed call setTaskbarEnabled with arg: " +
--                        enabled, e);
--            }
--        }
--    }
--
-     @Override
-     public void notifyTaskbarStatus(boolean visible, boolean stashed) {
-         if (mSystemUiProxy != null) {
-diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
-index b666ac1883..f96d59ebba 100644
---- a/src/com/android/launcher3/DeviceProfile.java
-+++ b/src/com/android/launcher3/DeviceProfile.java
-@@ -70,8 +70,6 @@ import com.android.launcher3.util.IconSizeSteps;
- import com.android.launcher3.util.ResourceHelper;
- import com.android.launcher3.util.WindowBounds;
- 
--import lineageos.providers.LineageSettings;
--
- import java.io.PrintWriter;
- import java.util.Locale;
- import java.util.function.Consumer;
-@@ -350,9 +348,7 @@ public class DeviceProfile {
-         isTablet = info.isTablet(windowBounds);
-         isPhone = !isTablet;
-         isTwoPanels = isTablet && isMultiDisplay;
--        boolean isTaskBarEnabled = LineageSettings.System.getInt(context.getContentResolver(),
--                LineageSettings.System.ENABLE_TASKBAR, isTablet ? 1 : 0) == 1;
--        isTaskbarPresent = isTaskBarEnabled && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS;
-+        isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS;
- 
-         // Some more constants.
-         context = getContext(context, info, isVerticalBarLayout() || (isTablet && isLandscape)
--- 
-2.34.1
-
diff --git a/patches/personal/treble_app/0001-misc-Remove-securize-preference.patch b/patches/personal/treble_app/0001-misc-Remove-securize-preference.patch
deleted file mode 100644
index df84996e..00000000
--- a/patches/personal/treble_app/0001-misc-Remove-securize-preference.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1586c804a971422cd93de3743ae67d27212986be Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Tue, 8 Jun 2021 09:44:26 +0100
-Subject: [PATCH] misc: Remove securize preference
-
----
- .../java/me/phh/treble/app/MiscSettings.kt    | 33 -------------------
- app/src/main/res/xml/pref_misc.xml            |  2 --
- 2 files changed, 35 deletions(-)
-
-diff --git a/app/src/main/java/me/phh/treble/app/MiscSettings.kt b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
-index dc2e0e3..80530b1 100644
---- a/app/src/main/java/me/phh/treble/app/MiscSettings.kt
-+++ b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
-@@ -49,39 +49,6 @@ class MiscSettingsFragment : SettingsFragment() {
-     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-         super.onCreatePreferences(savedInstanceState, rootKey)
- 
--        val securizePref = findPreference<Preference>(MiscSettings.securize)
--        securizePref!!.setOnPreferenceClickListener {
--                val builder = AlertDialog.Builder( this.getActivity() )
--                builder.setTitle(getString(R.string.remove_root))
--                builder.setMessage(getString(R.string.continue_question))
--
--                builder.setPositiveButton(android.R.string.yes) { dialog, which ->
--
--                var cmds = listOf(
--                    arrayOf("/sbin/su", "-c", "/system/bin/phh-securize.sh"),
--                    arrayOf("/system/xbin/su", "-c", "/system/bin/phh-securize.sh"),
--                    arrayOf("/system/xbin/phh-su", "-c", "/system/bin/phh-securize.sh"),
--                    arrayOf("/sbin/su", "0", "/system/bin/phh-securize.sh"),
--                    arrayOf("/system/xbin/su", "0", "/system/bin/phh-securize.sh"),
--                    arrayOf("/system/xbin/phh-su", "0", "/system/bin/phh-securize.sh")
--                )
--                for (cmd in cmds) {
--                    try {
--                        Runtime.getRuntime().exec(cmd).waitFor()
--                        break
--                    } catch (t: Throwable) {
--                        Log.d("PHH", "Failed to exec \"" + cmd.joinToString(separator = " ") + "\", skipping")
--                    }
--                }
--            }
--
--            builder.setNegativeButton(android.R.string.no) { dialog, which ->
--            }
--
--            builder.show()
--            return@setOnPreferenceClickListener true
--        }
--
-         val removeTelephonyPref = findPreference<Preference>(MiscSettings.removeTelephony)
-         removeTelephonyPref!!.setOnPreferenceClickListener {
- 
-diff --git a/app/src/main/res/xml/pref_misc.xml b/app/src/main/res/xml/pref_misc.xml
-index 4210106..9176674 100644
---- a/app/src/main/res/xml/pref_misc.xml
-+++ b/app/src/main/res/xml/pref_misc.xml
-@@ -161,8 +161,6 @@
-             android:entryValues="@array/pref_misc_fod_color_values"
-             android:key="key_misc_fod_color"
-             android:title="Under-display fp color" />
--        <Preference android:title="Securize"
--            android:key="key_misc_securize" />
-     </PreferenceCategory>
-     <PreferenceCategory android:title="Debugging">
-         <Preference android:title="Debug Sensors">
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch b/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
deleted file mode 100644
index 68dca6d4..00000000
--- a/patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c0724aca39c9e50864d73d405c8bec8de757efbb Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 27 Oct 2021 14:39:29 -0400
-Subject: [PATCH 1/2] Disable vndklite handling
-
-Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
----
- linker/linker.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/linker/linker.cpp b/linker/linker.cpp
-index b0caeddc1..3e0e7fecf 100644
---- a/linker/linker.cpp
-+++ b/linker/linker.cpp
-@@ -97,7 +97,6 @@ static uint64_t g_module_unload_counter = 0;
- static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";
- 
- static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
--static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt";
- 
- static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt";
- 
-@@ -3463,10 +3462,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
- }
- 
- static std::string get_ld_config_file_vndk_path() {
--  if (android::base::GetBoolProperty("ro.vndk.lite", false)) {
--    return kLdConfigVndkLiteFilePath;
--  }
--
-   std::string ld_config_file_vndk = kLdConfigFilePath;
-   size_t insert_pos = ld_config_file_vndk.find_last_of('.');
-   if (insert_pos == std::string::npos) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch b/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch
deleted file mode 100644
index dcd49a22..00000000
--- a/patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From c89be47b786aa45ad3fbd9ba1ac201e43c6070ec Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 19 Feb 2022 08:20:25 -0500
-Subject: [PATCH 2/2] Add new mechanism to fake vendor props on a per-process
- basis
-
-This reads debug.phh.props.<process name>. If its value is "vendor",
-then ro.product.device/ro.product.manufacturer is read from vendor
----
- libc/system_properties/system_properties.cpp | 87 +++++++++++++++++++-
- 1 file changed, 85 insertions(+), 2 deletions(-)
-
-diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp
-index 9dd5e35ce..886bef127 100644
---- a/libc/system_properties/system_properties.cpp
-+++ b/libc/system_properties/system_properties.cpp
-@@ -36,6 +36,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <string.h>
-+#include <fcntl.h>
- 
- #include <new>
- 
-@@ -53,6 +55,85 @@
- #define SERIAL_VALUE_LEN(serial) ((serial) >> 24)
- #define APPCOMPAT_PREFIX "ro.appcompat_override."
- 
-+static char comm[128];
-+static bool self_ok = false;
-+static char comm_override[PROP_VALUE_MAX];
-+
-+static void read_self() {
-+  //NB: Not atomic, but should be good enough, there is no possible corruption from concurrency
-+  if(self_ok) return;
-+  self_ok = true;
-+
-+  char cmdline[128];
-+  int fd = open("/proc/self/cmdline", O_RDONLY);
-+  if(fd<0) return;
-+  read(fd, cmdline, sizeof(cmdline)-1);
-+  for(unsigned i=0; i<sizeof(cmdline); i++)
-+    if(cmdline[i] == '\n')
-+      cmdline[i] = 0;
-+  close(fd);
-+
-+  // Truncate to last /, we don't want `/` in the prop
-+  const char *c = strrchr(cmdline, '/');
-+  if (c != nullptr) {
-+      c = c+1;
-+  } else {
-+      c = cmdline;
-+  }
-+  // Take only the last 16 bytes (prop names max is 32)
-+  if(strlen(c) < 15) {
-+      strcpy(comm, c);
-+  } else {
-+      strcpy(comm, c + strlen(c) - 15);
-+  }
-+
-+
-+  //That's calling ourselves but that's fine because we already have self_ok = true
-+  char propName[PROP_NAME_MAX];
-+  memset(propName, 0, PROP_NAME_MAX);
-+  strncpy(propName, "debug.phh.props.", PROP_NAME_MAX - 1);
-+  strncat(propName, comm, PROP_NAME_MAX - strlen(propName) - 1);
-+
-+  //async_safe_format_log(ANDROID_LOG_WARN, "libc", "Reading debug prop %s", propName);
-+  __system_property_get(propName, comm_override);
-+}
-+
-+static const char* redirectToProp(const char *name) {
-+  read_self();
-+  /*if(strstr(name, "ro.keymaster") != nullptr || strstr(name, "security_patch") != nullptr || strstr(name, "release") != nullptr) {
-+    async_safe_format_log(ANDROID_LOG_WARN, "libc", "Process/comm %s/%s is reading %s", comm, comm_override, name);
-+  }*/
-+  if(strcmp(comm_override, "vendor") == 0) {
-+    if(strcmp(name, "ro.product.device") == 0) {
-+      return "ro.product.vendor.device";
-+    }
-+    if(strcmp(name, "ro.product.manufacturer") == 0) {
-+      return "ro.product.vendor.manufacturer";
-+    }
-+  }
-+  if(strcmp(comm_override, "keymaster") == 0) {
-+    if(strcmp(name, "ro.product.model") == 0) {
-+      return "ro.keymaster.mod";
-+    }
-+    if(strcmp(name, "ro.product.brand") == 0) {
-+      return "ro.keymaster.brn";
-+    }
-+    if(strcmp(name, "ro.build.version.release") == 0) {
-+      return "ro.keymaster.xxx.release";
-+    }
-+    if(strcmp(name, "ro.build.version.security_patch") == 0) {
-+      return "ro.keymaster.xxx.security_patch";
-+    }
-+    if(strcmp(name, "ro.boot.vbmeta.device_state") == 0) {
-+      return "ro.keymaster.xxx.vbmeta_state";
-+    }
-+    if(strcmp(name, "ro.boot.verifiedbootstate") == 0) {
-+      return "ro.keymaster.xxx.verifiedbootstate";
-+    }
-+  }
-+  return name;
-+}
-+
- static bool is_dir(const char* pathname) {
-   struct stat info;
-   if (stat(pathname, &info) == -1) {
-@@ -156,17 +237,19 @@ uint32_t SystemProperties::AreaSerial() {
- }
- 
- const prop_info* SystemProperties::Find(const char* name) {
-+  const char* newName = redirectToProp(name);
-+
-   if (!initialized_) {
-     return nullptr;
-   }
- 
--  prop_area* pa = contexts_->GetPropAreaForName(name);
-+  prop_area* pa = contexts_->GetPropAreaForName(newName);
-   if (!pa) {
-     async_safe_format_log(ANDROID_LOG_WARN, "libc", "Access denied finding property \"%s\"", name);
-     return nullptr;
-   }
- 
--  return pa->find(name);
-+  return pa->find(newName);
- }
- 
- static bool is_appcompat_override(const char* name) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch b/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
deleted file mode 100644
index 864d5b81..00000000
--- a/patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 48f0b520ddb023295740c43fd10d88bd43eb4973 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 12 Sep 2019 20:31:07 +0200
-Subject: [PATCH] Don't reboot if we couldn't get bootctrl
-
-Change-Id: Id1793660bd1c97ab369607f58a772ca3512ec1af
----
- update_verifier/update_verifier.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
-index a0160e2f..24d6ccab 100644
---- a/update_verifier/update_verifier.cpp
-+++ b/update_verifier/update_verifier.cpp
-@@ -324,7 +324,7 @@ int update_verifier(int argc, char** argv) {
-   const auto module = android::hal::BootControlClient::WaitForService();
-   if (module == nullptr) {
-     LOG(ERROR) << "Error getting bootctrl module.";
--    return reboot_device();
-+    return 0;
-   }
- 
-   uint32_t current_slot = module->GetCurrentSlot();
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_build/0001-Remove-init.vndk-nodef.rc.patch b/patches/trebledroid/platform_build/0001-Remove-init.vndk-nodef.rc.patch
deleted file mode 100644
index 9f21836f..00000000
--- a/patches/trebledroid/platform_build/0001-Remove-init.vndk-nodef.rc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From fe5645730f484a0eebed59150c931c8821f6ee34 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Wed, 8 Dec 2021 07:04:53 +0000
-Subject: [PATCH 1/4] Remove init.vndk-nodef.rc
-
-This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
-
-Paired with https://github.com/LineageOS/android_system_core/commit/0b265e35ddf42638fa807f5349a10c40e3d46446, it kicks permissive devices into bootloader.
-Given that GSI+permissive won't ever be a Lineage official scenario, revert this only on our side.
-Thanks @Kethen for the insight!
-
-Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9
----
- target/product/gsi/Android.mk         | 13 -------------
- target/product/gsi/init.gsi.rc        |  2 --
- target/product/gsi/init.vndk-nodef.rc |  3 ---
- target/product/gsi_release.mk         |  1 -
- 4 files changed, 19 deletions(-)
- delete mode 100644 target/product/gsi/init.vndk-nodef.rc
-
-diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
-index f348fbb60b..ff8e688b12 100644
---- a/target/product/gsi/Android.mk
-+++ b/target/product/gsi/Android.mk
-@@ -278,16 +278,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
- LOCAL_MODULE_RELATIVE_PATH := init
- 
- include $(BUILD_PREBUILT)
--
--
--include $(CLEAR_VARS)
--LOCAL_MODULE := init.vndk-nodef.rc
--LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
--LOCAL_LICENSE_CONDITIONS := notice
--LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
--LOCAL_SRC_FILES := $(LOCAL_MODULE)
--LOCAL_MODULE_CLASS := ETC
--LOCAL_SYSTEM_EXT_MODULE := true
--LOCAL_MODULE_RELATIVE_PATH := gsi
--
--include $(BUILD_PREBUILT)
-diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc
-index 69c8e467be..c6faba78d9 100644
---- a/target/product/gsi/init.gsi.rc
-+++ b/target/product/gsi/init.gsi.rc
-@@ -1,5 +1,3 @@
- #
- # Android init script for GSI required initialization
- #
--
--import /system/system_ext/etc/gsi/init.vndk-${ro.vndk.version:-nodef}.rc
-diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc
-deleted file mode 100644
-index 1b141a05e7..0000000000
---- a/target/product/gsi/init.vndk-nodef.rc
-+++ /dev/null
-@@ -1,3 +0,0 @@
--on early-init
--    # Reboot if BOARD_VNDK_VERSION is not defined
--    exec - root -- /system/bin/reboot bootloader
-diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
-index 2e373663a4..2636a11972 100644
---- a/target/product/gsi_release.mk
-+++ b/target/product/gsi_release.mk
-@@ -51,7 +51,6 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
- PRODUCT_PACKAGES += \
-     gsi_skip_mount.cfg \
-     init.gsi.rc \
--    init.vndk-nodef.rc \
- 
- # Overlay the GSI specific SystemUI setting
- PRODUCT_PACKAGES += gsi_overlay_systemui
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_build/0002-build-Remove-llkd.patch b/patches/trebledroid/platform_build/0002-build-Remove-llkd.patch
deleted file mode 100644
index fe39443d..00000000
--- a/patches/trebledroid/platform_build/0002-build-Remove-llkd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d37dc312e1710545fd4b6c6cda4f5d7bcbbae5f5 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Thu, 14 Oct 2021 12:20:52 +0000
-Subject: [PATCH 2/4] build: Remove llkd
-
-...until someone figures out why Genshin Impact fails it
-
-Change-Id: I29384a820a0c07b29d3f11d7039bed40eeaee926
----
- target/product/base_system.mk | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/target/product/base_system.mk b/target/product/base_system.mk
-index 5969cc884d..c780679f1a 100644
---- a/target/product/base_system.mk
-+++ b/target/product/base_system.mk
-@@ -211,7 +211,6 @@ PRODUCT_PACKAGES += \
-     libvulkan \
-     libwilhelm \
-     linker \
--    llkd \
-     lmkd \
-     LocalTransport \
-     locksettings \
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_build/0003-Include-vndk-v28-sepolicy-support.patch b/patches/trebledroid/platform_build/0003-Include-vndk-v28-sepolicy-support.patch
deleted file mode 100644
index aa07f36b..00000000
--- a/patches/trebledroid/platform_build/0003-Include-vndk-v28-sepolicy-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e6b76d1e7d9be605890c8125efdf0b4a33957048 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 19:11:22 -0400
-Subject: [PATCH 3/4] Include vndk v28 sepolicy support
-
----
- core/config.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/config.mk b/core/config.mk
-index 546858aac9..11e8799405 100644
---- a/core/config.mk
-+++ b/core/config.mk
-@@ -879,6 +879,7 @@ BOARD_SEPOLICY_VERS := $(PLATFORM_SEPOLICY_VERSION)
- 
- # A list of SEPolicy versions, besides PLATFORM_SEPOLICY_VERSION, that the framework supports.
- PLATFORM_SEPOLICY_COMPAT_VERSIONS := $(filter-out $(PLATFORM_SEPOLICY_VERSION), \
-+    28.0 \
-     29.0 \
-     30.0 \
-     31.0 \
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_build/0004-core-sysprop-Write-build-display-id-to-product-prop.patch b/patches/trebledroid/platform_build/0004-core-sysprop-Write-build-display-id-to-product-prop.patch
deleted file mode 100644
index 9d14b379..00000000
--- a/patches/trebledroid/platform_build/0004-core-sysprop-Write-build-display-id-to-product-prop.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 15659173205b2200bb7a22d7102cd2ece45e50c5 Mon Sep 17 00:00:00 2001
-From: Adithya R <gh0strider.2k18.reborn@gmail.com>
-Date: Thu, 18 Aug 2022 21:29:34 +0530
-Subject: [PATCH 4/4] core: sysprop: Write build display id to product prop
-
-Some vendors override build id in odm or vendor, such as oplus.
-
-Change-Id: I1c2de43ba7c3544710897ad9127d320dd02293fe
----
- core/sysprop.mk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/core/sysprop.mk b/core/sysprop.mk
-index 652ca9757e..57e54dbb19 100644
---- a/core/sysprop.mk
-+++ b/core/sysprop.mk
-@@ -75,6 +75,9 @@ define generate-common-build-props
-             echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\
-         )\
-     )\
-+    $(if $(filter product,$(1)),\
-+        echo "ro.build.display.id=$(BUILD_DISPLAY_ID)" >> $(2);\
-+    )\
-     echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\
-     echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\
-     # Allow optional assignments for ARC forward-declarations (b/249168657)
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch b/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
deleted file mode 100644
index 484310f3..00000000
--- a/patches/trebledroid/platform_external_selinux/0001-Increase-default-log_level-to-get-actual-selinux-err.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3f08011b0526525692fc46e8e04824ed1b395885 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 9 Apr 2018 00:19:49 +0200
-Subject: [PATCH 01/10] Increase default log_level to get actual selinux error
- in kmsg
-
----
- secilc/secilc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/secilc/secilc.c b/secilc/secilc.c
-index 80d3583d..a51630b2 100644
---- a/secilc/secilc.c
-+++ b/secilc/secilc.c
-@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
- 	int opt_index = 0;
- 	char *fc_buf = NULL;
- 	size_t fc_size;
--	enum cil_log_level log_level = CIL_ERR;
-+	enum cil_log_level log_level = CIL_WARN;
- 	static struct option long_opts[] = {
- 		{"help", no_argument, 0, 'h'},
- 		{"verbose", no_argument, 0, 'v'},
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch b/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
deleted file mode 100644
index 5c88e9ac..00000000
--- a/patches/trebledroid/platform_external_selinux/0002-Revert-libsepol-Make-an-unknown-permission-an-error-.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 23d8ea53182c41bb71f714384e6ddc5c8b812f35 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 9 Sep 2020 22:36:42 +0200
-Subject: [PATCH 02/10] Revert "libsepol: Make an unknown permission an error
- in CIL"
-
-This reverts commit dc4e54126bf25dea4d51820922ccd1959be68fbc.
-
-This is required because some targets calls undefined permissions:
-- Realme X2 Pro calls sigcont
-- Honor 7X calls perf_event
----
- libsepol/cil/src/cil_resolve_ast.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/libsepol/cil/src/cil_resolve_ast.c b/libsepol/cil/src/cil_resolve_ast.c
-index d2bfdc81..91fa1075 100644
---- a/libsepol/cil/src/cil_resolve_ast.c
-+++ b/libsepol/cil/src/cil_resolve_ast.c
-@@ -136,14 +136,18 @@ static int __cil_resolve_perms(symtab_t *class_symtab, symtab_t *common_symtab,
- 				}
- 			}
- 			if (rc != SEPOL_OK) {
-+				struct cil_list *empty_list;
- 				if (class_flavor == CIL_MAP_CLASS) {
- 					cil_log(CIL_ERR, "Failed to resolve permission %s for map class\n", (char*)curr->data);
--				} else {
--					cil_log(CIL_ERR, "Failed to resolve permission %s\n", (char*)curr->data);
-+					goto exit;
- 				}
--				goto exit;
-+				cil_log(CIL_WARN, "Failed to resolve permission %s\n", (char*)curr->data);
-+				/* Use an empty list to represent unknown perm */
-+				cil_list_init(&empty_list, perm_strs->flavor);
-+				cil_list_append(*perm_datums, CIL_LIST, empty_list);
-+			} else {
-+				cil_list_append(*perm_datums, CIL_DATUM, perm_datum);
- 			}
--			cil_list_append(*perm_datums, CIL_DATUM, perm_datum);
- 		} else {
- 			cil_list_append(*perm_datums, curr->flavor, curr->data);
- 		}
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch b/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
deleted file mode 100644
index 0ac28ce9..00000000
--- a/patches/trebledroid/platform_external_selinux/0003-Workaround-device-phh-treble-conflict-with-SELinux-p.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 2f8b7f6bbbcd30282ef9b8100133f26670557da5 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 31 Mar 2021 23:32:37 +0200
-Subject: [PATCH 03/10] Workaround device/phh/treble conflict with SELinux
- policy
-
-device/phh/treble defines the following three types (hostapd,
-sysfs_usb_supply, rpmb_device)
-However, Qualcomm Samsung Android 11 devices export those symbols as
-typealias.
-Type and typealias are fundamentally not mergeable.
-Luckily, Samsung doesn't do anything with those typealias, so we can
-simply ignore them.
----
- libsepol/cil/src/cil_binary.c      |  8 ++++++--
- libsepol/cil/src/cil_build_ast.c   | 11 +++++++++--
- libsepol/cil/src/cil_resolve_ast.c | 15 +++++++++++++--
- 3 files changed, 28 insertions(+), 6 deletions(-)
-
-diff --git a/libsepol/cil/src/cil_binary.c b/libsepol/cil/src/cil_binary.c
-index 40615db2..74a52956 100644
---- a/libsepol/cil/src/cil_binary.c
-+++ b/libsepol/cil/src/cil_binary.c
-@@ -511,13 +511,17 @@ int cil_typealias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias)
- 	type_datum_init(sepol_alias);
- 
- 	rc = __cil_get_sepol_type_datum(pdb, DATUM(cil_alias->actual), &sepol_type);
--	if (rc != SEPOL_OK) goto exit;
-+	if (rc != SEPOL_OK) {
-+        cil_log(CIL_ERR, "Failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);
-+        goto exit;
-+    }
- 
- 	sepol_alias->flavor = TYPE_TYPE;
- 
- 	key = cil_strdup(cil_alias->datum.fqn);
- 	rc = symtab_insert(pdb, SYM_TYPES, key, sepol_alias, SCOPE_DECL, 0, NULL);
- 	if (rc != SEPOL_OK) {
-+        cil_log(CIL_ERR, "Failed at %s:%s:%d:%d\n", __FILE__, __FUNCTION__, __LINE__, rc);
- 		goto exit;
- 	}
- 	sepol_alias->s.value = sepol_type->s.value;
-@@ -3995,7 +3999,7 @@ static int __cil_node_to_policydb(struct cil_tree_node *node, void *extra_args)
- 
- exit:
- 	if (rc != SEPOL_OK) {
--		cil_tree_log(node, CIL_ERR, "Binary policy creation failed");
-+		cil_tree_log(node, CIL_ERR, "Binary policy creation failed, for pass = %d, flavor = %d", pass, node->flavor);
- 	}
- 	return rc;
- }
-diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
-index 4177c9f6..118de1f5 100644
---- a/libsepol/cil/src/cil_build_ast.c
-+++ b/libsepol/cil/src/cil_build_ast.c
-@@ -116,7 +116,7 @@ int cil_add_decl_to_symtab(struct cil_db *db, symtab_t *symtab, hashtab_key_t ke
- 
- 	rc = cil_symtab_insert(symtab, key, datum, node);
- 	if (rc == SEPOL_EEXIST) {
--		struct cil_symtab_datum *prev;
-+		struct cil_symtab_datum *prev = NULL;
- 		rc = cil_symtab_get_datum(symtab, key, &prev);
- 		if (rc != SEPOL_OK) {
- 			cil_log(CIL_ERR, "Re-declaration of %s %s, but previous declaration could not be found\n",cil_node_to_string(node), key);
-@@ -129,7 +129,14 @@ int cil_add_decl_to_symtab(struct cil_db *db, symtab_t *symtab, hashtab_key_t ke
- 				cil_node_to_string(node), key);
- 			cil_tree_log(node, CIL_ERR, "Previous declaration of %s",
- 				     cil_node_to_string(n));
--			return SEPOL_ERR;
-+			if(
-+				strcmp(key, "sysfs_usb_supply") == 0 ||
-+				strcmp(key, "hostapd") == 0 ||
-+				strcmp(key, "rpmb_device") == 0) {
-+					cil_log(CIL_ERR, "Ignoring...");
-+			} else {
-+				return SEPOL_ERR;
-+			}
- 		}
- 		/* multiple_decls is enabled and works for this datum type, add node */
- 		cil_list_append(prev->nodes, CIL_NODE, node);
-diff --git a/libsepol/cil/src/cil_resolve_ast.c b/libsepol/cil/src/cil_resolve_ast.c
-index 91fa1075..d20fb7ee 100644
---- a/libsepol/cil/src/cil_resolve_ast.c
-+++ b/libsepol/cil/src/cil_resolve_ast.c
-@@ -522,7 +522,13 @@ static int cil_resolve_aliasactual(struct cil_tree_node *current, void *extra_ar
- 	}
- 	if (FLAVOR(alias_datum) != alias_flavor) {
- 		cil_log(CIL_ERR, "%s is not an alias\n",alias_datum->name);
--		rc = SEPOL_ERR;
-+		if(
-+			strcmp(alias_datum->name, "hostapd") == 0 ||
-+			strcmp(alias_datum->name, "sysfs_usb_supply") == 0 ||
-+			strcmp(alias_datum->name, "rpmb_device") == 0)
-+				rc = 0;
-+			else
-+				rc = SEPOL_ERR;
- 		goto exit;
- 	}
- 
-@@ -563,7 +569,12 @@ static int cil_resolve_alias_to_actual(struct cil_tree_node *current, enum cil_f
- 	int limit = 2;
- 
- 	if (alias->actual == NULL) {
--		cil_tree_log(current, CIL_ERR, "Alias declared but not used");
-+		cil_tree_log(current, CIL_ERR, "Alias %s declared but not used", a1->datum.name);
-+		if(
-+			strcmp(a1->datum.name, "hostapd") == 0 ||
-+			strcmp(a1->datum.name, "sysfs_usb_supply") == 0 ||
-+			strcmp(a1->datum.name, "rpmb_device") == 0)
-+				return SEPOL_OK;
- 		return SEPOL_ERR;
- 	}
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch b/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
deleted file mode 100644
index e41c3b87..00000000
--- a/patches/trebledroid/platform_external_selinux/0004-Allow-devices-virtual-block-genfscon-conflict-seen-o.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2efe57e39df931d5dba0f2c61c30e79a2e55af03 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Sep 2019 15:07:25 +0200
-Subject: [PATCH 04/10] Allow /devices/virtual/block/ genfscon conflict (seen
- on Xiaomi Mi 9)
-
-Change-Id: I06e4e9d5b82d61a8aeab595b47e2589249675895
----
- libsepol/cil/src/cil_post.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
-index a7c66ead..99410da0 100644
---- a/libsepol/cil/src/cil_post.c
-+++ b/libsepol/cil/src/cil_post.c
-@@ -491,7 +491,23 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b)
- {
- 	struct cil_genfscon *a_genfscon = *(struct cil_genfscon**)a;
- 	struct cil_genfscon *b_genfscon = *(struct cil_genfscon**)b;
--	return context_compare(a_genfscon->context, b_genfscon->context);
-+	int rc = context_compare(a_genfscon->context, b_genfscon->context);
-+	if(rc) {
-+		fprintf(stderr, "hello %s\n", a_genfscon->fs_str);
-+		int bypass = 0;
-+		/*
-+		 * This conflict has been seen on Xiaomi Mi 9:
-+		 * - AOSP Q says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_devices_block ((s0) (s0))))
-+		 * - stock rom says (genfscon sysfs /devices/virtual/block/ (u object_r sysfs_ufs_target ((s0) (s0))))
-+		 */
-+		if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0)
-+			bypass = 1;
-+		if(bypass == 1) {
-+			fprintf(stderr, "Received conflicting %s vs %s but ignore\n", a_genfscon->path_str, b_genfscon->path_str);
-+			return 0;
-+		}
-+	}
-+	return rc;
- }
- 
- static int cil_post_netifcon_context_compare(const void *a, const void *b)
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch b/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
deleted file mode 100644
index d0a0bc2a..00000000
--- a/patches/trebledroid/platform_external_selinux/0005-if-service-is-rcs-accept-conflict.-Seen-on-Moto-E5.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a55acf8200ba38d7bdede7336c9d4cc1a4d1c5cd Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 12 Sep 2019 20:37:04 +0200
-Subject: [PATCH 05/10] if service is "rcs", accept conflict. Seen on Moto E5
-
-Change-Id: I0cc2d0fad83f403f2b5d7458039b1564ce5ed9dd
----
- libselinux/src/label_backends_android.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/libselinux/src/label_backends_android.c b/libselinux/src/label_backends_android.c
-index 77f7a1eb..55a30944 100644
---- a/libselinux/src/label_backends_android.c
-+++ b/libselinux/src/label_backends_android.c
-@@ -62,14 +62,24 @@ static int nodups_specs(struct saved_data *data)
- 					    curr_spec->property_key)) {
- 				if (strcmp(spec_arr[jj].lr.ctx_raw,
- 						    curr_spec->lr.ctx_raw)) {
--					rc = -1;
--					errno = EINVAL;
- 					selinux_log
- 						(SELINUX_ERROR,
- 						 "Multiple different specifications for %s  (%s and %s).\n",
- 						 curr_spec->property_key,
- 						 spec_arr[jj].lr.ctx_raw,
- 						 curr_spec->lr.ctx_raw);
-+					int ignore = 0;
-+					/*
-+					 * This issue has been found on Moto E5
-+					 * E SELinux : Multiple different specifications for rcs  (u:object_r:radio_service:s0 and u:object_r:mot_rcs_service:s0).
-+					 */
-+					if(!strcmp(curr_spec->property_key, "rcs"))
-+						ignore = 1;
-+
-+					if(!ignore) {
-+						rc = -1;
-+						errno = EINVAL;
-+					}
- 				} else {
- 					selinux_log
- 						(SELINUX_WARNING,
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch b/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
deleted file mode 100644
index 77862018..00000000
--- a/patches/trebledroid/platform_external_selinux/0006-Allow-mismatches-of-exfat-genfscon.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1b6e0989e7c8fdd3d4813f4aa19aa40d39b43d79 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 24 May 2020 17:22:22 +0200
-Subject: [PATCH 06/10] Allow mismatches of exfat genfscon
-
----
- libsepol/cil/src/cil_post.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
-index 99410da0..7f614c03 100644
---- a/libsepol/cil/src/cil_post.c
-+++ b/libsepol/cil/src/cil_post.c
-@@ -502,6 +502,10 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b)
- 		 */
- 		if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0)
- 			bypass = 1;
-+		if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) {
-+            if(strcmp(a_genfscon->path_str, "/") == 0)
-+                bypass = 1;
-+        }
- 		if(bypass == 1) {
- 			fprintf(stderr, "Received conflicting %s vs %s but ignore\n", a_genfscon->path_str, b_genfscon->path_str);
- 			return 0;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch b/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
deleted file mode 100644
index 504f9a87..00000000
--- a/patches/trebledroid/platform_external_selinux/0007-Fix-boot-on-Moto-devices-using-unknown-class.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From cb4c6918dc57ada33799b5973e96a42d2138a8ed Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 25 Oct 2019 13:29:20 +0200
-Subject: [PATCH 07/10] Fix boot on Moto devices using unknown class
-
-vendor sepolicy never contains new class or classorder, and are not
-allowed to.
-Though this is not tested, and it turns out Moto did it anyway.
-This raises an issue, because class need to be ordered, and thus the cil
-contains the ordering. This ordering needs to be merged.
-Android 10 added new classes, so the ordering can no longer be merged,
-and secilc fails on those devices, preventing boot.
-
-Considering vendor are not supposed to declare new class (and thus
-declare classorder), this fix ignores class-es/classorder in vendor
-SELinux policy.
-
-Since the vendor selinux policy has allows rules based on this context,
-those allows will fail since the class doesn't exist.
-Workaround this by ignoring rules with the problematic class
-( keystore_moto_key )
-
-Lucky us, this new class `keystore_moto_key` is used by Moto for
-framework to framework (more accurately priv app to keymaster), since
-our own framework doesn't use this class, simply ignoring it fixes the
-issue.
-
-Change-Id: I66339857634ebfdba359f12a99dfd0bff709d80b
----
- libsepol/cil/src/cil_build_ast.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
-index 118de1f5..77e130d1 100644
---- a/libsepol/cil/src/cil_build_ast.c
-+++ b/libsepol/cil/src/cil_build_ast.c
-@@ -462,6 +462,14 @@ int cil_gen_class(struct cil_db *db, struct cil_tree_node *parse_current, struct
- 	struct cil_tree_node *perms = NULL;
- 	int rc = SEPOL_ERR;
- 
-+    {
-+        const char* path = cil_tree_get_cil_path(parse_current);
-+        if(strstr(path, "vendor/")) {
-+            cil_clear_node(ast_node);
-+            return SEPOL_OK;
-+        }
-+    }
-+
- 	rc = __cil_verify_syntax(parse_current, syntax, syntax_len);
- 	if (rc != SEPOL_OK) {
- 		goto exit;
-@@ -530,6 +538,14 @@ int cil_gen_classorder(struct cil_db *db, struct cil_tree_node *parse_current, s
- 	struct cil_list_item *head = NULL;
- 	int rc = SEPOL_ERR;
- 
-+    {
-+        const char* path = cil_tree_get_cil_path(parse_current);
-+        if(strstr(path, "vendor/")) {
-+            cil_clear_node(ast_node);
-+            return SEPOL_OK;
-+        }
-+    }
-+
- 	if (db == NULL || parse_current == NULL || ast_node == NULL) {
- 		goto exit;
- 	}
-@@ -2115,6 +2131,14 @@ int cil_gen_avrule(struct cil_tree_node *parse_current, struct cil_tree_node *as
- 	rule->src_str = parse_current->next->data;
- 	rule->tgt_str = parse_current->next->next->data;
- 
-+    {
-+        const char *classname = parse_current->next->next->next->cl_head->data;
-+        if(strcmp(classname, "keystore_moto_key") == 0) {
-+            cil_clear_node(ast_node);
-+            return SEPOL_OK;
-+        }
-+    }
-+
- 	rc = cil_fill_classperms_list(parse_current->next->next->next, &rule->perms.classperms);
- 	if (rc != SEPOL_OK) {
- 		goto exit;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch b/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
deleted file mode 100644
index 8918f3b1..00000000
--- a/patches/trebledroid/platform_external_selinux/0008-Improve-SELinux-policy-workaround-on-device-phh-treb.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ce0f8fed3ff7e9ca42d0da8aea4ec9903d57435e Mon Sep 17 00:00:00 2001
-From: ponces <ponces26@gmail.com>
-Date: Mon, 7 Nov 2022 16:14:20 +0000
-Subject: [PATCH 08/10] Improve SELinux policy workaround on device/phh/treble
- conflict to exit with SEPOL_OK instead of SEPOL_EEXIST
-
-This fixes boot on many Samsung devices as exiting with SEPOL_EEXIST will prevent them to boot
----
- libsepol/cil/src/cil_build_ast.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
-index 77e130d1..daf8b8b3 100644
---- a/libsepol/cil/src/cil_build_ast.c
-+++ b/libsepol/cil/src/cil_build_ast.c
-@@ -141,7 +141,6 @@ int cil_add_decl_to_symtab(struct cil_db *db, symtab_t *symtab, hashtab_key_t ke
- 		/* multiple_decls is enabled and works for this datum type, add node */
- 		cil_list_append(prev->nodes, CIL_NODE, node);
- 		node->data = prev;
--		return SEPOL_EEXIST;
- 	}
- 
- 	return SEPOL_OK;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch b/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch
deleted file mode 100644
index 47b0de4f..00000000
--- a/patches/trebledroid/platform_external_selinux/0009-Allow-sys-vm-watermark_scale_factor-conflict-seen-on.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From daf8cded81349ec4f151861cd793139adb5eda4f Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 20 Jul 2023 14:21:21 -0400
-Subject: [PATCH 09/10] Allow /sys/vm/watermark_scale_factor conflict -- seen
- on Freebox Player Pop
-
----
- libsepol/cil/src/cil_post.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
-index 7f614c03..1703b3b6 100644
---- a/libsepol/cil/src/cil_post.c
-+++ b/libsepol/cil/src/cil_post.c
-@@ -502,6 +502,15 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b)
- 		 */
- 		if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0)
- 			bypass = 1;
-+        /*
-+         * This conflict has been seen on Freebox Player Pop
-+         * - AOSP T says (genfscon proc "/sys/vm/watermark_scale_factor" (u object_r proc_watermark_scale_factor ((s0) (s0))))
-+         * - stock rom says proc_vm_writable
-+         *
-+         * Stock ROM uses it only in recovery so it's safe to ignore
-+         */
-+		if(strcmp(a_genfscon->path_str, "/sys/vm/watermark_scale_factor") == 0)
-+			bypass = 1;
- 		if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) {
-             if(strcmp(a_genfscon->path_str, "/") == 0)
-                 bypass = 1;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch b/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch
deleted file mode 100644
index 55d6d620..00000000
--- a/patches/trebledroid/platform_external_selinux/0010-Allow-conflict-on-fuseblk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6fe4ae3a8172443330a4a4c48fd6f05a02975a7c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 08:49:59 -0400
-Subject: [PATCH 10/10] Allow conflict on fuseblk
-
----
- libsepol/cil/src/cil_post.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
-index 1703b3b6..5428005d 100644
---- a/libsepol/cil/src/cil_post.c
-+++ b/libsepol/cil/src/cil_post.c
-@@ -511,7 +511,7 @@ static int cil_post_genfscon_context_compare(const void *a, const void *b)
-          */
- 		if(strcmp(a_genfscon->path_str, "/sys/vm/watermark_scale_factor") == 0)
- 			bypass = 1;
--		if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) {
-+		if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0 || strcmp(a_genfscon->fs_str, "fuseblk") == 0) {
-             if(strcmp(a_genfscon->path_str, "/") == 0)
-                 bypass = 1;
-         }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch b/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
deleted file mode 100644
index 19601312..00000000
--- a/patches/trebledroid/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-From db3527b0b30cbce4872e2e80204cb845e3292b60 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Thu, 18 Aug 2022 15:44:46 -0400
-Subject: [PATCH 01/24] APM: Restore S, R and Q behavior respectively for
- telephony audio
-
-This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)
-when the VNDK version is equal to or before S, R and Q respectively.
-
-On R, commit afd4ce made it so that both HW and SW bridging go through
-`createAudioPatch()`, which is broken on some devices such as on MTK Q
-vendor, because their HAL do not support HW patching via the newer
-`createAudioPatch()` method. Instead, the patching on Q was done through
-`setOutputDevices()`.
-
-On S, commit 51c9cc refactored the related code again such that HW
-bridging for the Rx direction is essentially removed, replaced with SW
-bridging through `startAudioSource()`. This is, again, broken on MTK R
-vendor devices.
-
-On T, commit b2e5cb applied the same SW bridging to the Tx direction.
-
-All of these commits rely on assumptions that are not tested through
-VTS and just presumed to be true. Although we can blame MTK for not
-supporting all the possible cases in their HAL, it will not fix
-anything, and really frameworks code should not depend on such untested
-assumptions.
-
-To work around said issues, we restore old behavior from S, R and Q
-relying on the value of `ro.vndk.version`.
-
-Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
----
- .../managerdefault/AudioPolicyManager.cpp     | 206 ++++++++++++------
- .../managerdefault/AudioPolicyManager.h       |   3 +
- 2 files changed, 147 insertions(+), 62 deletions(-)
-
-diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-index 3bebb1134a..1823522fe2 100644
---- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
-@@ -699,6 +699,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
-     ALOGV("%s device rxDevice %s txDevice %s", __func__,
-           rxDevices.itemAt(0)->toString().c_str(), txSourceDevice->toString().c_str());
- 
-+    // release existing RX patch if any
-+    if (mCallRxPatch != 0) {
-+        releaseAudioPatchInternal(mCallRxPatch->getHandle());
-+        mCallRxPatch.clear();
-+    }
-+    // release TX patch if any
-+    if (mCallTxPatch != 0) {
-+        releaseAudioPatchInternal(mCallTxPatch->getHandle());
-+        mCallTxPatch.clear();
-+    }
-+
-     auto telephonyRxModule =
-         mHwModules.getModuleForDeviceType(AUDIO_DEVICE_IN_TELEPHONY_RX, AUDIO_FORMAT_DEFAULT);
-     auto telephonyTxModule =
-@@ -721,9 +732,20 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
-             ALOGE("%s() no telephony Tx and/or RX device", __func__);
-             return INVALID_OPERATION;
-         }
--        // createAudioPatchInternal now supports both HW / SW bridging
--        createRxPatch = true;
--        createTxPatch = true;
-+        if (property_get_int32("ro.vndk.version", 31) >= 30) {
-+            // createAudioPatchInternal now supports both HW / SW bridging
-+            createRxPatch = true;
-+            createTxPatch = true;
-+        } else {
-+            // pre-R behavior: some devices before VNDK 30 do not support createAudioPatch correctly
-+            // for HW bridging even though they declare support for it
-+            // do not create a patch (aka Sw Bridging) if Primary HW module has declared supporting a
-+            // route between telephony RX to Sink device and Source device to telephony TX
-+            ALOGI("%s() Using pre-R behavior for createRxPatch and createTxPatch", __func__);
-+            const auto &primaryModule = telephonyRxModule;
-+            createRxPatch = !primaryModule->supportsPatch(rxSourceDevice, rxDevices.itemAt(0));
-+            createTxPatch = !primaryModule->supportsPatch(txSourceDevice, txSinkDevice);
-+        }
-     } else {
-         // If the RX device is on the primary HW module, then use legacy routing method for
-         // voice calls via setOutputDevice() on primary output.
-@@ -744,7 +766,14 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
-         }
-         muteWaitMs = setOutputDevices(__func__, mPrimaryOutput, rxDevices, true, delayMs);
-     } else { // create RX path audio patch
--        connectTelephonyRxAudioSource();
-+        if (property_get_int32("ro.vndk.version", 31) >= 31) {
-+            connectTelephonyRxAudioSource();
-+        } else {
-+            // pre-S behavior: some devices do not support SW bridging correctly when HW bridge is
-+            // available through createAudioPatch(); startAudioSource() forces SW bridging.
-+            ALOGI("%s() Using pre-S behavior to create HW Rx patch", __func__);
-+            mCallRxPatch = createTelephonyPatch(true /*isRx*/, rxDevices.itemAt(0), delayMs);
-+        }
-         // If the TX device is on the primary HW module but RX device is
-         // on other HW module, SinkMetaData of telephony input should handle it
-         // assuming the device uses audio HAL V5.0 and above
-@@ -759,7 +788,12 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
-                 closeActiveClients(activeDesc);
-             }
-         }
--        connectTelephonyTxAudioSource(txSourceDevice, txSinkDevice, delayMs);
-+        if (property_get_int32("ro.vndk.version", 33) >= 33) {
-+            connectTelephonyTxAudioSource(txSourceDevice, txSinkDevice, delayMs);
-+        } else {
-+            // pre-T behavior: hw bridging for tx too; skip the SwOutput
-+            mCallTxPatch = createTelephonyPatch(false /*isRx*/, txSourceDevice, delayMs);
-+        }
-     }
-     if (waitMs != nullptr) {
-         *waitMs = muteWaitMs;
-@@ -767,6 +801,36 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
-     return NO_ERROR;
- }
- 
-+sp<AudioPatch> AudioPolicyManager::createTelephonyPatch(
-+        bool isRx, const sp<DeviceDescriptor> &device, uint32_t delayMs) {
-+    PatchBuilder patchBuilder;
-+
-+    if (device == nullptr) {
-+        return nullptr;
-+    }
-+
-+    // @TODO: still ignoring the address, or not dealing platform with multiple telephony devices
-+    if (isRx) {
-+        patchBuilder.addSink(device).
-+                addSource(mAvailableInputDevices.getDevice(
-+                    AUDIO_DEVICE_IN_TELEPHONY_RX, String8(), AUDIO_FORMAT_DEFAULT));
-+    } else {
-+        patchBuilder.addSource(device).
-+                addSink(mAvailableOutputDevices.getDevice(
-+                    AUDIO_DEVICE_OUT_TELEPHONY_TX, String8(), AUDIO_FORMAT_DEFAULT));
-+    }
-+
-+    audio_patch_handle_t patchHandle = AUDIO_PATCH_HANDLE_NONE;
-+    status_t status =
-+            createAudioPatchInternal(patchBuilder.patch(), &patchHandle, mUidCached, delayMs, nullptr);
-+    ssize_t index = mAudioPatches.indexOfKey(patchHandle);
-+    if (status != NO_ERROR || index < 0) {
-+        ALOGW("%s() error %d creating %s audio patch", __func__, status, isRx ? "RX" : "TX");
-+        return nullptr;
-+    }
-+    return mAudioPatches.valueAt(index);
-+}
-+
- bool AudioPolicyManager::isDeviceOfModule(
-         const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
-     sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
-@@ -5192,83 +5256,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
-                 // in config XML to reach the sink so that is can be declared as available.
-                 audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
-                 sp<SwAudioOutputDescriptor> outputDesc;
--                if (!sourceDesc->isInternal()) {
--                    // take care of dynamic routing for SwOutput selection,
--                    audio_attributes_t attributes = sourceDesc->attributes();
--                    audio_stream_type_t stream = sourceDesc->stream();
--                    audio_attributes_t resultAttr;
--                    audio_config_t config = AUDIO_CONFIG_INITIALIZER;
--                    config.sample_rate = sourceDesc->config().sample_rate;
--                    audio_channel_mask_t sourceMask = sourceDesc->config().channel_mask;
--                    config.channel_mask =
--                            (audio_channel_mask_get_representation(sourceMask)
--                                == AUDIO_CHANNEL_REPRESENTATION_INDEX) ? sourceMask
--                                    : audio_channel_mask_in_to_out(sourceMask);
--                    config.format = sourceDesc->config().format;
--                    audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;
--                    audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE;
--                    bool isRequestedDeviceForExclusiveUse = false;
--                    output_type_t outputType;
--                    bool isSpatialized;
--                    bool isBitPerfect;
--                    getOutputForAttrInt(&resultAttr, &output, AUDIO_SESSION_NONE, &attributes,
--                                        &stream, sourceDesc->uid(), &config, &flags,
--                                        &selectedDeviceId, &isRequestedDeviceForExclusiveUse,
--                                        nullptr, &outputType, &isSpatialized, &isBitPerfect);
--                    if (output == AUDIO_IO_HANDLE_NONE) {
--                        ALOGV("%s no output for device %s",
--                              __FUNCTION__, sinkDevice->toString().c_str());
--                        return INVALID_OPERATION;
--                    }
--                    outputDesc = mOutputs.valueFor(output);
--                    if (outputDesc->isDuplicated()) {
--                        ALOGE("%s output is duplicated", __func__);
--                        return INVALID_OPERATION;
--                    }
--                    bool closeOutput = outputDesc->mDirectOpenCount != 0;
--                    sourceDesc->setSwOutput(outputDesc, closeOutput);
--                } else {
--                    // Same for "raw patches" aka created from createAudioPatch API
--                    SortedVector<audio_io_handle_t> outputs =
--                            getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
--                    // if the sink device is reachable via an opened output stream, request to
--                    // go via this output stream by adding a second source to the patch
--                    // description
--                    output = selectOutput(outputs);
--                    if (output == AUDIO_IO_HANDLE_NONE) {
--                        ALOGE("%s no output available for internal patch sink", __func__);
--                        return INVALID_OPERATION;
--                    }
--                    outputDesc = mOutputs.valueFor(output);
--                    if (outputDesc->isDuplicated()) {
--                        ALOGV("%s output for device %s is duplicated",
--                              __func__, sinkDevice->toString().c_str());
--                        return INVALID_OPERATION;
-+                if (sourceDesc != nullptr) {
-+                    if (!sourceDesc->isInternal()) {
-+                        // take care of dynamic routing for SwOutput selection,
-+                        audio_attributes_t attributes = sourceDesc->attributes();
-+                        audio_stream_type_t stream = sourceDesc->stream();
-+                        audio_attributes_t resultAttr;
-+                        audio_config_t config = AUDIO_CONFIG_INITIALIZER;
-+                        config.sample_rate = sourceDesc->config().sample_rate;
-+                        audio_channel_mask_t sourceMask = sourceDesc->config().channel_mask;
-+                        config.channel_mask =
-+                                (audio_channel_mask_get_representation(sourceMask)
-+                                    == AUDIO_CHANNEL_REPRESENTATION_INDEX) ? sourceMask
-+                                        : audio_channel_mask_in_to_out(sourceMask);
-+                        config.format = sourceDesc->config().format;
-+                        audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;
-+                        audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE;
-+                        bool isRequestedDeviceForExclusiveUse = false;
-+                        output_type_t outputType;
-+                        bool isSpatialized;
-+                        bool isBitPerfect;
-+                        getOutputForAttrInt(&resultAttr, &output, AUDIO_SESSION_NONE, &attributes,
-+                                            &stream, sourceDesc->uid(), &config, &flags,
-+                                            &selectedDeviceId, &isRequestedDeviceForExclusiveUse,
-+                                            nullptr, &outputType, &isSpatialized, &isBitPerfect);
-+                        if (output == AUDIO_IO_HANDLE_NONE) {
-+                            ALOGV("%s no output for device %s",
-+                                  __FUNCTION__, sinkDevice->toString().c_str());
-+                            return INVALID_OPERATION;
-+                        }
-+                        outputDesc = mOutputs.valueFor(output);
-+                        if (outputDesc->isDuplicated()) {
-+                            ALOGE("%s output is duplicated", __func__);
-+                            return INVALID_OPERATION;
-+                        }
-+                        bool closeOutput = outputDesc->mDirectOpenCount != 0;
-+                        sourceDesc->setSwOutput(outputDesc, closeOutput);
-+                    } else {
-+                        // Same for "raw patches" aka created from createAudioPatch API
-+                        SortedVector<audio_io_handle_t> outputs =
-+                                getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
-+                        // if the sink device is reachable via an opened output stream, request to
-+                        // go via this output stream by adding a second source to the patch
-+                        // description
-+                        output = selectOutput(outputs);
-+                        if (output == AUDIO_IO_HANDLE_NONE) {
-+                            ALOGE("%s no output available for internal patch sink", __func__);
-+                            return INVALID_OPERATION;
-+                        }
-+                        outputDesc = mOutputs.valueFor(output);
-+                        if (outputDesc->isDuplicated()) {
-+                            ALOGV("%s output for device %s is duplicated",
-+                                  __func__, sinkDevice->toString().c_str());
-+                            return INVALID_OPERATION;
-+                        }
-                     }
--                    sourceDesc->setSwOutput(outputDesc, /* closeOutput= */ false);
-                 }
-                 // create a software bridge in PatchPanel if:
-                 // - source and sink devices are on different HW modules OR
-                 // - audio HAL version is < 3.0
-                 // - audio HAL version is >= 3.0 but no route has been declared between devices
--                // - called from startAudioSource (aka sourceDesc is not internal) and source device
-+                // - called from startAudioSource (aka sourceDesc is neither null nor internal) and source device
-                 //   does not have a gain controller
-                 if (!srcDevice->hasSameHwModuleAs(sinkDevice) ||
-                         (srcDevice->getModuleVersionMajor() < 3) ||
-                         !srcDevice->getModule()->supportsPatch(srcDevice, sinkDevice) ||
--                        (!sourceDesc->isInternal() &&
-+                        ((sourceDesc != nullptr && !sourceDesc->isInternal()) &&
-                          srcDevice->getAudioPort()->getGains().size() == 0)) {
-                     // support only one sink device for now to simplify output selection logic
-                     if (patch->num_sinks > 1) {
-                         return INVALID_OPERATION;
-                     }
--                    sourceDesc->setUseSwBridge();
-+                    if (sourceDesc == nullptr) {
-+                        SortedVector<audio_io_handle_t> outputs =
-+                                getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
-+                        // if the sink device is reachable via an opened output stream, request to
-+                        // go via this output stream by adding a second source to the patch
-+                        // description
-+                        output = selectOutput(outputs);
-+                        if (output != AUDIO_IO_HANDLE_NONE) {
-+                            outputDesc = mOutputs.valueFor(output);
-+                            if (outputDesc->isDuplicated()) {
-+                                ALOGV("%s output for device %s is duplicated",
-+                                      __FUNCTION__, sinkDevice->toString().c_str());
-+                                return INVALID_OPERATION;
-+                            }
-+                        }
-+                    } else {
-+                        sourceDesc->setUseSwBridge();
-+                    }
-                     if (outputDesc != nullptr) {
-                         audio_port_config srcMixPortConfig = {};
-                         outputDesc->toAudioPortConfig(&srcMixPortConfig, nullptr);
-                         // for volume control, we may need a valid stream
-                         srcMixPortConfig.ext.mix.usecase.stream =
--                            (!sourceDesc->isInternal() || isCallTxAudioSource(sourceDesc)) ?
-+                            (sourceDesc != nullptr && (!sourceDesc->isInternal() || isCallTxAudioSource(sourceDesc))) ?
-                                     mEngine->getStreamTypeForAttributes(sourceDesc->attributes()) :
-                                     AUDIO_STREAM_PATCH;
-                         patchBuilder.addSource(srcMixPortConfig);
-diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-index a3232a2d40..cc2cf50688 100644
---- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
-+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
-@@ -980,6 +980,9 @@ protected:
- 
-         SoundTriggerSessionCollection mSoundTriggerSessions;
- 
-+        sp<AudioPatch> mCallTxPatch;
-+        sp<AudioPatch> mCallRxPatch;
-+
-         HwAudioOutputCollection mHwOutputs;
-         SourceClientCollection mAudioSources;
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch b/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
deleted file mode 100644
index d8385c62..00000000
--- a/patches/trebledroid/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From ba1af8b786870343392d82fac8cde1f251f5cdce Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 02/24] Fix BT in-call on CAF devices
-
-See https://github.com/phhusson/treble_experimentations/issues/374
-
-In Qualcomm's BSP audio_policy_configuration.xml, one route is missing,
-from primary output and telephony to BT SCO.
-
-Add it if we detect telephony and bt sco, but no such route.
-
-Change-Id: Ifea0f88276ec9a0811f3cb1973c4b06f2c82077b
----
- .../managerdefinitions/src/Serializer.cpp     | 93 +++++++++++++++++++
- 1 file changed, 93 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 6f19a7a145..1ab472f396 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -667,6 +667,98 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-     return route;
- }
- 
-+static void fixupQualcommBtScoRoute(RouteTraits::Collection& routes, DevicePortTraits::Collection& devicePorts, HwModule* ctx) {
-+    // On many Qualcomm devices, there is a BT SCO Headset Mic => primary input mix
-+    // But Telephony Rx => BT SCO Headset route is missing
-+    // When we detect such case, add the missing route
-+
-+    // If we have:
-+    // <route type="mix" sink="Telephony Tx" sources="voice_tx"/>
-+    // <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/>
-+    // <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink" />
-+    // And no <route type="mix" sink="BT SCO Headset" />
-+
-+    // Add:
-+    // <route type="mix" sink="BT SCO Headset" sources="primary output,deep_buffer,compressed_offload,Telephony Rx"/>
-+    bool foundBtScoHeadsetDevice = false;
-+    for(const auto& device: devicePorts) {
-+        if(device->getTagName() == "BT SCO Headset") {
-+            foundBtScoHeadsetDevice = true;
-+            break;
-+        }
-+    }
-+    if(!foundBtScoHeadsetDevice) {
-+        ALOGE("No BT SCO Headset device found, don't patch policy");
-+        return;
-+    }
-+
-+    bool foundTelephony = false;
-+    bool foundBtScoInput = false;
-+    bool foundScoHeadsetRoute = false;
-+    for(const auto& route: routes) {
-+        ALOGE("Looking at route %d\n", route->getType());
-+        if(route->getType() != AUDIO_ROUTE_MIX)
-+            continue;
-+        auto sink = route->getSink();
-+        ALOGE("... With sink %s\n", sink->getTagName().c_str());
-+        if(sink->getTagName() == "Telephony Tx") {
-+            foundTelephony = true;
-+            continue;
-+        }
-+        if(sink->getTagName() == "BT SCO Headset") {
-+            foundScoHeadsetRoute = true;
-+            break;
-+        }
-+        for(const auto& source: route->getSources()) {
-+            ALOGE("... With source %s\n", source->getTagName().c_str());
-+            if(source->getTagName() == "BT SCO Headset Mic") {
-+                foundBtScoInput = true;
-+                break;
-+            }
-+        }
-+    }
-+    //The route we want to add is already there
-+    ALOGE("Done looking for existing routes");
-+    if(foundScoHeadsetRoute)
-+        return;
-+
-+    ALOGE("No existing route found... %d %d", foundTelephony ? 1 : 0, foundBtScoInput ? 1 : 0);
-+    //We couldn't find the routes we assume are required for the function we want to add
-+    if(!foundTelephony || !foundBtScoInput)
-+        return;
-+    ALOGE("Adding our own.");
-+
-+    // Add:
-+    // <route type="mix" sink="BT SCO Headset" sources="primary output,deep_buffer,compressed_offload,Telephony Rx"/>
-+    AudioRoute *newRoute = new AudioRoute(AUDIO_ROUTE_MIX);
-+
-+    auto sink = ctx->findPortByTagName("BT SCO Headset");
-+    ALOGE("Got sink %p\n", sink.get());
-+    newRoute->setSink(sink);
-+
-+    Vector<sp<PolicyAudioPort>> sources;
-+    for(const auto& sourceName: {
-+            "primary output",
-+            "deep_buffer",
-+            "compressed_offload",
-+            "Telephony Rx"
-+            }) {
-+        auto source = ctx->findPortByTagName(sourceName);
-+        ALOGE("Got source %p\n", source.get());
-+        if (source.get() != nullptr) {
-+            sources.add(source);
-+            source->addRoute(newRoute);
-+        }
-+    }
-+
-+    newRoute->setSources(sources);
-+
-+    sink->addRoute(newRoute);
-+
-+    auto ret = routes.add(newRoute);
-+    ALOGE("route add returned %zd", ret);
-+}
-+
- template<>
- std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<ModuleTraits>(
-         const xmlNode *cur, ModuleTraits::PtrSerializingCtx ctx)
-@@ -714,6 +806,7 @@ std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<Modu
-     if (status != NO_ERROR) {
-         return status;
-     }
-+    fixupQualcommBtScoRoute(routes, devicePorts, module.get());
-     module->setRoutes(routes);
- 
-     for (const xmlNode *children = cur->xmlChildrenNode; children != NULL;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch b/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
deleted file mode 100644
index 935160e1..00000000
--- a/patches/trebledroid/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From dfaaee97088144d2058dbaec07fc003dff576593 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 1 Oct 2019 13:35:49 +0200
-Subject: [PATCH 03/24] Add (partial, cam id is hardcoded) support for Asus ZF6
- motor camera
-
-Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
----
- .../camera/libcameraservice/CameraService.cpp | 26 +++++++++++++++++++
- .../camera/libcameraservice/CameraService.h   |  3 +++
- 2 files changed, 29 insertions(+)
-
-diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
-index 2d55f39b25..1e4001be1c 100644
---- a/services/camera/libcameraservice/CameraService.cpp
-+++ b/services/camera/libcameraservice/CameraService.cpp
-@@ -28,6 +28,7 @@
- #include <sstream>
- #include <string>
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <inttypes.h>
- #include <pthread.h>
- #include <poll.h>
-@@ -159,6 +160,7 @@ static std::set<std::string> sServiceErrorEventSet;
- 
- CameraService::CameraService(
-         std::shared_ptr<CameraServiceProxyWrapper> cameraServiceProxyWrapper) :
-+        mPhysicalFrontCamStatus(false),
-         mCameraServiceProxyWrapper(cameraServiceProxyWrapper == nullptr ?
-                 std::make_shared<CameraServiceProxyWrapper>() : cameraServiceProxyWrapper),
-         mEventLog(DEFAULT_EVENT_LOG_LENGTH),
-@@ -2743,6 +2745,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
-             mServiceLock.lock();
-         } else {
-             // Otherwise, add client to active clients list
-+            physicalFrontCam(cameraId == "1");
-             finishConnectLocked(client, partial, oomScoreOffset, systemNativeClient);
-         }
- 
-@@ -2869,6 +2872,27 @@ status_t CameraService::addOfflineClient(const std::string &cameraId,
-     return OK;
- }
- 
-+void CameraService::physicalFrontCam(bool on) {
-+    if(on == mPhysicalFrontCamStatus) return;
-+    mPhysicalFrontCamStatus = on;
-+
-+    if(access("/dev/asusMotoDrv", F_OK) == 0) {
-+        int pid = fork();
-+        if(pid == 0) {
-+            const char* cmd[] = {
-+                "/system/bin/asus-motor",
-+                "0",
-+                NULL
-+            };
-+            cmd[1] = on ? "0" : "1";
-+            execve("/system/bin/asus-motor", (char**)cmd, environ);
-+            _exit(1);
-+        } else {
-+            waitpid(pid, NULL, 0);
-+        }
-+    }
-+}
-+
- Status CameraService::turnOnTorchWithStrengthLevel(const std::string& unresolvedCameraId,
-         int32_t torchStrength, const sp<IBinder>& clientBinder) {
-     Mutex::Autolock lock(mServiceLock);
-@@ -4138,6 +4162,8 @@ binder::Status CameraService::BasicClient::disconnect() {
-     }
-     mDisconnected = true;
- 
-+    sCameraService->physicalFrontCam(false);
-+
-     sCameraService->removeByClient(this);
-     sCameraService->logDisconnected(mCameraIdStr, mClientPid, mClientPackageName);
-     sCameraService->mCameraProviderManager->removeRef(CameraProviderManager::DeviceMode::CAMERA,
-diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
-index 8822cd37cf..e2c38a9096 100644
---- a/services/camera/libcameraservice/CameraService.h
-+++ b/services/camera/libcameraservice/CameraService.h
-@@ -276,6 +276,9 @@ public:
-     // Register an offline client for a given active camera id
-     status_t addOfflineClient(const std::string &cameraId, sp<BasicClient> offlineClient);
- 
-+    bool mPhysicalFrontCamStatus;
-+    void physicalFrontCam(bool on);
-+
-     /////////////////////////////////////////////////////////////////////
-     // Client functionality
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch b/patches/trebledroid/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch
deleted file mode 100644
index 88a8729c..00000000
--- a/patches/trebledroid/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 85fd011d544cfc03442f6a8ed60f80d9e0c228f3 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 24 Aug 2022 15:42:39 -0400
-Subject: [PATCH 04/24] APM: Optionally force-load audio policy for system-side
- bt audio HAL
-
-Required to support our system-side bt audio implementation, i.e.
-`sysbta`.
-
-Co-authored-by: Pierre-Hugues Husson <phh@phh.me>
-Change-Id: I279fff541a531f922f3fa55b8f14d00237db59ff
----
- .../managerdefinitions/src/Serializer.cpp     | 25 +++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 1ab472f396..29d36ca00b 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -25,6 +25,7 @@
- #include <libxml/parser.h>
- #include <libxml/xinclude.h>
- #include <media/convert.h>
-+#include <cutils/properties.h>
- #include <utils/Log.h>
- #include <utils/StrongPointer.h>
- #include <utils/Errors.h>
-@@ -988,6 +989,30 @@ status_t PolicySerializer::deserialize(const char *configFile, AudioPolicyConfig
-     if (status != NO_ERROR) {
-         return status;
-     }
-+
-+   // Remove modules called bluetooth, bluetooth_qti or a2dp, and inject our own
-+    if (property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)) {
-+	    for (auto it = modules.begin(); it != modules.end(); it++) {
-+		    const char *name = (*it)->getName();
-+		    if (strcmp(name, "a2dp") == 0 ||
-+				    strcmp(name, "a2dpsink") == 0 ||
-+				    strcmp(name, "bluetooth") == 0 ||
-+				    strcmp(name, "bluetooth_qti") == 0) {
-+
-+			    ALOGE("Removed module %s\n", name);
-+			    it = modules.erase(it);
-+		    }
-+		    if (it == modules.end()) break;
-+	    }
-+	    const char* a2dpFileName = "/system/etc/sysbta_audio_policy_configuration.xml";
-+	    if (version == "7.0")
-+		    a2dpFileName = "/system/etc/sysbta_audio_policy_configuration_7_0.xml";
-+	    auto doc = make_xmlUnique(xmlParseFile(a2dpFileName));
-+	    xmlNodePtr root = xmlDocGetRootElement(doc.get());
-+	    auto maybeA2dpModule = deserialize<ModuleTraits>(root, config);
-+	    modules.add(std::get<1>(maybeA2dpModule));
-+    }
-+
-     config->setHwModules(modules);
- 
-     // Global Configuration
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch b/patches/trebledroid/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
deleted file mode 100644
index 536e3699..00000000
--- a/patches/trebledroid/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From ea43231276b613f5e02c155ca11846108e6a2df5 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Thu, 25 Aug 2022 13:30:29 -0400
-Subject: [PATCH 05/24] APM: Remove A2DP audio ports from the primary HAL
-
-These ports defined in the primary HAL are intended for A2DP offloading,
-however they do not work in general on GSIs, and will interfere with
-sysbta, the system-side generic bluetooth audio implementation.
-
-Remove them as we parse the policy XML.
-
-Co-authored-by: Pierre-Hugues Husson <phh@phh.me>
-Change-Id: I3305594a17285da113167b419543543f0ef71122
----
- .../managerdefinitions/src/Serializer.cpp     | 26 ++++++++++++++++---
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 29d36ca00b..839974b9d3 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -26,6 +26,7 @@
- #include <libxml/xinclude.h>
- #include <media/convert.h>
- #include <cutils/properties.h>
-+#include <system/audio.h>
- #include <utils/Log.h>
- #include <utils/StrongPointer.h>
- #include <utils/Errors.h>
-@@ -334,11 +335,8 @@ status_t PolicySerializer::deserializeCollection(const xmlNode *cur,
-                             Trait::collectionTag);
-                         return status;
-                     }
--                } else if (mIgnoreVendorExtensions && std::get<status_t>(maybeElement) == NO_INIT) {
--                    // Skip a vendor extension element.
--                } else {
--                    return BAD_VALUE;
-                 }
-+                // Ignore elements that failed to parse, e.g. routes with invalid sinks
-             }
-         }
-         if (!xmlStrcmp(cur->name, reinterpret_cast<const xmlChar*>(Trait::tag))) {
-@@ -775,6 +773,7 @@ std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<Modu
-         ALOGE("%s: No %s found", __func__, Attributes::name);
-         return BAD_VALUE;
-     }
-+
-     uint32_t versionMajor = 0, versionMinor = 0;
-     std::string versionLiteral = getXmlAttribute(cur, Attributes::version);
-     if (!versionLiteral.empty()) {
-@@ -800,6 +799,25 @@ std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<Modu
-     if (status != NO_ERROR) {
-         return status;
-     }
-+    bool shouldEraseA2DP = name == "primary" && property_get_bool("persist.bluetooth.system_audio_hal.enabled", false);
-+    if (shouldEraseA2DP) {
-+        // Having A2DP ports in the primary audio HAL module will interfere with sysbta
-+        // so remove them here. Note that we do not need to explicitly remove the
-+        // corresponding routes below, because routes with invalid sinks will be ignored
-+        auto iter = devicePorts.begin();
-+        while (iter != devicePorts.end()) {
-+            auto port = *iter;
-+            auto type = port->type();
-+            if (type == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP
-+                    || type == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES
-+                    || type == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER) {
-+                ALOGE("Erasing A2DP device port %s", port->getTagName().c_str());
-+                iter = devicePorts.erase(iter);
-+            } else {
-+                iter++;
-+            }
-+        }
-+    }
-     module->setDeclaredDevices(devicePorts);
- 
-     RouteTraits::Collection routes;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch b/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
deleted file mode 100644
index b82b26c6..00000000
--- a/patches/trebledroid/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 46c8c5d31dec2ed5bab1f4fb16c172560ac1072c Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 06/24] audiopolicy: try again with trimmed audio port name if
- not found
-
-* In Spreadtrum BSP, some audio routes may contain ports with extra
-  spaces at the beginning and the end, causing audiopolicy to refuse to
-  load and leading to broken audio.
-
-* Fix this by retrying with trimmed port name when not found. Do not
-  use trimmed name all the time because a white space is a valid
-  character in port name, and we cannot be sure nobody is using it for
-  legitimite purposes.
-
-Change-Id: I993708b28e8404bc8c483d71a850ac69382231bd
----
- .../common/managerdefinitions/src/Serializer.cpp   | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 839974b9d3..21d3282134 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -593,6 +593,17 @@ std::variant<status_t, DevicePortTraits::Element> PolicySerializer::deserialize<
-     return deviceDesc;
- }
- 
-+char* trim(char * s) {
-+    int l = strlen(s);
-+
-+    if (l > 0) {
-+      while (isspace(s[l - 1])) --l;
-+      while (*s && isspace(*s)) ++s, --l;
-+    }
-+
-+    return strndup(s, l);
-+}
-+
- template<>
- std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<RouteTraits>(
-         const xmlNode *cur, RouteTraits::PtrSerializingCtx ctx)
-@@ -642,6 +653,9 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-     while (devTag != NULL) {
-         if (strlen(devTag) != 0) {
-             sp<PolicyAudioPort> source = ctx->findPortByTagName(devTag);
-+            if (source == NULL) {
-+                source = ctx->findPortByTagName(trim(devTag));
-+            }
-             if (source == NULL) {
-                 if (!mIgnoreVendorExtensions) {
-                     ALOGE("%s: no source found with name \"%s\"", __func__, devTag);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch b/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
deleted file mode 100644
index 9235680e..00000000
--- a/patches/trebledroid/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 60a4a39afdd196e229363f0f5bb063b3bdedf2fc Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 1 Jun 2022 16:56:46 -0400
-Subject: [PATCH 07/24] camera: Implement property to override default camera
-
-Complement to the frameworks/base patch.
-
-Change-Id: I002bfa974bafc2cc01365eeea31c7a5dcb5a2028
----
- .../common/CameraProviderManager.cpp          | 22 +++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 15e2755a98..60e4eb7b42 100644
---- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
-+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-@@ -41,6 +41,7 @@
- #include <functional>
- #include <camera_metadata_hidden.h>
- #include <android-base/parseint.h>
-+#include <android-base/properties.h>
- #include <android-base/logging.h>
- #include <cutils/properties.h>
- #include <hwbinder/IPCThreadState.h>
-@@ -278,6 +279,15 @@ std::vector<std::string> CameraProviderManager::getCameraDeviceIds(std::unordere
-             }
-         }
-     }
-+
-+    int32_t altPrimaryCamera = property_get_int32("persist.sys.alt_primary_camera", 0);
-+
-+    if (altPrimaryCamera != 0 && deviceIds.size() > (size_t) altPrimaryCamera) {
-+        const std::string origPrimary = deviceIds[0];
-+        deviceIds[0] = deviceIds[altPrimaryCamera];
-+        deviceIds[altPrimaryCamera] = origPrimary;
-+    }
-+
-     return deviceIds;
- }
- 
-@@ -344,6 +354,18 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
-     std::sort(systemDeviceIds.begin(), systemDeviceIds.end(), sortFunc);
-     deviceIds.insert(deviceIds.end(), publicDeviceIds.begin(), publicDeviceIds.end());
-     deviceIds.insert(deviceIds.end(), systemDeviceIds.begin(), systemDeviceIds.end());
-+
-+    // Default camera ID hack should match with android.hardware.camera2.CameraManager.sortCameraIds
-+    // Note that the alt primary camera may not be available here due to filterLogicalCameraIdsLocked()
-+    // in which case we will just ignore it.
-+    int altPrimaryCameraId = base::GetIntProperty("persist.sys.alt_primary_camera", -1);
-+
-+    if (altPrimaryCameraId > 0 && altPrimaryCameraId < (int) deviceIds.size()) {
-+        std::string origPrimary = deviceIds[0];
-+        deviceIds[0] = deviceIds[altPrimaryCameraId];
-+        deviceIds[altPrimaryCameraId] = origPrimary;
-+    }
-+
-     return deviceIds;
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch b/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
deleted file mode 100644
index 8deac1e5..00000000
--- a/patches/trebledroid/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d9af5eff09ab05b8c81c52077e1017ef0c381aab Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 13 Apr 2020 21:01:16 +0200
-Subject: [PATCH 08/24] There are three SCO devices. Fallback from one to the
- others if needed
-
-Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
----
- .../managerdefinitions/src/HwModule.cpp       | 21 +++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
-index 6696b45f03..3ea185d873 100644
---- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
-@@ -321,6 +321,27 @@ sp<HwModule> HwModuleCollection::getModuleForDeviceType(audio_devices_t type,
-             }
-         }
-     }
-+    //We didn't find one? Ok but all SCOs are equivalent surely?
-+    if(type == AUDIO_DEVICE_OUT_BLUETOOTH_SCO ||
-+        type == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET ||
-+        type == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT) {
-+        ALOGE("Fallback SCO");
-+        if(type != AUDIO_DEVICE_OUT_BLUETOOTH_SCO) {
-+            auto ret = getModuleForDeviceType(AUDIO_DEVICE_OUT_BLUETOOTH_SCO, encodedFormat);
-+            ALOGE("Fallback SCO simple? %s", (ret != nullptr) ? "yes" : "no");
-+            if(ret != nullptr) return ret;
-+        }
-+        if(type != AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {
-+            auto ret = getModuleForDeviceType(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET, encodedFormat);
-+            ALOGE("Fallback SCO headset? %s", (ret != nullptr) ? "yes" : "no");
-+            if(ret != nullptr) return ret;
-+        }
-+        if(type != AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT) {
-+            auto ret = getModuleForDeviceType(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT, encodedFormat);
-+            ALOGE("Fallback SCO carkit? %s", (ret != nullptr) ? "yes" : "no");
-+            if(ret != nullptr) return ret;
-+        }
-+    }
-     return nullptr;
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch b/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
deleted file mode 100644
index c0c8d830..00000000
--- a/patches/trebledroid/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 33cf2cbf4575cb815b21a49dd19bae961f70c6b8 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 09/24] Add persist.sys.phh.samsung.camera_ids property to
- access hidden Samsung cameras
-
-Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
----
- services/camera/libcameraservice/Android.bp        |  1 +
- .../common/hidl/HidlProviderInfo.cpp               | 14 ++++++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index 5b76bb0c0f..2f574133c6 100644
---- a/services/camera/libcameraservice/Android.bp
-+++ b/services/camera/libcameraservice/Android.bp
-@@ -107,6 +107,7 @@ cc_defaults {
-         "android.hardware.camera.provider@2.6",
-         "android.hardware.camera.provider@2.7",
-         "android.hardware.camera.provider-V3-ndk",
-+        "vendor.samsung.hardware.camera.provider@3.0",
-         "libaidlcommonsupport",
-         "libbinderthreadstateutils",
-         "libcameraservice_device_independent",
-diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index 065f0c5569..1b22767779 100644
---- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-@@ -28,6 +28,7 @@
- #include <utils/Trace.h>
- 
- #include <android/hardware/camera/device/3.7/ICameraDevice.h>
-+#include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
- 
- namespace {
- const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
-@@ -136,6 +137,7 @@ status_t HidlProviderInfo::initializeHidlProvider(
-             mMinorVersion = 6;
-         }
-     }
-+
-     // We need to check again since cast2_6.isOk() succeeds even if the provider
-     // version isn't actually 2.6.
-     if (interface2_6 == nullptr){
-@@ -172,6 +174,9 @@ status_t HidlProviderInfo::initializeHidlProvider(
-         return mapToStatusT(status);
-     }
- 
-+    auto samsungCast = vendor::samsung::hardware::camera::provider::V3_0::ISehCameraProvider::castFrom(interface);
-+    auto samsungProvider = samsungCast.isOk() ? static_cast<sp<vendor::samsung::hardware::camera::provider::V3_0::ISehCameraProvider>>(samsungCast) : nullptr;
-+
-     hardware::Return<bool> linked = interface->linkToDeath(this, /*cookie*/ mId);
-     if (!linked.isOk()) {
-         ALOGE("%s: Transaction error in linking to camera provider '%s' death: %s",
-@@ -202,7 +207,7 @@ status_t HidlProviderInfo::initializeHidlProvider(
- 
-     // Get initial list of camera devices, if any
-     std::vector<std::string> devices;
--    hardware::Return<void> ret = interface->getCameraIdList([&status, this, &devices](
-+    auto cb = [&status, this, &devices](
-             Status idStatus,
-             const hardware::hidl_vec<hardware::hidl_string>& cameraDeviceNames) {
-         status = idStatus;
-@@ -219,7 +224,12 @@ status_t HidlProviderInfo::initializeHidlProvider(
-                     mProviderPublicCameraIds.push_back(id);
-                 }
-             }
--        } });
-+        } };
-+    hardware::Return<void> ret;
-+    if(samsungProvider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false))
-+        ret = samsungProvider->sehGetCameraIdList(cb);
-+    else
-+        ret = interface->getCameraIdList(cb);
-     if (!ret.isOk()) {
-         ALOGE("%s: Transaction error in getting camera ID list from provider '%s': %s",
-                 __FUNCTION__, mProviderName.c_str(), linked.description().c_str());
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch b/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
deleted file mode 100644
index c5f1e0b0..00000000
--- a/patches/trebledroid/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4c3ab05d71508d747713809a6905ac8694091226 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 19 May 2020 14:01:14 +0200
-Subject: [PATCH 10/24] Add a property to force camera timestamp source
-
-Some devices wrongly report their timesource
-Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME
-The former doesn't increment in sleep, while the later does.
-There is a camera HAL property for that, though some devices don't
-report it properly.
-
-This issue happens on Xiaomi Redmi 7A, it needs to force the value to 1
-
-Add a property persist.sys.phh.camera.force_timestampsource to force
-timestamp source.
----
- .../libcameraservice/device3/Camera3Device.cpp       | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
-index 9792089009..abc3f8f084 100644
---- a/services/camera/libcameraservice/device3/Camera3Device.cpp
-+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
-@@ -209,8 +209,16 @@ status_t Camera3Device::initializeCommonLocked() {
-     mTimestampOffset = getMonoToBoottimeOffset();
-     camera_metadata_entry timestampSource =
-             mDeviceInfo.find(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE);
--    if (timestampSource.count > 0 && timestampSource.data.u8[0] ==
--            ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME) {
-+    int timestampSourceValue = 0;
-+    if ((timestampSource.count > 0 && timestampSource.data.u8[0] ==
-+            ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME)) {
-+        timestampSourceValue = 1;
-+    }
-+    int forceTimestampSource = property_get_int32("persist.sys.phh.camera.force_timestampsource", -1);
-+    //Don't override if it's -1, default value
-+    if(forceTimestampSource == 0) timestampSourceValue = 0;
-+    if(forceTimestampSource == 1) timestampSourceValue = 1;
-+    if (timestampSourceValue == 1) {
-         mDeviceTimeBaseIsRealtime = true;
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch b/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
deleted file mode 100644
index 19fc806c..00000000
--- a/patches/trebledroid/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From eccabf3dc6744a39652b7b9aa9d900286e8edc54 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 11/24] FIH devices: Fix "Earpiece" audio output
-
-On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
-Earpiece is not listed in attachedDevices, and devicePort's profile
-mentions it is AUDIO_CHANNEL_IN_MONO, instead of AUDIO_CHANNEL_OUT_MONO.
-
-Detect such cases (output device, but got only AUDIO_CHANNEL_IN_MONO),
-and fix both channelMasks and attachedDevices
-
-Change-Id: I4a88ba6d34d0fcd346eeea2ca903772f0271040a
----
- .../managerdefinitions/src/Serializer.cpp     | 27 ++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 21d3282134..6ee076660b 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -416,23 +416,32 @@ std::variant<status_t, AudioGainTraits::Element> PolicySerializer::deserialize<A
-     }
- }
- 
-+static bool fixedEarpieceChannels = false;
- template<>
- std::variant<status_t, AudioProfileTraits::Element>
- PolicySerializer::deserialize<AudioProfileTraits>(
--        const xmlNode *cur, AudioProfileTraits::PtrSerializingCtx /*serializingContext*/)
-+        const xmlNode *cur, AudioProfileTraits::PtrSerializingCtx serializingContext)
- {
-     using Attributes = AudioProfileTraits::Attributes;
-+    bool isOutput = serializingContext != nullptr;
- 
-     std::string samplingRates = getXmlAttribute(cur, Attributes::samplingRates);
-     std::string format = getXmlAttribute(cur, Attributes::format);
-     std::string channels = getXmlAttribute(cur, Attributes::channelMasks);
-+    ChannelTraits::Collection channelsMask = channelMasksFromString(channels, mChannelMasksSeparator.c_str());
-+
-+    //Some Foxconn devices have wrong earpiece channel mask, leading to no channel mask
-+    if(channelsMask.size() == 1 && *channelsMask.begin() == AUDIO_CHANNEL_IN_MONO && isOutput) {
-+        fixedEarpieceChannels = true;
-+        channelsMask = channelMasksFromString("AUDIO_CHANNEL_OUT_MONO", ",");
-+    }
- 
-     if (mIgnoreVendorExtensions && maybeVendorExtension(format)) {
-         ALOGI("%s: vendor extension format \"%s\" skipped", __func__, format.c_str());
-         return NO_INIT;
-     }
-     AudioProfileTraits::Element profile = new AudioProfile(formatFromString(format, gDynamicFormat),
--            channelMasksFromString(channels, mChannelMasksSeparator.c_str()),
-+            channelsMask,
-             samplingRatesFromString(samplingRates, mSamplingRatesSeparator.c_str()));
- 
-     profile->setDynamicFormat(profile->getFormat() == gDynamicFormat);
-@@ -571,7 +580,11 @@ std::variant<status_t, DevicePortTraits::Element> PolicySerializer::deserialize<
-             new DeviceDescriptor(type, name, address, encodedFormats);
- 
-     AudioProfileTraits::Collection profiles;
--    status_t status = deserializeCollection<AudioProfileTraits>(cur, &profiles, NULL);
-+    status_t status;
-+    if(audio_is_output_devices(type))
-+        status = deserializeCollection<AudioProfileTraits>(cur, &profiles, (AudioProfileTraits::PtrSerializingCtx)1);
-+    else
-+        status = deserializeCollection<AudioProfileTraits>(cur, &profiles, NULL);
-     if (status != NO_ERROR) {
-         return status;
-     }
-@@ -892,6 +905,14 @@ std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<Modu
-             }
-         }
-     }
-+
-+    if(fixedEarpieceChannels) {
-+        sp<DeviceDescriptor> device =
-+            module->getDeclaredDevices().getDeviceFromTagName("Earpiece");
-+        if(device != 0)
-+            ctx->addDevice(device);
-+        fixedEarpieceChannels = false;
-+    }
-     return module;
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch b/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
deleted file mode 100644
index 006488dd..00000000
--- a/patches/trebledroid/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cd1fd072f6b11427f5a0f312244cedc5b1e0e0f4 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 12 Sep 2020 12:32:50 +0200
-Subject: [PATCH 12/24] No longer make re-assigning legacy audio groups fatal.
- Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
- by framework too
-
-Change-Id: I794fe22d63a8af705be4f5f09b9879ecaab3eae5
----
- services/audiopolicy/engine/common/src/EngineBase.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/services/audiopolicy/engine/common/src/EngineBase.cpp b/services/audiopolicy/engine/common/src/EngineBase.cpp
-index e259e6e048..abd8786b4a 100644
---- a/services/audiopolicy/engine/common/src/EngineBase.cpp
-+++ b/services/audiopolicy/engine/common/src/EngineBase.cpp
-@@ -264,9 +264,9 @@ engineConfig::ParsingResult EngineBase::processParsingResult(
-             }
-             if (group.stream != AUDIO_STREAM_DEFAULT) {
-                 // A legacy stream can be assigned once to a volume group
--                LOG_ALWAYS_FATAL_IF(checkStreamForGroups(group.stream, mVolumeGroups),
--                                    "stream %s already assigned to a volume group, "
--                                    "review the configuration", toString(group.stream).c_str());
-+                if(checkStreamForGroups(group.stream, mVolumeGroups)) {
-+                    ALOGE("stream %s already assigned to a volume group, review the configuration", toString(group.stream).c_str());
-+                }
-                 volumeGroup->addSupportedStream(group.stream);
-             }
-             addSupportedAttributesToGroup(group, volumeGroup, strategy);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch b/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
deleted file mode 100644
index 186661b4..00000000
--- a/patches/trebledroid/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 152328ae268b982acedcba95c7d9e48ddd465d40 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 21 Dec 2020 20:19:11 +0100
-Subject: [PATCH 13/24] Make camera IDs filter-out optional
-
-Nowadays most people have Camera 2 apps, and would like to have all
-cameras, rather than limit which cameras are available.
-Add a property for that.
----
- .../common/CameraProviderManager.cpp               | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-index 60e4eb7b42..fbfdecc2ed 100644
---- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
-+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
-@@ -328,7 +328,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
-         // API1 app doesn't handle logical and physical camera devices well. So
-         // for each camera facing, only take the first id advertised by HAL in
-         // all [logical, physical1, physical2, ...] id combos, and filter out the rest.
--        filterLogicalCameraIdsLocked(providerDeviceIds);
-+        if(!property_get_bool("persist.sys.phh.include_all_cameras", false)) {
-+            filterLogicalCameraIdsLocked(providerDeviceIds);
-+        }
-         collectDeviceIdsLocked(providerDeviceIds, publicDeviceIds, systemDeviceIds);
-     }
-     auto sortFunc =
-@@ -1137,10 +1139,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
- 
-     // Go through the capabilities and check if it has
-     // ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA
--    for (size_t i = 0; i < entryCap.count; ++i) {
--        uint8_t capability = entryCap.data.u8[i];
--        if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA) {
--            return SystemCameraKind::SYSTEM_ONLY_CAMERA;
-+    if(!property_get_bool("persist.sys.phh.include_all_cameras", false)) {
-+        for (size_t i = 0; i < entryCap.count; ++i) {
-+            uint8_t capability = entryCap.data.u8[i];
-+            if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA) {
-+                return SystemCameraKind::SYSTEM_ONLY_CAMERA;
-+            }
-         }
-     }
-     return SystemCameraKind::PUBLIC;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch b/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
deleted file mode 100644
index 6b0773fa..00000000
--- a/patches/trebledroid/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c961ab1e63be4d64da191268bb789afcce6b9e86 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 14/24] Support Samsung R multi-cams
-
-Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
----
- services/camera/libcameraservice/Android.bp               | 1 +
- .../libcameraservice/common/hidl/HidlProviderInfo.cpp     | 8 +++++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index 2f574133c6..6b7a74edb6 100644
---- a/services/camera/libcameraservice/Android.bp
-+++ b/services/camera/libcameraservice/Android.bp
-@@ -108,6 +108,7 @@ cc_defaults {
-         "android.hardware.camera.provider@2.7",
-         "android.hardware.camera.provider-V3-ndk",
-         "vendor.samsung.hardware.camera.provider@3.0",
-+        "vendor.samsung.hardware.camera.provider@4.0",
-         "libaidlcommonsupport",
-         "libbinderthreadstateutils",
-         "libcameraservice_device_independent",
-diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index 1b22767779..c60c0c4ffa 100644
---- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-@@ -29,6 +29,7 @@
- 
- #include <android/hardware/camera/device/3.7/ICameraDevice.h>
- #include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
-+#include <vendor/samsung/hardware/camera/provider/4.0/ISehCameraProvider.h>
- 
- namespace {
- const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
-@@ -175,7 +176,9 @@ status_t HidlProviderInfo::initializeHidlProvider(
-     }
- 
-     auto samsungCast = vendor::samsung::hardware::camera::provider::V3_0::ISehCameraProvider::castFrom(interface);
-+    auto samsung40Cast = vendor::samsung::hardware::camera::provider::V4_0::ISehCameraProvider::castFrom(interface);
-     auto samsungProvider = samsungCast.isOk() ? static_cast<sp<vendor::samsung::hardware::camera::provider::V3_0::ISehCameraProvider>>(samsungCast) : nullptr;
-+    auto samsung40Provider = samsung40Cast.isOk() ? static_cast<sp<vendor::samsung::hardware::camera::provider::V4_0::ISehCameraProvider>>(samsung40Cast) : nullptr;
- 
-     hardware::Return<bool> linked = interface->linkToDeath(this, /*cookie*/ mId);
-     if (!linked.isOk()) {
-@@ -213,6 +216,7 @@ status_t HidlProviderInfo::initializeHidlProvider(
-         status = idStatus;
-         if (status == Status::OK) {
-             for (auto& name : cameraDeviceNames) {
-+		    ALOGE("Listing camera ID %s", name.c_str());
-                 uint16_t major, minor;
-                 std::string type, id;
-                 status_t res = parseDeviceName(name, &major, &minor, &type, &id);
-@@ -226,7 +230,9 @@ status_t HidlProviderInfo::initializeHidlProvider(
-             }
-         } };
-     hardware::Return<void> ret;
--    if(samsungProvider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false))
-+    if(samsung40Provider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false))
-+        ret = samsung40Provider->sehGetCameraIdList(cb);
-+    else if(samsungProvider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false))
-         ret = samsungProvider->sehGetCameraIdList(cb);
-     else
-         ret = interface->getCameraIdList(cb);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch b/patches/trebledroid/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
deleted file mode 100644
index cc61bac5..00000000
--- a/patches/trebledroid/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b48eeef242b27b4e391723c8b24b2fc07b598a4a Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 15/24] Not all sources in a route are valid. Dont ignore the
- whole route because of one broken source
-
-Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d
----
- .../audiopolicy/common/managerdefinitions/src/Serializer.cpp    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 6ee076660b..146c78b8f6 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -670,7 +670,7 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-                 source = ctx->findPortByTagName(trim(devTag));
-             }
-             if (source == NULL) {
--                if (!mIgnoreVendorExtensions) {
-+                if (false && !mIgnoreVendorExtensions) {
-                     ALOGE("%s: no source found with name \"%s\"", __func__, devTag);
-                     return BAD_VALUE;
-                 } else {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0016-Use-a-fake-volume-policy-when-none-has-been-found.patch b/patches/trebledroid/platform_frameworks_av/0016-Use-a-fake-volume-policy-when-none-has-been-found.patch
deleted file mode 100644
index 4402e800..00000000
--- a/patches/trebledroid/platform_frameworks_av/0016-Use-a-fake-volume-policy-when-none-has-been-found.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8d0bf8d33e27a676c86281d7c093f867af92209b Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 28 Mar 2021 14:48:49 +0200
-Subject: [PATCH 16/24] Use a fake volume policy when none has been found
-
-This is useful, because on Samsung devices, the "real"
-(=non-gsi-cheating) audio policy doesn't have any volume policy.
-
-This requires actually adding the fake audio policy xml file (done in
-device/phh/treble)
-
-Change-Id: I461a3f22893ab2b1d96d67f22397369b2cae41e5
----
- services/audiopolicy/engine/config/src/EngineConfig.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/services/audiopolicy/engine/config/src/EngineConfig.cpp b/services/audiopolicy/engine/config/src/EngineConfig.cpp
-index ca78ce7213..59211577c4 100644
---- a/services/audiopolicy/engine/config/src/EngineConfig.cpp
-+++ b/services/audiopolicy/engine/config/src/EngineConfig.cpp
-@@ -800,7 +800,12 @@ android::status_t parseLegacyVolumeFile(const char* path, VolumeGroups &volumeGr
- android::status_t parseLegacyVolumes(VolumeGroups &volumeGroups) {
-     if (std::string audioPolicyXmlConfigFile = audio_get_audio_policy_config_file();
-             !audioPolicyXmlConfigFile.empty()) {
--        return parseLegacyVolumeFile(audioPolicyXmlConfigFile.c_str(), volumeGroups);
-+        int ret = parseLegacyVolumeFile(audioPolicyXmlConfigFile.c_str(), volumeGroups);
-+        if (ret == NO_ERROR && volumeGroups.size() == 0) {
-+            ret = parseLegacyVolumeFile("/system/etc/fake_audio_policy_volume.xml", volumeGroups);
-+            ALOGE("Parsing volume for /system/etc/fake_audio_policy_volume.xml gave %zu",  volumeGroups.size());
-+        }
-+	return ret;
-     } else {
-         ALOGE("No readable audio policy config file found");
-         return BAD_VALUE;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0017-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch b/patches/trebledroid/platform_frameworks_av/0017-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
deleted file mode 100644
index 7ff771ab..00000000
--- a/patches/trebledroid/platform_frameworks_av/0017-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 95b8aab31d075baf0e472db616141d2397268c06 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 17/24] Revert "Remove support for audio HAL V2 from the
- framework"
-
-This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.
-
-Also enable new extensions required to actually build
-
-Change-Id: Icfd638a91b22ffa6d2cd6d19a624e699a85a850a
----
- media/libaudiohal/Android.bp                  |  1 +
- media/libaudiohal/FactoryHal.cpp              |  3 ++-
- media/libaudiohal/impl/Android.bp             | 26 +++++++++++++++++++
- media/libaudiohal/impl/DeviceHalHidl.cpp      | 10 +++++++
- .../impl/DevicesFactoryHalHidl.cpp            |  4 +++
- 5 files changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/media/libaudiohal/Android.bp b/media/libaudiohal/Android.bp
-index b8d099897f..e4a11a3fa8 100644
---- a/media/libaudiohal/Android.bp
-+++ b/media/libaudiohal/Android.bp
-@@ -23,6 +23,7 @@ cc_library_shared {
-     ],
- 
-     required: [
-+        "libaudiohal@2.0",
-         "libaudiohal@5.0",
-         "libaudiohal@6.0",
-         "libaudiohal@7.0",
-diff --git a/media/libaudiohal/FactoryHal.cpp b/media/libaudiohal/FactoryHal.cpp
-index 15cb297b5c..c922dd184d 100644
---- a/media/libaudiohal/FactoryHal.cpp
-+++ b/media/libaudiohal/FactoryHal.cpp
-@@ -50,12 +50,13 @@ using InterfaceName = std::pair<std::string, std::string>;
-  * This list need to keep sync with AudioHalVersionInfo.VERSIONS in
-  * media/java/android/media/AudioHalVersionInfo.java.
-  */
--static const std::array<AudioHalVersionInfo, 5> sAudioHALVersions = {
-+static const std::array<AudioHalVersionInfo, 6> sAudioHALVersions = {
-     AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0),
-     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 1),
-     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 0),
-     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0),
-     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 5, 0),
-+    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 2, 0),
- };
- 
- static const std::map<AudioHalVersionInfo::Type, InterfaceName> sDevicesHALInterfaces = {
-diff --git a/media/libaudiohal/impl/Android.bp b/media/libaudiohal/impl/Android.bp
-index 4d81f77d8e..23d7f0465b 100644
---- a/media/libaudiohal/impl/Android.bp
-+++ b/media/libaudiohal/impl/Android.bp
-@@ -82,6 +82,32 @@ cc_defaults {
-     ],
- }
- 
-+cc_library_shared {
-+    name: "libaudiohal@2.0",
-+    defaults: [
-+        "libaudiohal_default",
-+        "libaudiohal_hidl_default"
-+    ],
-+    srcs: [
-+        ":audio_core_hal_client_sources",
-+        ":audio_effect_hidl_hal_client_sources",
-+        "EffectsFactoryHalEntry.cpp",
-+    ],
-+    shared_libs: [
-+        "android.hardware.audio.common@2.0",
-+        "android.hardware.audio.common@2.0-util",
-+        "android.hardware.audio.effect@2.0",
-+        "android.hardware.audio.effect@2.0-util",
-+        "android.hardware.audio@2.0",
-+        "android.hardware.audio@2.0-util",
-+    ],
-+    cflags: [
-+        "-DMAJOR_VERSION=2",
-+        "-DMINOR_VERSION=0",
-+        "-include common/all-versions/VersionMacro.h",
-+    ]
-+}
-+
- cc_library_shared {
-     name: "libaudiohal@5.0",
-     defaults: [
-diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
-index 478e0f0026..a1b21d7d95 100644
---- a/media/libaudiohal/impl/DeviceHalHidl.cpp
-+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
-@@ -587,6 +587,7 @@ status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool
-         // call is successful. Also remove the cache here to avoid a large cache after a long run.
-         return NO_ERROR;
-     }
-+#if MAJOR_VERSION > 2
- #if MAJOR_VERSION == 7 && MINOR_VERSION == 1
-     if (supportsSetConnectedState7_1) {
-         AudioPort hidlPort;
-@@ -609,11 +610,17 @@ status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool
-         return result;
-     }
-     return processReturn("setConnectedState", mDevice->setConnectedState(hidlAddress, connected));
-+#else
-+    (void) port;
-+    (void) connected;
-+    return NO_ERROR;
-+#endif
- }
- 
- error::Result<audio_hw_sync_t> DeviceHalHidl::getHwAvSync() {
-     TIME_CHECK();
-     if (mDevice == 0) return NO_INIT;
-+#if MAJOR_VERSION > 2
-     audio_hw_sync_t value;
-     Result result;
-     Return<void> ret = mDevice->getHwAvSync([&value, &result](Result r, audio_hw_sync_t v) {
-@@ -622,6 +629,9 @@ error::Result<audio_hw_sync_t> DeviceHalHidl::getHwAvSync() {
-     });
-     RETURN_IF_ERROR(processReturn("getHwAvSync", ret, result));
-     return value;
-+#else
-+    return 0xdeadbeef;
-+#endif
- }
- 
- status_t DeviceHalHidl::dump(int fd, const Vector<String16>& args) {
-diff --git a/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp b/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp
-index 1cac9dab76..78c0c56416 100644
---- a/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp
-+++ b/media/libaudiohal/impl/DevicesFactoryHalHidl.cpp
-@@ -119,6 +119,7 @@ status_t DevicesFactoryHalHidl::openDevice(const char *name, sp<DeviceHalInterfa
-     Result retval = Result::NOT_INITIALIZED;
-     for (const auto& factory : factories) {
-         Return<void> ret;
-+#if MAJOR_VERSION > 2
-         if (strcmp(name, AUDIO_HARDWARE_MODULE_ID_PRIMARY) == 0) {
-             // In V7.1 it's not possible to cast IDevice back to IPrimaryDevice,
-             // thus openPrimaryDevice must be used.
-@@ -135,6 +136,9 @@ status_t DevicesFactoryHalHidl::openDevice(const char *name, sp<DeviceHalInterfa
-                         }
-                     });
-         } else {
-+#else
-+        if (true) {
-+#endif
- #if MAJOR_VERSION == 7 && MINOR_VERSION == 1
-             ret = factory->openDevice_7_1(
- #else
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0018-Add-a-prop-to-change-Samsung-flash-strength.patch b/patches/trebledroid/platform_frameworks_av/0018-Add-a-prop-to-change-Samsung-flash-strength.patch
deleted file mode 100644
index a9d2fb6f..00000000
--- a/patches/trebledroid/platform_frameworks_av/0018-Add-a-prop-to-change-Samsung-flash-strength.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 6e4ac3b041074f31659737d43b0088465496220c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 16 Apr 2022 14:30:14 -0400
-Subject: [PATCH 18/24] Add a prop to change Samsung flash strength
-
----
- services/camera/libcameraservice/Android.bp   |  2 ++
- .../common/hidl/HidlProviderInfo.cpp          | 20 ++++++++++++++++++-
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index 6b7a74edb6..1e1423f42b 100644
---- a/services/camera/libcameraservice/Android.bp
-+++ b/services/camera/libcameraservice/Android.bp
-@@ -83,6 +83,8 @@ cc_defaults {
-         "android.hardware.camera.device@3.5",
-         "android.hardware.camera.device@3.6",
-         "android.hardware.camera.device@3.7",
-+        "vendor.samsung.hardware.camera.device@5.0",
-+        "vendor.samsung.hardware.camera.device@4.0",
-         "android.hardware.common-V2-ndk",
-         "android.hardware.common.fmq-V1-ndk",
-         "camera_platform_flags_c_lib",
-diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-index c60c0c4ffa..9d9275c89c 100644
---- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
-@@ -30,6 +30,8 @@
- #include <android/hardware/camera/device/3.7/ICameraDevice.h>
- #include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
- #include <vendor/samsung/hardware/camera/provider/4.0/ISehCameraProvider.h>
-+#include <vendor/samsung/hardware/camera/device/5.0/ISehCameraDevice.h>
-+#include <vendor/samsung/hardware/camera/device/4.0/ISehCameraDevice.h>
- 
- namespace {
- const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
-@@ -812,7 +814,23 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3(
- status_t HidlProviderInfo::HidlDeviceInfo3::setTorchMode(bool enabled) {
-     using hardware::camera::common::V1_0::TorchMode;
-     const sp<hardware::camera::device::V3_2::ICameraDevice> interface = startDeviceInterface();
--    Status s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
-+    int32_t flashStrength = property_get_int32("persist.sys.phh.flash_strength", 1);
-+
-+    auto sehCast = vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice::castFrom(interface);
-+    android::sp<vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice> seh = sehCast;
-+
-+    auto sehCast2 = vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice::castFrom(interface);
-+    android::sp<vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice> seh2 = sehCast2;
-+
-+    Status s;
-+    if(seh != nullptr) {
-+        s = seh->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
-+    } else if(seh2 != nullptr) {
-+        s = seh2->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
-+    } else {
-+        s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
-+    }
-+
-     return mapToStatusT(s);
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0019-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch b/patches/trebledroid/platform_frameworks_av/0019-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
deleted file mode 100644
index c95edd16..00000000
--- a/patches/trebledroid/platform_frameworks_av/0019-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4f10be516e736e271a2cd57d50dbffa625f20c1f Mon Sep 17 00:00:00 2001
-From: ponces <ponces26@gmail.com>
-Date: Mon, 24 Oct 2022 09:38:34 +0100
-Subject: [PATCH 19/24] voip: Fix high pitched voice on Qualcomm devices
-
----
- .../common/managerdefinitions/src/Serializer.cpp         | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 146c78b8f6..b9f71cc42b 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -252,6 +252,7 @@ private:
-     std::string mChannelMasksSeparator = ",";
-     std::string mSamplingRatesSeparator = ",";
-     std::string mFlagsSeparator = "|";
-+    std::string mMixPortName = "";
- 
-     // Children: ModulesTraits, VolumeTraits, SurroundSoundTraits (optional)
- };
-@@ -436,6 +437,13 @@ PolicySerializer::deserialize<AudioProfileTraits>(
-         channelsMask = channelMasksFromString("AUDIO_CHANNEL_OUT_MONO", ",");
-     }
- 
-+    // This breaks in-game voice chat and audio in some messaging apps causing it to play with a higher pitch and speed
-+    bool disableStereoVoip = property_get_bool("persist.sys.phh.disable_stereo_voip", false);
-+    if (disableStereoVoip && mMixPortName == "voip_rx") {
-+        ALOGI("%s: disabling stereo support on voip_rx", __func__);
-+        channelsMask = channelMasksFromString("AUDIO_CHANNEL_OUT_MONO", ",");
-+    }
-+
-     if (mIgnoreVendorExtensions && maybeVendorExtension(format)) {
-         ALOGI("%s: vendor extension format \"%s\" skipped", __func__, format.c_str());
-         return NO_INIT;
-@@ -458,6 +466,7 @@ std::variant<status_t, MixPortTraits::Element> PolicySerializer::deserialize<Mix
-     using Attributes = MixPortTraits::Attributes;
- 
-     std::string name = getXmlAttribute(child, Attributes::name);
-+    mMixPortName = name;
-     if (name.empty()) {
-         ALOGE("%s: No %s found", __func__, Attributes::name);
-         return BAD_VALUE;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0020-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch b/patches/trebledroid/platform_frameworks_av/0020-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch
deleted file mode 100644
index 4141bf48..00000000
--- a/patches/trebledroid/platform_frameworks_av/0020-audiopolicy-Fix-broken-mic-while-video-recording-on-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 969a349c2da0dd42f7f2064d1bbce0845c9fb052 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Sun, 30 Apr 2023 23:29:04 +0100
-Subject: [PATCH 20/24] audiopolicy: Fix broken mic while video recording on
- some Exynos devices
-
-This should fix https://github.com/phhusson/treble_experimentations/issues/2021 and https://github.com/phhusson/treble_experimentations/issues/2384.
-Credits to @haridhayal11.
----
- .../common/managerdefinitions/src/Serializer.cpp           | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index b9f71cc42b..77a96b47a4 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -662,6 +662,9 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-     }
-     route->setSink(sink);
- 
-+    // This fixes broken mic while video record on some Exynos devices
-+    bool disableBackMic = property_get_bool("persist.sys.phh.disable_back_mic", false);
-+
-     std::string sourcesAttr = getXmlAttribute(cur, Attributes::sources);
-     if (sourcesAttr.empty()) {
-         ALOGE("%s: No %s found", __func__, Attributes::sources);
-@@ -678,6 +681,10 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-             if (source == NULL) {
-                 source = ctx->findPortByTagName(trim(devTag));
-             }
-+            if (disableBackMic && strcmp(devTag, "Built-In Back Mic") == 0) {
-+                ALOGW("Skipping route source \"%s\" as it breaks video recording mic", devTag);
-+                source = NULL;
-+            }
-             if (source == NULL) {
-                 if (false && !mIgnoreVendorExtensions) {
-                     ALOGE("%s: no source found with name \"%s\"", __func__, devTag);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0021-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch b/patches/trebledroid/platform_frameworks_av/0021-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch
deleted file mode 100644
index 9817ffa2..00000000
--- a/patches/trebledroid/platform_frameworks_av/0021-Add-a-prop-to-disable-AUDIO_OUTPUT_FLAG_FAST-from-au.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f5c38ee63be969f6a16d14f8d6c6836e08740313 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 30 Oct 2023 10:30:58 -0400
-Subject: [PATCH 21/24] Add a prop to disable AUDIO_OUTPUT_FLAG_FAST from audio
- policies, when CPU can't really handle that kind of load
-
----
- .../audiopolicy/common/managerdefinitions/src/Serializer.cpp  | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 77a96b47a4..26edcaa1c4 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -504,6 +504,10 @@ std::variant<status_t, MixPortTraits::Element> PolicySerializer::deserialize<Mix
-             // use DEEP_BUFFER+FAST flag combo to indicate the spatializer output profile
-             uint32_t intFlags =
-                     OutputFlagConverter::maskFromString(flags, mFlagsSeparator.c_str());
-+            bool ignore_fast = property_get_bool("persist.sys.phh.disable_fast_audio", false);
-+            if (ignore_fast)
-+                intFlags &= ~AUDIO_OUTPUT_FLAG_FAST;
-+
-             if (intFlags == (AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_DEEP_BUFFER)) {
-                 intFlags = AUDIO_OUTPUT_FLAG_SPATIALIZER;
-             }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch b/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch
deleted file mode 100644
index d80f2679..00000000
--- a/patches/trebledroid/platform_frameworks_av/0022-Add-a-prop-to-fix-echo-on-incoming-or-outgoing-calls.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6781941064783d34cb601c2526c90e8902e6e928 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Sun, 5 Nov 2023 15:18:03 +0000
-Subject: [PATCH 22/24] Add a prop to fix echo on incoming or outgoing calls
-
-May even fix audio calls altogether.
-
-Change-Id: I3a05608ad7b3f0876160d5f6a12b7c529b8f0961
----
- .../common/managerdefinitions/src/Serializer.cpp         | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-index 26edcaa1c4..059e4adfa1 100644
---- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
-@@ -669,6 +669,9 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-     // This fixes broken mic while video record on some Exynos devices
-     bool disableBackMic = property_get_bool("persist.sys.phh.disable_back_mic", false);
- 
-+    // This may fix echo or non-working audio on calls
-+    bool disableVoiceCallIn = property_get_bool("persist.sys.phh.disable_voice_call_in", false);
-+
-     std::string sourcesAttr = getXmlAttribute(cur, Attributes::sources);
-     if (sourcesAttr.empty()) {
-         ALOGE("%s: No %s found", __func__, Attributes::sources);
-@@ -685,10 +688,16 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
-             if (source == NULL) {
-                 source = ctx->findPortByTagName(trim(devTag));
-             }
-+
-             if (disableBackMic && strcmp(devTag, "Built-In Back Mic") == 0) {
-                 ALOGW("Skipping route source \"%s\" as it breaks video recording mic", devTag);
-                 source = NULL;
-+            } else if (disableVoiceCallIn && strcmp(devTag, "Voice Call In") == 0 &&
-+                      (sinkAttr == "voice tx" || sinkAttr == "voice_tx")) {
-+                ALOGW("Skipping route source \"%s\" as it breaks audio on calls", devTag);
-+                source = NULL;
-             }
-+
-             if (source == NULL) {
-                 if (false && !mIgnoreVendorExtensions) {
-                     ALOGE("%s: no source found with name \"%s\"", __func__, devTag);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0023-Include-Samsung-AIDL-camera-ids.patch b/patches/trebledroid/platform_frameworks_av/0023-Include-Samsung-AIDL-camera-ids.patch
deleted file mode 100644
index c1c746ff..00000000
--- a/patches/trebledroid/platform_frameworks_av/0023-Include-Samsung-AIDL-camera-ids.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From ec6bbb73320d75ee88bf48db01398346e4674d78 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 7 Feb 2024 05:06:32 -0500
-Subject: [PATCH 23/24] Include Samsung AIDL camera ids
-
----
- services/camera/libcameraservice/Android.bp   |  1 +
- .../common/aidl/AidlProviderInfo.cpp          | 21 +++++++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
-index 1e1423f42b..bfe9c8bbb5 100644
---- a/services/camera/libcameraservice/Android.bp
-+++ b/services/camera/libcameraservice/Android.bp
-@@ -111,6 +111,7 @@ cc_defaults {
-         "android.hardware.camera.provider-V3-ndk",
-         "vendor.samsung.hardware.camera.provider@3.0",
-         "vendor.samsung.hardware.camera.provider@4.0",
-+        "vendor.samsung.hardware.camera.provider-V1-ndk",
-         "libaidlcommonsupport",
-         "libbinderthreadstateutils",
-         "libcameraservice_device_independent",
-diff --git a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
-index a721d287f4..1e16541ed6 100644
---- a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
-+++ b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
-@@ -30,6 +30,8 @@
- #include <utils/SessionConfigurationUtils.h>
- #include <utils/Trace.h>
- 
-+#include <aidl/vendor/samsung/hardware/camera/provider/ISehCameraProvider.h>
-+
- namespace {
- const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
- } // anonymous namespace
-@@ -170,6 +172,25 @@ status_t AidlProviderInfo::initializeAidlProvider(
-         return mapToStatusT(status);
-     }
- 
-+    if(true) {
-+        AIBinder *ext;
-+        auto spaibinder = interface->asBinder();
-+
-+        status_t ret = AIBinder_getExtension(spaibinder.get(), &ext);
-+        ALOGE("Grabbing CameraProvider extension got %d", ret);
-+        if (ret == android::OK) {
-+            using aidl::vendor::samsung::hardware::camera::provider::ISehCameraProvider;
-+            std::shared_ptr<ISehCameraProvider> provider = ISehCameraProvider::fromBinder(ndk::SpAIBinder(ext));
-+            ALOGE("Trying to get ISehCameraProvider...");
-+            if (provider != nullptr) {
-+                ALOGE("Got it!");
-+                if(property_get_bool("persist.sys.phh.samsung.camera_ids", false)) {
-+                    provider->getCameraIdListAll(&retDevices);
-+                }
-+            }
-+        }
-+    }
-+
-     for (auto& name : retDevices) {
-         uint16_t major, minor;
-         std::string type, id;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_av/0024-Allow-using-camera-modes-declared-in-Samsung-proprie.patch b/patches/trebledroid/platform_frameworks_av/0024-Allow-using-camera-modes-declared-in-Samsung-proprie.patch
deleted file mode 100644
index 82c3e4cd..00000000
--- a/patches/trebledroid/platform_frameworks_av/0024-Allow-using-camera-modes-declared-in-Samsung-proprie.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 8637ccc3797ed7509739ae114c197910c444f151 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 10 Feb 2024 09:30:19 -0500
-Subject: [PATCH 24/24] Allow using camera modes declared in Samsung
- proprietary values
-
----
- .../utils/SessionConfigurationUtils.cpp       | 79 +++++++++++++------
- 1 file changed, 53 insertions(+), 26 deletions(-)
-
-diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
-index 11ef9b7509..bbf3fcb054 100644
---- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
-+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
-@@ -168,35 +168,62 @@ bool roundBufferDimensionNearest(int32_t width, int32_t height,
- 
-     bool isJpegRDataSpace = (dataSpace == static_cast<android_dataspace_t>(
-                 ::aidl::android::hardware::graphics::common::Dataspace::JPEG_R));
--    camera_metadata_ro_entry streamConfigs =
--            (isJpegRDataSpace) ? info.find(jpegRSizesTag) :
--            (dataSpace == HAL_DATASPACE_DEPTH) ? info.find(depthSizesTag) :
--            (dataSpace == static_cast<android_dataspace>(HAL_DATASPACE_HEIF)) ?
--            info.find(heicSizesTag) :
--            info.find(scalerSizesTag);
-+    bool isDepth = dataSpace == HAL_DATASPACE_DEPTH;
-+    bool isHeif = dataSpace == static_cast<android_dataspace>(HAL_DATASPACE_HEIF);
-+    int32_t selectedTag = isJpegRDataSpace ? jpegRSizesTag :
-+        isDepth ? depthSizesTag :
-+        isHeif ? heicSizesTag : scalerSizesTag;
-+
-+    std::list<int32_t> tags = { selectedTag };
-+    if (selectedTag == scalerSizesTag) {
-+        sp<VendorTagDescriptor> vTags;
-+        sp<VendorTagDescriptorCache> cache = VendorTagDescriptorCache::getGlobalVendorTagCache();
-+        if (cache.get()) {
-+            auto vendorId = const_cast<CameraMetadata*>(&info)->getVendorId(); // getVendorId is actually const...
-+            cache->getVendorTagDescriptor(vendorId, &vTags);
-+        }
-+
-+        std::list<std::string> vendorTags = {
-+            "samsung.android.scaler.availablePictureStreamConfigurations",
-+            "samsung.android.scaler.availablePreviewStreamConfigurations",
-+            "samsung.android.scaler.availableThumbnailStreamConfigurations",
-+        };
-+        for(auto tagName: vendorTags) {
-+            uint32_t vendorTag;
-+            status_t tagStatus = info.getTagFromName(tagName.c_str(), vTags.get(), &vendorTag);
-+            //ALOGE("Tag by name %s %d %x", tagName.c_str(), tagStatus, vendorTag);
-+            if (tagStatus == OK)
-+                tags.push_back(vendorTag);
-+        }
-+    }
- 
-     int32_t bestWidth = -1;
-     int32_t bestHeight = -1;
--
--    // Iterate through listed stream configurations and find the one with the smallest euclidean
--    // distance from the given dimensions for the given format.
--    for (size_t i = 0; i < streamConfigs.count; i += 4) {
--        int32_t fmt = streamConfigs.data.i32[i];
--        int32_t w = streamConfigs.data.i32[i + 1];
--        int32_t h = streamConfigs.data.i32[i + 2];
--
--        // Ignore input/output type for now
--        if (fmt == format) {
--            if (w == width && h == height) {
--                bestWidth = width;
--                bestHeight = height;
--                break;
--            } else if (w <= ROUNDING_WIDTH_CAP && (bestWidth == -1 ||
--                    SessionConfigurationUtils::euclidDistSquare(w, h, width, height) <
--                    SessionConfigurationUtils::euclidDistSquare(bestWidth, bestHeight, width,
--                            height))) {
--                bestWidth = w;
--                bestHeight = h;
-+    for(auto tag: tags) {
-+        camera_metadata_ro_entry streamConfigs =
-+            info.find(tag);
-+
-+
-+        // Iterate through listed stream configurations and find the one with the smallest euclidean
-+        // distance from the given dimensions for the given format.
-+        for (size_t i = 0; i < streamConfigs.count; i += 4) {
-+            int32_t fmt = streamConfigs.data.i32[i];
-+            int32_t w = streamConfigs.data.i32[i + 1];
-+            int32_t h = streamConfigs.data.i32[i + 2];
-+
-+            // Ignore input/output type for now
-+            if (fmt == format) {
-+                if (w == width && h == height) {
-+                    bestWidth = width;
-+                    bestHeight = height;
-+                    break;
-+                } else if (w <= ROUNDING_WIDTH_CAP && (bestWidth == -1 ||
-+                        SessionConfigurationUtils::euclidDistSquare(w, h, width, height) <
-+                        SessionConfigurationUtils::euclidDistSquare(bestWidth, bestHeight, width,
-+                                height))) {
-+                    bestWidth = w;
-+                    bestHeight = h;
-+                }
-             }
-         }
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch b/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
deleted file mode 100644
index e3e758c5..00000000
--- a/patches/trebledroid/platform_frameworks_base/0001-Disable-vendor-mismatch-warning.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3e59ead9ac716dcdea0b9c0a9d7c966bca637de2 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Thu, 5 Apr 2018 10:01:19 +0800
-Subject: [PATCH 01/54] Disable vendor mismatch warning
-
-Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
----
- .../server/wm/ActivityTaskManagerService.java      | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-index e283f3e8ef0e..ee9b04829617 100644
---- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -6290,19 +6290,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
- 
-                 if (!isBuildConsistent) {
-                     Slog.e(TAG, "Build fingerprint is not consistent, warning user");
--                    mUiHandler.post(() -> {
--                        if (mShowDialogs) {
--                            AlertDialog d = new BaseErrorDialog(mUiContext);
--                            d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
--                            d.setCancelable(false);
--                            d.setTitle(mUiContext.getText(R.string.android_system_label));
--                            d.setMessage(mUiContext.getText(R.string.system_error_manufacturer));
--                            d.setButton(DialogInterface.BUTTON_POSITIVE,
--                                    mUiContext.getText(R.string.ok),
--                                    mUiHandler.obtainMessage(DISMISS_DIALOG_UI_MSG, d));
--                            d.show();
--                        }
--                    });
-+                    // Do not emit warning about vendor mismatch
-                 }
-             }
-             Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
deleted file mode 100644
index b1ce2b24..00000000
--- a/patches/trebledroid/platform_frameworks_base/0002-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ae164a473cb945a0e09828136c722048c44e87c9 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 5 Oct 2021 17:59:16 -0400
-Subject: [PATCH 02/54] Fallback to stupid autobrightness if brightness values
- are broken
-
-This is needed because of:
-`ava.lang.IllegalArgumentException: The control points must all have strictly increasing X values.`
-on some Samsung devices
-
-Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9
----
- .../com/android/server/display/DisplayDeviceConfig.java  | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-index 9b2dcc53f456..04e06b99d3ee 100644
---- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-@@ -894,9 +894,14 @@ public class DisplayDeviceConfig {
-      */
-     public static DisplayDeviceConfig create(Context context, boolean useConfigXml,
-             DisplayManagerFlags flags) {
--        final DisplayDeviceConfig config;
-+        DisplayDeviceConfig config;
-         if (useConfigXml) {
--            config = getConfigFromGlobalXml(context, flags);
-+            try {
-+                config = getConfigFromGlobalXml(context, flags);
-+            } catch(Exception e) {
-+                android.util.Log.e("PHH", "Failed parsing automatic brightness values, fallbacking", e);
-+                config = getConfigFromPmValues(context, flags);
-+            }
-         } else {
-             config = getConfigFromPmValues(context, flags);
-         }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch b/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
deleted file mode 100644
index 93dea92c..00000000
--- a/patches/trebledroid/platform_frameworks_base/0003-Fix-env-empty-string-ANDROID_STORAGE.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a8ffcda0fc86e2021a2e04a36ffab6f6c87fa80c Mon Sep 17 00:00:00 2001
-From: Raphael Mounier <mounierr07@gmail.com>
-Date: Sat, 6 Aug 2022 18:08:36 +0200
-Subject: [PATCH 03/54] Fix env empty string - ANDROID_STORAGE
-
-Huawei hi6250 define in init.hi6250.rc ANDROID_STORAGE to "", so check empty string and replace with default path. Apply change for all env directory
----
- core/java/android/os/Environment.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
-index a459aaa42930..168825411139 100644
---- a/core/java/android/os/Environment.java
-+++ b/core/java/android/os/Environment.java
-@@ -1526,7 +1526,7 @@ public class Environment {
- 
-     static File getDirectory(String variableName, String defaultPath) {
-         String path = System.getenv(variableName);
--        return path == null ? new File(defaultPath) : new File(path);
-+        return ((path == null || path.isEmpty()) ? new File(defaultPath) : new File(path));
-     }
- 
-     @NonNull
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
deleted file mode 100644
index 38bf51c4..00000000
--- a/patches/trebledroid/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2278dbb63df4a8c6db8124689e647d0273a32d1e Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH 04/54] Relax requirement for visible flag to sdcards
-
-The vast majority of sdcard readers are stable enough to be declared by
-the API. (I see no counter-example)
-FBE broke adoptable storage with SDCard, hence this need.
-
-Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
----
- .../core/java/com/android/server/StorageManagerService.java    | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index e7fae2483d16..a3bb3f9c416c 100644
---- a/services/core/java/com/android/server/StorageManagerService.java
-+++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1621,7 +1621,8 @@ class StorageManagerService extends IStorageManager.Stub
- 
-             // Adoptable public disks are visible to apps, since they meet
-             // public API requirement of being in a stable location.
--            if (vol.disk.isAdoptable()) {
-+	    // Assume all SDs match this as well
-+            if (vol.disk.isAdoptable() || vol.disk.isSd()) {
-                 vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE_FOR_WRITE;
-             }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
deleted file mode 100644
index afc6698f..00000000
--- a/patches/trebledroid/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 269a11d58455c9cf084af39046dd81c9d03de36b Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 17 May 2018 20:28:35 +0200
-Subject: [PATCH 05/54] Don't crash if there is IR HAL is not declared
-
-Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
----
- .../core/java/com/android/server/ConsumerIrService.java   | 8 --------
- .../core/jni/com_android_server_ConsumerIrService.cpp     | 2 +-
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java
-index ee6d808aa549..be8e2bb95ece 100644
---- a/services/core/java/com/android/server/ConsumerIrService.java
-+++ b/services/core/java/com/android/server/ConsumerIrService.java
-@@ -53,14 +53,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub {
-         mWakeLock.setReferenceCounted(true);
- 
-         mHasNativeHal = getHalService();
--
--        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONSUMER_IR)) {
--            if (!mHasNativeHal) {
--                throw new RuntimeException("FEATURE_CONSUMER_IR present, but no IR HAL loaded!");
--            }
--        } else if (mHasNativeHal) {
--            throw new RuntimeException("IR HAL present, but FEATURE_CONSUMER_IR is not set!");
--        }
-     }
- 
-     @Override
-diff --git a/services/core/jni/com_android_server_ConsumerIrService.cpp b/services/core/jni/com_android_server_ConsumerIrService.cpp
-index 63daa3503bd5..d068ec06fc14 100644
---- a/services/core/jni/com_android_server_ConsumerIrService.cpp
-+++ b/services/core/jni/com_android_server_ConsumerIrService.cpp
-@@ -36,7 +36,7 @@ static sp<IConsumerIr> mHal;
- 
- static jboolean getHidlHalService(JNIEnv * /* env */, jobject /* obj */) {
-     // TODO(b/31632518)
--    mHal = IConsumerIr::getService();
-+    mHal = IConsumerIr::tryGetService();
-     return mHal != nullptr;
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch b/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
deleted file mode 100644
index b94811cf..00000000
--- a/patches/trebledroid/platform_frameworks_base/0006-Implement-a-persistent-property-to-override-the-defa.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f13ab9cf0dd4846bffd85f894cbccd410b186004 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 1 Jun 2022 16:56:20 -0400
-Subject: [PATCH 06/54] Implement a persistent property to override the default
- primary camera (0)
-
-Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b
----
- core/java/android/hardware/Camera.java                | 6 ++++++
- core/java/android/hardware/camera2/CameraManager.java | 9 +++++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
-index 1c36a88726b8..3ec40136e084 100644
---- a/core/java/android/hardware/Camera.java
-+++ b/core/java/android/hardware/Camera.java
-@@ -41,6 +41,7 @@ import android.os.Message;
- import android.os.Process;
- import android.os.RemoteException;
- import android.os.ServiceManager;
-+import android.os.SystemProperties;
- import android.text.TextUtils;
- import android.util.Log;
- import android.view.Surface;
-@@ -404,6 +405,11 @@ public class Camera {
-      * @see #open(int)
-      */
-     public static Camera open() {
-+        int altPrimaryCamera = SystemProperties.getInt("persist.sys.alt_primary_camera", -1);
-+        if (altPrimaryCamera > 0) {
-+            return new Camera(altPrimaryCamera);
-+        }
-+
-         int numberOfCameras = getNumberOfCameras();
-         CameraInfo cameraInfo = new CameraInfo();
-         for (int i = 0; i < numberOfCameras; i++) {
-diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
-index d2e4a614202f..b5a00b192edc 100644
---- a/core/java/android/hardware/camera2/CameraManager.java
-+++ b/core/java/android/hardware/camera2/CameraManager.java
-@@ -2196,6 +2196,15 @@ public final class CameraManager {
-                         }
-                     }});
- 
-+            // HAXX: Allow overriding default primary camera (assumed to be camera 0) via property
-+            // Should match with libcameraservice/common/CameraProviderManager.cpp
-+            int altPrimaryCamera = SystemProperties.getInt("persist.sys.alt_primary_camera", -1);
-+            if (altPrimaryCamera > 0 && altPrimaryCamera < cameraIds.length) {
-+                String origPrimary = cameraIds[0];
-+                cameraIds[0] = cameraIds[altPrimaryCamera];
-+                cameraIds[altPrimaryCamera] = origPrimary;
-+            }
-+
-         }
- 
-         public static boolean cameraStatusesContains(CameraStatus[] cameraStatuses, String id) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch b/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
deleted file mode 100644
index cf5da8ca..00000000
--- a/patches/trebledroid/platform_frameworks_base/0007-Show-APN-Settings-for-CDMA-carriers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7901ab8cd9a6abb8630db412bc422b248891d46c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 6 Aug 2018 12:49:00 +0200
-Subject: [PATCH 07/54] Show APN Settings for CDMA carriers
-
----
- telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
-index 5d99acd87dd3..cf914d41cac9 100644
---- a/telephony/java/android/telephony/CarrierConfigManager.java
-+++ b/telephony/java/android/telephony/CarrierConfigManager.java
-@@ -10347,7 +10347,7 @@ public class CarrierConfigManager {
-         sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);
-         sDefaults.putBoolean(KEY_PREFER_3G_VISIBILITY_BOOL, true);
-         sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);
--        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
-+        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
-         sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);
-         sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
-         sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
deleted file mode 100644
index bd6335aa..00000000
--- a/patches/trebledroid/platform_frameworks_base/0008-Re-order-services-so-that-it-works-even-without-qtag.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fac85e674d35e50ac18cd1cfdc185dd519d78765 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 8 Nov 2018 23:04:03 +0100
-Subject: [PATCH 08/54] Re-order services so that it works even without qtaguid
-
-Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
----
- .../android/server/net/NetworkPolicyManagerService.java   | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-index 18b495bfce5d..2aa005528859 100644
---- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
-@@ -986,6 +986,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
-         Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady");
-         final int oldPriority = Process.getThreadPriority(Process.myTid());
-         try {
-+            mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class);
-+            mAppStandby = LocalServices.getService(AppStandbyInternal.class);
-+            mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
-+
-             // Boost thread's priority during system server init
-             Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
-             if (!isBandwidthControlEnabled()) {
-@@ -993,10 +997,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
-                 return;
-             }
- 
--            mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class);
--            mAppStandby = LocalServices.getService(AppStandbyInternal.class);
--            mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
--
-             synchronized (mUidRulesFirstLock) {
-                 synchronized (mNetworkPoliciesSecondLock) {
-                     updatePowerSaveAllowlistUL();
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch b/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
deleted file mode 100644
index 0000928e..00000000
--- a/patches/trebledroid/platform_frameworks_base/0009-Support-samsung-Pie-and-Q-light-hal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2b6a99ed21c92e71160931854f5a45e2360fa43a Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 24 Mar 2019 23:05:14 +0100
-Subject: [PATCH 09/54] Support samsung Pie and Q light hal
-
-Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
----
- services/core/jni/Android.bp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
-index 3607dddc66d5..3641e3b21149 100644
---- a/services/core/jni/Android.bp
-+++ b/services/core/jni/Android.bp
-@@ -209,6 +209,8 @@ cc_defaults {
-         "android.system.suspend-V1-ndk",
-         "server_configurable_flags",
-         "service.incremental",
-+        "vendor.samsung.hardware.light@2.0",
-+        "vendor.samsung.hardware.light@3.0",
-     ],
- 
-     static_libs: [
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
deleted file mode 100644
index 4785f1b1..00000000
--- a/patches/trebledroid/platform_frameworks_base/0010-Add-support-for-samsung-touch-physical-and-hover-pro.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 24910d2e595a9adb70f3db6749b010705ce0bf67 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 12 Aug 2019 23:08:26 +0200
-Subject: [PATCH 10/54] Add support for samsung touch, physical and hover
- proximity sensor as fallback to real proximity sensor
-
-Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
----
- .../DisplayPowerProximityStateController.java | 35 +++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java b/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java
-index 882c02faedf9..c517aa794aa1 100644
---- a/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java
-+++ b/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java
-@@ -80,6 +80,20 @@ public final class DisplayPowerProximityStateController {
-         public void onSensorChanged(SensorEvent event) {
-             if (mProximitySensorEnabled) {
-                 final long time = mClock.uptimeMillis();
-+                if("com.samsung.sensor.touch_proximity".equals(mProximitySensor.getStringType())) {
-+                    int v = (int)event.values[0];
-+                    boolean positive = (v <= 4);
-+                    android.util.Log.d("PHH", "Samsung sensor changed " + positive + ":" + v);
-+                    handleProximitySensorEvent(time, positive);
-+                    return;
-+                }
-+                if("com.samsung.sensor.hover_proximity".equals(mProximitySensor.getStringType())) {
-+                    float v = event.values[0];
-+                    boolean positive = (v >= 0.5f && v <= 4.5);
-+                    android.util.Log.d("PHH", "Samsung hover sensor changed " + positive + ":" + v);
-+                    handleProximitySensorEvent(time, positive);
-+                    return;
-+                }
-                 final float distance = event.values[0];
-                 boolean positive = distance >= 0.0f && distance < mProximityThreshold;
-                 handleProximitySensorEvent(time, positive);
-@@ -360,6 +374,27 @@ public final class DisplayPowerProximityStateController {
-         }
-         mProximitySensor = SensorUtils.findSensor(mSensorManager,
-                 mDisplayDeviceConfig.getProximitySensor(), Sensor.TYPE_PROXIMITY);
-+        if(mProximitySensor == null) {
-+            java.util.List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
-+            for(Sensor sensor: sensors) {
-+                if("com.samsung.sensor.physical_proximity".equals(sensor.getStringType()))
-+                    mProximitySensor = sensor;
-+            }
-+        }
-+        if(mProximitySensor == null) {
-+            java.util.List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
-+            for(Sensor sensor: sensors) {
-+                if("com.samsung.sensor.hover_proximity".equals(sensor.getStringType()))
-+                    mProximitySensor = sensor;
-+            }
-+        }
-+        if(mProximitySensor == null) {
-+            java.util.List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
-+            for(Sensor sensor: sensors) {
-+                if("com.samsung.sensor.touch_proximity".equals(sensor.getStringType()))
-+                    mProximitySensor = sensor;
-+            }
-+        }
-         if (mProximitySensor != null) {
-             mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
-                     TYPICAL_PROXIMITY_THRESHOLD);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch b/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
deleted file mode 100644
index d6a0f2c4..00000000
--- a/patches/trebledroid/platform_frameworks_base/0011-Always-allow-overriding-the-number-of-work-profiles.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 60bcaa3b31176f2736e3805d419b4484f9ae27a8 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 5 Apr 2020 16:32:46 +0200
-Subject: [PATCH 11/54] Always allow overriding the number of work profiles
-
-Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
----
- .../java/com/android/server/pm/UserManagerService.java    | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
-index 7349755402b1..0d1930db746a 100644
---- a/services/core/java/com/android/server/pm/UserManagerService.java
-+++ b/services/core/java/com/android/server/pm/UserManagerService.java
-@@ -7883,12 +7883,8 @@ public class UserManagerService extends IUserManager.Stub {
-      */
-     private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
-         final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
--        if (!Build.IS_DEBUGGABLE) {
--            return defaultMax;
--        } else {
--            if (userTypeDetails.isManagedProfile()) {
--                return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
--            }
-+        if (userTypeDetails.isManagedProfile()) {
-+            return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
-         }
-         return defaultMax;
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
deleted file mode 100644
index 86b41570..00000000
--- a/patches/trebledroid/platform_frameworks_base/0012-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 949f4d77bff2d37774594583c233531f812d1efa Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 6 Jun 2020 18:21:56 +0200
-Subject: [PATCH 12/54] HOME deserves to wake-up devices just as well as back
- and menu
-
-Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
----
- core/java/android/view/KeyEvent.java | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
-index 1ee9509b116a..1def2f859dfd 100644
---- a/core/java/android/view/KeyEvent.java
-+++ b/core/java/android/view/KeyEvent.java
-@@ -2097,6 +2097,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
-         switch (keyCode) {
-             case KeyEvent.KEYCODE_CAMERA:
-             case KeyEvent.KEYCODE_MENU:
-+            case KeyEvent.KEYCODE_HOME:
-             case KeyEvent.KEYCODE_PAIRING:
-             case KeyEvent.KEYCODE_STEM_1:
-             case KeyEvent.KEYCODE_STEM_2:
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch b/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
deleted file mode 100644
index 6bf827e6..00000000
--- a/patches/trebledroid/platform_frameworks_base/0013-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ff62e80acf055fa985ec07702b096794b1da97cb Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 29 Sep 2020 22:39:47 +0200
-Subject: [PATCH 13/54] Some devices have proximity sensor reporting NaN as max
- range for some reason. Make them behave standard way by setting 5 cm
-
-Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
----
- .../server/display/DisplayPowerProximityStateController.java   | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java b/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java
-index c517aa794aa1..565cbcd6bb56 100644
---- a/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java
-+++ b/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java
-@@ -398,6 +398,9 @@ public final class DisplayPowerProximityStateController {
-         if (mProximitySensor != null) {
-             mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
-                     TYPICAL_PROXIMITY_THRESHOLD);
-+            if(Float.isNaN(mProximityThreshold)) {
-+                mProximityThreshold = 5.0f;
-+            }
-         }
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
deleted file mode 100644
index 214492ae..00000000
--- a/patches/trebledroid/platform_frameworks_base/0014-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e59e6b83921f4094f154fb721c75b86cf863d471 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 29 Sep 2020 22:40:10 +0200
-Subject: [PATCH 14/54] Fix brightness range not being complete on Samsung
- devices
-
-On some devices, minimum brightness is 0, which totally messes with
-Brightness computations (minimum float brightness becomes -1.0 instead
-of 0.0...).
-Cheat and have them report 1 as minimum instead, which fixes the slope
-
-Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1
----
- .../java/com/android/server/power/PowerManagerService.java  | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
-index a172de0bb0ff..4244c03d8744 100644
---- a/services/core/java/com/android/server/power/PowerManagerService.java
-+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -1203,9 +1203,11 @@ public final class PowerManagerService extends SystemService
- 
-         if (min == INVALID_BRIGHTNESS_IN_CONFIG || max == INVALID_BRIGHTNESS_IN_CONFIG
-                 || def == INVALID_BRIGHTNESS_IN_CONFIG) {
-+            int correctedMin = mContext.getResources().getInteger(com.android.internal.R.integer
-+                            .config_screenBrightnessSettingMinimum);
-+            if(correctedMin == 0) correctedMin = 1;
-             mScreenBrightnessMinimum = BrightnessSynchronizer.brightnessIntToFloat(
--                    mContext.getResources().getInteger(com.android.internal.R.integer
--                            .config_screenBrightnessSettingMinimum));
-+                    correctedMin);
-             mScreenBrightnessMaximum = BrightnessSynchronizer.brightnessIntToFloat(
-                     mContext.getResources().getInteger(com.android.internal.R.integer
-                             .config_screenBrightnessSettingMaximum));
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
deleted file mode 100644
index cb2f5bfb..00000000
--- a/patches/trebledroid/platform_frameworks_base/0015-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From ede905dd269c33c4dfba408b51f910b98aba118c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 25 Oct 2020 23:57:26 +0100
-Subject: [PATCH 15/54] Re-implement fnmatch-like behaviour for RRO java-side
-
-T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)
-
-Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
----
- core/java/android/content/pm/PackageParser.java     | 13 +++++++++++--
- .../pm/parsing/FrameworkParsingPackageUtils.java    | 13 +++++++++++--
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 4b579e7db9f8..3bee878e2fc8 100644
---- a/core/java/android/content/pm/PackageParser.java
-+++ b/core/java/android/content/pm/PackageParser.java
-@@ -2545,8 +2545,17 @@ public class PackageParser {
-         for (int i = 0; i < propNames.length; i++) {
-             // Check property value: make sure it is both set and equal to expected value
-             final String currValue = SystemProperties.get(propNames[i]);
--            if (!TextUtils.equals(currValue, propValues[i])) {
--                return false;
-+            final String value = propValues[i];
-+            if(value.startsWith("+")) {
-+                final java.util.regex.Pattern regex = java.util.regex.Pattern.compile(value.substring(1, value.length()).replace("*", ".*"));
-+                java.util.regex.Matcher matcher = regex.matcher(currValue);
-+                if (!matcher.find()) {
-+                    return false;
-+                }
-+            } else {
-+                if(!value.equals(currValue)) {
-+                    return false;
-+                }
-             }
-         }
-         return true;
-diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-index 153dd9a93490..4eacc197b4e9 100644
---- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-+++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
-@@ -215,8 +215,17 @@ public class FrameworkParsingPackageUtils {
-         for (int i = 0; i < propNames.length; i++) {
-             // Check property value: make sure it is both set and equal to expected value
-             final String currValue = SystemProperties.get(propNames[i]);
--            if (!TextUtils.equals(currValue, propValues[i])) {
--                return false;
-+            final String value = propValues[i];
-+            if(value.startsWith("+")) {
-+                final java.util.regex.Pattern regex = java.util.regex.Pattern.compile(value.substring(1, value.length()).replace("*", ".*"));
-+                java.util.regex.Matcher matcher = regex.matcher(currValue);
-+                if (!matcher.find()) {
-+                    return false;
-+                }
-+            } else {
-+                if(!value.equals(currValue)) {
-+                    return false;
-+                }
-             }
-         }
-         return true;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch b/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
deleted file mode 100644
index 41a5d7f6..00000000
--- a/patches/trebledroid/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 53329e4771498cbaf560e1aefdcab0232b4ebfe7 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 11 Dec 2020 14:41:09 +0100
-Subject: [PATCH 16/54] Remove useless notification about "console" service
- being running
-
----
- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index 663ba8a38d77..79ab590f3f3a 100644
---- a/services/core/java/com/android/server/am/ActivityManagerService.java
-+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -5245,7 +5245,7 @@ public class ActivityManagerService extends IActivityManager.Stub
-     }
- 
-     private void showConsoleNotificationIfActive() {
--        if (!SystemProperties.get("init.svc.console").equals("running")) {
-+        if (!SystemProperties.get("init.svc.console").equals("running") || true) {
-             return;
-         }
-         String title = mContext
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch b/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
deleted file mode 100644
index 08d22ec7..00000000
--- a/patches/trebledroid/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From d8cea8e858b9e42ee3a53bc1fb8a06b78727e67c Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 17/54] Revert "Remove unused SystemProperties.set"
-
-This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
-
-* Needed for SPRD IMS
----
- .../android/telephony/TelephonyManager.java   | 69 +++++++++++++++++++
- 1 file changed, 69 insertions(+)
-
-diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 88acbabc0e0f..9d2ea48dce30 100644
---- a/telephony/java/android/telephony/TelephonyManager.java
-+++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -8504,6 +8504,75 @@ public class TelephonyManager {
-         }
-     }
- 
-+    /**
-+     * Sets a per-phone telephony property with the value specified.
-+     *
-+     * @hide
-+     */
-+    @UnsupportedAppUsage
-+    public static void setTelephonyProperty(int phoneId, String property, String value) {
-+        String propVal = "";
-+        String p[] = null;
-+        String prop = SystemProperties.get(property);
-+
-+        if (value == null) {
-+            value = "";
-+        }
-+        value.replace(',', ' ');
-+        if (prop != null) {
-+            p = prop.split(",");
-+        }
-+
-+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
-+            Rlog.d(TAG, "setTelephonyProperty: invalid phoneId=" + phoneId +
-+                    " property=" + property + " value: " + value + " prop=" + prop);
-+            return;
-+        }
-+
-+        for (int i = 0; i < phoneId; i++) {
-+            String str = "";
-+            if ((p != null) && (i < p.length)) {
-+                str = p[i];
-+            }
-+            propVal = propVal + str + ",";
-+        }
-+
-+        propVal = propVal + value;
-+        if (p != null) {
-+            for (int i = phoneId + 1; i < p.length; i++) {
-+                propVal = propVal + "," + p[i];
-+            }
-+        }
-+
-+        int propValLen = propVal.length();
-+        try {
-+            propValLen = propVal.getBytes("utf-8").length;
-+        } catch (java.io.UnsupportedEncodingException e) {
-+            Rlog.d(TAG, "setTelephonyProperty: utf-8 not supported");
-+        }
-+        if (propValLen > SystemProperties.PROP_VALUE_MAX) {
-+            Rlog.d(TAG, "setTelephonyProperty: property too long phoneId=" + phoneId +
-+                    " property=" + property + " value: " + value + " propVal=" + propVal);
-+            return;
-+        }
-+
-+        SystemProperties.set(property, propVal);
-+    }
-+
-+    /**
-+     * Sets a global telephony property with the value specified.
-+     *
-+     * @hide
-+     */
-+    public static void setTelephonyProperty(String property, String value) {
-+        if (value == null) {
-+            value = "";
-+        }
-+        Rlog.d(TAG, "setTelephonyProperty: success" + " property=" +
-+                property + " value: " + value);
-+        SystemProperties.set(property, value);
-+    }
-+
-     /**
-      * Inserts or updates a list property. Expands the list if its length is not enough.
-      */
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch b/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
deleted file mode 100644
index b4c68024..00000000
--- a/patches/trebledroid/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 889de7902ffd8664328d3bf01c1d00c22f68e1d9 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 18/54] TelephonyManager: bring back getNetworkClass()
-
-This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
-
-* Needed by Spreadtrum IMS
----
- .../android/telephony/TelephonyManager.java   | 58 +++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
-diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 9d2ea48dce30..0c1857754fd5 100644
---- a/telephony/java/android/telephony/TelephonyManager.java
-+++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -3351,6 +3351,64 @@ public class TelephonyManager {
-         }
-     }
- 
-+    /**
-+     * Network Class Definitions.
-+     * Do not change this order, it is used for sorting during emergency calling in
-+     * {@link TelephonyConnectionService#getFirstPhoneForEmergencyCall()}. Any newer technologies
-+     * should be added after the current definitions.
-+     */
-+    /** Unknown network class. {@hide} */
-+    public static final int NETWORK_CLASS_UNKNOWN = 0;
-+    /** Class of broadly defined "2G" networks. {@hide} */
-+    @UnsupportedAppUsage
-+    public static final int NETWORK_CLASS_2_G = 1;
-+    /** Class of broadly defined "3G" networks. {@hide} */
-+    @UnsupportedAppUsage
-+    public static final int NETWORK_CLASS_3_G = 2;
-+    /** Class of broadly defined "4G" networks. {@hide} */
-+    @UnsupportedAppUsage
-+    public static final int NETWORK_CLASS_4_G = 3;
-+    /** Class of broadly defined "5G" networks. {@hide} */
-+    public static final int NETWORK_CLASS_5_G = 4;
-+
-+    /**
-+     * Return general class of network type, such as "3G" or "4G". In cases
-+     * where classification is contentious, this method is conservative.
-+     *
-+     * @hide
-+     */
-+    @UnsupportedAppUsage
-+    public static int getNetworkClass(int networkType) {
-+        switch (networkType) {
-+            case NETWORK_TYPE_GPRS:
-+            case NETWORK_TYPE_GSM:
-+            case NETWORK_TYPE_EDGE:
-+            case NETWORK_TYPE_CDMA:
-+            case NETWORK_TYPE_1xRTT:
-+            case NETWORK_TYPE_IDEN:
-+                return NETWORK_CLASS_2_G;
-+            case NETWORK_TYPE_UMTS:
-+            case NETWORK_TYPE_EVDO_0:
-+            case NETWORK_TYPE_EVDO_A:
-+            case NETWORK_TYPE_HSDPA:
-+            case NETWORK_TYPE_HSUPA:
-+            case NETWORK_TYPE_HSPA:
-+            case NETWORK_TYPE_EVDO_B:
-+            case NETWORK_TYPE_EHRPD:
-+            case NETWORK_TYPE_HSPAP:
-+            case NETWORK_TYPE_TD_SCDMA:
-+                return NETWORK_CLASS_3_G;
-+            case NETWORK_TYPE_LTE:
-+            case NETWORK_TYPE_IWLAN:
-+            case NETWORK_TYPE_LTE_CA:
-+                return NETWORK_CLASS_4_G;
-+            case NETWORK_TYPE_NR:
-+                return NETWORK_CLASS_5_G;
-+            default:
-+                return NETWORK_CLASS_UNKNOWN;
-+        }
-+    }
-+
-     /**
-      * Returns a string representation of the radio technology (network type)
-      * currently in use on the device.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
deleted file mode 100644
index f9b9ec9e..00000000
--- a/patches/trebledroid/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5532c13ae6f101786c3271126d8cdf7240fd72a9 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 19/54] TelephonyManager: add API annotations for
- setTelephonyProperty
-
-* This method was added back by reverting commit
-  debb4616ef67f9ed5054eca51ec58592358ff55f, but they do not conform to
-  the new R API requirements.
-
-* R requires such annotations.
----
- telephony/java/android/telephony/TelephonyManager.java | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 0c1857754fd5..0c9601ad7b30 100644
---- a/telephony/java/android/telephony/TelephonyManager.java
-+++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -8568,7 +8568,7 @@ public class TelephonyManager {
-      * @hide
-      */
-     @UnsupportedAppUsage
--    public static void setTelephonyProperty(int phoneId, String property, String value) {
-+    public static void setTelephonyProperty(int phoneId, @NonNull String property, @Nullable String value) {
-         String propVal = "";
-         String p[] = null;
-         String prop = SystemProperties.get(property);
-@@ -8622,7 +8622,8 @@ public class TelephonyManager {
-      *
-      * @hide
-      */
--    public static void setTelephonyProperty(String property, String value) {
-+    @UnsupportedAppUsage
-+    public static void setTelephonyProperty(@NonNull String property, @Nullable String value) {
-         if (value == null) {
-             value = "";
-         }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch b/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
deleted file mode 100644
index 9d294be4..00000000
--- a/patches/trebledroid/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8292e49e51fdd6540b15454beb259945f8e49f2 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Tue, 2 Feb 2021 10:20:51 +0000
-Subject: [PATCH 20/54] Fix Wakelock issue
-
-Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
----
- .../src/com/android/systemui/util/wakelock/WakeLock.java      | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
-index 707751a58d84..72a522e22693 100644
---- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
-+++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
-@@ -150,7 +150,9 @@ public interface WakeLock {
-                 if (logger != null) {
-                     logger.logRelease(inner, why, count);
-                 }
--                inner.release();
-+                if (inner.isHeld()) {
-+                    inner.release();
-+                }
-             }
- 
-             /** @see PowerManager.WakeLock#wrap(Runnable) */
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
deleted file mode 100644
index be16098d..00000000
--- a/patches/trebledroid/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd0c7445a8e30b1834f167e8fb6844c5eaedf2dc Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 20 Mar 2021 14:31:01 +0100
-Subject: [PATCH 21/54] Automatically detect pick up sensor, so that an overlay
- is required for the sole purpose of enabling pulse doze on pick up sensor
-
----
- .../display/AmbientDisplayConfiguration.java  | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/core/java/android/hardware/display/AmbientDisplayConfiguration.java b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
-index 47541ca16cda..28168b9208f5 100644
---- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
-+++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
-@@ -25,6 +25,9 @@ import android.text.TextUtils;
- import android.util.ArrayMap;
- import android.util.SparseArray;
- 
-+import android.hardware.SensorManager;
-+import android.hardware.Sensor;
-+
- import com.android.internal.R;
- import com.android.internal.util.ArrayUtils;
- 
-@@ -105,8 +108,20 @@ public class AmbientDisplayConfiguration {
- 
-     /** @hide */
-     public boolean dozePickupSensorAvailable() {
--        return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup);
--    }
-+        SensorManager sm = mContext.getSystemService(SensorManager.class);
-+        boolean found = false;
-+        if(sm == null) {
-+            android.util.Log.d("PHH", "Failed getting sensor manager, can't detect pickup sensor");
-+        } else {
-+            java.util.List<Sensor> sensors = sm.getSensorList(Sensor.TYPE_ALL);
-+            for(Sensor s : sensors) {
-+                if(Sensor.STRING_TYPE_PICK_UP_GESTURE.equals(s.getStringType())) {
-+                    found = true;
-+                    break;
-+                }
-+            }
-+        }
-+        return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup) || found;    }
- 
-     /** @hide */
-     public boolean tapGestureEnabled(int user) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
deleted file mode 100644
index 29a5522d..00000000
--- a/patches/trebledroid/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b0bc2cfb2167e78ec75d570050352bc50b30fa1b Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 23 Mar 2021 19:43:26 +0100
-Subject: [PATCH 22/54] Catch broken mainBuiltInDisplayCutoutRectApproximation
-
-Some devices (Redmi Note 9T) have:
-mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
-Since mainBuiltInDisplayCutout is private, its ID is dynamic and can't
-be relied upon.
-This means that we'll get garbage in mainBuiltInDisplayCutoutRectApproximation
-The SVG Path parser will fail, triggering an exception.
-
-Fix it by catching it, and parsing mainBuiltInDisplayCutout instead
-
-Change-Id: I03b6e78bac2cc38f3a623c8add801405ad6ba7ba
----
- core/java/android/view/DisplayCutout.java | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/core/java/android/view/DisplayCutout.java b/core/java/android/view/DisplayCutout.java
-index db665a92ec5c..fcf7152f503c 100644
---- a/core/java/android/view/DisplayCutout.java
-+++ b/core/java/android/view/DisplayCutout.java
-@@ -1188,12 +1188,21 @@ public final class DisplayCutout {
-     public static DisplayCutout fromResourcesRectApproximation(Resources res,
-             String displayUniqueId, int physicalDisplayWidth, int physicalDisplayHeight,
-             int displayWidth, int displayHeight) {
--        return pathAndDisplayCutoutFromSpec(getDisplayCutoutPath(res, displayUniqueId),
--                getDisplayCutoutApproximationRect(res, displayUniqueId), physicalDisplayWidth,
--                physicalDisplayHeight, displayWidth, displayHeight,
--                DENSITY_DEVICE_STABLE / (float) DENSITY_DEFAULT,
--                getWaterfallInsets(res, displayUniqueId),
--                getDisplayCutoutSideOverrides(res, displayUniqueId)).second;
-+        try {
-+            return pathAndDisplayCutoutFromSpec(getDisplayCutoutPath(res, displayUniqueId),
-+                    getDisplayCutoutApproximationRect(res, displayUniqueId), physicalDisplayWidth,
-+                    physicalDisplayHeight, displayWidth, displayHeight,
-+                    DENSITY_DEVICE_STABLE / (float) DENSITY_DEFAULT,
-+                    getWaterfallInsets(res, displayUniqueId),
-+                    getDisplayCutoutSideOverrides(res, displayUniqueId)).second;
-+        } catch(Throwable t) {
-+            return pathAndDisplayCutoutFromSpec(getDisplayCutoutPath(res, displayUniqueId),
-+                    null, physicalDisplayWidth,
-+                    physicalDisplayHeight, displayWidth, displayHeight,
-+                    DENSITY_DEVICE_STABLE / (float) DENSITY_DEFAULT,
-+                    getWaterfallInsets(res, displayUniqueId),
-+                    getDisplayCutoutSideOverrides(res, displayUniqueId)).second;
-+        }
-     }
- 
-     /**
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
deleted file mode 100644
index 9cc78265..00000000
--- a/patches/trebledroid/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From f6529956526ad8bff7e3309f9d987f67bd5af829 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 23/54] backlight: Fix backlight control on Galaxy S9(+)
-
-Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
-
-:backlight: S9 brightness override only for screen
-
-Change-Id: Ie16a46336fa64850014b962429f7a20ff569222f
-
-:backlight: [WIP] Fix OP6 brightness
-
-Change-Id: If08959ece6cac1f27e1f1a0bd966ee8e1813241d
-
-:backlight: Try to make brightness more generic using property set by rw-system
-
-Change-Id: I0f20ca4b1f0fa1fcfd19833aa291fbdf16d6eedd
-
-:backlight: Add Qualcomm starlte
-
-Change-Id: I12a445344deb8b2e59a2f6ce6b24c1ffe5675092
-
-:backlight: Switch samsung light fingerprint match to regexp, to include Note9
-
-Change-Id: I2995f7bab615aec125927a5a027ad8f9ae43405f
-
-Add a property toggle to enable high brightness range on samsung device
-
-Change-Id: I649a3985ef87f46a5515a63935fdae9cdcbd8ec5
-
-:backlight: Add japanese S9
-
-Change-Id: I5e245469f5f51fed14c6080e5be72506e10389e0
-
-:backlight: Fix backlight on S10*. Add an additional property to check, so testers can try it more easily
-
-Change-Id: Ia224e641cad8561201b4dee3d896362bee80c903
-
-:backlight: Make samsung light HAL more overridable
-
-Change-Id: Ie04f394f8a614da8070f330bcadbcbe12895bed0
-
-Use new backlight control API only for backlight, not for other lights
-
-Change-Id: I35c35fabff8b275f35671dcb8578b96dcad526f1
-
-:backlight: fixup
-
-Change-Id: I4e85178327d2bb63d5d0a37786058843662a89ba
----
- .../android/server/lights/LightsService.java  | 46 +++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 6124b553498c..67f6932921f6 100644
---- a/services/core/java/com/android/server/lights/LightsService.java
-+++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -31,6 +31,7 @@ import android.os.Looper;
- import android.os.PermissionEnforcer;
- import android.os.RemoteException;
- import android.os.ServiceManager;
-+import android.os.SystemProperties;
- import android.os.Trace;
- import android.provider.Settings;
- import android.util.Slog;
-@@ -297,6 +298,51 @@ public class LightsService extends SystemService {
-                     return;
-                 }
-                 int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness);
-+
-+                if(mHwLight.id == 0) {
-+                    String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
-+                    if(fp.matches(".*astarqlte.*")) {
-+                        int newBrightness = brightnessInt;
-+                        if(SystemProperties.getBoolean("persist.sys.samsung.full_brightness", false)) {
-+                            newBrightness = (int) (brightnessInt * 365.0 / 255.0);
-+                        }
-+                        setLightLocked(newBrightness, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
-+                        return;
-+                    }
-+
-+                    int useSamsungBacklight = SystemProperties.getInt("persist.sys.phh.samsung_backlight", -1);
-+                    if(useSamsungBacklight != 0) {
-+                        if(useSamsungBacklight > 0 ||
-+                                fp.matches(".*beyond.*lte.*") ||
-+                                fp.matches(".*(crown|star)[q2]*lte.*") ||
-+                                fp.matches(".*(SC-0[23]K|SCV3[89]).*")) {
-+                            int ratio = 100;
-+                            if(useSamsungBacklight > 1)
-+                                ratio = useSamsungBacklight;
-+                            int newBrightness = brightnessInt * ratio;
-+                            if(SystemProperties.getBoolean("persist.sys.samsung.full_brightness", false)) {
-+                                newBrightness = (int) (brightnessInt * 40960.0 / 255.0);
-+                            }
-+                            setLightLocked(newBrightness, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
-+                            return;
-+                        }
-+                    }
-+
-+                    boolean qcomExtendBrightness = SystemProperties.getBoolean("persist.extend.brightness", false);
-+                    int scale = SystemProperties.getInt("persist.display.max_brightness", 1023);
-+                    //This is set by vndk-detect
-+                    int qcomScale = SystemProperties.getInt("persist.sys.qcom-brightness", -1);
-+                    if(qcomScale != -1) {
-+                        qcomExtendBrightness = true;
-+                        scale = qcomScale;
-+                    }
-+
-+                    if(qcomExtendBrightness) {
-+                        setLightLocked(brightnessInt * scale / 255, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
-+                        return;
-+                    }
-+                }
-+
-                 int color = brightnessInt & 0x000000ff;
-                 color = 0xff000000 | (color << 16) | (color << 8) | color;
-                 setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
deleted file mode 100644
index 144a14d4..00000000
--- a/patches/trebledroid/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 85e659c511cd04c9c38d4dd8ef31a2aa754d69cc Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sat, 4 Sep 2021 08:26:30 +0000
-Subject: [PATCH 24/54] Revert "Switch long-press power behavior in AOSP."
-
-This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
----
- core/res/res/values/config.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 8edf42afa730..7af64afa620a 100644
---- a/core/res/res/values/config.xml
-+++ b/core/res/res/values/config.xml
-@@ -1146,7 +1146,7 @@
-             4 - Go to voice assist
-             5 - Go to assistant (Settings.Secure.ASSISTANT)
-     -->
--    <integer name="config_longPressOnPowerBehavior">5</integer>
-+    <integer name="config_longPressOnPowerBehavior">1</integer>
- 
-     <!-- The time in milliseconds after which a press on power button is considered "long". -->
-     <integer name="config_longPressOnPowerDurationMs">500</integer>
-@@ -1178,7 +1178,7 @@
-             1 - Mute toggle
-             2 - Global actions menu
-     -->
--    <integer name="config_keyChordPowerVolumeUp">2</integer>
-+    <integer name="config_keyChordPowerVolumeUp">1</integer>
- 
-     <!-- Control the behavior when the user long presses the back button.  Non-zero values are only
-          valid for watches as part of CDD/CTS.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch b/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
deleted file mode 100644
index 3c89eb7f..00000000
--- a/patches/trebledroid/platform_frameworks_base/0025-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2a1ee059c06724737018301410ced6844e011b16 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 2 Apr 2022 18:04:01 -0400
-Subject: [PATCH 25/54] Allow disabling of fingerprint cleanups, needed on some
- Realme devices that cant enumerate
-
----
- .../biometrics/sensors/fingerprint/hidl/Fingerprint21.java      | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-index 33e448bbe612..387693f2737d 100644
---- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
-@@ -1007,6 +1007,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
- 
-     private void scheduleInternalCleanup(int userId,
-             @Nullable ClientMonitorCallback callback) {
-+	final boolean mNocleanup = android.os.SystemProperties.getBoolean("persist.sys.phh.fingerprint.nocleanup", false);
-+	if(mNocleanup) return;
-         mHandler.post(() -> {
-             scheduleUpdateActiveUserWithoutHandler(userId);
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch b/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
deleted file mode 100644
index 0a8ff61b..00000000
--- a/patches/trebledroid/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c531613aa6ff8e21d3ff56f81d802502cc6973fa Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 20 Dec 2021 15:01:41 -0500
-Subject: [PATCH 26/54] Dynamically resize boot animation to match screen size
-
-Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
----
- cmds/bootanimation/BootAnimation.cpp | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
-index 77b74e9898b8..ba14cc03fccb 100644
---- a/cmds/bootanimation/BootAnimation.cpp
-+++ b/cmds/bootanimation/BootAnimation.cpp
-@@ -618,6 +618,28 @@ status_t BootAnimation::readyToRun() {
-     mFlingerSurface = s;
-     mTargetInset = -1;
- 
-+    if ( mAnimation != nullptr ) {
-+        SLOGE("Got screen size %d, animation size %d", mWidth, mAnimation->width);
-+        int origWidth = mAnimation->width;
-+        if ( mAnimation->width*2 < mWidth ) {
-+            SLOGE("Making animation bigger");
-+            mAnimation->width *= 2;
-+            mAnimation->height *= 2;
-+        } else if ( mWidth < mAnimation->width ) {
-+            SLOGE("Making animation smaller");
-+            mAnimation->width /= 2;
-+            mAnimation->height /= 2;
-+        }
-+        for (Animation::Part& part : mAnimation->parts) {
-+            for(auto& frame: part.frames) {
-+                if(frame.trimWidth == origWidth && frame.trimX == 0 && frame.trimY == 0) {
-+                    frame.trimWidth = mAnimation->width;
-+                    frame.trimHeight = mAnimation->height;
-+                }
-+            }
-+        }
-+    }
-+
-     // Rotate the boot animation according to the value specified in the sysprop
-     // ro.bootanim.set_orientation_<display_id>. Four values are supported: ORIENTATION_0,
-     // ORIENTATION_90, ORIENTATION_180 and ORIENTATION_270.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch b/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
deleted file mode 100644
index 6292e6e9..00000000
--- a/patches/trebledroid/platform_frameworks_base/0027-Revert-Remove-more-FDE-methods-from-StorageManager.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 3503adeb4c3fa88555de054f8837c403325f2a03 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sat, 15 Oct 2022 09:33:56 +0000
-Subject: [PATCH 27/54] Revert "Remove more FDE methods from StorageManager"
-
-This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
-
-Change-Id: Ic394934ec27b1a486c60123130825d44dad73412
----
- .../android/os/storage/StorageManager.java    | 74 +++++++++++++++++++
- .../internal/os/RoSystemProperties.java       |  4 +
- 2 files changed, 78 insertions(+)
-
-diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
-index d45a17f7194e..6850e261e6ad 100644
---- a/core/java/android/os/storage/StorageManager.java
-+++ b/core/java/android/os/storage/StorageManager.java
-@@ -1709,6 +1709,15 @@ public class StorageManager {
-         return false;
-     }
- 
-+    /** {@hide}
-+     * Is this device encryptable or already encrypted?
-+     * @return true for encryptable or encrypted
-+     *         false not encrypted and not encryptable
-+     */
-+    public static boolean isEncryptable() {
-+        return RoSystemProperties.CRYPTO_ENCRYPTABLE;
-+    }
-+
-     /** {@hide}
-      * Is this device encrypted?
-      * <p>
-@@ -1733,6 +1742,71 @@ public class StorageManager {
-         return RoSystemProperties.CRYPTO_FILE_ENCRYPTED;
-     }
- 
-+    /** {@hide}
-+     * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported.
-+     */
-+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-+    @Deprecated
-+    public static boolean isFileEncryptedNativeOnly() {
-+        return false;
-+    }
-+
-+    /** {@hide}
-+     * Is this device block encrypted?
-+     * @return true for block encrypted. (Implies isEncrypted() == true)
-+     *         false not encrypted or file encrypted
-+     */
-+    public static boolean isBlockEncrypted() {
-+        return false;
-+    }
-+
-+    /** {@hide}
-+     * Is this device block encrypted with credentials?
-+     * @return true for crediential block encrypted.
-+     *         (Implies isBlockEncrypted() == true)
-+     *         false not encrypted, file encrypted or default block encrypted
-+     */
-+    public static boolean isNonDefaultBlockEncrypted() {
-+        return false;
-+    }
-+
-+    /** {@hide}
-+     * Is this device in the process of being block encrypted?
-+     * @return true for encrypting.
-+     *         false otherwise
-+     * Whether device isEncrypted at this point is undefined
-+     * Note that only system services and CryptKeeper will ever see this return
-+     * true - no app will ever be launched in this state.
-+     * Also note that this state will not change without a teardown of the
-+     * framework, so no service needs to check for changes during their lifespan
-+     */
-+    public static boolean isBlockEncrypting() {
-+        return false;
-+    }
-+
-+    /** {@hide}
-+     * Is this device non default block encrypted and in the process of
-+     * prompting for credentials?
-+     * @return true for prompting for credentials.
-+     *         (Implies isNonDefaultBlockEncrypted() == true)
-+     *         false otherwise
-+     * Note that only system services and CryptKeeper will ever see this return
-+     * true - no app will ever be launched in this state.
-+     * Also note that this state will not change without a teardown of the
-+     * framework, so no service needs to check for changes during their lifespan
-+     */
-+    public static boolean inCryptKeeperBounce() {
-+        return false;
-+    }
-+
-+    /** {@hide}
-+     * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported.
-+     */
-+    @Deprecated
-+    public static boolean isFileEncryptedNativeOrEmulated() {
-+        return false;
-+    }
-+
-     /** {@hide} */
-     public static boolean hasAdoptable() {
-         switch (SystemProperties.get(PROP_ADOPTABLE)) {
-diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
-index 40d5c4761dff..66288706b0f1 100644
---- a/core/java/com/android/internal/os/RoSystemProperties.java
-+++ b/core/java/com/android/internal/os/RoSystemProperties.java
-@@ -68,10 +68,14 @@ public class RoSystemProperties {
-     public static final CryptoProperties.type_values CRYPTO_TYPE =
-             CryptoProperties.type().orElse(CryptoProperties.type_values.NONE);
-     // These are pseudo-properties
-+    public static final boolean CRYPTO_ENCRYPTABLE =
-+            CRYPTO_STATE != CryptoProperties.state_values.UNSUPPORTED;
-     public static final boolean CRYPTO_ENCRYPTED =
-             CRYPTO_STATE == CryptoProperties.state_values.ENCRYPTED;
-     public static final boolean CRYPTO_FILE_ENCRYPTED =
-             CRYPTO_TYPE == CryptoProperties.type_values.FILE;
-+    public static final boolean CRYPTO_BLOCK_ENCRYPTED =
-+            CRYPTO_TYPE == CryptoProperties.type_values.BLOCK;
- 
-     public static final boolean CONTROL_PRIVAPP_PERMISSIONS_LOG =
-             "log".equalsIgnoreCase(CONTROL_PRIVAPP_PERMISSIONS);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch b/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
deleted file mode 100644
index 625d9adb..00000000
--- a/patches/trebledroid/platform_frameworks_base/0028-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 780b1cd591b16004fcac81cb45917ccca2179992 Mon Sep 17 00:00:00 2001
-From: Arne Coucheron <arco68@gmail.com>
-Date: Thu, 5 Nov 2020 05:38:44 +0100
-Subject: [PATCH 28/54] SystemUI: Use AVCProfileMain for screen recorder
-
-Some devices don't support the High profile very well.
-Use Main profile, which is more compatible, so they
-can use screen recorder too.
-
-Change-Id: Iac23480e080edf4300e6f411c3394c0b41030daa
----
- .../com/android/systemui/screenrecord/ScreenMediaRecorder.java  | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
-index 5469a4e9da08..60b8e7175da3 100644
---- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
-+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
-@@ -152,7 +152,7 @@ public class ScreenMediaRecorder extends MediaProjection.Callback {
-                 * VIDEO_FRAME_RATE_TO_RESOLUTION_RATIO;
-         mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
-         mMediaRecorder.setVideoEncodingProfileLevel(
--                MediaCodecInfo.CodecProfileLevel.AVCProfileHigh,
-+                MediaCodecInfo.CodecProfileLevel.AVCProfileMain,
-                 MediaCodecInfo.CodecProfileLevel.AVCLevel3);
-         mMediaRecorder.setVideoSize(width, height);
-         mMediaRecorder.setVideoFrameRate(refreshRate);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch b/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
deleted file mode 100644
index 7e55899d..00000000
--- a/patches/trebledroid/platform_frameworks_base/0029-Set-old-fingerprint-sensors-to-security-strong.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 88211b27bc92eef04735e42c564e585929ac85bf Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 3 Dec 2022 17:13:24 -0500
-Subject: [PATCH 29/54] Set old fingerprint sensors to security "strong"
-
-This allows removing config_biometric_sensors from overlays, which led
-to Pixels not booting, because they are using AIDL biometric sensor, and
-despite its name, config_biometric_sensors is HIDL-specific
----
- .../core/java/com/android/server/biometrics/AuthService.java  | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
-index 48bf9f4967bc..2f7cd14f44b2 100644
---- a/services/core/java/com/android/server/biometrics/AuthService.java
-+++ b/services/core/java/com/android/server/biometrics/AuthService.java
-@@ -763,7 +763,7 @@ public class AuthService extends SystemService {
-             final int firstApiLevel = SystemProperties.getInt(SYSPROP_FIRST_API_LEVEL, 0);
-             final int apiLevel = SystemProperties.getInt(SYSPROP_API_LEVEL, firstApiLevel);
-             String[] configStrings = mInjector.getConfiguration(getContext());
--            if (configStrings.length == 0 && apiLevel == Build.VERSION_CODES.R) {
-+            if (configStrings.length == 0 && apiLevel <= Build.VERSION_CODES.R) {
-                 // For backwards compatibility with R where biometrics could work without being
-                 // configured in config_biometric_sensors. In the absence of a vendor provided
-                 // configuration, we assume the weakest biometric strength (i.e. convenience).
-@@ -925,7 +925,7 @@ public class AuthService extends SystemService {
-         if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
-             modalities.add(String.valueOf(BiometricAuthenticator.TYPE_FACE));
-         }
--        final String strength = String.valueOf(Authenticators.BIOMETRIC_CONVENIENCE);
-+        final String strength = String.valueOf(Authenticators.BIOMETRIC_STRONG);
-         final String[] configStrings = new String[modalities.size()];
-         for (int i = 0; i < modalities.size(); ++i) {
-             final String id = String.valueOf(i);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch b/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
deleted file mode 100644
index 44a14af0..00000000
--- a/patches/trebledroid/platform_frameworks_base/0030-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 844e4f92f7324a5aa5988669e84cbe92ab4fcf27 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 14 Dec 2022 17:21:00 -0500
-Subject: [PATCH 30/54] Call Samsung's ISehSysInputDev to report screen state
- to touchscreen driver
-
-This fixes touchscreen not waking up on Galaxy F23
----
- services/core/Android.bp                      |  1 +
- .../server/display/LocalDisplayAdapter.java   | 31 +++++++++++++++++++
- 2 files changed, 32 insertions(+)
-
-diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 5fe4be72c036..1934f8196639 100644
---- a/services/core/Android.bp
-+++ b/services/core/Android.bp
-@@ -255,6 +255,7 @@ java_library_static {
-         "net_flags_lib",
-         "stats_flags_lib",
-         "core_os_flags_lib",
-+        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
-     ],
-     javac_shard_size: 50,
-     javacflags: [
-diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
-index 88c24e0a7eff..ac4a9c474c9e 100644
---- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
-+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
-@@ -38,6 +38,7 @@ import android.os.Trace;
- import android.util.DisplayUtils;
- import android.util.LongSparseArray;
- import android.util.Slog;
-+import android.util.Log;
- import android.util.SparseArray;
- import android.view.Display;
- import android.view.DisplayAddress;
-@@ -58,6 +59,8 @@ import com.android.server.display.notifications.DisplayNotificationManager;
- import com.android.server.lights.LightsManager;
- import com.android.server.lights.LogicalLight;
- 
-+import vendor.samsung.hardware.sysinput.V1_1.ISehSysInputDev;
-+
- import java.io.PrintWriter;
- import java.util.ArrayList;
- import java.util.Arrays;
-@@ -251,6 +254,8 @@ final class LocalDisplayAdapter extends DisplayAdapter {
- 
-         private DisplayEventReceiver.FrameRateOverride[] mFrameRateOverrides =
-                 new DisplayEventReceiver.FrameRateOverride[0];
-+        private boolean triedSamsungHal = false;
-+        private ISehSysInputDev samsungSysinput = null;
- 
-         LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
-                 SurfaceControl.StaticDisplayInfo staticDisplayInfo,
-@@ -859,16 +864,42 @@ final class LocalDisplayAdapter extends DisplayAdapter {
-                             }
-                         }
- 
-+                        if (!triedSamsungHal) {
-+                            triedSamsungHal = true;
-+                            try {
-+                                samsungSysinput = ISehSysInputDev.getService();
-+                            } catch(Throwable t) {}
-+                        }
-                         final int mode = getPowerModeForState(state);
-                         Trace.traceBegin(Trace.TRACE_TAG_POWER, "setDisplayState("
-                                 + "id=" + physicalDisplayId
-                                 + ", state=" + Display.stateToString(state) + ")");
-+
-+                        if (samsungSysinput != null) {
-+                            try {
-+                                Log.d("PHH", "setTspEnable 1, " + state + ", true");
-+                                samsungSysinput.setTspEnable(1, state, true);
-+                            } catch(Throwable t) {
-+                                Log.d("PHH", "Failed settings tsp enable", t);
-+                            }
-+                        }
-+
-                         try {
-                             mSurfaceControlProxy.setDisplayPowerMode(token, mode);
-                             Trace.traceCounter(Trace.TRACE_TAG_POWER, "DisplayPowerMode", mode);
-                         } finally {
-                             Trace.traceEnd(Trace.TRACE_TAG_POWER);
-                         }
-+
-+                        if (samsungSysinput != null) {
-+                            try {
-+                                Log.d("PHH", "setTspEnable 1, " + state + ", false");
-+                                samsungSysinput.setTspEnable(1, state, false);
-+                            } catch(Throwable t) {
-+                                Log.d("PHH", "Failed settings tsp enable", t);
-+                            }
-+                        }
-+
-                         setCommittedState(state);
- 
-                         // If we're entering a suspended (but not OFF) power state and we
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch b/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
deleted file mode 100644
index 062d412b..00000000
--- a/patches/trebledroid/platform_frameworks_base/0031-Try-catch-around-constrainNitsAndBacklightArrays-and.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From dff98e9216531c4c1de3ae8f2288ffa321f362c6 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 2 Jun 2023 19:19:31 -0400
-Subject: [PATCH 31/54] Try catch around constrainNitsAndBacklightArrays, and
- falls back to dumb curve. It crashes on Xperia 1 IV.
-
----
- .../server/display/DisplayDeviceConfig.java   | 56 ++++++++++---------
- 1 file changed, 31 insertions(+), 25 deletions(-)
-
-diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-index 04e06b99d3ee..663f78f78e50 100644
---- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
-@@ -2145,37 +2145,43 @@ public class DisplayDeviceConfig {
-             return;
-         }
- 
--        // Use the (preferred) display device config mapping
--        final List<Point> points = map.getPoint();
--        final int size = points.size();
-+        try {
-+            // Use the (preferred) display device config mapping
-+            final List<Point> points = map.getPoint();
-+            final int size = points.size();
- 
--        float[] nits = new float[size];
--        float[] backlight = new float[size];
-+            float[] nits = new float[size];
-+            float[] backlight = new float[size];
- 
--        mInterpolationType = convertInterpolationType(map.getInterpolation());
--        int i = 0;
--        for (Point point : points) {
--            nits[i] = point.getNits().floatValue();
--            backlight[i] = point.getValue().floatValue();
--            if (i > 0) {
--                if (nits[i] < nits[i - 1]) {
--                    Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
--                            + " of configuration. Nits: " + nits[i] + " < " + nits[i - 1]);
--                    return;
--                }
-+            mInterpolationType = convertInterpolationType(map.getInterpolation());
-+            int i = 0;
-+            for (Point point : points) {
-+                nits[i] = point.getNits().floatValue();
-+                backlight[i] = point.getValue().floatValue();
-+                if (i > 0) {
-+                    if (nits[i] < nits[i - 1]) {
-+                        Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
-+                                + " of configuration. Nits: " + nits[i] + " < " + nits[i - 1]);
-+                        return;
-+                    }
- 
--                if (backlight[i] < backlight[i - 1]) {
--                    Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
--                            + " of configuration. Value: " + backlight[i] + " < "
--                            + backlight[i - 1]);
--                    return;
-+                    if (backlight[i] < backlight[i - 1]) {
-+                        Slog.e(TAG, "screenBrightnessMap must be non-decreasing, ignoring rest "
-+                                + " of configuration. Value: " + backlight[i] + " < "
-+                                + backlight[i - 1]);
-+                        return;
-+                    }
-                 }
-+                ++i;
-             }
--            ++i;
-+            mRawNits = nits;
-+            mRawBacklight = backlight;
-+            constrainNitsAndBacklightArrays();
-+        } catch(Throwable t) {
-+            mRawNits = null;
-+            mRawBacklight = null;
-+            setSimpleMappingStrategyValues();
-         }
--        mRawNits = nits;
--        mRawBacklight = backlight;
--        constrainNitsAndBacklightArrays();
-     }
- 
-     private Spline loadSdrHdrRatioMap(HighBrightnessMode hbmConfig) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch b/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
deleted file mode 100644
index 9030e8d2..00000000
--- a/patches/trebledroid/platform_frameworks_base/0032-Add-Mediatek-power-hints-on-touch.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From b3ac1c493a2487279951cbdc32a8ab6c8f673817 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 17 Jun 2023 08:31:55 -0400
-Subject: [PATCH 32/54] Add Mediatek power hints on touch
-
-Mediatek has multiple HALs (which existed concurrently), so it is a bit
-of a mess.
-From what I can tell, mOldMtkPerf is used on Android 10 vendors, while
-mMtkPerf is used on Android 11/12 vendors.
-If anyone has an Android 9 vendor and want to take a look, I think it
-would be something like this:
-vendor.mediatek.hardware.power.V2_0.IPower.powerHint()
-
-On some devices, sending the touch boost isn't very helpful. Our guess
-is that Android 12 rendering got a lot heavier, and then touch boost is
-not enough. So, we add a property to /cheat/ and report a bigger boost:
-APP_ROTATE.
-On the few devices we've seen, touch boost only boosts scheduler, while
-app rotate will also for cpu min frequency.
-Experimentally using this app rotate boost indeed makes the device much
-smoother.
-
-Change-Id: I9f1eac5a20b98920a5d0c8204fe4d165ba069f5a
----
- services/core/Android.bp                      |  4 +-
- .../com/android/server/wm/DisplayPolicy.java  | 49 +++++++++++++++++++
- 2 files changed, 52 insertions(+), 1 deletion(-)
-
-diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 1934f8196639..eb2520546e8f 100644
---- a/services/core/Android.bp
-+++ b/services/core/Android.bp
-@@ -255,7 +255,9 @@ java_library_static {
-         "net_flags_lib",
-         "stats_flags_lib",
-         "core_os_flags_lib",
--        "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
-+        // HIDL
-+        "vendor.mediatek.hardware.mtkpower-V1.1-java",
-+        "vendor.samsung.hardware.sysinput-V1.2-java",
-     ],
-     javac_shard_size: 50,
-     javacflags: [
-diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index 7f3df958664c..d02360adf06e 100644
---- a/services/core/java/com/android/server/wm/DisplayPolicy.java
-+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -216,6 +216,9 @@ public class DisplayPolicy {
-      */
-     private boolean mRemoteInsetsControllerControlsSystemBars;
- 
-+    private vendor.mediatek.hardware.mtkpower.V1_1.IMtkPerf mMtkPerf;
-+    private vendor.mediatek.hardware.mtkpower.V1_0.IMtkPower mOldMtkPerf;
-+
-     StatusBarManagerInternal getStatusBarManagerInternal() {
-         synchronized (mServiceAcquireLock) {
-             if (mStatusBarManagerInternal == null) {
-@@ -425,6 +428,19 @@ public class DisplayPolicy {
-             mScreenOnEarly = true;
-             mScreenOnFully = true;
-         }
-+        try {
-+            mMtkPerf = vendor.mediatek.hardware.mtkpower.V1_1.IMtkPerf.getService();
-+        } catch(Throwable t) {
-+            android.util.Log.d("PHH-Power", "Retrieving mtkpower 1.0", t);
-+            mMtkPerf = null;
-+        }
-+
-+        try {
-+            mOldMtkPerf = vendor.mediatek.hardware.mtkpower.V1_0.IMtkPower.getService();
-+        } catch(Throwable t) {
-+            android.util.Log.d("PHH-Power", "Retrieving mtkpower 1.0", t);
-+            mOldMtkPerf = null;
-+        }
- 
-         final Looper looper = UiThread.getHandler().getLooper();
-         mHandler = new PolicyHandler(looper);
-@@ -509,6 +525,17 @@ public class DisplayPolicy {
-                         mService.mPowerManagerInternal.setPowerBoost(
-                                 Boost.INTERACTION, duration);
-                     }
-+                    if(mOldMtkPerf != null) {
-+                        try {
-+                            android.util.Log.d("PHH-Power", "mtk1 fling power hint");
-+                            int hint = 36; // MTKPOWER_HINT_APP_TOUCH
-+                            if("rotate".equals(SystemProperties.get("persist.sys.phh.touch_hint")))
-+                                    hint = 35; // MTKPOWER_HINT_APP_ROTATE
-+                            mOldMtkPerf.mtkPowerHint(hint, duration);
-+                        } catch(Throwable t) {
-+                            android.util.Log.d("PHH-Power", "Failed sending touch power hint", t);
-+                        }
-+                    }
-                 }
- 
-                 @Override
-@@ -527,6 +554,28 @@ public class DisplayPolicy {
-                     if (listener != null) {
-                         listener.onTouchStart();
-                     }
-+                    if(mMtkPerf != null) {
-+                        try {
-+                            android.util.Log.d("PHH-Power", "mtk power hint");
-+                            int hint = 25; //MTKPOWER_HINT_APP_TOUCH
-+                            if("rotate".equals(SystemProperties.get("persist.sys.phh.touch_hint")))
-+                                    hint = 24; // MTKPOWER_HINT_APP_ROTATE
-+                            mMtkPerf.perfCusLockHint(hint, 1000);
-+                        } catch(Throwable t) {
-+                            android.util.Log.d("PHH-Power", "Failed sending touch power hint", t);
-+                        }
-+                    }
-+                    if(mOldMtkPerf != null) {
-+                        try {
-+                            android.util.Log.d("PHH-Power", "mtk1 power hint");
-+                            int hint = 36; // MTKPOWER_HINT_APP_TOUCH
-+                            if("rotate".equals(SystemProperties.get("persist.sys.phh.touch_hint")))
-+                                    hint = 35; // MTKPOWER_HINT_APP_ROTATE
-+                            mOldMtkPerf.mtkPowerHint(hint, 1000);
-+                        } catch(Throwable t) {
-+                            android.util.Log.d("PHH-Power", "Failed sending touch power hint", t);
-+                        }
-+                    }
-                 }
- 
-                 @Override
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch b/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
deleted file mode 100644
index b9ce2368..00000000
--- a/patches/trebledroid/platform_frameworks_base/0033-Detect-Moto-dynamic-hardware-feature.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 92b561fb992fddd46bc7985e97c4bd7c229532e3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 5 Jul 2023 10:50:36 -0400
-Subject: [PATCH 33/54] Detect Moto dynamic hardware feature
-
-Moto added a custom node in sysconfig XMLs:
-<unavailable-feature-conditional />
-This node reads a property and enables a feature based on it.
-
-Take those into account to enable NFC on Moto devices which have
-NFC-less variants
----
- .../java/com/android/server/SystemConfig.java | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java
-index e1d7be121865..c8dafc5024d7 100644
---- a/services/core/java/com/android/server/SystemConfig.java
-+++ b/services/core/java/com/android/server/SystemConfig.java
-@@ -989,6 +989,25 @@ public class SystemConfig {
-                         }
-                         XmlUtils.skipCurrentTag(parser);
-                     } break;
-+                    case "unavailable-feature-conditional": {
-+                        if (allowFeatures) {
-+                            String fname = parser.getAttributeValue(null, "name");
-+                            String prop = parser.getAttributeValue(null, "prop");
-+                            if (fname == null || prop == null) {
-+                                Slog.w(TAG, "<" + name + "> without name in " + permFile
-+                                        + " at " + parser.getPositionDescription());
-+                            } else {
-+                                if(android.os.SystemProperties.getBoolean(prop, false)) {
-+                                    addFeature(fname, 0);
-+                                } else {
-+                                    mUnavailableFeatures.add(fname);
-+                                }
-+                            }
-+                        } else {
-+                            logNotAllowedInPartition(name, permFile, parser);
-+                        }
-+                        XmlUtils.skipCurrentTag(parser);
-+                    } break;
-                     case "allow-in-power-save-except-idle": {
-                         if (allowOverrideAppRestrictions) {
-                             String pkgname = parser.getAttributeValue(null, "package");
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch b/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
deleted file mode 100644
index 2855637c..00000000
--- a/patches/trebledroid/platform_frameworks_base/0034-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8b0966fc71e8e329c6f2808e4cbab8e9fe7571d6 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Wed, 2 Aug 2023 20:59:53 +0800
-Subject: [PATCH 34/54] Restore getSimStateForSlotIndex in SubscriptionManager
-
-MTK IMS still needs it here
-
-Change-Id: I41bac57c68055f369232359a464642daab94403b
----
- .../android/telephony/SubscriptionManager.java     | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
-index c5f2d42389e5..1324741145bd 100644
---- a/telephony/java/android/telephony/SubscriptionManager.java
-+++ b/telephony/java/android/telephony/SubscriptionManager.java
-@@ -2902,6 +2902,20 @@ public class SubscriptionManager {
-         return TelephonyManager.getDefault().isNetworkRoaming(subId);
-     }
- 
-+    /**
-+     * Returns a constant indicating the state of sim for the slot index.
-+     *
-+     * @param slotIndex Logical SIM slot index.
-+     *
-+     * @see TelephonyManager.SimState
-+     *
-+     * @hide
-+     */
-+    @TelephonyManager.SimState
-+    public static int getSimStateForSlotIndex(int slotIndex) {
-+        return TelephonyManager.getSimStateForSlotIndex(slotIndex);
-+    }
-+
-     /**
-      * Set a field in the subscription database. Note not all fields are supported.
-      *
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch b/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
deleted file mode 100644
index 3ed6644b..00000000
--- a/patches/trebledroid/platform_frameworks_base/0035-Add-runWithCleanCallingIdentity-variant-with-both-ex.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4f23f2917496b0683fac7275c9a5498b33589259 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sat, 12 Aug 2023 20:11:17 +0800
-Subject: [PATCH 35/54] Add runWithCleanCallingIdentity variant with both
- executor and return value
-
-This complements the fixup to ImsPhoneCallTracker (in fw/o/t) for U
-
-Change-Id: If444290787025e130dce4bdeaf92372ae32793fe
----
- .../telephony/util/TelephonyUtils.java        | 30 +++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
-index a63db88cb614..1d5a36885307 100644
---- a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
-+++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
-@@ -44,7 +44,9 @@ import com.android.internal.telephony.ITelephony;
- import java.io.PrintWriter;
- import java.util.Collections;
- import java.util.List;
-+import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.CountDownLatch;
-+import java.util.concurrent.ExecutionException;
- import java.util.concurrent.Executor;
- import java.util.concurrent.TimeUnit;
- import java.util.function.Supplier;
-@@ -153,6 +155,34 @@ public final class TelephonyUtils {
-         }
-     }
- 
-+    /**
-+     * Convenience method for running the provided action in the provided
-+     * executor enclosed in
-+     * {@link Binder#clearCallingIdentity}/{@link Binder#restoreCallingIdentity} and return
-+     * the result.
-+     *
-+     * Any exception thrown by the given action will need to be handled by caller.
-+     *
-+     */
-+    public static <T> T runWithCleanCallingIdentity(
-+            @NonNull Supplier<T> action, @NonNull Executor executor) {
-+        if (action != null) {
-+            if (executor != null) {
-+                try {
-+                    return CompletableFuture.supplyAsync(
-+                            () -> runWithCleanCallingIdentity(action), executor).get();
-+                } catch (ExecutionException | InterruptedException e) {
-+                    Log.w(LOG_TAG, "TelephonyUtils : runWithCleanCallingIdentity exception: "
-+                            + e.getMessage());
-+                    return null;
-+                }
-+            } else {
-+                return runWithCleanCallingIdentity(action);
-+            }
-+        }
-+        return null;
-+    }
-+
-     /**
-      * Filter values in bundle to only basic types.
-      */
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch b/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
deleted file mode 100644
index fb756267..00000000
--- a/patches/trebledroid/platform_frameworks_base/0036-Catch-NPE-in-SystemUI.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 481b4ac7fd1b06521eaf6984109221a16d05d664 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 10:57:13 -0400
-Subject: [PATCH 36/54] Catch NPE in SystemUI
-
-No idea why it triggers, but it crashes SystemUI on boot for my TV
-device
----
- .../com/android/systemui/keyguard/KeyguardViewMediator.java | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-index 0de61a2652be..1643c1535477 100644
---- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
-@@ -3482,7 +3482,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
-         Trace.beginSection("KeyguardViewMediator#handleMotifyStartedWakingUp");
-         synchronized (KeyguardViewMediator.this) {
-             if (DEBUG) Log.d(TAG, "handleNotifyWakingUp");
--            mKeyguardViewControllerLazy.get().onStartedWakingUp();
-+            try {
-+                mKeyguardViewControllerLazy.get().onStartedWakingUp();
-+            } catch(Throwable t) {
-+                android.util.Log.e("PHH", "handleNotifyStartedWakingUp crashed bip", t);
-+            }
-         }
-         Trace.endSection();
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0037-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch b/patches/trebledroid/platform_frameworks_base/0037-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
deleted file mode 100644
index 22d7db83..00000000
--- a/patches/trebledroid/platform_frameworks_base/0037-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 80360e077d4cf9146f14ac39ef45338f3d9987af Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 27 Dec 2021 17:57:11 -0500
-Subject: [PATCH 37/54] Once we integrate Samsung Power hal in libpowermanager,
- libpowermanager and its deps require linking against
- vendor.samsung.hardware.miscpower@2.0
-
-Change-Id: I9084f64e505009abe9420d28b44199605cee52d8
----
- services/core/jni/Android.bp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
-index 3641e3b21149..50cf6f56d703 100644
---- a/services/core/jni/Android.bp
-+++ b/services/core/jni/Android.bp
-@@ -211,6 +211,7 @@ cc_defaults {
-         "service.incremental",
-         "vendor.samsung.hardware.light@2.0",
-         "vendor.samsung.hardware.light@3.0",
-+        "vendor.samsung.hardware.miscpower@2.0",
-     ],
- 
-     static_libs: [
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0038-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch b/patches/trebledroid/platform_frameworks_base/0038-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
deleted file mode 100644
index 5288323b..00000000
--- a/patches/trebledroid/platform_frameworks_base/0038-FOD-support-for-Asus-Samsung-recent-Xiaomi-and-RedMa.patch
+++ /dev/null
@@ -1,969 +0,0 @@
-From c5a1a3601c678df1c4c9db3d2829b5004129ba60 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 18 Dec 2022 18:20:40 -0500
-Subject: [PATCH 38/54] FOD support for Asus, Samsung recent Xiaomi and
- RedMagic 8 devices
-
-Thanks Asus for providing a free device to make this support
-And thanks @davigamer987 for donating enough to get a Samsung FOD device
-to make this
-
-14QPR2 note: Forced legacy/pre-"UdfpsRefactor"
-Thanks @jgudec for Xiaomi support
-Thanks @boydaihungst for Redmagic 6 support
-
-Co-authored-by: jgudec <jakov.gudec@gmail.com>
-Co-authored-by: Huy Hoang
-Change-Id: Ibd0f9ea8fba584a38c060fd9271549a5e106b4eb
-
-Also include commits:
-fix(fod): Extra Dim overlap fod overlay
-Fix Xiaomi custom vendors implementing fingerprint properly
-Also override UDFPS infos on AIDL fingerprints -- needed for FP on S24
-Try catch the Xiaomi calls
-Typo in observing Samsung brightness
----
- packages/SystemUI/Android.bp                  |   4 +
- .../systemui/biometrics/UdfpsController.java  |  76 ++++-
- .../biometrics/UdfpsControllerOverlay.kt      |   7 +-
- .../android/systemui/biometrics/UdfpsView.kt  | 231 ++++++++++++++
- .../shared/DeviceEntryUdfpsRefactor.kt        |   2 +-
- services/core/Android.bp                      |   5 +
- .../server/biometrics/AuthService.java        | 296 +++++++++++++++++-
- .../fingerprint/FingerprintService.java       |   3 +-
- .../fingerprint/aidl/FingerprintProvider.java |  26 +-
- 9 files changed, 640 insertions(+), 10 deletions(-)
-
-diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
-index cc2e84c5a995..9b88ea297ec6 100644
---- a/packages/SystemUI/Android.bp
-+++ b/packages/SystemUI/Android.bp
-@@ -164,6 +164,10 @@ android_library {
-         "androidx.compose.material_material-icons-extended",
-         "androidx.activity_activity-compose",
-         "androidx.compose.animation_animation-graphics",
-+        "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
-+        "vendor.xiaomi.hw.touchfeature-V1.0-java",
-+        "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
-+        "vendor.nubia.ifaa-V1.0-java",
-     ],
-     libs: [
-         "keepanno-annotations",
-diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-index 2c3ebe901850..c17e6eed6098 100644
---- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
-@@ -41,11 +41,13 @@ import android.hardware.fingerprint.FingerprintSensorProperties;
- import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
- import android.hardware.fingerprint.IUdfpsOverlayController;
- import android.hardware.fingerprint.IUdfpsOverlayControllerCallback;
-+import android.hardware.display.ColorDisplayManager;
- import android.hardware.input.InputManager;
- import android.os.Build;
- import android.os.Handler;
- import android.os.PowerManager;
- import android.os.Trace;
-+import android.os.SystemProperties;
- import android.os.VibrationAttributes;
- import android.os.VibrationEffect;
- import android.util.Log;
-@@ -115,8 +117,12 @@ import java.util.ArrayList;
- import java.util.HashSet;
- import java.util.Set;
- import java.util.concurrent.Executor;
-+import java.io.File;
-+import java.io.FileWriter;
-+import java.io.IOException;
- 
- import javax.inject.Inject;
-+import vendor.nubia.ifaa.V1_0.IIfaa;
- 
- import kotlinx.coroutines.CoroutineScope;
- import kotlinx.coroutines.ExperimentalCoroutinesApi;
-@@ -182,6 +188,8 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-     @NonNull private final UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate;
-     @NonNull private final SelectedUserInteractor mSelectedUserInteractor;
-     @NonNull private final FpsUnlockTracker mFpsUnlockTracker;
-+    @NonNull private final ColorDisplayManager mColorDisplayManager;
-+    private boolean mIgnoreExtraDim;
-     private final boolean mIgnoreRefreshRate;
-     private final KeyguardTransitionInteractor mKeyguardTransitionInteractor;
- 
-@@ -254,6 +262,46 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-             mScreenOn = false;
-         }
-     };
-+    // Nubia 6 series fingerprint control command
-+    // cmd = 13 -> finger down
-+    // cmd = 14 -> after UI ready
-+    // cmd = 15 -> finger up
-+    public byte[] processCmd(int cmd, int param1, int param2, byte[] send_buf, int length) {
-+        try {
-+            if (cmd == 999) {
-+                Log.d(TAG, "processCmd: 999");
-+                return null;
-+            }
-+            ArrayList<Byte> sendList = new ArrayList<>();
-+            if (send_buf != null) {
-+                for (byte b : send_buf) {
-+                    sendList.add(Byte.valueOf(b));
-+                }
-+            }
-+            if (send_buf == null) {
-+                Log.d(TAG, "FingerprintService send_buf = " + send_buf);
-+            }
-+            IIfaa iIfaaDaemon = IIfaa.getService();
-+            if (iIfaaDaemon == null) {
-+                Log.d(TAG, "processCmd: no iIfaaDaemon!");
-+                return null;
-+            }
-+            ArrayList<Byte> resultList = iIfaaDaemon.processCmd(cmd, param1, param2, sendList, length);
-+            int n = resultList.size();
-+            Log.d(TAG, "FingerprintService result length n = " + n);
-+            if (n == 0) {
-+                return null;
-+            }
-+            byte[] result = new byte[n];
-+            for (int i = 0; i < n; i++) {
-+                result[i] = resultList.get(i).byteValue();
-+            }
-+            return result;
-+        } catch (Exception e) {
-+            e.printStackTrace();
-+            return null;
-+        }
-+    };
- 
-     @Override
-     public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
-@@ -687,7 +735,8 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-             Lazy<DefaultUdfpsTouchOverlayViewModel> defaultUdfpsTouchOverlayViewModel,
-             @NonNull UdfpsOverlayInteractor udfpsOverlayInteractor,
-             @NonNull PowerInteractor powerInteractor,
--            @Application CoroutineScope scope) {
-+            @Application CoroutineScope scope,
-+            @NonNull ColorDisplayManager colorDisplayManager) {
-         mContext = context;
-         mExecution = execution;
-         mVibrator = vibrator;
-@@ -737,6 +786,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-         mFpsUnlockTracker = fpsUnlockTracker;
-         mFpsUnlockTracker.startTracking();
-         mKeyguardTransitionInteractor = keyguardTransitionInteractor;
-+        mColorDisplayManager = colorDisplayManager;
- 
-         mTouchProcessor = singlePointerTouchProcessor;
-         mSessionTracker = sessionTracker;
-@@ -809,7 +859,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
- 
-     private void showUdfpsOverlay(@NonNull UdfpsControllerOverlay overlay) {
-         mExecution.assertIsMainThread();
--
-+        mIgnoreExtraDim = mColorDisplayManager.isReduceBrightColorsActivated();
-+        if (mIgnoreExtraDim) {
-+            Log.d(TAG, "Current extra dim state (showUdfpsOverlay): " + mIgnoreExtraDim);
-+        }
-         mOverlay = overlay;
-         final int requestReason = overlay.getRequestReason();
-         if (requestReason == REASON_AUTH_KEYGUARD
-@@ -1035,6 +1088,10 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-             return;
-         }
-         if (isOptical()) {
-+            if (mIgnoreExtraDim) {
-+                mColorDisplayManager.setReduceBrightColorsActivated(false);
-+                Log.d(TAG, "Extra dim disabled");
-+            }
-             mLatencyTracker.onActionStart(ACTION_UDFPS_ILLUMINATE);
-         }
-         if (getBiometricSessionType() == SESSION_KEYGUARD) {
-@@ -1066,10 +1123,17 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-                 }
-             }
-         }
-+        if(SystemProperties.get("ro.vendor.build.fingerprint").contains("nubia/NX669")) {
-+          processCmd(13, 0, 0, new byte[0], 0);
-+        }
- 
-         for (Callback cb : mCallbacks) {
-             cb.onFingerDown();
-         }
-+        if(SystemProperties.get("ro.vendor.build.fingerprint").contains("nubia/NX669")) {
-+          processCmd(14, 0, 0, new byte[0], 0);
-+        }
-+
-     }
- 
-     private void onFingerUp(long requestId, @NonNull View view) {
-@@ -1103,8 +1167,16 @@ public class UdfpsController implements DozeReceiver, Dumpable {
-         mActivePointerId = MotionEvent.INVALID_POINTER_ID;
-         mAcquiredReceived = false;
-         if (mOnFingerDown) {
-+            if (mIgnoreExtraDim && isOptical()) {
-+                mColorDisplayManager.setReduceBrightColorsActivated(true);
-+                Log.d(TAG, "Extra dim restored");
-+            }
-             mFingerprintManager.onPointerUp(requestId, mSensorProps.sensorId, pointerId, x,
-                     y, minor, major, orientation, time, gestureStart, isAod);
-+            if(SystemProperties.get("ro.vendor.build.fingerprint").contains("nubia/NX669")) {
-+                processCmd(15, 0, 0, new byte[0], 0);
-+            }
-+
-             for (Callback cb : mCallbacks) {
-                 cb.onFingerUp();
-             }
-diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
-index 16865ca809d9..6619be426ca9 100644
---- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
-+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
-@@ -168,7 +168,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
-         gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
-         layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
-         flags = (Utils.FINGERPRINT_OVERLAY_LAYOUT_PARAM_FLAGS or
--                WindowManager.LayoutParams.FLAG_SPLIT_TOUCH)
-+                WindowManager.LayoutParams.FLAG_SPLIT_TOUCH) or
-+                WindowManager.LayoutParams.FLAG_DIM_BEHIND
-+        dimAmount = 0.0f
-         privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
-         // Avoid announcing window title.
-         accessibilityTitle = " "
-@@ -252,6 +254,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
- 
-                         addViewNowOrLater(this, animation)
-                         sensorRect = sensorBounds
-+                        dimUpdate = {
-+                            windowManager.updateViewLayout(this, coreLayoutParams.updateDimensions(animation).apply { dimAmount = it })
-+                        }
-                     }
-                 }
-                 getTouchOverlay()?.apply {
-diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-index 76bcd6e2863b..7ce6ecbb6311 100644
---- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
-@@ -19,14 +19,32 @@ import android.content.Context
- import android.graphics.Canvas
- import android.graphics.Color
- import android.graphics.Paint
-+import android.graphics.PixelFormat
-+import android.graphics.PointF
- import android.graphics.Rect
- import android.graphics.RectF
-+import android.os.FileObserver
- import android.util.AttributeSet
- import android.util.Log
- import android.view.MotionEvent
-+import android.view.SurfaceHolder
-+import android.view.SurfaceView
-+import android.view.ViewGroup
- import android.widget.FrameLayout
- import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams
- import com.android.systemui.doze.DozeReceiver
-+import java.io.File
-+import java.io.FileNotFoundException
-+
-+import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon
-+
-+import vendor.xiaomi.hw.touchfeature.V1_0.ITouchFeature
-+import vendor.xiaomi.hardware.fingerprintextension.V1_0.IXiaomiFingerprint
-+
-+import android.os.Handler
-+import android.os.HandlerThread
-+
-+import vendor.nubia.ifaa.V1_0.IIfaa
- 
- private const val TAG = "UdfpsView"
- 
-@@ -37,6 +55,55 @@ class UdfpsView(
-     context: Context,
-     attrs: AttributeSet?
- ) : FrameLayout(context, attrs), DozeReceiver {
-+    private var currentOnIlluminatedRunnable: Runnable? = null
-+    private val mySurfaceView = SurfaceView(context)
-+    init {
-+        mySurfaceView.setVisibility(INVISIBLE)
-+        mySurfaceView.setZOrderOnTop(true)
-+        addView(mySurfaceView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
-+        mySurfaceView.holder.addCallback(object: SurfaceHolder.Callback{
-+            override fun surfaceCreated(p0: SurfaceHolder) {
-+                Log.d("PHH", "Surface created!")
-+                val paint = Paint(0 /* flags */);
-+                paint.setAntiAlias(true);
-+                paint.setStyle(Paint.Style.FILL);
-+                val colorStr = android.os.SystemProperties.get("persist.sys.phh.fod_color", "00ff00");
-+                try {
-+                    val parsedColor = Color.parseColor("#" + colorStr);
-+                    val r = (parsedColor shr 16) and 0xff;
-+                    val g = (parsedColor shr  8) and 0xff;
-+                    val b = (parsedColor shr  0) and 0xff;
-+                    paint.setARGB(255, r, g, b);
-+                } catch(t: Throwable) {
-+                    Log.d("PHH", "Failed parsing color #" + colorStr, t);
-+                }
-+                var canvas: Canvas? = null
-+                try {
-+                    canvas = p0.lockCanvas();
-+                    Log.d("PHH", "Surface dimensions ${canvas.getWidth()*1.0f} ${canvas.getHeight()*1.0f}")
-+                    canvas.drawOval(RectF(overlayParams.sensorBounds), paint);
-+                } finally {
-+                    // Make sure the surface is never left in a bad state.
-+                    if (canvas != null) {
-+                        p0.unlockCanvasAndPost(canvas);
-+                    }
-+                }
-+
-+                currentOnIlluminatedRunnable?.run()
-+            }
-+
-+            override fun surfaceChanged(p0: SurfaceHolder, p1: Int, p2: Int, p3: Int) {
-+                Log.d("PHH", "Got surface size $p1 $p2 $p3")
-+            }
-+
-+            override fun surfaceDestroyed(p0: SurfaceHolder) {
-+                Log.d("PHH", "Surface destroyed!")
-+            }
-+        })
-+        mySurfaceView.holder.setFormat(PixelFormat.RGBA_8888)
-+
-+    }
-+
-     // sensorRect may be bigger than the sensor. True sensor dimensions are defined in
-     // overlayParams.sensorBounds
-     var sensorRect = Rect()
-@@ -53,6 +120,8 @@ class UdfpsView(
-     /** Parameters that affect the position and size of the overlay. */
-     var overlayParams = UdfpsOverlayParams()
- 
-+    var dimUpdate: (Float) -> Unit = {}
-+
-     /** Debug message. */
-     var debugMessage: String? = null
-         set(value) {
-@@ -103,15 +172,177 @@ class UdfpsView(
-         }
-     }
- 
-+    fun goodixCmd(id: Int) {
-+        val goodixSvc = IGoodixFingerprintDaemon.getService()
-+        if(goodixSvc != null) {
-+            goodixSvc.sendCommand(id, ArrayList(), { returnCode, resultData -> {
-+                Log.e("PHH-Enroll", "Goodix send command returned code "+ returnCode);
-+            }});
-+        }
-+    }
-+
-+    val asusGhbmOnAchieved = "/sys/class/drm/ghbm_on_achieved"
-+    var hasAsusGhbm = File(asusGhbmOnAchieved).exists()
-+    var samsungActualMaskBrightness = "/sys/class/lcd/panel/actual_mask_brightness"
-+    val hasSamsungMask = File(samsungActualMaskBrightness).exists()
-+    var fodFileObserver: FileObserver? = null
-+
-+    val xiaomiDispParam = "/sys/class/mi_display/disp-DSI-0/disp_param"
-+    var hasXiaomiLhbm = try {
-+            val xiaomiFingerprintService = IXiaomiFingerprint.getService()
-+            File(xiaomiDispParam).exists() && xiaomiFingerprintService != null
-+        } catch(e: Exception) {
-+            false
-+        }
-+
-+    private val handlerThread = HandlerThread("UDFPS").also { it.start() }
-+    val myHandler = Handler(handlerThread.looper)
-+
-+    // This file contain current hbm value
-+    val nubiaHbmState = "/sys/kernel/lcd_enhance/hbm_state"
-+    var hasNubiaHbm = File(nubiaHbmState).exists()
-+
-     fun configureDisplay(onDisplayConfigured: Runnable) {
-         isDisplayConfigured = true
-         animationViewController?.onDisplayConfiguring()
-         mUdfpsDisplayMode?.enable(onDisplayConfigured)
-+
-+        mySurfaceView.setVisibility(VISIBLE)
-+        Log.d("PHH", "setting surface visible!")
-+
-+        val brightnessFiles = listOf(
-+            File("/sys/class/backlight/panel/brightness"),
-+            File("/sys/class/backlight/panel0-backlight/brightness"),
-+            File("/sys/devices/platform/soc/soc:mtk_leds/leds/lcd-backlight/brightness")
-+        )
-+        val maxBrightnessFiles = listOf(
-+            File("/sys/class/backlight/panel/max_brightness"),
-+            File("/sys/class/backlight/panel0-backlight/max_brightness"),
-+            File("/sys/devices/platform/soc/soc:mtk_leds/leds/lcd-backlight/max_brightness")
-+        )
-+
-+        var brightness: Double = 0.0
-+        var maxBrightness: Double = 0.0
-+        var bmFilesExist: Boolean = false
-+
-+        brightnessFiles.zip(maxBrightnessFiles) {bFile, mFile ->
-+            if (bFile.exists() && mFile.exists()) {
-+                bmFilesExist = true
-+                brightness = bFile.readText().toDouble()
-+                maxBrightness = mFile.readText().toDouble()
-+            }
-+        }
-+
-+        val dim = if (bmFilesExist) {
-+            1.0 - Math.pow( (brightness / maxBrightness), 1/2.3);
-+        } else {
-+            0.0
-+        }
-+
-+        // Assume HBM is max brightness
-+        Log.d("PHH-Enroll", "Brightness is $brightness / $maxBrightness, setting dim to $dim")
-+        if (hasAsusGhbm) {
-+            dimUpdate(dim.toFloat())
-+        }
-+        if (hasSamsungMask) {
-+            dimUpdate(dim.toFloat())
-+        }
-+
-+        if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
-+            goodixCmd(200001)
-+        }
-+
-+        if(hasXiaomiLhbm){
-+            Log.d("PHH-Enroll", "Xiaomi scenario in UdfpsView reached!")
-+            mySurfaceView.setVisibility(INVISIBLE)
-+
-+            try {
-+                IXiaomiFingerprint.getService().extCmd(android.os.SystemProperties.getInt("persist.phh.xiaomi.fod.enrollment.id", 4), 1);
-+            } catch(t: Throwable) {}
-+            var res = try { ITouchFeature.getService().setTouchMode(0, 10, 1) } catch(t: Throwable){ -1 }
-+            if(res != 0){
-+                Log.d("PHH-Enroll", "SetTouchMode 10,1 was NOT executed successfully. Res is " + res)
-+            }
-+
-+            myHandler.postDelayed({
-+                var ret200 = try { ITouchFeature.getService().setTouchMode(0, 10, 1); } catch(t: Throwable) { -1 }
-+
-+                if(ret200 != 0){
-+                    Log.d("PHH-Enroll", "myHandler.postDelayed 200ms -SetTouchMode was NOT executed successfully. Ret is " + ret200)
-+                }
-+
-+                myHandler.postDelayed({
-+                    Log.d("PHH-Enroll", "myHandler.postDelayed 600ms - line prior to setTouchMode 10,0")
-+                    var ret600 = try { ITouchFeature.getService().setTouchMode(0, 10, 0); } catch(t: Throwable) { -1 }
-+
-+                    if(ret600 != 0){
-+                        Log.d("PHH-Enroll", "myHandler.postDelayed 600ms -SetTouchMode 10,0 was NOT executed successfully. Ret is " + ret600)
-+                    }
-+                }, 600)
-+            }, 200)
-+        }
-+          if(hasNubiaHbm) {
-+            Log.d("PHH-Enroll", "Nubia scenario in UdfpsView reached!")
-+            File(nubiaHbmState).writeText("4095")
-+          }
-+
-     }
- 
-     fun unconfigureDisplay() {
-         isDisplayConfigured = false
-         animationViewController?.onDisplayUnconfigured()
-         mUdfpsDisplayMode?.disable(null /* onDisabled */)
-+
-+        if (hasAsusGhbm) {
-+            fodFileObserver = object: FileObserver(asusGhbmOnAchieved, FileObserver.MODIFY) {
-+                override fun onEvent(event: Int, path: String?): Unit {
-+                    if (path == null) return
-+                    Log.d("PHH-Enroll", "Asus ghbm event")
-+                    try {
-+                        val spotOn = File(asusGhbmOnAchieved).readText().toInt()
-+                        if(spotOn == 0) {
-+                            dimUpdate(0.0f)
-+                            fodFileObserver?.stopWatching()
-+                            fodFileObserver = null
-+                        }
-+                    } catch(e: Exception) {
-+                        Log.d("PHH-Enroll", "Failed dimpdate off", e)
-+                    }
-+                }
-+            };
-+            fodFileObserver?.startWatching();
-+        } else if (hasSamsungMask) {
-+            fodFileObserver = object: FileObserver(samsungActualMaskBrightness, FileObserver.MODIFY) {
-+                override fun onEvent(event: Int, path: String?): Unit {
-+                    if (path == null) return
-+                    Log.d("PHH-Enroll", "samsung mask brightness event")
-+                    try {
-+                        val spotOn = File(samsungActualMaskBrightness).readText().toInt()
-+                        if(spotOn == 0) {
-+                            dimUpdate(0.0f)
-+                            fodFileObserver?.stopWatching()
-+                            fodFileObserver = null
-+                        }
-+                    } catch(e: Exception) {
-+                        Log.d("PHH-Enroll", "Failed dimpdate off", e)
-+                    }
-+                }
-+            };
-+            fodFileObserver?.startWatching();
-+        } else if(hasXiaomiLhbm) {
-+            IXiaomiFingerprint.getService().extCmd(android.os.SystemProperties.getInt("persist.phh.xiaomi.fod.enrollment.id", 4), 0);
-+            ITouchFeature.getService().setTouchMode(0, 10, 0);
-+        } else if(hasNubiaHbm) {
-+            Log.d("PHH-Enroll", "Nubia Restore brightness")
-+            File(nubiaHbmState).writeText(File("/sys/class/backlight/panel0-backlight/brightness").readText())
-+        } else {
-+            dimUpdate(0.0f)
-+        }
-+
-+        mySurfaceView.setVisibility(INVISIBLE)
-+        Log.d("PHH", "setting surface invisible!")
-+        if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
-+            goodixCmd(200003)
-+        }
-     }
- }
-diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/shared/DeviceEntryUdfpsRefactor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/shared/DeviceEntryUdfpsRefactor.kt
-index b5d5803ca6fb..68f74f3ed6f3 100644
---- a/packages/SystemUI/src/com/android/systemui/deviceentry/shared/DeviceEntryUdfpsRefactor.kt
-+++ b/packages/SystemUI/src/com/android/systemui/deviceentry/shared/DeviceEntryUdfpsRefactor.kt
-@@ -33,7 +33,7 @@ object DeviceEntryUdfpsRefactor {
-     /** Is the refactor enabled */
-     @JvmStatic
-     inline val isEnabled
--        get() = Flags.deviceEntryUdfpsRefactor()
-+        get() = false //Flags.deviceEntryUdfpsRefactor()
- 
-     /**
-      * Called to ensure code is only run when the flag is enabled. This protects users from the
-diff --git a/services/core/Android.bp b/services/core/Android.bp
-index eb2520546e8f..7f5bd07cae78 100644
---- a/services/core/Android.bp
-+++ b/services/core/Android.bp
-@@ -258,6 +258,11 @@ java_library_static {
-         // HIDL
-         "vendor.mediatek.hardware.mtkpower-V1.1-java",
-         "vendor.samsung.hardware.sysinput-V1.2-java",
-+        "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
-+        "vendor.samsung.hardware.biometrics.fingerprint-V3.0-java",
-+        "vendor.oplus.hardware.biometrics.fingerprint-V2.1-java",
-+        "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
-+        "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
-     ],
-     javac_shard_size: 50,
-     javacflags: [
-diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
-index 2f7cd14f44b2..16dbbe753cbe 100644
---- a/services/core/java/com/android/server/biometrics/AuthService.java
-+++ b/services/core/java/com/android/server/biometrics/AuthService.java
-@@ -83,6 +83,25 @@ import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.List;
- 
-+import android.hardware.display.DisplayManager;
-+
-+import android.graphics.Point;
-+import android.text.TextUtils;
-+import android.util.DisplayMetrics;
-+import java.io.BufferedReader;
-+import java.io.File;
-+import java.io.FileReader;
-+import java.io.PrintWriter;
-+
-+import android.os.FileObserver;
-+import android.os.Build;
-+
-+import vendor.samsung.hardware.biometrics.fingerprint.V3_0.ISehBiometricsFingerprint;
-+import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon;
-+import vendor.samsung.hardware.sysinput.V1_0.ISehSysInputDev;
-+
-+import vendor.xiaomi.hardware.fingerprintextension.V1_0.IXiaomiFingerprint;
-+
- /**
-  * System service that provides an interface for authenticating with biometrics and
-  * PIN/pattern/password to BiometricPrompt and lock screen.
-@@ -101,6 +120,11 @@ public class AuthService extends SystemService {
-     @VisibleForTesting
-     final IAuthService.Stub mImpl;
- 
-+    private FileObserver fodFileObserver = null;
-+    private ISehBiometricsFingerprint mSamsungFingerprint = null;
-+
-+    private IXiaomiFingerprint mXiaomiFingerprint = null;
-+
-     /**
-      * Class for injecting dependencies into AuthService.
-      * TODO(b/141025588): Replace with a dependency injection framework (e.g. Guice, Dagger).
-@@ -763,11 +787,11 @@ public class AuthService extends SystemService {
-             final int firstApiLevel = SystemProperties.getInt(SYSPROP_FIRST_API_LEVEL, 0);
-             final int apiLevel = SystemProperties.getInt(SYSPROP_API_LEVEL, firstApiLevel);
-             String[] configStrings = mInjector.getConfiguration(getContext());
--            if (configStrings.length == 0 && apiLevel <= Build.VERSION_CODES.R) {
-+            if (configStrings.length == 0) {
-                 // For backwards compatibility with R where biometrics could work without being
-                 // configured in config_biometric_sensors. In the absence of a vendor provided
-                 // configuration, we assume the weakest biometric strength (i.e. convenience).
--                Slog.w(TAG, "Found R vendor partition without config_biometric_sensors");
-+                Slog.w(TAG, "Found vendor partition without config_biometric_sensors");
-                 configStrings = generateRSdkCompatibleConfiguration();
-             }
-             hidlConfigs = new SensorConfig[configStrings.length];
-@@ -786,6 +810,102 @@ public class AuthService extends SystemService {
-         }
- 
-         mInjector.publishBinderService(this, mImpl);
-+        try {
-+            mSamsungFingerprint = ISehBiometricsFingerprint.getService();
-+            android.util.Log.e("PHH", "Got samsung fingerprint HAL");
-+        } catch(Exception e) {
-+            android.util.Log.e("PHH", "Failed getting Samsung fingerprint HAL", e);
-+        }
-+        try {
-+            mXiaomiFingerprint = IXiaomiFingerprint.getService();
-+            android.util.Log.e("PHH", "Got xiaomi fingerprint HAL");
-+        } catch(Exception e) {
-+            android.util.Log.e("PHH", "Failed getting xiaomi fingerprint HAL", e);
-+        }
-+        if(samsungHasCmd("fod_enable") && mSamsungFingerprint != null) {
-+            samsungCmd("fod_enable,1,1,0");
-+            String actualMaskBrightnessPath = "/sys/class/lcd/panel/actual_mask_brightness";
-+            android.util.Log.e("PHH-Enroll", "Reading actual brightness file gives " + readFile(actualMaskBrightnessPath));
-+            fodFileObserver = new FileObserver(actualMaskBrightnessPath, FileObserver.MODIFY) {
-+                @Override
-+                public void onEvent(int event, String path) {
-+                    String actualMask = readFile(actualMaskBrightnessPath);
-+                    try {
-+                        mSamsungFingerprint = ISehBiometricsFingerprint.getService();
-+                    } catch(Exception e) {}
-+                    Slog.d("PHH-Enroll", "New actual mask brightness is " + actualMask);
-+                    try {
-+                        int eventReq = 0;
-+                        if("0".equals(actualMask)) {
-+                            eventReq = 1; //released
-+                        } else {
-+                            eventReq = 2; //pressed
-+                        }
-+                        if(mSamsungFingerprint != null) {
-+                            mSamsungFingerprint.sehRequest(22 /* SEM_FINGER_STATE */, eventReq, new java.util.ArrayList<Byte>(),
-+                                    (int retval, java.util.ArrayList<Byte> out) -> {} );
-+                        }
-+                    } catch(Exception e) {
-+                        Slog.d("PHH-Enroll", "Failed setting samsung event for mask observer", e);
-+                    }
-+                }
-+            };
-+            fodFileObserver.startWatching();
-+        }
-+
-+        String asusGhbmOnAchieved = "/sys/class/drm/ghbm_on_achieved";
-+        if( (new File(asusGhbmOnAchieved)).exists()) {
-+            fodFileObserver = new FileObserver(asusGhbmOnAchieved, FileObserver.MODIFY) {
-+                boolean wasOn = false;
-+                @Override
-+                public void onEvent(int event, String path) {
-+                    String spotOn = readFile(asusGhbmOnAchieved);
-+                    if("1".equals(spotOn)) {
-+                        if(!wasOn) {
-+                            try {
-+                                IGoodixFingerprintDaemon goodixDaemon = IGoodixFingerprintDaemon.getService();
-+
-+                                //Send UI ready
-+                                goodixDaemon.sendCommand(200002, new java.util.ArrayList<Byte>(), (returnCode, resultData) -> {
-+                                    Slog.e(TAG, "Goodix send command touch pressed returned code "+ returnCode);
-+                                });
-+                            } catch(Throwable t) {
-+                                Slog.d("PHH-Enroll", "Failed sending goodix command", t);
-+                            }
-+                        }
-+                        wasOn = true;
-+                    } else {
-+                        wasOn = false;
-+                    }
-+                }
-+            };
-+            fodFileObserver.startWatching();
-+        }
-+
-+        String xiaomiFodPressedStatusPath = "/sys/class/touch/touch_dev/fod_press_status";
-+        if(new File(xiaomiFodPressedStatusPath).exists() && mXiaomiFingerprint != null) {
-+            fodFileObserver = new FileObserver(xiaomiFodPressedStatusPath, FileObserver.MODIFY) {
-+                @Override
-+                public void onEvent(int event, String path) {
-+                    String isFodPressed = readFile(xiaomiFodPressedStatusPath);
-+                    Slog.d("PHH-Enroll", "Fod pressed status: " + isFodPressed);
-+                    Slog.d("PHH-Enroll", "Within xiaomi scenario for FOD");
-+
-+                    try {
-+                    if("0".equals(isFodPressed)) {
-+                        Slog.d("PHH-Enroll", "Fod un-pressed!");
-+                        mXiaomiFingerprint.extCmd(android.os.SystemProperties.getInt("phh.xiaomi.fod.enrollment.id", 4), 0);
-+                    } else if("1".equals(isFodPressed)) {
-+                        Slog.d("PHH-Enroll", "Fod pressed!");
-+                        mXiaomiFingerprint.extCmd(android.os.SystemProperties.getInt("phh.xiaomi.fod.enrollment.id", 4), 1);
-+                    }
-+                    } catch(Exception e) {
-+                        Slog.d("PHH-Enroll", "Failed Xiaomi async extcmd", e);
-+                    }
-+                }
-+            };
-+            fodFileObserver.startWatching();
-+        }
-     }
- 
-     private void registerAuthenticators() {
-@@ -1037,14 +1157,119 @@ public class AuthService extends SystemService {
-                 ? modality : (modality & ~BiometricAuthenticator.TYPE_CREDENTIAL);
-     }
- 
-+    static public int[] dynamicUdfpsProps(Context ctxt) {
-+        DisplayManager mDM = (DisplayManager) ctxt.getSystemService(Context.DISPLAY_SERVICE);
-+        Point displayRealSize = new Point();
-+        DisplayMetrics displayMetrics = new DisplayMetrics();
-+        mDM.getDisplay(0).getRealSize(displayRealSize);
-+        mDM.getDisplay(0).getMetrics(displayMetrics);
-+
-+        if(readFile("/sys/class/fingerprint/fingerprint/position") != null) {
-+            try {
-+            ISehSysInputDev s = ISehSysInputDev.getService();
-+            s.getTspFodInformation(0, (a, b) -> {
-+                Slog.d("PHH-Enroll", "TspFod info " + a + ", " + b);
-+            });
-+            s.getTspFodPosition(0, (a, b) -> {
-+                Slog.d("PHH-Enroll", "TspFod info " + a + ", " + b);
-+            });
-+            }catch(Throwable t) {
-+                Slog.d("PHH-Enroll", "heya ", t);
-+            }
-+
-+
-+            android.util.Log.d("PHH", "Samsung fingerprint");
-+            String[] fodPositionArray = readFile("/sys/class/fingerprint/fingerprint/position").split(",");
-+            float bottomMM = Float.parseFloat(fodPositionArray[0]);
-+            float areaSizeMM = Float.parseFloat(fodPositionArray[5]);
-+            float heightMM = Float.parseFloat(fodPositionArray[2]);
-+            float bottomInch = bottomMM * 0.0393700787f;
-+            float areaSizeInch = areaSizeMM * 0.0393700787f;
-+            float heightInch = heightMM * 0.0393700787f;
-+            int bottomPx = (int)(bottomInch * displayMetrics.ydpi);
-+            int areaSizePx = (int)(areaSizeInch * displayMetrics.ydpi);
-+            int midDistPx = (int)(areaSizeInch * displayMetrics.ydpi / 2.0f);
-+
-+            float mW = areaSizePx/2;
-+            float mH = areaSizePx/2;
-+            float mX = displayRealSize.x/2;
-+            //float mY = displayRealSize.y - bottomPx - midDistPx;
-+            float mY = displayRealSize.y - (bottomInch * displayMetrics.ydpi) - (areaSizeInch * displayMetrics.ydpi / 2.0f);
-+
-+            samsungCmd(String.format("fod_rect,%d,%d,%d,%d", (int)(mX - mW/2), (int)(mY - mW/2), (int)(mX + mW/2), (int)(mY + mW/2)));
-+            Slog.d("PHH-Enroll", "Display real size is " + displayRealSize.y + ", dpy " + displayMetrics.ydpi);
-+
-+            int udfpsProps[] = new int[3];
-+            udfpsProps[0] = (int)mX;
-+            udfpsProps[1] = (int)mY;
-+            udfpsProps[2] = (int)mW;
-+
-+            try {
-+                mSamsungFingerprint = ISehBiometricsFingerprint.getService();
-+                Slog.d("PHH-Enroll", "Samsung ask for sensor status");
-+                mSamsungFingerprint.sehRequest(6, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
-+                    Slog.d("PHH-Enroll", "Result is " + retval);
-+                    for(int i=0; i<out.size(); i++) {
-+                        Slog.d("PHH-Enroll", "\t" + i + ":" + out.get(i));
-+                    }
-+                } );
-+                Slog.d("PHH-Enroll", "Samsung ask for sensor brightness value");
-+                mSamsungFingerprint.sehRequest(32, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
-+                    Slog.d("PHH-Enroll", "Result is " + retval);
-+                    for(int i=0; i<out.size(); i++) {
-+                        Slog.d("PHH-Enroll", "\t" + i + ":" + out.get(i));
-+                    }
-+                } );
-+
-+            } catch(Exception e) {
-+                Slog.d("PHH-Enroll", "Failed setting samsung3.0 fingerprint recognition", e);
-+            }
-+            return udfpsProps;
-+        }
-+
-+        if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS_I006D")) {
-+            int udfpsProps[] = new int[3];
-+            udfpsProps[0] = displayRealSize.x/2;
-+            udfpsProps[1] = 1741;
-+            udfpsProps[2] = 110;
-+            return udfpsProps;
-+        }
-+
-+       String fpLocation = android.os.SystemProperties.get("persist.vendor.sys.fp.fod.location.X_Y");
-+       if(!TextUtils.isEmpty(fpLocation) && fpLocation.contains(",")) {
-+            int[] udfpsProps = new int[3];
-+            String[] coordinates = fpLocation.split(",");
-+            udfpsProps[0] = displayRealSize.x/2;
-+            udfpsProps[1] = Integer.parseInt(coordinates[1]) + 100;
-+
-+            String[] widthHeight = android.os.SystemProperties.get("persist.vendor.sys.fp.fod.size.width_height").split(",");
-+
-+            udfpsProps[2] = (Integer.parseInt(widthHeight[0]) /2);
-+            return udfpsProps;
-+        }
-+
-+        return new int[0];
-+    }
- 
-     private FingerprintSensorPropertiesInternal getHidlFingerprintSensorProps(int sensorId,
-             @BiometricManager.Authenticators.Types int strength) {
-         // The existence of config_udfps_sensor_props indicates that the sensor is UDFPS.
--        final int[] udfpsProps = getContext().getResources().getIntArray(
-+        int[] udfpsProps = getContext().getResources().getIntArray(
-                 com.android.internal.R.array.config_udfps_sensor_props);
- 
--        final boolean isUdfps = !ArrayUtils.isEmpty(udfpsProps);
-+        boolean isUdfps = !ArrayUtils.isEmpty(udfpsProps);
-+        if(!isUdfps) {
-+            try {
-+                udfpsProps = dynamicUdfpsProps(getContext());
-+            } catch(Throwable t) {
-+                Slog.e("PHH-Enroll", "Failed generating UDFPS props");
-+            }
-+        }
-+        isUdfps = !ArrayUtils.isEmpty(udfpsProps);
-+
-+        if(udfpsProps.length > 0) {
-+            Slog.d("PHH-Enroll", "Got udfps infos " + udfpsProps[0] + ", " + udfpsProps[1] + ", " + udfpsProps[2]);
-+        }
- 
-         // config_is_powerbutton_fps indicates whether device has a power button fingerprint sensor.
-         final boolean isPowerbuttonFps = getContext().getResources().getBoolean(
-@@ -1106,4 +1331,67 @@ public class AuthService extends SystemService {
-                 componentInfo, resetLockoutRequiresHardwareAuthToken,
-                 resetLockoutRequiresChallenge);
-     }
-+
-+   private static boolean samsungHasCmd(String cmd) {
-+        try {
-+            File f = new File("/sys/devices/virtual/sec/tsp/cmd_list");
-+            if(!f.exists()) return false;
-+
-+            android.util.Log.d("PHH", "Managed to grab cmd list, checking...");
-+            BufferedReader b = new BufferedReader(new FileReader(f));
-+            String line = null;
-+            while( (line = b.readLine()) != null) {
-+                if(line.equals(cmd)) return true;
-+            }
-+            android.util.Log.d("PHH", "... nope");
-+            return false;
-+        } catch(Exception e) {
-+            android.util.Log.d("PHH", "Failed reading cmd_list", e);
-+            return false;
-+        }
-+    }
-+
-+    public static void samsungCmd(String cmd) {
-+        try {
-+            writeFile("/sys/devices/virtual/sec/tsp/cmd", cmd);
-+
-+            String status = readFile("/sys/devices/virtual/sec/tsp/cmd_status");
-+            String ret = readFile("/sys/devices/virtual/sec/tsp/cmd_result");
-+
-+            android.util.Log.d("PHH", "Sending command " + cmd + " returned " + ret + ":" + status);
-+        } catch(Exception e) {
-+            android.util.Log.d("PHH", "Failed sending command " + cmd, e);
-+        }
-+    }
-+
-+    private static void writeFile(String path, String value) {
-+        try {
-+            PrintWriter writer = new PrintWriter(path, "UTF-8");
-+            writer.println(value);
-+            writer.close();
-+        } catch(Exception e) {
-+            android.util.Log.d("PHH", "Failed writing to " + path + ": " + value);
-+        }
-+    }
-+
-+    private static void writeFile(File file, String value) {
-+        try {
-+            PrintWriter writer = new PrintWriter(file, "UTF-8");
-+            writer.println(value);
-+            writer.close();
-+        } catch(Exception e) {
-+            android.util.Log.d("PHH", "Failed writing to " + file + ": " + value);
-+        }
-+    }
-+
-+    private static String readFile(String path) {
-+        try {
-+            File f = new File(path);
-+
-+            BufferedReader b = new BufferedReader(new FileReader(f));
-+            return b.readLine();
-+        } catch(Exception e) {
-+            return null;
-+        }
-+    }
- }
-diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
-index 1ba12134ab29..41a7eb0acffa 100644
---- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
-+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
-@@ -913,8 +913,9 @@ public class FingerprintService extends SystemService {
-                         filteredInstances = filterAvailableHalInstances(hidlSensors, aidlSensors);
- 
-                 final List<ServiceProvider> providers = new ArrayList<>();
--                providers.addAll(getHidlProviders(filteredInstances.first));
-                 providers.addAll(getAidlProviders(filteredInstances.second));
-+                if (providers.isEmpty())
-+                    providers.addAll(getHidlProviders(filteredInstances.first));
- 
-                 return providers;
-             });
-diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
-index c04c47e2d95a..a7b86964e3e5 100644
---- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
-+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
-@@ -38,6 +38,7 @@ import android.hardware.biometrics.common.ComponentInfo;
- import android.hardware.biometrics.fingerprint.IFingerprint;
- import android.hardware.biometrics.fingerprint.PointerContext;
- import android.hardware.biometrics.fingerprint.SensorProps;
-+import android.hardware.biometrics.fingerprint.SensorLocation;
- import android.hardware.fingerprint.Fingerprint;
- import android.hardware.fingerprint.FingerprintAuthenticateOptions;
- import android.hardware.fingerprint.FingerprintEnrollOptions;
-@@ -249,9 +250,32 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
-         } else {
-             final List<SensorLocationInternal> workaroundLocations =
-                     getWorkaroundSensorProps(mContext);
-+            android.util.Log.e("PHH-Enroll", "Poping AIDL fp provider");
- 
-             for (SensorProps prop : props) {
-                 final int sensorId = prop.commonProps.sensorId;
-+                SensorLocation[] locations = prop.sensorLocations;
-+
-+                android.util.Log.e("PHH-Enroll", "Got fp props -- pre");
-+                for(SensorLocation loc: locations) {
-+                    android.util.Log.e("PHH-Enroll", " - " + loc.sensorLocationX + ", " + loc.sensorLocationY + ", " +loc.sensorRadius + ", disp =" + loc.display + ", shape " + loc.sensorShape);
-+                }
-+                if (locations.length == 1 && locations[0].sensorLocationX == 0) {
-+                    int[] otherValues = com.android.server.biometrics.AuthService.dynamicUdfpsProps(mContext);
-+                    if (otherValues.length > 0) {
-+                        SensorLocation loc = new SensorLocation();
-+                        loc.sensorLocationX = otherValues[0];
-+                        loc.sensorLocationY = otherValues[1];
-+                        loc.sensorRadius = otherValues[2];
-+                        locations[0] = loc;
-+                    }
-+                }
-+
-+                android.util.Log.e("PHH-Enroll", "Got fp props -- post");
-+                for(SensorLocation loc: locations) {
-+                    android.util.Log.e("PHH-Enroll", " - " + loc.sensorLocationX + ", " + loc.sensorLocationY + ", " +loc.sensorRadius + ", disp =" + loc.display + ", shape " + loc.sensorShape);
-+                }
-+
-                 final List<ComponentInfoInternal> componentInfo = new ArrayList<>();
-                 if (prop.commonProps.componentInfo != null) {
-                     for (ComponentInfo info : prop.commonProps.componentInfo) {
-@@ -269,7 +293,7 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
-                                 prop.halControlsIllumination,
-                                 true /* resetLockoutRequiresHardwareAuthToken */,
-                                 !workaroundLocations.isEmpty() ? workaroundLocations :
--                                        Arrays.stream(prop.sensorLocations).map(
-+                                        Arrays.stream(locations).map(
-                                                         location -> new SensorLocationInternal(
-                                                                 location.display,
-                                                                 location.sensorLocationX,
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0039-Fix-brightness-slider-curve-for-some-devices.patch b/patches/trebledroid/platform_frameworks_base/0039-Fix-brightness-slider-curve-for-some-devices.patch
deleted file mode 100644
index 3421739a..00000000
--- a/patches/trebledroid/platform_frameworks_base/0039-Fix-brightness-slider-curve-for-some-devices.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 34e366e41f1a97a5a144db58b026717821e7d159 Mon Sep 17 00:00:00 2001
-From: ChonDoit <thphantomblog@gmail.com>
-Date: Thu, 24 Aug 2023 15:58:15 -0300
-Subject: [PATCH 39/54] Fix brightness slider curve for some devices
-
-Some devices report max brightness as 2047 or 4095
----
- .../settingslib/display/BrightnessUtils.java      | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/packages/SettingsLib/DisplayUtils/src/com/android/settingslib/display/BrightnessUtils.java b/packages/SettingsLib/DisplayUtils/src/com/android/settingslib/display/BrightnessUtils.java
-index 66ed10433459..f6820b4436fc 100644
---- a/packages/SettingsLib/DisplayUtils/src/com/android/settingslib/display/BrightnessUtils.java
-+++ b/packages/SettingsLib/DisplayUtils/src/com/android/settingslib/display/BrightnessUtils.java
-@@ -16,13 +16,18 @@
- 
- package com.android.settingslib.display;
- 
-+import android.os.SystemProperties;
- import android.util.MathUtils;
- 
-+import com.android.internal.display.BrightnessSynchronizer;
-+
- /** Utility methods for calculating the display brightness. */
- public class BrightnessUtils {
- 
-+    public static final boolean LowGammaBrightness = Boolean.parseBoolean(SystemProperties.get("persist.sys.phh.low_gamma_brightness", "false"));
-+
-     public static final int GAMMA_SPACE_MIN = 0;
--    public static final int GAMMA_SPACE_MAX = 65535;
-+    public static final int GAMMA_SPACE_MAX = LowGammaBrightness ? 255 : 65535;
- 
-     // Hybrid Log Gamma constant values
-     private static final float R = 0.5f;
-@@ -88,9 +93,8 @@ public class BrightnessUtils {
-         // it shouldn't be out of bounds.
-         final float normalizedRet = MathUtils.constrain(ret, 0, 12);
- 
--        // Re-normalize to the range [0, 1]
--        // in order to derive the correct setting value.
--        return MathUtils.lerp(min, max, normalizedRet / 12);
-+        return LowGammaBrightness ? MathUtils.constrain(BrightnessSynchronizer.brightnessIntToFloat(val),
-+                         min, max) : MathUtils.lerp(min, max, normalizedRet / 12);
-     }
- 
-     /**
-@@ -137,6 +141,7 @@ public class BrightnessUtils {
-             ret = A * MathUtils.log(normalizedVal - B) + C;
-         }
- 
--        return Math.round(MathUtils.lerp(GAMMA_SPACE_MIN, GAMMA_SPACE_MAX, ret));
-+        return LowGammaBrightness ? BrightnessSynchronizer.brightnessFloatToInt(
-+                       MathUtils.constrain(val, min, max)) : Math.round(MathUtils.lerp(GAMMA_SPACE_MIN, GAMMA_SPACE_MAX, ret));
-     }
- }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0040-Ignore-cgroup-creation-errors.patch b/patches/trebledroid/platform_frameworks_base/0040-Ignore-cgroup-creation-errors.patch
deleted file mode 100644
index 4831fd49..00000000
--- a/patches/trebledroid/platform_frameworks_base/0040-Ignore-cgroup-creation-errors.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e0c3befcbeb119f1ce73b68a49b667a5fc6ee659 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 18 Oct 2023 16:53:40 -0400
-Subject: [PATCH 40/54] Ignore cgroup creation errors
-
-For old kernels who don't have those modern cgroups
----
- core/jni/com_android_internal_os_Zygote.cpp               | 2 ++
- services/core/java/com/android/server/am/ProcessList.java | 5 -----
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
-index 3ed9f49ede26..90c6e6d145c0 100644
---- a/core/jni/com_android_internal_os_Zygote.cpp
-+++ b/core/jni/com_android_internal_os_Zygote.cpp
-@@ -1968,10 +1968,12 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
-     if (getuid() == 0) {
-         const int rc = createProcessGroup(uid, getpid());
-         if (rc != 0) {
-+#if 0
-             fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "
-                                                 "CONFIG_CGROUP_CPUACCT?")
-                                  : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
-                                                 /* pid= */ 0, strerror(-rc)));
-+#endif
-         }
-     }
- 
-diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
-index 89c89944e92e..641b2cc824e0 100644
---- a/services/core/java/com/android/server/am/ProcessList.java
-+++ b/services/core/java/com/android/server/am/ProcessList.java
-@@ -2513,14 +2513,9 @@ public final class ProcessList {
-                         // If we're not told to skip the process group creation, go create it.
-                         final int res = Process.createProcessGroup(uid, startResult.pid);
-                         if (res < 0) {
--                            if (res == -OsConstants.ESRCH) {
-                                 Slog.e(ActivityManagerService.TAG,
-                                         "Unable to create process group for "
-                                         + app.processName + " (" + startResult.pid + ")");
--                            } else {
--                                throw new AssertionError("Unable to create process group for "
--                                    + app.processName + " (" + startResult.pid + ")");
--                            }
-                         } else {
-                             app.mProcessGroupCreated = true;
-                         }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0041-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch b/patches/trebledroid/platform_frameworks_base/0041-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
deleted file mode 100644
index 2024f452..00000000
--- a/patches/trebledroid/platform_frameworks_base/0041-Samsung-tablets-use-SW_MACHINE_COVER-rather-than-SW_.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From b7aa66232d322c3d2decb95f58a783e1b16bf785 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 18 Oct 2023 16:57:34 -0400
-Subject: [PATCH 41/54] Samsung tablets use SW_MACHINE_COVER rather than SW_LID
-
-So check whether SW_MACHINE_COVER is declared, then use it
-Otherwise stick to SW_LID
-
-Should fix https://github.com/phhusson/treble_experimentations/issues/2572
----
- .../server/input/InputManagerService.java     | 25 ++++++++++++++++---
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
-index 05b1cb69235b..0f44f37e2262 100644
---- a/services/core/java/com/android/server/input/InputManagerService.java
-+++ b/services/core/java/com/android/server/input/InputManagerService.java
-@@ -376,6 +376,9 @@ public class InputManagerService extends IInputManager.Stub
-     /** Switch code: Microphone. When set, the mic is muted. */
-     public static final int SW_MUTE_DEVICE = 0x0e;
- 
-+    /** Switch code: Cover. When set, the cover is closed. */
-+    public static final int SW_MACHINE_COVER = 0x10;
-+
-     public static final int SW_LID_BIT = 1 << SW_LID;
-     public static final int SW_TABLET_MODE_BIT = 1 << SW_TABLET_MODE;
-     public static final int SW_KEYPAD_SLIDE_BIT = 1 << SW_KEYPAD_SLIDE;
-@@ -387,6 +390,8 @@ public class InputManagerService extends IInputManager.Stub
-             SW_HEADPHONE_INSERT_BIT | SW_MICROPHONE_INSERT_BIT | SW_JACK_PHYSICAL_INSERT_BIT | SW_LINEOUT_INSERT_BIT;
-     public static final int SW_CAMERA_LENS_COVER_BIT = 1 << SW_CAMERA_LENS_COVER;
-     public static final int SW_MUTE_DEVICE_BIT = 1 << SW_MUTE_DEVICE;
-+    public static final int SW_MACHINE_COVER_BIT = 1 << SW_MACHINE_COVER;
-+    private int mSwForLid = SW_LID;
- 
-     // The following are layer numbers used for z-ordering the input overlay layers on the display.
-     // This is used for ordering layers inside {@code DisplayContent#getInputOverlayLayer()}.
-@@ -499,6 +504,16 @@ public class InputManagerService extends IInputManager.Stub
-         mWiredAccessoryCallbacks = callbacks;
-     }
- 
-+    private void checkForSwMachineCover() {
-+        int machineCoverState = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_MACHINE_COVER);
-+        if (machineCoverState != KEY_STATE_UNKNOWN) {
-+            android.util.Log.e("PHH", "Found a SW_MACHINE_COVER. Use this instead of SW_LID");
-+            mSwForLid = SW_MACHINE_COVER;
-+        } else {
-+            android.util.Log.e("PHH", "Not found a SW_MACHINE_COVER");
-+        }
-+    }
-+
-     void registerLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) {
-         synchronized (mLidSwitchLock) {
-             mLidSwitchCallbacks.add(callback);
-@@ -507,7 +522,8 @@ public class InputManagerService extends IInputManager.Stub
-             // state will be reported as KEY_STATE_UNKNOWN. The callback will be triggered in
-             // systemRunning().
-             if (mSystemReady) {
--                boolean lidOpen = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_LID)
-+                checkForSwMachineCover();
-+                boolean lidOpen = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, mSwForLid)
-                         == KEY_STATE_UP;
-                 callback.notifyLidSwitchChanged(0 /* whenNanos */, lidOpen);
-             }
-@@ -545,7 +561,8 @@ public class InputManagerService extends IInputManager.Stub
- 
-             // Send the initial lid switch state to any callback registered before the system was
-             // ready.
--            int switchState = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_LID);
-+            checkForSwMachineCover();
-+            int switchState = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, mSwForLid);
-             for (int i = 0; i < mLidSwitchCallbacks.size(); i++) {
-                 LidSwitchCallback callback = mLidSwitchCallbacks.get(i);
-                 callback.notifyLidSwitchChanged(0 /* whenNanos */, switchState == KEY_STATE_UP);
-@@ -2370,8 +2387,8 @@ public class InputManagerService extends IInputManager.Stub
-                     + ", mask=" + Integer.toHexString(switchMask));
-         }
- 
--        if ((switchMask & SW_LID_BIT) != 0) {
--            final boolean lidOpen = ((switchValues & SW_LID_BIT) == 0);
-+        if ((switchMask & (1 << mSwForLid)) != 0) {
-+            final boolean lidOpen = ((switchValues & (1 << mSwForLid)) == 0);
-             synchronized (mLidSwitchLock) {
-                 if (mSystemReady) {
-                     for (int i = 0; i < mLidSwitchCallbacks.size(); i++) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0042-Revert-Removed-IWLAN-legacy-mode-support.patch b/patches/trebledroid/platform_frameworks_base/0042-Revert-Removed-IWLAN-legacy-mode-support.patch
deleted file mode 100644
index f97176cd..00000000
--- a/patches/trebledroid/platform_frameworks_base/0042-Revert-Removed-IWLAN-legacy-mode-support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 551ad309dd7cd2ec1ea29f542a65d8345580506c Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Fri, 20 Oct 2023 09:26:19 +0000
-Subject: [PATCH 42/54] Revert "Removed IWLAN legacy mode support"
-
-This reverts commit 2832dee607ab33eee688abea206f4adfcfc896f1.
----
- .../java/android/telephony/ServiceState.java  | 30 ++++++++++++-------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
-index db167c0592df..ef64fc9fcc65 100644
---- a/telephony/java/android/telephony/ServiceState.java
-+++ b/telephony/java/android/telephony/ServiceState.java
-@@ -1217,8 +1217,13 @@ public class ServiceState implements Parcelable {
- 
-     /**
-      * Initialize the service state. Set everything to the default value.
-+     *
-+     * @param legacyMode {@code true} if the device is on IWLAN legacy mode, where IWLAN is
-+     * considered as a RAT on WWAN {@link NetworkRegistrationInfo}. {@code false} if the device
-+     * is on AP-assisted mode, where IWLAN should be reported through WLAN.
-+     * {@link NetworkRegistrationInfo}.
-      */
--    private void init() {
-+    private void init(boolean legacyMode) {
-         if (DBG) Rlog.d(LOG_TAG, "init");
-         mVoiceRegState = STATE_OUT_OF_SERVICE;
-         mDataRegState = STATE_OUT_OF_SERVICE;
-@@ -1250,11 +1255,13 @@ public class ServiceState implements Parcelable {
-                     .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
-                     .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN)
-                     .build());
--            addNetworkRegistrationInfo(new NetworkRegistrationInfo.Builder()
--                    .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
--                    .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
--                    .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN)
--                    .build());
-+            if (!legacyMode) {
-+                addNetworkRegistrationInfo(new NetworkRegistrationInfo.Builder()
-+                        .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
-+                        .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
-+                        .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN)
-+                        .build());
-+            }
-         }
-         mOperatorAlphaLongRaw = null;
-         mOperatorAlphaShortRaw = null;
-@@ -1263,11 +1270,11 @@ public class ServiceState implements Parcelable {
-     }
- 
-     public void setStateOutOfService() {
--        init();
-+        init(true);
-     }
- 
-     public void setStateOff() {
--        init();
-+        init(true);
-         mVoiceRegState = STATE_POWER_OFF;
-         mDataRegState = STATE_POWER_OFF;
-     }
-@@ -1275,11 +1282,14 @@ public class ServiceState implements Parcelable {
-     /**
-      * Set the service state to out-of-service
-      *
-+     * @param legacyMode {@code true} if the device is on IWLAN legacy mode, where IWLAN is
-+     * considered as a RAT on WWAN {@link NetworkRegistrationInfo}. {@code false} if the device
-+     * is on AP-assisted mode, where IWLAN should be reported through WLAN.
-      * @param powerOff {@code true} if this is a power off case (i.e. Airplane mode on).
-      * @hide
-      */
--    public void setOutOfService(boolean powerOff) {
--        init();
-+    public void setOutOfService(boolean legacyMode, boolean powerOff) {
-+        init(legacyMode);
-         if (powerOff) {
-             mVoiceRegState = STATE_POWER_OFF;
-             mDataRegState = STATE_POWER_OFF;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0043-Add-a-prop-to-use-linear-backlight-control.patch b/patches/trebledroid/platform_frameworks_base/0043-Add-a-prop-to-use-linear-backlight-control.patch
deleted file mode 100644
index c06b1cc9..00000000
--- a/patches/trebledroid/platform_frameworks_base/0043-Add-a-prop-to-use-linear-backlight-control.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 82bdbc47d1b956faf669c33232851a04071fe8f2 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 30 Oct 2023 19:25:27 -0400
-Subject: [PATCH 43/54] Add a prop to use linear backlight control
-
----
- .../settings/brightness/BrightnessController.java      | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
-index e92630fc67a2..7080e18e4223 100644
---- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
-+++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
-@@ -346,9 +346,15 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
-                 : MetricsEvent.ACTION_BRIGHTNESS;
-         minBacklight = mBrightnessMin;
-         maxBacklight = mBrightnessMax;
--        final float valFloat = MathUtils.min(
-+        float valFloat = MathUtils.min(
-                 convertGammaToLinearFloat(value, minBacklight, maxBacklight),
-                 maxBacklight);
-+        if (android.os.SystemProperties.getBoolean("persist.sys.phh.linear_brightness", false)) {
-+            android.util.Log.e("PHH", "Linear brightness val " + value + " from " + minBacklight + " to " + maxBacklight + " makes " + valFloat);
-+            valFloat = value / 65536.0f;
-+        }
-+        final float finalValFloat = valFloat;
-+
-         if (stopTracking) {
-             // TODO(brightnessfloat): change to use float value instead.
-             MetricsLogger.action(mContext, metric,
-@@ -359,7 +365,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
-         if (!tracking) {
-             AsyncTask.execute(new Runnable() {
-                     public void run() {
--                        mDisplayManager.setBrightness(mDisplayId, valFloat);
-+                        mDisplayManager.setBrightness(mDisplayId, finalValFloat);
-                     }
-                 });
-         }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0044-Add-support-for-Samsung-full-brightness-on-their-AID.patch b/patches/trebledroid/platform_frameworks_base/0044-Add-support-for-Samsung-full-brightness-on-their-AID.patch
deleted file mode 100644
index 4092ae8e..00000000
--- a/patches/trebledroid/platform_frameworks_base/0044-Add-support-for-Samsung-full-brightness-on-their-AID.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From e89c32558546172d6280cf70b93508491ffbfd00 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 10 Dec 2023 18:04:49 -0500
-Subject: [PATCH 44/54] Add support for Samsung full brightness on their AIDL
- HAL
-
----
- services/core/Android.bp                      |  4 ++
- .../android/server/lights/LightsService.java  | 40 +++++++++++++++++++
- 2 files changed, 44 insertions(+)
-
-diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 7f5bd07cae78..403ba2301413 100644
---- a/services/core/Android.bp
-+++ b/services/core/Android.bp
-@@ -263,6 +263,10 @@ java_library_static {
-         "vendor.oplus.hardware.biometrics.fingerprint-V2.1-java",
-         "vendor.oppo.hardware.biometrics.fingerprint-V2.1-java",
-         "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
-+
-+        //AIDL
-+        "vendor.samsung.hardware.biometrics.fingerprint-V1-java",
-+        "vendor.samsung.hardware.light-V1-java",
-     ],
-     javac_shard_size: 50,
-     javacflags: [
-diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 67f6932921f6..0379eadfa383 100644
---- a/services/core/java/com/android/server/lights/LightsService.java
-+++ b/services/core/java/com/android/server/lights/LightsService.java
-@@ -44,8 +44,10 @@ import com.android.internal.util.DumpUtils;
- import com.android.internal.util.Preconditions;
- import com.android.server.SystemService;
- 
-+import java.io.File;
- import java.io.FileDescriptor;
- import java.io.PrintWriter;
-+import java.nio.file.Files;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.HashMap;
-@@ -53,6 +55,8 @@ import java.util.List;
- import java.util.Map;
- import java.util.function.Supplier;
- 
-+import vendor.samsung.hardware.light.ISehLights;
-+
- public class LightsService extends SystemService {
-     static final String TAG = "LightsService";
-     static final boolean DEBUG = false;
-@@ -63,6 +67,10 @@ public class LightsService extends SystemService {
-     @Nullable
-     private final Supplier<ILights> mVintfLights;
- 
-+    @Nullable
-+    private ISehLights mSamsungLights;
-+    private int mSamsungMaxBrightness;
-+
-     @VisibleForTesting
-     final LightsManagerBinderService mManagerService;
- 
-@@ -300,6 +308,17 @@ public class LightsService extends SystemService {
-                 int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness);
- 
-                 if(mHwLight.id == 0) {
-+                    if (mSamsungLights != null && SystemProperties.getBoolean("persist.sys.samsung.full_brightness", false)) {
-+                        HwLightState lightState = new HwLightState(); // don't care
-+                        try {
-+                            int v = (int)Math.round(brightness * mSamsungMaxBrightness);
-+                            mSamsungLights.setLightState(mHwLight.id, lightState, v);
-+                            Slog.e("PHH", "Set sammy brightness to " + v);
-+                        } catch(Throwable t) {
-+                            Slog.e("PHH", "Failed setting samsung brightness", t);
-+                        }
-+                        return;
-+                    }
-                     String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
-                     if(fp.matches(".*astarqlte.*")) {
-                         int newBrightness = brightnessInt;
-@@ -502,6 +521,27 @@ public class LightsService extends SystemService {
-         mH = new Handler(looper);
-         mVintfLights = service.get() != null ? service : null;
- 
-+        if (service.get() != null) {
-+            try {
-+                mSamsungLights = ISehLights.Stub.asInterface(service.get().asBinder().getExtension());
-+                mSamsungMaxBrightness = 510;
-+
-+                ArrayList<File> paths = new ArrayList<>();
-+                paths.add(new File("/sys/class/backlight/panel/max_brightness"));
-+                paths.add(new File("/sys/class/backlight/panel0-backlight/max_brightness"));
-+                paths.add(new File("/sys/devices/platform/soc/soc:mtk_leds/leds/lcd-backlight/max_brightness"));
-+                for(File f: paths) {
-+                    try {
-+                        List<String> lines = Files.readAllLines(f.toPath());
-+                        mSamsungMaxBrightness = Integer.parseInt(lines.get(0));
-+                        Slog.e("PHH", "" + f + " gave us " + mSamsungMaxBrightness);
-+                    } catch(Throwable t) {}
-+                }
-+            } catch(Throwable t) {
-+                Slog.e("PHH", "Failed getting Samsung lights AIDL", t);
-+            }
-+        }
-+
-         populateAvailableLights(context);
-         mManagerService = new LightsManagerBinderService();
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0045-Add-Samsung-sysinput.patch b/patches/trebledroid/platform_frameworks_base/0045-Add-Samsung-sysinput.patch
deleted file mode 100644
index 3279418f..00000000
--- a/patches/trebledroid/platform_frameworks_base/0045-Add-Samsung-sysinput.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a0912bc287e7c0ad6bb16742e5c8e4a41f7192ff Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 29 Jan 2024 17:07:07 -0500
-Subject: [PATCH 45/54] Add Samsung sysinput
-
----
- services/core/Android.bp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/services/core/Android.bp b/services/core/Android.bp
-index 403ba2301413..69089d3a69bc 100644
---- a/services/core/Android.bp
-+++ b/services/core/Android.bp
-@@ -265,6 +265,7 @@ java_library_static {
-         "vendor.xiaomi.hardware.fingerprintextension-V1.0-java",
- 
-         //AIDL
-+        "vendor.samsung.hardware.sysinput-V1-java",
-         "vendor.samsung.hardware.biometrics.fingerprint-V1-java",
-         "vendor.samsung.hardware.light-V1-java",
-     ],
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0046-Bunch-of-FOD-stuff-commonize-refreshing-the-services.patch b/patches/trebledroid/platform_frameworks_base/0046-Bunch-of-FOD-stuff-commonize-refreshing-the-services.patch
deleted file mode 100644
index f366f3ac..00000000
--- a/patches/trebledroid/platform_frameworks_base/0046-Bunch-of-FOD-stuff-commonize-refreshing-the-services.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From cda15e1f87122072d17a1fe11cb89e50a52e5ad7 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 29 Jan 2024 17:15:38 -0500
-Subject: [PATCH 46/54] Bunch of FOD stuff -- commonize refreshing the
- services, start supporting AIDL Samsung
-
----
- .../server/biometrics/AuthService.java        | 157 +++++++++++++++---
- 1 file changed, 138 insertions(+), 19 deletions(-)
-
-diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
-index 16dbbe753cbe..061f66352d3b 100644
---- a/services/core/java/com/android/server/biometrics/AuthService.java
-+++ b/services/core/java/com/android/server/biometrics/AuthService.java
-@@ -46,6 +46,7 @@ import android.hardware.biometrics.IAuthService;
- import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;
- import android.hardware.biometrics.IBiometricService;
- import android.hardware.biometrics.IBiometricServiceReceiver;
-+import android.hardware.biometrics.fingerprint.IFingerprint;
- import android.hardware.biometrics.IInvalidationCallback;
- import android.hardware.biometrics.ITestSession;
- import android.hardware.biometrics.ITestSessionCallback;
-@@ -99,6 +100,7 @@ import android.os.Build;
- import vendor.samsung.hardware.biometrics.fingerprint.V3_0.ISehBiometricsFingerprint;
- import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon;
- import vendor.samsung.hardware.sysinput.V1_0.ISehSysInputDev;
-+import vendor.samsung.hardware.biometrics.fingerprint.ISehFingerprint;
- 
- import vendor.xiaomi.hardware.fingerprintextension.V1_0.IXiaomiFingerprint;
- 
-@@ -122,6 +124,8 @@ public class AuthService extends SystemService {
- 
-     private FileObserver fodFileObserver = null;
-     private ISehBiometricsFingerprint mSamsungFingerprint = null;
-+    private ISehFingerprint mSamsungFingerprintAidl = null;
-+    private vendor.samsung.hardware.sysinput.ISehSysInputDev mSamsungSysinputAidl = null;
- 
-     private IXiaomiFingerprint mXiaomiFingerprint = null;
- 
-@@ -778,6 +782,101 @@ public class AuthService extends SystemService {
-      *                 └── for (s : p.sensors)
-      *                     └── BiometricService.registerAuthenticator(s)
-      */
-+
-+    private static void samsungSysinputCommand(String arg) {
-+        try {
-+            android.util.Log.e("PHH-Enroll", "SysinputCommand " + arg);
-+            var name = "default";
-+            var fqName = vendor.samsung.hardware.sysinput.ISehSysInputDev.DESCRIPTOR + "/" + name;
-+            var b = android.os.Binder.allowBlocking(android.os.ServiceManager.waitForDeclaredService(fqName));
-+            var samsungSysinputAidl = vendor.samsung.hardware.sysinput.ISehSysInputDev.Stub.asInterface(b);
-+            Thread.sleep(100);
-+            samsungSysinputAidl.setProperty(1 /*DEFAULT_TSP*/, 18, arg);
-+            android.util.Log.e("PHH-Enroll", "Done SysinputCommand");
-+        } catch(Throwable t) {
-+            android.util.Log.e("PHH-Enroll", "SysinputCommand", t);
-+        }
-+    }
-+
-+    private void refreshVendorServices() {
-+        try {
-+            mSamsungFingerprint = ISehBiometricsFingerprint.getService();
-+            android.util.Log.e("PHH", "Got samsung fingerprint HAL");
-+        } catch(Exception e) {
-+            if (e instanceof java.util.NoSuchElementException) {
-+                android.util.Log.e("PHH", "Failed getting Samsung fingerprint HAL, doesn't exist");
-+            } else {
-+                android.util.Log.e("PHH", "Failed getting Samsung fingerprint HAL", e);
-+            }
-+        }
-+
-+        try {
-+            final String name = "default";
-+            final String fqName = IFingerprint.DESCRIPTOR + "/" + name;
-+            final IBinder fpBinder = Binder.allowBlocking(ServiceManager.waitForDeclaredService(fqName));
-+            //final IFingerprint fp = IFingerprint.Stub.asInterface(fpBinder);
-+            mSamsungFingerprintAidl = ISehFingerprint.Stub.asInterface(fpBinder.getExtension());
-+        } catch(Exception e) {
-+            android.util.Log.e("PHH", "Failed getting Samsung fingerprint AIDL HAL", e);
-+        }
-+
-+        try {
-+            final String name = "default";
-+            final String fqName = vendor.samsung.hardware.sysinput.ISehSysInputDev.DESCRIPTOR + "/" + name;
-+            final IBinder b = Binder.allowBlocking(ServiceManager.waitForDeclaredService(fqName));
-+            mSamsungSysinputAidl = vendor.samsung.hardware.sysinput.ISehSysInputDev.Stub.asInterface(b);
-+            mSamsungSysinputAidl.registerCallback(new vendor.samsung.hardware.sysinput.ISehSysInputCallback.Stub() {
-+                @Override
-+                public void onReportInformation(int type, String data) {
-+                    android.util.Log.e("PHH", "Received Sysinput Report Information " +type + ", " + data);
-+                }
-+                @Override
-+                public void onReportRawData(int type, int count, int[] data) {
-+                    android.util.Log.e("PHH", "Received Sysinput Report RawData " + type + ", " + count);
-+                }
-+
-+                @Override
-+                public int getInterfaceVersion() {
-+                    return this.VERSION;
-+                }
-+
-+                @Override
-+                public String getInterfaceHash() {
-+                    return this.HASH;
-+                }
-+            });
-+            String res;
-+            res = mSamsungSysinputAidl.getProperty(1, 1);
-+            Thread.sleep(100);
-+            android.util.Log.e("PHH", "Got Samsung sysinput aidl feature " + res);
-+            res = mSamsungSysinputAidl.getProperty(1, 2);
-+            Thread.sleep(100);
-+            android.util.Log.e("PHH", "Got Samsung sysinput aidl cmd_list " + res);
-+            res = mSamsungSysinputAidl.getProperty(1, 3);
-+            Thread.sleep(100);
-+            android.util.Log.e("PHH", "Got Samsung sysinput aidl scrub_pos " + res);
-+            res = mSamsungSysinputAidl.getProperty(1, 4);
-+            Thread.sleep(100);
-+            android.util.Log.e("PHH", "Got Samsung sysinput aidl fod_info " + res);
-+            res = mSamsungSysinputAidl.getProperty(1, 5);
-+            Thread.sleep(100);
-+            android.util.Log.e("PHH", "Got Samsung sysinput aidl fod_pos " + res);
-+        } catch(Exception e) {
-+            android.util.Log.e("PHH", "Failed getting Samsung fingerprint AIDL HAL", e);
-+        }
-+
-+        try {
-+            mXiaomiFingerprint = IXiaomiFingerprint.getService();
-+            android.util.Log.e("PHH", "Got xiaomi fingerprint HAL");
-+        } catch(Exception e) {
-+            if (e instanceof java.util.NoSuchElementException) {
-+                android.util.Log.e("PHH", "Failed getting xiaomi fingerprint HAL, doesn't exist");
-+            } else {
-+                android.util.Log.e("PHH", "Failed getting xiaomi fingerprint HAL", e);
-+            }
-+        }
-+    }
-+
-     @Override
-     public void onStart() {
-         mBiometricService = mInjector.getBiometricService();
-@@ -809,20 +908,11 @@ public class AuthService extends SystemService {
-             registerAuthenticators(hidlConfigs);
-         }
- 
-+        refreshVendorServices();
-+
-         mInjector.publishBinderService(this, mImpl);
--        try {
--            mSamsungFingerprint = ISehBiometricsFingerprint.getService();
--            android.util.Log.e("PHH", "Got samsung fingerprint HAL");
--        } catch(Exception e) {
--            android.util.Log.e("PHH", "Failed getting Samsung fingerprint HAL", e);
--        }
--        try {
--            mXiaomiFingerprint = IXiaomiFingerprint.getService();
--            android.util.Log.e("PHH", "Got xiaomi fingerprint HAL");
--        } catch(Exception e) {
--            android.util.Log.e("PHH", "Failed getting xiaomi fingerprint HAL", e);
--        }
--        if(samsungHasCmd("fod_enable") && mSamsungFingerprint != null) {
-+        //samsungSysinputCommand("fod_icon_visible,1");
-+        if(samsungHasCmd("fod_enable") && (mSamsungFingerprint != null || mSamsungFingerprintAidl != null)) {
-             samsungCmd("fod_enable,1,1,0");
-             String actualMaskBrightnessPath = "/sys/class/lcd/panel/actual_mask_brightness";
-             android.util.Log.e("PHH-Enroll", "Reading actual brightness file gives " + readFile(actualMaskBrightnessPath));
-@@ -830,9 +920,7 @@ public class AuthService extends SystemService {
-                 @Override
-                 public void onEvent(int event, String path) {
-                     String actualMask = readFile(actualMaskBrightnessPath);
--                    try {
--                        mSamsungFingerprint = ISehBiometricsFingerprint.getService();
--                    } catch(Exception e) {}
-+                    refreshVendorServices();
-                     Slog.d("PHH-Enroll", "New actual mask brightness is " + actualMask);
-                     try {
-                         int eventReq = 0;
-@@ -1205,22 +1293,53 @@ public class AuthService extends SystemService {
-             udfpsProps[2] = (int)mW;
- 
-             try {
--                mSamsungFingerprint = ISehBiometricsFingerprint.getService();
-+                ISehBiometricsFingerprint samsungFingerprint = null;
-+                samsungFingerprint = ISehBiometricsFingerprint.getService();
-                 Slog.d("PHH-Enroll", "Samsung ask for sensor status");
--                mSamsungFingerprint.sehRequest(6, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
-+                samsungFingerprint.sehRequest(6, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
-                     Slog.d("PHH-Enroll", "Result is " + retval);
-                     for(int i=0; i<out.size(); i++) {
-                         Slog.d("PHH-Enroll", "\t" + i + ":" + out.get(i));
-                     }
-                 } );
-                 Slog.d("PHH-Enroll", "Samsung ask for sensor brightness value");
--                mSamsungFingerprint.sehRequest(32, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
-+                samsungFingerprint.sehRequest(32, 0, new java.util.ArrayList(), (int retval, java.util.ArrayList<Byte> out) -> {
-                     Slog.d("PHH-Enroll", "Result is " + retval);
-                     for(int i=0; i<out.size(); i++) {
-                         Slog.d("PHH-Enroll", "\t" + i + ":" + out.get(i));
-                     }
-                 } );
- 
-+            } catch(Exception e) {
-+                if (e instanceof java.util.NoSuchElementException) {
-+                    Slog.d("PHH-Enroll", "Failed setting samsung3.0 fingerprint recognition, doesn't exist");
-+                } else {
-+                    Slog.d("PHH-Enroll", "Failed setting samsung3.0 fingerprint recognition", e);
-+                }
-+            }
-+
-+            try {
-+                final String name = "default";
-+                final String fqName = IFingerprint.DESCRIPTOR + "/" + name;
-+                final IBinder fpBinder = Binder.allowBlocking(ServiceManager.waitForDeclaredService(fqName));
-+                final IFingerprint fp = IFingerprint.Stub.asInterface(fpBinder);
-+                final ISehFingerprint fpaidl = ISehFingerprint.Stub.asInterface(fpBinder.getExtension());
-+
-+                Slog.d("PHH-Enroll", "Samsung ask for sensor status");
-+                vendor.samsung.hardware.biometrics.fingerprint.SehResult sehres = fpaidl.sehRequest(0, 6, 0, new byte[0]);
-+
-+                Slog.d("PHH-Enroll", "Result is " + sehres.retValue);
-+                for(int i=0; i<sehres.data.length; i++) {
-+                    Slog.d("PHH-Enroll", "\t" + i + ":" + sehres.data[i]);
-+                }
-+
-+                Slog.d("PHH-Enroll", "Samsung ask for sensor brightness value");
-+                sehres = fpaidl.sehRequest(0, 32, 0, new byte[0]);
-+
-+                Slog.d("PHH-Enroll", "Result is " + sehres.retValue);
-+                for(int i=0; i<sehres.data.length; i++) {
-+                    Slog.d("PHH-Enroll", "\t" + i + ":" + sehres.data[i]);
-+                }
-             } catch(Exception e) {
-                 Slog.d("PHH-Enroll", "Failed setting samsung3.0 fingerprint recognition", e);
-             }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0047-Some-Samsung-devices-use-SW_FLIP-0x15-rather-than-SW.patch b/patches/trebledroid/platform_frameworks_base/0047-Some-Samsung-devices-use-SW_FLIP-0x15-rather-than-SW.patch
deleted file mode 100644
index ff909a67..00000000
--- a/patches/trebledroid/platform_frameworks_base/0047-Some-Samsung-devices-use-SW_FLIP-0x15-rather-than-SW.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0b3cdf21b5e9977355f103fe872b57ce8ea258d6 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 4 Feb 2024 18:01:07 -0500
-Subject: [PATCH 47/54] Some Samsung devices use SW_FLIP 0x15 rather than
- SW_MACHINE_COVER 0x10, so use that
-
----
- .../server/input/InputManagerService.java     | 25 +++++++++++++------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
-index 0f44f37e2262..d3d29ef85c62 100644
---- a/services/core/java/com/android/server/input/InputManagerService.java
-+++ b/services/core/java/com/android/server/input/InputManagerService.java
-@@ -378,6 +378,8 @@ public class InputManagerService extends IInputManager.Stub
- 
-     /** Switch code: Cover. When set, the cover is closed. */
-     public static final int SW_MACHINE_COVER = 0x10;
-+    // Samsung
-+    public static final int SW_FLIP = 0x15;
- 
-     public static final int SW_LID_BIT = 1 << SW_LID;
-     public static final int SW_TABLET_MODE_BIT = 1 << SW_TABLET_MODE;
-@@ -505,13 +507,22 @@ public class InputManagerService extends IInputManager.Stub
-     }
- 
-     private void checkForSwMachineCover() {
--        int machineCoverState = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_MACHINE_COVER);
--        if (machineCoverState != KEY_STATE_UNKNOWN) {
--            android.util.Log.e("PHH", "Found a SW_MACHINE_COVER. Use this instead of SW_LID");
--            mSwForLid = SW_MACHINE_COVER;
--        } else {
--            android.util.Log.e("PHH", "Not found a SW_MACHINE_COVER");
--        }
-+            int machineCoverState = getSwitchState(-1, InputDevice.SOURCE_ANY, SW_MACHINE_COVER);
-+            if (machineCoverState != KEY_STATE_UNKNOWN) {
-+                android.util.Log.e("PHH", "Found a SW_MACHINE_COVER. Use this instead of SW_LID");
-+                mSwForLid = SW_MACHINE_COVER;
-+            } else {
-+                android.util.Log.e("PHH", "Not found a SW_MACHINE_COVER");
-+            }
-+
-+            int flip = getSwitchState(-1, InputDevice.SOURCE_ANY, SW_FLIP);
-+            if (flip != KEY_STATE_UNKNOWN) {
-+                android.util.Log.e("PHH", "Found a SW_FLIP. Use this instead of SW_LID");
-+                mSwForLid = SW_FLIP;
-+            } else {
-+                android.util.Log.e("PHH", "Not found a SW_FLIP");
-+            }
-+            android.util.Log.e("PHH", "Switch state got " + machineCoverState + " and " + flip);
-     }
- 
-     void registerLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0048-Include-vendor.samsung.hardware.radio.network-V1-jav.patch b/patches/trebledroid/platform_frameworks_base/0048-Include-vendor.samsung.hardware.radio.network-V1-jav.patch
deleted file mode 100644
index f81a187e..00000000
--- a/patches/trebledroid/platform_frameworks_base/0048-Include-vendor.samsung.hardware.radio.network-V1-jav.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 90d4b6286f60cb37449217495b110c595eeec675 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 21 Feb 2024 12:41:46 -0500
-Subject: [PATCH 48/54] Include vendor.samsung.hardware.radio.network-V1-java
- in base libs, will be used by f/o/telephony
-
----
- Android.bp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Android.bp b/Android.bp
-index 8d7ab983593d..3539553a95e9 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -238,6 +238,7 @@ java_library {
-         "android.hardware.radio.messaging-V3-java",
-         "android.hardware.radio.modem-V3-java",
-         "android.hardware.radio.network-V3-java",
-+        "vendor.samsung.hardware.radio.network-V1-java",
-         "android.hardware.radio.sim-V3-java",
-         "android.hardware.radio.voice-V3-java",
-         "android.hardware.thermal-V1.0-java-constants",
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0049-Include-vendor.samsung.hardware.radio-V2.2-java-HIDL.patch b/patches/trebledroid/platform_frameworks_base/0049-Include-vendor.samsung.hardware.radio-V2.2-java-HIDL.patch
deleted file mode 100644
index db23774a..00000000
--- a/patches/trebledroid/platform_frameworks_base/0049-Include-vendor.samsung.hardware.radio-V2.2-java-HIDL.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1ebf36b6785576dd13401b392ff59625f39584d5 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 21 Feb 2024 16:19:47 -0500
-Subject: [PATCH 49/54] Include vendor.samsung.hardware.radio-V2.2-java HIDL in
- base libs, will be used by f/o/telephony
-
----
- Android.bp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Android.bp b/Android.bp
-index 3539553a95e9..31ef1907c110 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -233,6 +233,7 @@ java_library {
-         "android.hardware.gnss-V2.1-java",
-         "android.hardware.health-V1.0-java-constants",
-         "android.hardware.radio-V1.6-java",
-+        "vendor.samsung.hardware.radio-V2.2-java",
-         "android.hardware.radio.data-V3-java",
-         "android.hardware.radio.ims-V2-java",
-         "android.hardware.radio.messaging-V3-java",
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0050-Allow-signature-spoofing-for-microG-Companion-Servic.patch b/patches/trebledroid/platform_frameworks_base/0050-Allow-signature-spoofing-for-microG-Companion-Servic.patch
deleted file mode 100644
index 6b4e3016..00000000
--- a/patches/trebledroid/platform_frameworks_base/0050-Allow-signature-spoofing-for-microG-Companion-Servic.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 7de635ba1e5979396146cd6062608d139f0c5ff3 Mon Sep 17 00:00:00 2001
-From: LuK1337 <priv.luk@gmail.com>
-Date: Mon, 19 Feb 2024 16:20:04 +0100
-Subject: [PATCH 50/54] Allow signature spoofing for microG Companion/Services
-
-This patch enables signature spoofing when the following conditions are
-met:
-* Build is debuggable (userdebug/eng)
-* Package name is com.android.vending or com.google.android.gms
-* Package is signed with microG release keys
-* Fake signature is correct
-
-Additionally, we let these apps be forceQueryable if they so desire.
-
-phh change: No need to be debuggable
-
-Change-Id: I8fc82ed266a2cc59636b662c7ea7e29c94f509b5
----
- .../com/android/server/pm/AppsFilterImpl.java |  2 +
- .../com/android/server/pm/ComputerEngine.java | 47 +++++++++++++++++++
- 2 files changed, 49 insertions(+)
-
-diff --git a/services/core/java/com/android/server/pm/AppsFilterImpl.java b/services/core/java/com/android/server/pm/AppsFilterImpl.java
-index cc4c2b5bf893..57263da936d6 100644
---- a/services/core/java/com/android/server/pm/AppsFilterImpl.java
-+++ b/services/core/java/com/android/server/pm/AppsFilterImpl.java
-@@ -36,6 +36,7 @@ import static com.android.server.pm.AppsFilterUtils.canQueryAsUpdateOwner;
- import static com.android.server.pm.AppsFilterUtils.canQueryViaComponents;
- import static com.android.server.pm.AppsFilterUtils.canQueryViaPackage;
- import static com.android.server.pm.AppsFilterUtils.canQueryViaUsesLibrary;
-+import static com.android.server.pm.ComputerEngine.isMicrogSigned;
- 
- import android.annotation.NonNull;
- import android.annotation.Nullable;
-@@ -599,6 +600,7 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
-             newIsForceQueryable = mForceQueryable.contains(newPkgSetting.getAppId())
-                             /* shared user that is already force queryable */
-                             || newPkgSetting.isForceQueryableOverride() /* adb override */
-+                            || (newPkg.isForceQueryable() && isMicrogSigned(newPkg))
-                             || (newPkgSetting.isSystem() && (mSystemAppsQueryable
-                             || newPkg.isForceQueryable()
-                             || ArrayUtils.contains(mForceQueryableByDevicePackageNames,
-diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
-index 9afdde53643c..60979e086a34 100644
---- a/services/core/java/com/android/server/pm/ComputerEngine.java
-+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
-@@ -102,6 +102,7 @@ import android.content.pm.UserPackage;
- import android.content.pm.VersionedPackage;
- import android.os.Binder;
- import android.os.Build;
-+import android.os.Bundle;
- import android.os.IBinder;
- import android.os.ParcelableException;
- import android.os.PatternMatcher;
-@@ -174,6 +175,7 @@ import java.util.Collections;
- import java.util.Comparator;
- import java.util.List;
- import java.util.Objects;
-+import java.util.Optional;
- import java.util.Set;
- import java.util.UUID;
- 
-@@ -423,6 +425,10 @@ public class ComputerEngine implements Computer {
-     private final PackageManagerInternal.ExternalSourcesPolicy mExternalSourcesPolicy;
-     private final CrossProfileIntentResolverEngine mCrossProfileIntentResolverEngine;
- 
-+    // Signatures used by microG
-+    private static final Signature MICROG_FAKE_SIGNATURE = new Signature("308204433082032ba003020102020900c2e08746644a308d300d06092a864886f70d01010405003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964301e170d3038303832313233313333345a170d3336303130373233313333345a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820120300d06092a864886f70d01010105000382010d00308201080282010100ab562e00d83ba208ae0a966f124e29da11f2ab56d08f58e2cca91303e9b754d372f640a71b1dcb130967624e4656a7776a92193db2e5bfb724a91e77188b0e6a47a43b33d9609b77183145ccdf7b2e586674c9e1565b1f4c6a5955bff251a63dabf9c55c27222252e875e4f8154a645f897168c0b1bfc612eabf785769bb34aa7984dc7e2ea2764cae8307d8c17154d7ee5f64a51a44a602c249054157dc02cd5f5c0e55fbef8519fbe327f0b1511692c5a06f19d18385f5c4dbc2d6b93f68cc2979c70e18ab93866b3bd5db8999552a0e3b4c99df58fb918bedc182ba35e003c1b4b10dd244a8ee24fffd333872ab5221985edab0fc0d0b145b6aa192858e79020103a381d93081d6301d0603551d0e04160414c77d8cc2211756259a7fd382df6be398e4d786a53081a60603551d2304819e30819b8014c77d8cc2211756259a7fd382df6be398e4d786a5a178a4763074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964820900c2e08746644a308d300c0603551d13040530030101ff300d06092a864886f70d010104050003820101006dd252ceef85302c360aaace939bcff2cca904bb5d7a1661f8ae46b2994204d0ff4a68c7ed1a531ec4595a623ce60763b167297a7ae35712c407f208f0cb109429124d7b106219c084ca3eb3f9ad5fb871ef92269a8be28bf16d44c8d9a08e6cb2f005bb3fe2cb96447e868e731076ad45b33f6009ea19c161e62641aa99271dfd5228c5c587875ddb7f452758d661f6cc0cccb7352e424cc4365c523532f7325137593c4ae341f4db41edda0d0b1071a7c440f0fe9ea01cb627ca674369d084bd2fd911ff06cdbf2cfa10dc0f893ae35762919048c7efc64c7144178342f70581c9de573af55b390dd7fdb9418631895d5f759f30112687ff621410c069308a");
-+    private static final Signature MICROG_REAL_SIGNATURE = new Signature("308202ed308201d5a003020102020426ffa009300d06092a864886f70d01010b05003027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a656374301e170d3132313030363132303533325a170d3337303933303132303533325a3027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a65637430820122300d06092a864886f70d01010105000382010f003082010a02820101009a8d2a5336b0eaaad89ce447828c7753b157459b79e3215dc962ca48f58c2cd7650df67d2dd7bda0880c682791f32b35c504e43e77b43c3e4e541f86e35a8293a54fb46e6b16af54d3a4eda458f1a7c8bc1b7479861ca7043337180e40079d9cdccb7e051ada9b6c88c9ec635541e2ebf0842521c3024c826f6fd6db6fd117c74e859d5af4db04448965ab5469b71ce719939a06ef30580f50febf96c474a7d265bb63f86a822ff7b643de6b76e966a18553c2858416cf3309dd24278374bdd82b4404ef6f7f122cec93859351fc6e5ea947e3ceb9d67374fe970e593e5cd05c905e1d24f5a5484f4aadef766e498adf64f7cf04bddd602ae8137b6eea40722d0203010001a321301f301d0603551d0e04160414110b7aa9ebc840b20399f69a431f4dba6ac42a64300d06092a864886f70d01010b0500038201010007c32ad893349cf86952fb5a49cfdc9b13f5e3c800aece77b2e7e0e9c83e34052f140f357ec7e6f4b432dc1ed542218a14835acd2df2deea7efd3fd5e8f1c34e1fb39ec6a427c6e6f4178b609b369040ac1f8844b789f3694dc640de06e44b247afed11637173f36f5886170fafd74954049858c6096308fc93c1bc4dd5685fa7a1f982a422f2a3b36baa8c9500474cf2af91c39cbec1bc898d10194d368aa5e91f1137ec115087c31962d8f76cd120d28c249cf76f4c70f5baa08c70a7234ce4123be080cee789477401965cfe537b924ef36747e8caca62dfefdd1a6288dcb1c4fd2aaa6131a7ad254e9742022cfd597d2ca5c660ce9e41ff537e5a4041e37");
-+
-     // PackageManagerService attributes that are primitives are referenced through the
-     // pms object directly.  Primitives are the only attributes so referenced.
-     protected final PackageManagerService mService;
-@@ -1465,6 +1471,42 @@ public class ComputerEngine implements Computer {
-         return result;
-     }
- 
-+    public static boolean isMicrogSigned(AndroidPackage p) {
-+        // Allowlist the following apps:
-+        // * com.android.vending - microG Companion
-+        // * com.google.android.gms - microG Services
-+        if (!p.getPackageName().equals("com.android.vending") &&
-+                !p.getPackageName().equals("com.google.android.gms")) {
-+            return false;
-+        }
-+        return Signature.areExactMatch(
-+                p.getSigningDetails(), new Signature[]{MICROG_REAL_SIGNATURE});
-+    }
-+
-+    private static Optional<Signature> generateFakeSignature(AndroidPackage p) {
-+        if (!isMicrogSigned(p)) {
-+            return Optional.empty();
-+        }
-+
-+        Bundle metadata = p.getMetaData();
-+        if (metadata == null) {
-+            return Optional.empty();
-+        }
-+
-+        String fakeSignatureStr = metadata.getString("fake-signature");
-+        if (TextUtils.isEmpty(fakeSignatureStr)) {
-+            return Optional.empty();
-+        }
-+
-+        // Only MICROG_FAKE_SIGNATURE can be faked
-+        Signature fakeSignature = new Signature(fakeSignatureStr);
-+        if (!fakeSignature.equals(MICROG_FAKE_SIGNATURE)) {
-+            return Optional.empty();
-+        }
-+
-+        return Optional.of(fakeSignature);
-+    }
-+
-     public final PackageInfo generatePackageInfo(PackageStateInternal ps,
-             @PackageManager.PackageInfoFlagsBits long flags, int userId) {
-         if (!mUserManager.exists(userId)) return null;
-@@ -1520,6 +1562,11 @@ public class ComputerEngine implements Computer {
-                             mApexManager.getActivePackageNameForApexModuleName(apexModuleName));
-                 }
-             }
-+
-+            generateFakeSignature(p).ifPresent(fakeSignature -> {
-+                packageInfo.signatures = new Signature[]{fakeSignature};
-+            });
-+
-             return packageInfo;
-         } else if ((flags & (MATCH_UNINSTALLED_PACKAGES | MATCH_ARCHIVED_PACKAGES)) != 0
-                 && PackageUserStateUtils.isAvailable(state, flags)) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0051-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch b/patches/trebledroid/platform_frameworks_base/0051-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
deleted file mode 100644
index 11193e2c..00000000
--- a/patches/trebledroid/platform_frameworks_base/0051-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 08f51ef7ee03d1c3bd0e99dbc5751d88c8bbb11c Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Sun, 31 Mar 2024 23:38:19 +0000
-Subject: [PATCH 51/54] Revert "Remove deprecated IRadio <1.4 APIs and
- references"
-
-This reverts commit 4d53aa0caec7029bf6c9b5789c1708bc4bb71b76.
----
- .../android/telephony/TelephonyManager.java   | 23 +++++++++++++++++++
- .../internal/telephony/ITelephony.aidl        | 11 +++++++++
- .../internal/telephony/RILConstants.java      |  5 ++++
- 3 files changed, 39 insertions(+)
-
-diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 0c9601ad7b30..4ac056a15f1e 100644
---- a/telephony/java/android/telephony/TelephonyManager.java
-+++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -11488,6 +11488,29 @@ public class TelephonyManager {
-         return result;
-     }
- 
-+    /**
-+     * Returns the result and response from RIL for oem request
-+     *
-+     * @param oemReq the data is sent to ril.
-+     * @param oemResp the respose data from RIL.
-+     * @return negative value request was not handled or get error
-+     *         0 request was handled succesfully, but no response data
-+     *         positive value success, data length of response
-+     * @hide
-+     * @deprecated OEM needs a vendor-extension hal and their apps should use that instead
-+     */
-+    @Deprecated
-+    public int invokeOemRilRequestRaw(byte[] oemReq, byte[] oemResp) {
-+        try {
-+            ITelephony telephony = getITelephony();
-+            if (telephony != null)
-+                return telephony.invokeOemRilRequestRaw(oemReq, oemResp);
-+        } catch (RemoteException ex) {
-+        } catch (NullPointerException ex) {
-+        }
-+        return -1;
-+    }
-+
-     /**
-      * Shut down all the live radios over all the slot indexes.
-      *
-diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
-index ff2ee27abc60..d7ca28c447a6 100644
---- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
-+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
-@@ -1194,6 +1194,17 @@ interface ITelephony {
-             in List<String> gsmNonRoamingList, in List<String> cdmaRoamingList,
-             in List<String> cdmaNonRoamingList);
- 
-+    /**
-+     * Returns the result and response from RIL for oem request
-+     *
-+     * @param oemReq the data is sent to ril.
-+     * @param oemResp the respose data from RIL.
-+     * @return negative value request was not handled or get error
-+     *         0 request was handled succesfully, but no response data
-+     *         positive value success, data length of response
-+     */
-+    int invokeOemRilRequestRaw(in byte[] oemReq, out byte[] oemResp);
-+
-     /**
-      * Check if any mobile Radios need to be shutdown.
-      *
-diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
-index b7dd4df1c843..5f5e21916bd0 100644
---- a/telephony/java/com/android/internal/telephony/RILConstants.java
-+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
-@@ -298,6 +298,11 @@ public interface RILConstants {
-     int SETUP_DATA_AUTH_CHAP      = 2;
-     int SETUP_DATA_AUTH_PAP_CHAP  = 3;
- 
-+    /* LCE service related constants. */
-+    int LCE_NOT_AVAILABLE = -1;
-+    int LCE_STOPPED = 0;
-+    int LCE_ACTIVE = 1;
-+
-     /**
-      * No restriction at all including voice/SMS/USSD/SS/AV64
-      * and packet data.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0052-Don-t-crash-system_server-if-we-fail-to-parse-dynami.patch b/patches/trebledroid/platform_frameworks_base/0052-Don-t-crash-system_server-if-we-fail-to-parse-dynami.patch
deleted file mode 100644
index cf24db50..00000000
--- a/patches/trebledroid/platform_frameworks_base/0052-Don-t-crash-system_server-if-we-fail-to-parse-dynami.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ee26bed16d6dd4845abc3006f9310067ee138f6d Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 17 Apr 2024 04:49:18 -0400
-Subject: [PATCH 52/54] Don't crash system_server if we fail to parse dynamic
- udfps position
-
----
- .../fingerprint/aidl/FingerprintProvider.java  | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
-index a7b86964e3e5..83836458a9ea 100644
---- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
-+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
-@@ -261,13 +261,17 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
-                     android.util.Log.e("PHH-Enroll", " - " + loc.sensorLocationX + ", " + loc.sensorLocationY + ", " +loc.sensorRadius + ", disp =" + loc.display + ", shape " + loc.sensorShape);
-                 }
-                 if (locations.length == 1 && locations[0].sensorLocationX == 0) {
--                    int[] otherValues = com.android.server.biometrics.AuthService.dynamicUdfpsProps(mContext);
--                    if (otherValues.length > 0) {
--                        SensorLocation loc = new SensorLocation();
--                        loc.sensorLocationX = otherValues[0];
--                        loc.sensorLocationY = otherValues[1];
--                        loc.sensorRadius = otherValues[2];
--                        locations[0] = loc;
-+                    try {
-+                        int[] otherValues = com.android.server.biometrics.AuthService.dynamicUdfpsProps(mContext);
-+                        if (otherValues.length > 0) {
-+                            SensorLocation loc = new SensorLocation();
-+                            loc.sensorLocationX = otherValues[0];
-+                            loc.sensorLocationY = otherValues[1];
-+                            loc.sensorRadius = otherValues[2];
-+                            locations[0] = loc;
-+                        }
-+                    } catch(Throwable t) {
-+                        android.util.Log.e("PHH-Enroll", "FingerprintProvider dynamicUdfpsProps", t);
-                     }
-                 }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0053-Add-a-prop-to-disable-animation-in-for-sysui-media-c.patch b/patches/trebledroid/platform_frameworks_base/0053-Add-a-prop-to-disable-animation-in-for-sysui-media-c.patch
deleted file mode 100644
index 412dae6c..00000000
--- a/patches/trebledroid/platform_frameworks_base/0053-Add-a-prop-to-disable-animation-in-for-sysui-media-c.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2926422e7d589a2b18714f457272f9c3239bec38 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 8 May 2024 11:55:07 -0400
-Subject: [PATCH 53/54] Add a prop to disable animation in for sysui media
- carousel
-
----
- .../media/controls/ui/controller/MediaCarouselController.kt    | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
-index b721236eab01..8da1ddc2010f 100644
---- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
-+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
-@@ -22,6 +22,7 @@ import android.content.Intent
- import android.content.res.ColorStateList
- import android.content.res.Configuration
- import android.database.ContentObserver
-+import android.os.SystemProperties
- import android.provider.Settings
- import android.provider.Settings.ACTION_MEDIA_CONTROLS_SETTINGS
- import android.util.Log
-@@ -1050,7 +1051,7 @@ constructor(
-                         desiredHostState.showsOnlyActiveMedia
- 
-                 for (mediaPlayer in MediaPlayerData.players()) {
--                    if (animate) {
-+                    if (animate && !SystemProperties.getBoolean("persist.sys.phh.no_media_carousel_animation", false)) {
-                         mediaPlayer.mediaViewController.animatePendingStateChange(
-                             duration = duration,
-                             delay = startDelay
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_base/0054-Allow-APKs-of-a-certain-signature-to-install-work-li.patch b/patches/trebledroid/platform_frameworks_base/0054-Allow-APKs-of-a-certain-signature-to-install-work-li.patch
deleted file mode 100644
index 8f4f397b..00000000
--- a/patches/trebledroid/platform_frameworks_base/0054-Allow-APKs-of-a-certain-signature-to-install-work-li.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 1713f8ea95cef6acaaefd19370c248f9a393e44f Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 7 Jul 2024 21:55:42 +0800
-Subject: [PATCH 54/54] Allow APKs of a certain signature to install/work like
- platform-signed
-
-Intended usecase - one authoritative set of signed IMS APKs for any GSI, regardless of their signature
-
-Change-Id: Ia1a13edec8eb8ecf0ea25fffaee4aeff9c75a5e1
----
- .../android/server/pm/PackageManagerServiceUtils.java | 11 +++++++++++
- .../core/java/com/android/server/pm/SELinuxMMAC.java  |  5 +++++
- .../java/com/android/server/pm/ScanPackageUtils.java  |  5 ++++-
- 3 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
-index 189a138a191a..523eb59ec703 100644
---- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
-+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
-@@ -221,6 +221,8 @@ public class PackageManagerServiceUtils {
-      */
-     private static final boolean FORCE_PACKAGE_PARSED_CACHE_ENABLED = false;
- 
-+    private static final Signature PHH_SIGNATURE = new Signature("308205fb308203e3a00302010202144cd9cede3ae98180d0c500b979c371be9189d42d300d06092a864886f70d01010b050030818b310b3009060355040613024652310f300d06035504080c064672616e6365310e300c06035504070c05506172697331143012060355040a0c0b547265626c6544726f696431143012060355040b0c0b547265626c6544726f69643114301206035504030c0b547265626c6544726f69643119301706092a864886f70d010901160a706868407068682e6d653020170d3234303731333136313435375a180f32303531313132393136313435375a30818b310b3009060355040613024652310f300d06035504080c064672616e6365310e300c06035504070c05506172697331143012060355040a0c0b547265626c6544726f696431143012060355040b0c0b547265626c6544726f69643114301206035504030c0b547265626c6544726f69643119301706092a864886f70d010901160a706868407068682e6d6530820222300d06092a864886f70d01010105000382020f003082020a0282020100ea313fa144409b3f52c489fb1401f98c0e2c1f66933c67e4f4b3ec1757b33b72d996de4f60fb6316aaab04b1c973e27833f8dca1bd109cb74525c48fda9a2d0f3fe2ff943e69042290f41f36c996b3c3c327a9cc6398ec3b4da7bd4a281005d10b6d022f4d871c113051b685d9e2059b68ffb00c174c2516cfa3c64d3d1e51f7f100fde5bf4a7af00f2c8bbb258f066fa1c4a077ee32ba1a3f56edec8f1e05b609aadb6dbe63487275812b8447881ada997d1ddf278008246565e97f1665943b6cbc6f4fe2f2982894d3b2dfec0eb5bc2f91e6d6d7497aef732b90c82531d7065bbacf234a73d53111cb8f2d117c67c9e873c326117410b9ea7a18d12811db8e2d0b183c37b53b5a4d066b7b5e2a6741748c7082f7fb0d7d8b21ad0c93ded88c71844f54fd25255f9a6eb7a7910475a1a2264110f5e0f267df671ea42d76a3381a632dde6c7f63f5e15d8d573b7f926e3106ead126d1ef0c0b22d909a6bfd6f3c444803d782a9aec3e4695016b055e180ccc1b7c24b532c226839d1ad1a5d7fe51f6e9e43460b8d706ca3d484b5994fb68fe212dbc2662935d0effb52ff018a9c760086b5ad5b7cd6549543677742cbf2f6bf409b2f70abb0ec6e042d30768eac5b61e1038f8b9c8dd4e801357cc7bfa2bfaebcbe59dc27331b5f388642d829a20893be0384bedab4287b881ef7a9a27765ba6910036a70128d8606f194acf070203010001a3533051301d0603551d0e04160414124752cf65d60fd9a632855450ae4124ebe78e3c301f0603551d23041830168014124752cf65d60fd9a632855450ae4124ebe78e3c300f0603551d130101ff040530030101ff300d06092a864886f70d01010b0500038202010045d310fab3cf34fda5c59a651853fe47ba759195db454b18727692fd54613fef6401ed31aff26a2579362fd6c0ae563b3c32472bafb919eb3e0a1173b0a3a9b0c475bf10db328d157eead62af2615b2b5bfa84cf51a3af38222ba737e5e47c5cdad3d2c8505796fa8b205e5fe39f2ff2516c961972c279c9197e913c2e6cc5951fe69bd8cbc09a9ee1664ce7a784b17ce721b8b61fa7a79c7919bed3de48b386eec4b5a1dd0bc4cde32ada097c2cb0fe13fc772d38740235866b0b304e79071a292ba77a8fb5532545df2452a11d53e7365851a515a9640c691d6d2570fee2d9b97cb1d52213411b3a29a16a5eb789000e2e2e2a4a33d38fc93d32c2511c57e6c420c29b5d1346904d9346537290bbefd7566c2ff3245db663ab5e21e721cbac1adada3e84defbc9758dbd1340cbd9b2a8e98542057eb517938462a5401825e31d640d57f881305d8474a9372db8459293fc9a2ccace877517bbedb759eb6eea45b5fcd5ea149d531ddf6a1ccf5f7dbe4d139a308af94049f717c09ff022a5ba0a2fbd35c4ce18671dfce2eccf292ac48b073d8e85a158ceac6f9253a1e6607b743fc2f557f55a1366716eda5653e9cb272e611c77e7949310ca3f294f1689efdfde087512a53bdf460029b9f0adb8fb7fada5e1443bdfdc8c8c29914b7856aa995c8cbf1866ac7d6c65e2d4c7c6738d7a8cb56d7ba9230ba9bc056d02e48f41");
-+
-     /**
-      * Returns the registered PackageManagerLocal instance, or else throws an unchecked error.
-      */
-@@ -306,6 +308,11 @@ public class PackageManagerServiceUtils {
-         return maxModifiedTime;
-     }
- 
-+    protected static boolean doesSignatureMatchPHH(SigningDetails signingDetails) {
-+        return signingDetails.getSignatures() != null
-+                && Signature.areExactMatch(signingDetails, new Signature[]{PHH_SIGNATURE});
-+    }
-+
-     private static File getSettingsProblemFile() {
-         File dataDir = Environment.getDataDirectory();
-         File systemDir = new File(dataDir, "system");
-@@ -579,6 +586,10 @@ public class PackageManagerServiceUtils {
-             boolean compareCompat, boolean compareRecover, boolean isRollback)
-             throws PackageManagerException {
-         final String packageName = pkgSetting.getPackageName();
-+        if (doesSignatureMatchPHH(parsedSignatures)) {
-+            Slog.w(TAG, "Package " + packageName + " has PHH signature, skipping subsequent checks");
-+            return false;
-+        }
-         boolean compatMatch = false;
-         if (pkgSetting.getSigningDetails().getSignatures() != null) {
-             // For an already existing package, make sure the parsed signatures from the package
-diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
-index e667bfe36d18..e08a6ba24807 100644
---- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
-+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
-@@ -448,6 +448,11 @@ public final class SELinuxMMAC {
-             }
-         }
- 
-+        if (pkg.getSigningDetails() != SigningDetails.UNKNOWN &&
-+                PackageManagerServiceUtils.doesSignatureMatchPHH(pkg.getSigningDetails())) {
-+            seInfo = "platform";
-+        }
-+
-         if (seInfo == null) {
-             seInfo = DEFAULT_SEINFO;
-         }
-diff --git a/services/core/java/com/android/server/pm/ScanPackageUtils.java b/services/core/java/com/android/server/pm/ScanPackageUtils.java
-index 2e67b2f41520..20a614235e6e 100644
---- a/services/core/java/com/android/server/pm/ScanPackageUtils.java
-+++ b/services/core/java/com/android/server/pm/ScanPackageUtils.java
-@@ -47,6 +47,7 @@ import static com.android.server.pm.PackageManagerService.TAG;
- import static com.android.server.pm.PackageManagerServiceUtils.compareSignatures;
- import static com.android.server.pm.PackageManagerServiceUtils.compressedFileExists;
- import static com.android.server.pm.PackageManagerServiceUtils.deriveAbiOverride;
-+import static com.android.server.pm.PackageManagerServiceUtils.doesSignatureMatchPHH;
- import static com.android.server.pm.PackageManagerServiceUtils.getLastModifiedTime;
- 
- import android.annotation.NonNull;
-@@ -918,7 +919,9 @@ final class ScanPackageUtils {
-                         || (platformPkg != null && compareSignatures(
-                         platformPkg.getSigningDetails(),
-                         parsedPackage.getSigningDetails()
--                ) == PackageManager.SIGNATURE_MATCH))
-+                        ) == PackageManager.SIGNATURE_MATCH)
-+                        || doesSignatureMatchPHH(
-+                        parsedPackage.getSigningDetails()))
-         );
- 
-         if (!isSystemApp) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch b/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
deleted file mode 100644
index 0bcb2063..00000000
--- a/patches/trebledroid/platform_frameworks_native/0001-On-Samsung-we-need-to-send-a-hack-message-to-HAL-to-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 50db1f171c6f2833f5f146190b6da249919e11bc Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 14 Aug 2019 23:37:10 +0200
-Subject: [PATCH 01/13] On Samsung, we need to send a hack-message to HAL to
- get all Sensors
-
-Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
----
- services/sensorservice/SensorDevice.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
-index f62562ce9d..be7d33ba62 100644
---- a/services/sensorservice/SensorDevice.cpp
-+++ b/services/sensorservice/SensorDevice.cpp
-@@ -40,6 +40,7 @@
- #include "android/hardware/sensors/2.1/types.h"
- #include "convertV2_1.h"
- 
-+#include <android-base/properties.h>
- using namespace android::hardware::sensors;
- using android::util::ProtoOutputStream;
- namespace sensorservice_flags = com::android::frameworks::sensorservice::flags;
-@@ -79,6 +80,8 @@ SensorDevice::SensorDevice() : mInHalBypassMode(false) {
- }
- 
- void SensorDevice::initializeSensorList() {
-+    if(::android::base::GetBoolProperty("persist.sys.phh.samsung_sensors", false))
-+        setMode(5555);
-     if (mHalWrapper == nullptr) {
-         return;
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch b/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
deleted file mode 100644
index 312d91d1..00000000
--- a/patches/trebledroid/platform_frameworks_native/0002-Matching-an-input-with-a-display-uses-uniqueId.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6dcdf89f11eeb4af174a07c966e902c523ba265c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 22 Oct 2020 23:22:46 +0200
-Subject: [PATCH 02/13] Matching an input with a display uses uniqueId
-
-Not all devices have a `location`, notably bluetooth devices.
-However, we might still want to associate them with a screen,
-so match them with uniqueId indeed.
-
-This is useful to have bluetooth keyboard in desktop mode for instance.
-
-Change-Id: Ifcbc8329d54386f58e013270d9888316c0f516b6
----
- services/inputflinger/reader/InputDevice.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
-index 4d8ffb68bb..1d041e1498 100644
---- a/services/inputflinger/reader/InputDevice.cpp
-+++ b/services/inputflinger/reader/InputDevice.cpp
-@@ -272,7 +272,10 @@ std::list<NotifyArgs> InputDevice::configureInternal(nsecs_t when,
-             mAssociatedDisplayUniqueId = std::nullopt;
-             mAssociatedViewport = std::nullopt;
-             // Find the display port that corresponds to the current input port.
--            const std::string& inputPort = mIdentifier.location;
-+            std::string inputPort = mIdentifier.location;
-+            if (inputPort.empty()) {
-+                inputPort = mIdentifier.uniqueId;
-+            }
-             if (!inputPort.empty()) {
-                 const std::unordered_map<std::string, uint8_t>& ports =
-                         readerConfig.portAssociations;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch b/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
deleted file mode 100644
index 40866039..00000000
--- a/patches/trebledroid/platform_frameworks_native/0003-unshared_oob-didn-t-exist-in-O-P-so-detect-its-suppo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From db878a2dce60d6a19e2d4ea8cc80317e1d159710 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 5 Jan 2021 23:44:00 +0100
-Subject: [PATCH 03/13] unshared_oob didn't exist in O/P, so detect its
- supported based on vndk version
-
----
- cmds/installd/migrate_legacy_obb_data.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmds/installd/migrate_legacy_obb_data.sh b/cmds/installd/migrate_legacy_obb_data.sh
-index 7399681c3e..9d5b73eae2 100644
---- a/cmds/installd/migrate_legacy_obb_data.sh
-+++ b/cmds/installd/migrate_legacy_obb_data.sh
-@@ -18,7 +18,7 @@
- rm -rf /data/media/0/Android/obb/test_probe
- mkdir -p /data/media/0/Android/obb/
- touch /data/media/0/Android/obb/test_probe
--if ! test -f /data/media/0/Android/obb/test_probe ; then
-+if ! test -f /data/media/0/Android/obb/test_probe  || [ "$(adb shell getprop ro.vndk.version)" -le 28 ]; then
-   log -p i -t migrate_legacy_obb_data "No support for 'unshared_obb'. Not migrating"
-   rm -rf /data/media/0/Android/obb/test_probe
-   exit 0
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch b/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
deleted file mode 100644
index 2f7abf50..00000000
--- a/patches/trebledroid/platform_frameworks_native/0004-Remove-Samsung-system-permission-on-sensors.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 90afacd9625b2ff98e8a22ac8bcc8682cf90b693 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 31 Mar 2021 23:36:03 +0200
-Subject: [PATCH 04/13] Remove Samsung system permission on sensors
-
----
- libs/sensor/Sensor.cpp              | 1 +
- libs/sensor/include/sensor/Sensor.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
-index a1549ea385..3eec309a93 100644
---- a/libs/sensor/Sensor.cpp
-+++ b/libs/sensor/Sensor.cpp
-@@ -429,6 +429,7 @@ const String8& Sensor::getStringType() const {
- }
- 
- const String8& Sensor::getRequiredPermission() const {
-+    if (mRequiredPermission == "com.samsung.permission.SSENSOR") return mFakeRequiredPermission;
-     return mRequiredPermission;
- }
- 
-diff --git a/libs/sensor/include/sensor/Sensor.h b/libs/sensor/include/sensor/Sensor.h
-index bae8a1380b..afaafb321e 100644
---- a/libs/sensor/include/sensor/Sensor.h
-+++ b/libs/sensor/include/sensor/Sensor.h
-@@ -125,6 +125,7 @@ private:
-     uint32_t mFifoMaxEventCount;
-     String8 mStringType;
-     String8 mRequiredPermission;
-+    String8 mFakeRequiredPermission;
-     bool mRequiredPermissionRuntime = false;
-     int32_t mRequiredAppOp;
-     int32_t mMaxDelay;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch b/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch
deleted file mode 100644
index 35bd51b8..00000000
--- a/patches/trebledroid/platform_frameworks_native/0005-Mark-accelerometer-input-as-sensor-exclusively-if-th.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e0d0fce849431dd86dbc6f770919b209ec8da9de Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 12 Dec 2021 08:45:36 -0500
-Subject: [PATCH 05/13] Mark accelerometer input as sensor exclusively if there
- are ABS axis
-
-The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and
-Galaxy J8, the input device reporting power button/vol- reports ACCELEROMETER
-input prop.
-This leads to wrong timestamping ioctl, leading to crashes and broken UI
-
-Change-Id: I491ab89724c908ef09a23a6427d24a8889bf806a
----
- services/inputflinger/reader/EventHub.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp
-index 3ca691efba..a2b5d7d8b0 100644
---- a/services/inputflinger/reader/EventHub.cpp
-+++ b/services/inputflinger/reader/EventHub.cpp
-@@ -2431,7 +2431,13 @@ void EventHub::openDeviceLocked(const std::string& devicePath) {
- 
-     // Check whether this device is an accelerometer.
-     if (device->propBitmask.test(INPUT_PROP_ACCELEROMETER)) {
--        device->classes |= InputDeviceClass::SENSOR;
-+        bool hasAxis = false;
-+        for (int i = 0; i <= ABS_MAX; i++) {
-+            if (device->absBitmask.test(i)) hasAxis = true;
-+        }
-+        if(hasAxis) {
-+            device->classes |= InputDeviceClass::SENSOR;
-+        }
-     }
- 
-     // Check whether this device has switches.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch b/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
deleted file mode 100644
index 80971a49..00000000
--- a/patches/trebledroid/platform_frameworks_native/0006-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d0d340a845cccd76e21b9f15f12cbe7457d839e3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 25 Mar 2022 05:37:56 -0400
-Subject: [PATCH 06/13] MIUI13 devices hide their vibrator HAL behind
- non-default name: "vibratorfeature"
-
----
- services/vibratorservice/VibratorHalController.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/services/vibratorservice/VibratorHalController.cpp b/services/vibratorservice/VibratorHalController.cpp
-index c1795f5c32..345016efd6 100644
---- a/services/vibratorservice/VibratorHalController.cpp
-+++ b/services/vibratorservice/VibratorHalController.cpp
-@@ -59,6 +59,12 @@ std::shared_ptr<HalWrapper> connectHal(std::shared_ptr<CallbackScheduler> schedu
-         return std::make_shared<AidlHalWrapper>(std::move(scheduler), aidlHal);
-     }
- 
-+    aidlHal = waitForVintfService<Aidl::IVibrator>(String16("vibratorfeature"));
-+    if (aidlHal) {
-+        ALOGV("Successfully connected to Xiaomi Vibrator HAL AIDL service.");
-+        return std::make_shared<AidlHalWrapper>(std::move(scheduler), aidlHal);
-+    }
-+
-     sp<V1_0::IVibrator> halV1_0 = V1_0::IVibrator::getService();
-     if (halV1_0 == nullptr) {
-         ALOGV("Vibrator HAL service not available.");
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch b/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch
deleted file mode 100644
index 6f09c314..00000000
--- a/patches/trebledroid/platform_frameworks_native/0007-powermanager-Add-support-Samsung-miscpower-HAL.patch
+++ /dev/null
@@ -1,333 +0,0 @@
-From a38497ff4222dfb75efd39a079935e421d0578f4 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 27 Dec 2021 18:00:43 -0500
-Subject: [PATCH 07/13] powermanager: Add support Samsung miscpower HAL
-
-Several various configurations need to be supported:
-- Android Pie vendors have a android.hardware.power HIDL default + "miscpower"
-- Android Q vendors have default HIDL android.hardware.power +
-  ISehMiscPower
-- Android R vendors have default AIDL android.hardware.power +
-  ISehMiscPower
-
-ISehMiscPower is always in addition to android.hardware.power, not as a
-substituion
-
-Only tested configuration ATM is the latest one
-
-Change-Id: I182a91ccb0a89f9d0d7d41f36eccab218b553bbc
----
- include/powermanager/PowerHalLoader.h         |  3 +
- include/powermanager/PowerHalWrapper.h        | 36 +++++++++-
- services/powermanager/Android.bp              |  2 +
- services/powermanager/PowerHalController.cpp  | 13 +++-
- services/powermanager/PowerHalLoader.cpp      | 17 ++++-
- services/powermanager/PowerHalWrapper.cpp     | 70 +++++++++++++++++++
- .../CompositionEngine/Android.bp              |  1 +
- 7 files changed, 136 insertions(+), 6 deletions(-)
-
-diff --git a/include/powermanager/PowerHalLoader.h b/include/powermanager/PowerHalLoader.h
-index cbbfa597ba..c27a833a07 100644
---- a/include/powermanager/PowerHalLoader.h
-+++ b/include/powermanager/PowerHalLoader.h
-@@ -22,6 +22,7 @@
- #include <android/hardware/power/1.1/IPower.h>
- #include <android/hardware/power/1.2/IPower.h>
- #include <android/hardware/power/1.3/IPower.h>
-+#include <vendor/samsung/hardware/miscpower/2.0/ISehMiscPower.h>
- 
- namespace android {
- 
-@@ -36,6 +37,7 @@ public:
-     static sp<hardware::power::V1_1::IPower> loadHidlV1_1();
-     static sp<hardware::power::V1_2::IPower> loadHidlV1_2();
-     static sp<hardware::power::V1_3::IPower> loadHidlV1_3();
-+    static sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> loadHidlSeh();
- 
- private:
-     static std::mutex gHalMutex;
-@@ -44,6 +46,7 @@ private:
-     static sp<hardware::power::V1_1::IPower> gHalHidlV1_1 GUARDED_BY(gHalMutex);
-     static sp<hardware::power::V1_2::IPower> gHalHidlV1_2 GUARDED_BY(gHalMutex);
-     static sp<hardware::power::V1_3::IPower> gHalHidlV1_3 GUARDED_BY(gHalMutex);
-+    static sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> gHalHidlSeh GUARDED_BY(gHalMutex);
- 
-     static sp<hardware::power::V1_0::IPower> loadHidlV1_0Locked()
-             EXCLUSIVE_LOCKS_REQUIRED(gHalMutex);
-diff --git a/include/powermanager/PowerHalWrapper.h b/include/powermanager/PowerHalWrapper.h
-index e2da014606..66bb910ec2 100644
---- a/include/powermanager/PowerHalWrapper.h
-+++ b/include/powermanager/PowerHalWrapper.h
-@@ -27,6 +27,7 @@
- #include <android/hardware/power/1.2/IPower.h>
- #include <android/hardware/power/1.3/IPower.h>
- #include <binder/Status.h>
-+#include <vendor/samsung/hardware/miscpower/2.0/ISehMiscPower.h>
- 
- #include <utility>
- 
-@@ -278,8 +279,10 @@ protected:
- // Wrapper for the AIDL Power HAL.
- class AidlHalWrapper : public EmptyHalWrapper {
- public:
--    explicit AidlHalWrapper(std::shared_ptr<aidl::android::hardware::power::IPower> handle)
--          : mHandle(std::move(handle)) {}
-+    explicit AidlHalWrapper(std::shared_ptr<aidl::android::hardware::power::IPower> handle,
-+            sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> sehHandle)
-+          : mHandle(std::move(handle)),
-+            mHandleSeh(std::move(sehHandle)) {}
-     ~AidlHalWrapper() override = default;
- 
-     HalResult<void> setBoost(aidl::android::hardware::power::Boost boost,
-@@ -307,6 +310,7 @@ private:
-     std::mutex mBoostMutex;
-     std::mutex mModeMutex;
-     std::shared_ptr<aidl::android::hardware::power::IPower> mHandle;
-+    sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> mHandleSeh;
-     // Android framework only sends boost upto DISPLAY_UPDATE_IMMINENT.
-     // Need to increase the array size if more boost supported.
-     std::array<
-@@ -321,6 +325,34 @@ private:
-             mModeSupportedArray GUARDED_BY(mModeMutex) = {HalSupport::UNKNOWN};
- };
- 
-+class HidlHalWrapperSeh : public EmptyHalWrapper {
-+public:
-+    explicit HidlHalWrapperSeh(sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> hal1,
-+            sp<android::hardware::power::V1_1::IPower> hal2,
-+            sp<android::hardware::power::V1_0::IPower> hal3)
-+    : mHandleSeh(std::move(hal1)),
-+        mHandle11(std::move(hal2)),
-+        mHandle10(std::move(hal3)) {}
-+    ~HidlHalWrapperSeh() = default;
-+
-+    HalResult<void> setBoost(aidl::android::hardware::power::Boost boost, int32_t durationMs) override;
-+    HalResult<void> setMode(aidl::android::hardware::power::Mode mode, bool enabled) override;
-+    HalResult<std::shared_ptr<aidl::android::hardware::power::IPowerHintSession>> createHintSession(
-+            int32_t tgid, int32_t uid, const std::vector<int32_t>& threadIds,
-+            int64_t durationNanos) override;
-+    HalResult<int64_t> getHintSessionPreferredRate() override;
-+
-+protected:
-+    HalResult<void> sendPowerHint(hardware::power::V1_0::PowerHint hintId, uint32_t data);
-+
-+private:
-+    sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> mHandleSeh;
-+    sp<android::hardware::power::V1_1::IPower> mHandle11;
-+    sp<android::hardware::power::V1_0::IPower> mHandle10;
-+    HalResult<void> setInteractive(bool enabled);
-+    HalResult<void> setFeature(hardware::power::V1_0::Feature feature, bool enabled);
-+};
-+
- }; // namespace power
- 
- }; // namespace android
-diff --git a/services/powermanager/Android.bp b/services/powermanager/Android.bp
-index 1f72e8ba2c..d7eea4dfc7 100644
---- a/services/powermanager/Android.bp
-+++ b/services/powermanager/Android.bp
-@@ -42,6 +42,7 @@ cc_library_shared {
-         "android.hardware.power@1.1",
-         "android.hardware.power@1.2",
-         "android.hardware.power@1.3",
-+        "vendor.samsung.hardware.miscpower@2.0",
-     ],
- 
-     export_shared_lib_headers: [
-@@ -49,6 +50,7 @@ cc_library_shared {
-         "android.hardware.power@1.1",
-         "android.hardware.power@1.2",
-         "android.hardware.power@1.3",
-+        "vendor.samsung.hardware.miscpower@2.0",
-     ],
- 
-     cflags: [
-diff --git a/services/powermanager/PowerHalController.cpp b/services/powermanager/PowerHalController.cpp
-index bc178bce8f..98dc5adefc 100644
---- a/services/powermanager/PowerHalController.cpp
-+++ b/services/powermanager/PowerHalController.cpp
-@@ -20,6 +20,7 @@
- #include <aidl/android/hardware/power/IPowerHintSession.h>
- #include <aidl/android/hardware/power/Mode.h>
- #include <android/hardware/power/1.1/IPower.h>
-+#include <vendor/samsung/hardware/miscpower/2.0/ISehMiscPower.h>
- #include <powermanager/PowerHalController.h>
- #include <powermanager/PowerHalLoader.h>
- #include <utils/Log.h>
-@@ -33,19 +34,25 @@ namespace power {
- // -------------------------------------------------------------------------------------------------
- 
- std::unique_ptr<HalWrapper> HalConnector::connect() {
-+    sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> halHidlSeh = PowerHalLoader::loadHidlSeh();
-     if (std::shared_ptr<aidl::android::hardware::power::IPower> halAidl =
-                 PowerHalLoader::loadAidl()) {
--        return std::make_unique<AidlHalWrapper>(halAidl);
-+        return std::make_unique<AidlHalWrapper>(halAidl, halHidlSeh);
-     }
-     // If V1_0 isn't defined, none of them are
--    if (sp<V1_0::IPower> halHidlV1_0 = PowerHalLoader::loadHidlV1_0()) {
-+    sp<V1_0::IPower> halHidlV1_0 = PowerHalLoader::loadHidlV1_0();
-+    sp<V1_1::IPower> halHidlV1_1 = PowerHalLoader::loadHidlV1_1();
-+    if (halHidlSeh) {
-+        return std::make_unique<HidlHalWrapperSeh>(halHidlSeh, halHidlV1_1, halHidlV1_0);
-+    }
-+    if (halHidlV1_0) {
-         if (sp<V1_3::IPower> halHidlV1_3 = PowerHalLoader::loadHidlV1_3()) {
-             return std::make_unique<HidlHalWrapperV1_3>(halHidlV1_3);
-         }
-         if (sp<V1_2::IPower> halHidlV1_2 = PowerHalLoader::loadHidlV1_2()) {
-             return std::make_unique<HidlHalWrapperV1_2>(halHidlV1_2);
-         }
--        if (sp<V1_1::IPower> halHidlV1_1 = PowerHalLoader::loadHidlV1_1()) {
-+        if (halHidlV1_1) {
-             return std::make_unique<HidlHalWrapperV1_1>(halHidlV1_1);
-         }
-         return std::make_unique<HidlHalWrapperV1_0>(halHidlV1_0);
-diff --git a/services/powermanager/PowerHalLoader.cpp b/services/powermanager/PowerHalLoader.cpp
-index 22144615da..5823fa697d 100644
---- a/services/powermanager/PowerHalLoader.cpp
-+++ b/services/powermanager/PowerHalLoader.cpp
-@@ -21,6 +21,7 @@
- #include <android/hardware/power/1.1/IPower.h>
- #include <android/hardware/power/1.2/IPower.h>
- #include <android/hardware/power/1.3/IPower.h>
-+#include <vendor/samsung/hardware/miscpower/2.0/ISehMiscPower.h>
- #include <binder/IServiceManager.h>
- #include <hardware/power.h>
- #include <hardware_legacy/power.h>
-@@ -60,6 +61,7 @@ sp<V1_0::IPower> PowerHalLoader::gHalHidlV1_0 = nullptr;
- sp<V1_1::IPower> PowerHalLoader::gHalHidlV1_1 = nullptr;
- sp<V1_2::IPower> PowerHalLoader::gHalHidlV1_2 = nullptr;
- sp<V1_3::IPower> PowerHalLoader::gHalHidlV1_3 = nullptr;
-+sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> PowerHalLoader::gHalHidlSeh = nullptr;
- 
- void PowerHalLoader::unloadAll() {
-     std::lock_guard<std::mutex> lock(gHalMutex);
-@@ -122,10 +124,23 @@ sp<V1_3::IPower> PowerHalLoader::loadHidlV1_3() {
-     return loadHal<V1_3::IPower>(gHalExists, gHalHidlV1_3, loadFn, "HIDL v1.3");
- }
- 
-+sp<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower> PowerHalLoader::loadHidlSeh() {
-+    std::lock_guard<std::mutex> lock(gHalMutex);
-+    static bool gHalExists = true;
-+    static auto loadFn = []() { return vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower::getService(); };
-+    return loadHal<vendor::samsung::hardware::miscpower::V2_0::ISehMiscPower>(gHalExists, gHalHidlSeh, loadFn, "HIDL SEH v1.1");
-+}
-+
- sp<V1_0::IPower> PowerHalLoader::loadHidlV1_0Locked() {
-+    static bool gSecHalExists = true;
-+    static auto loadFnSec = []() { return V1_0::IPower::getService("power"); };
-+    auto hal = loadHal<V1_0::IPower>(gSecHalExists, gHalHidlV1_0, loadFnSec, "HIDL v1.0");
-+
-     static bool gHalExists = true;
-     static auto loadFn = []() { return V1_0::IPower::getService(); };
--    return loadHal<V1_0::IPower>(gHalExists, gHalHidlV1_0, loadFn, "HIDL v1.0");
-+    if(hal == nullptr)
-+        hal = loadHal<V1_0::IPower>(gHalExists, gHalHidlV1_0, loadFn, "HIDL v1.0");
-+    return hal;
- }
- 
- // -------------------------------------------------------------------------------------------------
-diff --git a/services/powermanager/PowerHalWrapper.cpp b/services/powermanager/PowerHalWrapper.cpp
-index 1009100cc2..79605a1309 100644
---- a/services/powermanager/PowerHalWrapper.cpp
-+++ b/services/powermanager/PowerHalWrapper.cpp
-@@ -232,6 +232,10 @@ HalResult<void> AidlHalWrapper::setMode(Aidl::Mode mode, bool enabled) {
-     std::unique_lock<std::mutex> lock(mModeMutex);
-     size_t idx = static_cast<size_t>(mode);
- 
-+    if (mHandleSeh != nullptr && mode == Aidl::Mode::INTERACTIVE) {
-+        mHandleSeh->setInteractiveAsync(enabled, false);
-+    }
-+
-     // Quick return if mode is not supported by HAL
-     if (idx >= mModeSupportedArray.size() || mModeSupportedArray[idx] == HalSupport::OFF) {
-         ALOGV("Skipped setMode %s because %s", toString(mode).c_str(), getUnsupportedMessage());
-@@ -294,6 +298,72 @@ const char* AidlHalWrapper::getUnsupportedMessage() {
-     return "Power HAL doesn't support it";
- }
- 
-+HalResult<void> HidlHalWrapperSeh::setBoost(Aidl::Boost boost, int32_t durationMs) {
-+    if (boost == Aidl::Boost::INTERACTION) {
-+        return sendPowerHint(V1_0::PowerHint::INTERACTION, durationMs);
-+    } else {
-+        ALOGV("Skipped setBoost %s because Power HAL AIDL not available", toString(boost).c_str());
-+        return HalResult<void>::unsupported();
-+    }
-+}
-+
-+HalResult<void> HidlHalWrapperSeh::setMode(Aidl::Mode mode, bool enabled) {
-+    uint32_t data = enabled ? 1 : 0;
-+    switch (mode) {
-+        case Aidl::Mode::LAUNCH:
-+            return sendPowerHint(V1_0::PowerHint::LAUNCH, data);
-+        case Aidl::Mode::LOW_POWER:
-+            return sendPowerHint(V1_0::PowerHint::LOW_POWER, data);
-+        case Aidl::Mode::SUSTAINED_PERFORMANCE:
-+            return sendPowerHint(V1_0::PowerHint::SUSTAINED_PERFORMANCE, data);
-+        case Aidl::Mode::VR:
-+            return sendPowerHint(V1_0::PowerHint::VR_MODE, data);
-+        case Aidl::Mode::INTERACTIVE:
-+            return setInteractive(enabled);
-+        case Aidl::Mode::DOUBLE_TAP_TO_WAKE:
-+            return setFeature(V1_0::Feature::POWER_FEATURE_DOUBLE_TAP_TO_WAKE, enabled);
-+        default:
-+            ALOGV("Skipped setMode %s because Power HAL AIDL not available",
-+                  toString(mode).c_str());
-+            return HalResult<void>::unsupported();
-+    }
-+}
-+
-+HalResult<void> HidlHalWrapperSeh::sendPowerHint(V1_0::PowerHint hintId, uint32_t data) {
-+    if(mHandle11 != nullptr) {
-+        auto ret = mHandle11->powerHintAsync(hintId, data);
-+        return HalResult<void>::fromReturn(ret);
-+    } else {
-+        auto ret = mHandle10->powerHint(hintId, data);
-+        return HalResult<void>::fromReturn(ret);
-+    }
-+}
-+
-+HalResult<void> HidlHalWrapperSeh::setInteractive(bool enabled) {
-+    if(mHandleSeh != nullptr) {
-+        mHandleSeh->setInteractiveAsync(enabled, false);
-+    }
-+    auto ret = mHandle10->setInteractive(enabled);
-+    return HalResult<void>::fromReturn(ret);
-+}
-+
-+HalResult<void> HidlHalWrapperSeh::setFeature(V1_0::Feature feature, bool enabled) {
-+    auto ret = mHandle10->setFeature(feature, enabled);
-+    return HalResult<void>::fromReturn(ret);
-+}
-+
-+HalResult<std::shared_ptr<Aidl::IPowerHintSession>> HidlHalWrapperSeh::createHintSession(
-+        int32_t, int32_t, const std::vector<int32_t>& threadIds, int64_t) {
-+    ALOGV("Skipped createHintSession(task num=%zu) because Power HAL not available",
-+          threadIds.size());
-+    return HalResult<std::shared_ptr<Aidl::IPowerHintSession>>::unsupported();
-+}
-+
-+HalResult<int64_t> HidlHalWrapperSeh::getHintSessionPreferredRate() {
-+    ALOGV("Skipped getHintSessionPreferredRate because Power HAL not available");
-+    return HalResult<int64_t>::unsupported();
-+}
-+
- // -------------------------------------------------------------------------------------------------
- 
- } // namespace power
-diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
-index 0b01c666a4..4c9220bb28 100644
---- a/services/surfaceflinger/CompositionEngine/Android.bp
-+++ b/services/surfaceflinger/CompositionEngine/Android.bp
-@@ -39,6 +39,7 @@ cc_defaults {
-         "libui",
-         "libutils",
-         "server_configurable_flags",
-+        "vendor.samsung.hardware.miscpower@2.0",
-     ],
-     static_libs: [
-         "liblayers_proto",
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch b/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch
deleted file mode 100644
index 2537132e..00000000
--- a/patches/trebledroid/platform_frameworks_native/0008-FOD-support-for-Samsung-and-Asus.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From 2ed23f83325f00f3d8e935b8e9ea3c63f1674af3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 18 Dec 2022 18:17:30 -0500
-Subject: [PATCH 08/13] FOD support for Samsung and Asus
-
----
- libs/gui/BLASTBufferQueue.cpp                 | 20 ++++++++++++++--
- libs/ui/Gralloc2.cpp                          |  1 -
- libs/ui/Gralloc3.cpp                          |  1 -
- libs/ui/Gralloc4.cpp                          |  1 -
- .../CompositionEngine/src/OutputLayer.cpp     | 24 +++++++++++++++++++
- .../DisplayHardware/AidlComposerHal.cpp       |  8 +++++++
- .../DisplayHardware/AidlComposerHal.h         |  2 ++
- .../DisplayHardware/ComposerHal.h             |  3 +++
- .../surfaceflinger/DisplayHardware/HWC2.cpp   |  8 +++++++
- .../surfaceflinger/DisplayHardware/HWC2.h     |  5 ++++
- .../DisplayHardware/HidlComposerHal.cpp       |  7 ++++++
- .../DisplayHardware/HidlComposerHal.h         |  2 ++
- 12 files changed, 77 insertions(+), 5 deletions(-)
-
-diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
-index f317a2eea0..6a55bb3f70 100644
---- a/libs/gui/BLASTBufferQueue.cpp
-+++ b/libs/gui/BLASTBufferQueue.cpp
-@@ -37,6 +37,7 @@
- 
- #include <private/gui/ComposerService.h>
- #include <private/gui/ComposerServiceAIDL.h>
-+#include <cutils/properties.h>
- 
- #include <android-base/thread_annotations.h>
- #include <chrono>
-@@ -46,6 +47,14 @@
- using namespace com::android::graphics::libgui;
- using namespace std::chrono_literals;
- 
-+static bool sCheckedProps = false;
-+static bool sSamsungFod = false;
-+static void init_fod_props() {
-+    if(sCheckedProps) return;
-+    sCheckedProps = true;
-+    sSamsungFod = property_get_bool("persist.sys.phh.fod.samsung", false);
-+}
-+
- namespace {
- inline const char* boolToString(bool b) {
-     return b ? "true" : "false";
-@@ -181,9 +190,16 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati
- 
-     // safe default, most producers are expected to override this
-     mProducer->setMaxDequeuedBufferCount(2);
-+    uint64_t usage = GraphicBuffer::USAGE_HW_COMPOSER |
-+        GraphicBuffer::USAGE_HW_TEXTURE;
-+
-+    init_fod_props();
-+    if(sSamsungFod && name.find("SurfaceView[UdfpsControllerOverlay]") != std::string::npos) {
-+           usage |= 0x400000000LL;
-+    }
-+
-     mBufferItemConsumer = new BLASTBufferItemConsumer(mConsumer,
--                                                      GraphicBuffer::USAGE_HW_COMPOSER |
--                                                              GraphicBuffer::USAGE_HW_TEXTURE,
-+            usage,
-                                                       1, false, this);
-     static std::atomic<uint32_t> nextId = 0;
-     mProducerId = nextId++;
-diff --git a/libs/ui/Gralloc2.cpp b/libs/ui/Gralloc2.cpp
-index a5aca9912f..f55ab759fb 100644
---- a/libs/ui/Gralloc2.cpp
-+++ b/libs/ui/Gralloc2.cpp
-@@ -108,7 +108,6 @@ status_t Gralloc2Mapper::validateBufferDescriptorInfo(
-     if (descriptorInfo->usage & ~validUsageBits) {
-         ALOGE("buffer descriptor contains invalid usage bits 0x%" PRIx64,
-               descriptorInfo->usage & ~validUsageBits);
--        return BAD_VALUE;
-     }
- 
-     // Gralloc2 implementations never understand non-BLOB with GPU_DATA_BUFFER
-diff --git a/libs/ui/Gralloc3.cpp b/libs/ui/Gralloc3.cpp
-index 152b35a505..5f3b258cab 100644
---- a/libs/ui/Gralloc3.cpp
-+++ b/libs/ui/Gralloc3.cpp
-@@ -99,7 +99,6 @@ status_t Gralloc3Mapper::validateBufferDescriptorInfo(
-     if (descriptorInfo->usage & ~validUsageBits) {
-         ALOGE("buffer descriptor contains invalid usage bits 0x%" PRIx64,
-               descriptorInfo->usage & ~validUsageBits);
--        return BAD_VALUE;
-     }
- 
-     // Gralloc3 implementations never understand non-BLOB with GPU_DATA_BUFFER
-diff --git a/libs/ui/Gralloc4.cpp b/libs/ui/Gralloc4.cpp
-index 2a607308d1..9b185cea89 100644
---- a/libs/ui/Gralloc4.cpp
-+++ b/libs/ui/Gralloc4.cpp
-@@ -122,7 +122,6 @@ static status_t validateBufferDescriptorInfo(IMapper::BufferDescriptorInfo* desc
-     if (descriptorInfo->usage & ~validUsageBits) {
-         ALOGE("buffer descriptor contains invalid usage bits 0x%" PRIx64,
-               descriptorInfo->usage & ~validUsageBits);
--        return BAD_VALUE;
-     }
- 
-     // Combinations that are only allowed with gralloc 4.1.
-diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
-index 091c207464..60e095c49b 100644
---- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
-+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
-@@ -26,6 +26,7 @@
- #include "system/graphics-base-v1.0.h"
- 
- #include <ui/HdrRenderTypeUtils.h>
-+#include <cutils/properties.h>
- 
- // TODO(b/129481165): remove the #pragma below and fix conversion issues
- #pragma clang diagnostic push
-@@ -36,6 +37,9 @@
- // TODO(b/129481165): remove the #pragma below and fix conversion issues
- #pragma clang diagnostic pop // ignored "-Wconversion"
- 
-+static bool sCheckedProps = false;
-+static bool sAsusFod = false;
-+
- using aidl::android::hardware::graphics::composer3::Composition;
- 
- namespace android::compositionengine {
-@@ -441,6 +445,26 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
-                                                      ->getHeight()));
-     }
- 
-+    if(!sCheckedProps) {
-+        sCheckedProps = true;
-+        sAsusFod = property_get_bool("persist.sys.phh.fod.asus", false);
-+    }
-+
-+    if (strstr(getLayerFE().getDebugName(), "UdfpsControllerOverlay#") != nullptr) {
-+        if (sAsusFod) {
-+            if (auto error = hwcLayer->setLayerClass(5); error != hal::Error::NONE) {
-+                ALOGE("Failed setting Asus layer class");
-+            }
-+        }
-+    }
-+    if (strstr(getLayerFE().getDebugName(), "SurfaceView[UdfpsControllerOverlay](BLAST)#") != nullptr) {
-+        if (sAsusFod) {
-+            if (auto error = hwcLayer->setLayerClass(4); error != hal::Error::NONE) {
-+                ALOGE("Failed setting Asus layer class");
-+            }
-+        }
-+    }
-+
-     ALOGV("Writing display frame [%d, %d, %d, %d]", displayFrame.left, displayFrame.top,
-           displayFrame.right, displayFrame.bottom);
- 
-diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
-index 362ab9c39e..62c2ed8f8d 100644
---- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
-+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
-@@ -1686,5 +1686,13 @@ void AidlComposer::addDisplay(Display display) {
- void AidlComposer::onHotplugConnect(Display display) {
-     addDisplay(display);
- }
-+
-+Error AidlComposer::setLayerClass(Display display, Layer layer, uint32_t layerClass) {
-+    (void) display;
-+    (void) layer;
-+    (void) layerClass;
-+    return Error::NONE;
-+}
-+
- } // namespace Hwc2
- } // namespace android
-diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.h b/services/surfaceflinger/DisplayHardware/AidlComposerHal.h
-index ea0e53a202..1e11102cad 100644
---- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.h
-+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.h
-@@ -245,6 +245,8 @@ public:
-     Error notifyExpectedPresent(Display, nsecs_t expectedPresentTime,
-                                 int32_t frameIntervalNs) override;
- 
-+    // Proprietary extensions
-+    Error setLayerClass(Display display, Layer layer, uint32_t layerClass) override;
- private:
-     // Many public functions above simply write a command into the command
-     // queue to batch the calls.  validateDisplay and presentDisplay will call
-diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.h b/services/surfaceflinger/DisplayHardware/ComposerHal.h
-index bc067a0e5d..c0fcff6a7d 100644
---- a/services/surfaceflinger/DisplayHardware/ComposerHal.h
-+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.h
-@@ -303,6 +303,9 @@ public:
-     virtual Error setRefreshRateChangedCallbackDebugEnabled(Display, bool) = 0;
-     virtual Error notifyExpectedPresent(Display, nsecs_t expectedPresentTime,
-                                         int32_t frameIntervalNs) = 0;
-+
-+    // Proprietary extensions
-+    virtual Error setLayerClass(Display display, Layer layer, uint32_t layerClass) = 0;
- };
- 
- } // namespace Hwc2
-diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp
-index 84f668d9df..7f867c10c7 100644
---- a/services/surfaceflinger/DisplayHardware/HWC2.cpp
-+++ b/services/surfaceflinger/DisplayHardware/HWC2.cpp
-@@ -1030,6 +1030,14 @@ Error Layer::setBlockingRegion(const Region& region) {
-     return static_cast<Error>(intError);
- }
- 
-+Error Layer::setLayerClass(uint32_t layerClass) {
-+    if (CC_UNLIKELY(!mDisplay)) {
-+        return Error::BAD_DISPLAY;
-+    }
-+    auto intError = mComposer.setLayerClass(mDisplay->getId(), mId, layerClass);
-+    return static_cast<Error>(intError);
-+}
-+
- } // namespace impl
- } // namespace HWC2
- } // namespace android
-diff --git a/services/surfaceflinger/DisplayHardware/HWC2.h b/services/surfaceflinger/DisplayHardware/HWC2.h
-index de044e0b76..09454e26e2 100644
---- a/services/surfaceflinger/DisplayHardware/HWC2.h
-+++ b/services/surfaceflinger/DisplayHardware/HWC2.h
-@@ -353,6 +353,9 @@ public:
-     // AIDL HAL
-     [[nodiscard]] virtual hal::Error setBrightness(float brightness) = 0;
-     [[nodiscard]] virtual hal::Error setBlockingRegion(const android::Region& region) = 0;
-+
-+    // Proprietary HAL
-+    [[nodiscard]] virtual hal::Error setLayerClass(uint32_t layerClass) = 0;
- };
- 
- namespace impl {
-@@ -404,6 +407,8 @@ public:
-     hal::Error setBrightness(float brightness) override;
-     hal::Error setBlockingRegion(const android::Region& region) override;
- 
-+    // Proprietary HAL
-+    hal::Error setLayerClass(uint32_t layerClass) override;
- private:
-     // These are references to data owned by HWComposer, which will outlive
-     // this HWC2::Layer, so these references are guaranteed to be valid for
-diff --git a/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp
-index 12ab2c284a..d34ed04127 100644
---- a/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp
-+++ b/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp
-@@ -1435,6 +1435,13 @@ Error HidlComposer::getPhysicalDisplayOrientation(Display, AidlTransform*) {
-                      "OptionalFeature::PhysicalDisplayOrientation is not supported on HIDL");
- }
- 
-+Error HidlComposer::setLayerClass(Display display, Layer layer, uint32_t layerClass) {
-+    mWriter.selectDisplay(display);
-+    mWriter.selectLayer(layer);
-+    mWriter.vendor800_1(layerClass);
-+    return Error::NONE;
-+}
-+
- void HidlComposer::registerCallback(ComposerCallback& callback) {
-     const bool vsyncSwitchingSupported =
-             isSupported(Hwc2::Composer::OptionalFeature::RefreshRateSwitching);
-diff --git a/services/surfaceflinger/DisplayHardware/HidlComposerHal.h b/services/surfaceflinger/DisplayHardware/HidlComposerHal.h
-index d78bfb7c6b..c05dc69934 100644
---- a/services/surfaceflinger/DisplayHardware/HidlComposerHal.h
-+++ b/services/surfaceflinger/DisplayHardware/HidlComposerHal.h
-@@ -352,6 +352,8 @@ public:
-     Error setRefreshRateChangedCallbackDebugEnabled(Display, bool) override;
-     Error notifyExpectedPresent(Display, nsecs_t, int32_t) override;
- 
-+    // Proprietary extensions
-+    Error setLayerClass(Display display, Layer layer, uint32_t layerClass) override;
- private:
-     class CommandWriter : public CommandWriterBase {
-     public:
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch b/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch
deleted file mode 100644
index ba9975ae..00000000
--- a/patches/trebledroid/platform_frameworks_native/0009-Add-MTK-GED-KPI-support-to-fix-broken-Mediatek-gpufr.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 0e3e58ee51ebf509fd662fe1146f723b185dd542 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 25 Nov 2023 08:15:28 -0500
-Subject: [PATCH 09/13] Add MTK GED KPI support to fix broken Mediatek gpufreq
-
-Mediatek GPU scheduler likes to have the timestamps of the frames to be
-able to adjust DVFS.
-Technically this isn't completely needed, because it looks like DVFS can
-work once we started triggering /proc/ged. But now that the work is
-done, let's do it completely.
-
-In benchmarks on Poco X4 GT, before this patch result is 1500, after is
-5700. If we disable the patch after enabling it without rebooting, it
-goes to 5400. So looks like GED KPI thingy does try to do a bit more
-than just standard DVFS.
-
-Thanks @sarthakroy2002 for the help and support (other people helped as
-well)
----
- libs/gui/Surface.cpp           | 202 +++++++++++++++++++++++++++++++++
- libs/gui/include/gui/Surface.h |   3 +
- 2 files changed, 205 insertions(+)
-
-diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
-index 086544e48a..6e73c38a63 100644
---- a/libs/gui/Surface.cpp
-+++ b/libs/gui/Surface.cpp
-@@ -24,6 +24,9 @@
- #include <deque>
- #include <mutex>
- #include <thread>
-+#include <sys/ioctl.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- 
- #include <inttypes.h>
- 
-@@ -50,6 +53,9 @@
- #include <gui/LayerState.h>
- #include <private/gui/ComposerService.h>
- #include <private/gui/ComposerServiceAIDL.h>
-+#include <android-base/properties.h>
-+
-+#include <binder/IPCThreadState.h>
- 
- #include <com_android_graphics_libgui_flags.h>
- 
-@@ -76,6 +82,37 @@ bool isInterceptorRegistrationOp(int op) {
- }
- 
- } // namespace
-+  //
-+#define GED_MAGIC 'g'
-+#define GED_BRIDGE_COMMAND_GPU_TIMESTAMP      103
-+#define GED_IOWR(INDEX)  _IOWR(GED_MAGIC, INDEX, GED_BRIDGE_PACKAGE)
-+#define GED_BRIDGE_IO_GPU_TIMESTAMP \
-+    GED_IOWR(GED_BRIDGE_COMMAND_GPU_TIMESTAMP)
-+typedef struct _GED_BRIDGE_PACKAGE {
-+    unsigned int ui32FunctionID;
-+    int i32Size;
-+    void *pvParamIn;
-+    int i32InBufferSize;
-+    void *pvParamOut;
-+    int i32OutBufferSize;
-+} GED_BRIDGE_PACKAGE;
-+
-+struct GED_BRIDGE_IN_GPU_TIMESTAMP {
-+    int pid;
-+    uint64_t ullWnd;
-+    int32_t i32FrameID;
-+    int fence_fd;
-+    int QedBuffer_length;
-+    int isSF;
-+};
-+
-+struct GED_BRIDGE_OUT_GPU_TIMESTAMP {
-+    int eError;
-+    int is_ged_kpi_enabled;
-+};
-+
-+static int doMtkGedKpi = -1;
-+static int ged_fd = -1;
- 
- Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp,
-                  const sp<IBinder>& surfaceControlHandle)
-@@ -128,6 +165,47 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll
-     mSwapIntervalZero = false;
-     mMaxBufferCount = NUM_BUFFER_SLOTS;
-     mSurfaceControlHandle = surfaceControlHandle;
-+
-+    if (doMtkGedKpi == -1) {
-+        doMtkGedKpi = android::base::GetIntProperty("persist.sys.phh.mtk_ged_kpi", 0);
-+    }
-+
-+    if (ged_fd == -1 && doMtkGedKpi == 1) {
-+        ALOGE("Opening ged");
-+        ged_fd = open("/proc/ged", O_RDONLY);
-+        ALOGE("Opening ged ret = %d", ged_fd);
-+        {
-+        struct GED_BRIDGE_IN_GPU_TIMESTAMP in = {
-+            .pid = 0,
-+            //.ullWnd = (uint64_t)(intptr_t)this,
-+                .ullWnd = 0,
-+                .i32FrameID = 0,
-+            .fence_fd = 0,
-+            .isSF = 0,
-+            .QedBuffer_length = 0,
-+        };
-+        struct GED_BRIDGE_OUT_GPU_TIMESTAMP out;
-+        memset(&in, 0, sizeof(in));
-+        GED_BRIDGE_PACKAGE package = {
-+            .ui32FunctionID = GED_BRIDGE_IO_GPU_TIMESTAMP,
-+            .i32Size = sizeof(GED_BRIDGE_PACKAGE),
-+            .pvParamIn = &in,
-+            .i32InBufferSize = sizeof(in),
-+            .pvParamOut = &out,
-+            .i32OutBufferSize = sizeof(out),
-+        };
-+        if (ged_fd >= 0) {
-+            int ret = ioctl(ged_fd, GED_BRIDGE_IO_GPU_TIMESTAMP, &package);
-+            ALOGE("First null timestamp ioctl returned %d %d %d", ret, out.eError, out.is_ged_kpi_enabled);
-+            if (out.is_ged_kpi_enabled != 1) {
-+                ALOGE("is_ged_kpi_enabled reported disabled");
-+                doMtkGedKpi = 0;
-+            }
-+        } else {
-+            ALOGE("No /proc/ged");
-+        }
-+        }
-+    }
- }
- 
- Surface::~Surface() {
-@@ -668,6 +746,36 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) {
-         }
-     }
- 
-+    if (mGraphicBufferProducer != nullptr && ged_fd >= 0) {
-+        uint64_t uniqueId;
-+        mGraphicBufferProducer->getUniqueId(&uniqueId);
-+
-+        const int32_t dupFenceFd = fence->isValid() ? fence->dup() : -1;
-+
-+        struct GED_BRIDGE_IN_GPU_TIMESTAMP in = {
-+            .pid = mPid,
-+            .ullWnd = uniqueId,
-+            .i32FrameID = static_cast<int32_t>(reinterpret_cast<intptr_t>(gbuf->handle)) & 0x3fffffff,
-+            .fence_fd = dupFenceFd,
-+            .isSF = mIsSurfaceFlinger ? 1 : 0,
-+            .QedBuffer_length = -2,
-+        };
-+        struct GED_BRIDGE_OUT_GPU_TIMESTAMP out;
-+        memset(&out, 0, sizeof(out));
-+        GED_BRIDGE_PACKAGE package = {
-+            .ui32FunctionID = GED_BRIDGE_IO_GPU_TIMESTAMP,
-+            .i32Size = sizeof(GED_BRIDGE_PACKAGE),
-+            .pvParamIn = &in,
-+            .i32InBufferSize = sizeof(in),
-+            .pvParamOut = &out,
-+            .i32OutBufferSize = sizeof(out),
-+        };
-+
-+        int ret = ioctl(ged_fd, GED_BRIDGE_IO_GPU_TIMESTAMP, &package);
-+        ALOGV("GPU timestamp ioctl returned %d %d %d %d", ret, out.eError, out.is_ged_kpi_enabled, in.i32FrameID);
-+
-+        close(dupFenceFd);
-+    }
-     if (fence->isValid()) {
-         *fenceFd = fence->dup();
-         if (*fenceFd == -1) {
-@@ -1111,6 +1219,60 @@ void Surface::onBufferQueuedLocked(int slot, sp<Fence> fence,
-     }
- 
-     mQueueBufferCondition.broadcast();
-+    if (mGraphicBufferProducer != nullptr && ged_fd >= 0) {
-+        sp<GraphicBuffer>& gbuf(mSlots[slot].buffer);
-+        uint64_t uniqueId;
-+        mGraphicBufferProducer->getUniqueId(&uniqueId);
-+
-+        const int32_t dupFenceFd = fence->isValid() ? fence->dup() : -1;
-+        // onQueue
-+        {
-+            struct GED_BRIDGE_IN_GPU_TIMESTAMP in = {
-+                .pid = mPid,
-+                .ullWnd = uniqueId,
-+                .i32FrameID = static_cast<int32_t>(reinterpret_cast<intptr_t>(gbuf->handle)) & 0x3fffffff,
-+                .fence_fd = dupFenceFd,
-+                .isSF = mIsSurfaceFlinger ? 1 : 0,
-+                .QedBuffer_length = static_cast<int>(output.numPendingBuffers),
-+            };
-+            struct GED_BRIDGE_OUT_GPU_TIMESTAMP out;
-+            memset(&out, 0, sizeof(out));
-+            GED_BRIDGE_PACKAGE package = {
-+                .ui32FunctionID = GED_BRIDGE_IO_GPU_TIMESTAMP,
-+                .i32Size = sizeof(GED_BRIDGE_PACKAGE),
-+                .pvParamIn = &in,
-+                .i32InBufferSize = sizeof(in),
-+                .pvParamOut = &out,
-+                .i32OutBufferSize = sizeof(out),
-+            };
-+            int ret = ioctl(ged_fd, GED_BRIDGE_IO_GPU_TIMESTAMP, &package);
-+            ALOGV("GPU timestamp ioctl returned %d %d %d", ret, out.eError, in.i32FrameID);
-+        }
-+        // acquire
-+        {
-+            struct GED_BRIDGE_IN_GPU_TIMESTAMP in = {
-+                .pid = mPid,
-+                .isSF = mIsSurfaceFlinger ? 1 : 0,
-+                .ullWnd = uniqueId,
-+                .i32FrameID = static_cast<int32_t>(reinterpret_cast<intptr_t>(gbuf->handle)) & 0x3fffffff,
-+                .fence_fd = dupFenceFd,
-+                .QedBuffer_length = -1,
-+            };
-+            struct GED_BRIDGE_OUT_GPU_TIMESTAMP out;
-+            memset(&out, 0, sizeof(out));
-+            GED_BRIDGE_PACKAGE package = {
-+                .ui32FunctionID = GED_BRIDGE_IO_GPU_TIMESTAMP,
-+                .i32Size = sizeof(GED_BRIDGE_PACKAGE),
-+                .pvParamIn = &in,
-+                .i32InBufferSize = sizeof(in),
-+                .pvParamOut = &in,
-+                .i32OutBufferSize = sizeof(out),
-+            };
-+            int ret = ioctl(ged_fd, GED_BRIDGE_IO_GPU_TIMESTAMP, &package);
-+            ALOGV("GPU timestamp ioctl returned %d %d %d", ret, out.eError, in.i32FrameID);
-+        }
-+        close(dupFenceFd);
-+    }
- 
-     if (CC_UNLIKELY(atrace_is_tag_enabled(ATRACE_TAG_GRAPHICS))) {
-         static gui::FenceMonitor gpuCompletionThread("GPU completion");
-@@ -1878,6 +2040,46 @@ int Surface::connect(
- 
-         mConsumerRunningBehind = (output.numPendingBuffers >= 2);
-     }
-+
-+    // For MTK GED KPI, we need to grab the Surface owner's PID
-+    // and also know whether that owner is surfaceflinger
-+    if (api == NATIVE_WINDOW_API_EGL && ged_fd >= 0) {
-+        IPCThreadState *ipc = IPCThreadState::selfOrNull();
-+        const sp<IBinder>& token = listener->asBinder(listener);
-+        mPid =  (token != NULL && NULL != token->localBinder())
-+            ? getpid()
-+            : (ipc != nullptr)?ipc->getCallingPid():-1;
-+
-+        // We've got caller PID. Now checking whether it is surfaceflinger
-+        char cmdline[128];
-+        char path[128];
-+        snprintf(path, sizeof(path)-1, "/proc/%d/cmdline", mPid);
-+        int fd = open(path, O_RDONLY);
-+        read(fd, cmdline, sizeof(cmdline)-1);
-+        // Normally cmdline is already \0-separated, but well
-+        for(unsigned i=0; i<sizeof(cmdline); i++)
-+            if(cmdline[i] == '\n')
-+                cmdline[i] = 0;
-+        cmdline[sizeof(cmdline)-1] = 0;
-+
-+        close(fd);
-+
-+        // Truncate to last / (also called basename)
-+        const char *c = strrchr(cmdline, '/');
-+        if (c != nullptr) {
-+            c = c+1;
-+        } else {
-+            c = cmdline;
-+        }
-+        if(strcmp(c, "surfaceflinger") == 0) {
-+            ALOGE("is surfaceflinger = 1");
-+            mIsSurfaceFlinger = true;
-+        } else {
-+            ALOGE("is surfaceflinger = 0");
-+            mIsSurfaceFlinger = false;
-+        }
-+    }
-+
-     if (!err && api == NATIVE_WINDOW_API_CPU) {
-         mConnectedToCpu = true;
-         // Clear the dirty region in case we're switching from a non-CPU API
-diff --git a/libs/gui/include/gui/Surface.h b/libs/gui/include/gui/Surface.h
-index 39a59e42aa..ff595dd188 100644
---- a/libs/gui/include/gui/Surface.h
-+++ b/libs/gui/include/gui/Surface.h
-@@ -638,6 +638,9 @@ protected:
- 
-     // Buffers that are successfully dequeued/attached and handed to clients
-     std::unordered_set<int> mDequeuedSlots;
-+
-+    pid_t mPid;
-+    bool mIsSurfaceFlinger;
- };
- 
- } // namespace android
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0010-Fix-loading-unnamed-GLES.patch b/patches/trebledroid/platform_frameworks_native/0010-Fix-loading-unnamed-GLES.patch
deleted file mode 100644
index c0e169e4..00000000
--- a/patches/trebledroid/platform_frameworks_native/0010-Fix-loading-unnamed-GLES.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 71510732a097c837a83861b0f03c1305dfa2d404 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 20 Dec 2023 09:48:04 -0500
-Subject: [PATCH 10/13] Fix loading unnamed GLES
-
-Normally Android loads libGLES_${ro.hardware.egl}.so
-But up to Android 14, it was allowed not to set ro.hardware.egl
-In which case, Android would just load whatever libGLES_xxxx.so
-
-Android 14.0 did it more finely, and would fallback only when
-ro.hardware.egl is not set, which was still fine for older platforms.
-Android 14.1 broke it by refusing the fallback when ro.board.platform is
-set (which often is)
-
-Simply allow the fallback in all cases.
-
-Test:
-- Blackview BV9800 Pro fails to boot without this patch
-- It does boot with it
----
- opengl/libs/EGL/Loader.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
-index e487cbc54d..71e170c73f 100644
---- a/opengl/libs/EGL/Loader.cpp
-+++ b/opengl/libs/EGL/Loader.cpp
-@@ -314,8 +314,7 @@ void* Loader::open(egl_connection_t* cnx) {
-         hnd = attempt_to_load_system_driver(cnx, nullptr, true);
-     }
- 
--    if (!hnd && !failToLoadFromDriverSuffixProperty &&
--        property_get_int32("ro.vendor.api_level", 0) < __ANDROID_API_U__) {
-+    if (!hnd) {
-         // Still can't find the graphics drivers with the exact name. This time try to use wildcard
-         // matching if the device is launched before Android 14.
-         hnd = attempt_to_load_system_driver(cnx, nullptr, false);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0011-Increase-SW_MAX-4.patch b/patches/trebledroid/platform_frameworks_native/0011-Increase-SW_MAX-4.patch
deleted file mode 100644
index a027c252..00000000
--- a/patches/trebledroid/platform_frameworks_native/0011-Increase-SW_MAX-4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 42f8375463aa6de1cc8b140e5e7df12758bc707b Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 3 Feb 2024 07:38:33 -0500
-Subject: [PATCH 11/13] Increase SW_MAX *= 4
-
-We increase the size of SW_MAX for two reasons:
-1. SW_MACHINE_COVER which is SW_MAX is ignored, guessing an off by one
-   somwehere
-2. Samsung extends SW_ beyond standard SW_MAX. SW_FLIP goes to 0x15,
-   standard SW_MAX 0x10
----
- services/inputflinger/reader/EventHub.cpp       | 4 ++--
- services/inputflinger/reader/include/EventHub.h | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp
-index a2b5d7d8b0..2697ae1d36 100644
---- a/services/inputflinger/reader/EventHub.cpp
-+++ b/services/inputflinger/reader/EventHub.cpp
-@@ -1118,7 +1118,7 @@ int32_t EventHub::getKeyCodeForKeyLocation(int32_t deviceId, int32_t locationKey
- }
- 
- int32_t EventHub::getSwitchState(int32_t deviceId, int32_t sw) const {
--    if (sw < 0 || sw > SW_MAX) {
-+    if (sw < 0 || sw > (SW_MAX*4)) {
-         return AKEY_STATE_UNKNOWN;
-     }
-     std::scoped_lock _l(mLock);
-@@ -2441,7 +2441,7 @@ void EventHub::openDeviceLocked(const std::string& devicePath) {
-     }
- 
-     // Check whether this device has switches.
--    for (int i = 0; i <= SW_MAX; i++) {
-+    for (int i = 0; i <= (SW_MAX * 4); i++) {
-         if (device->swBitmask.test(i)) {
-             device->classes |= InputDeviceClass::SWITCH;
-             break;
-diff --git a/services/inputflinger/reader/include/EventHub.h b/services/inputflinger/reader/include/EventHub.h
-index a7e06756d0..f33ee5aa96 100644
---- a/services/inputflinger/reader/include/EventHub.h
-+++ b/services/inputflinger/reader/include/EventHub.h
-@@ -635,8 +635,8 @@ private:
-         BitArray<KEY_CNT> keyBitmask;
-         BitArray<KEY_CNT> keyState;
-         BitArray<REL_CNT> relBitmask;
--        BitArray<SW_CNT> swBitmask;
--        BitArray<SW_CNT> swState;
-+        BitArray<SW_CNT * 4> swBitmask;
-+        BitArray<SW_CNT * 4> swState;
-         BitArray<LED_CNT> ledBitmask;
-         BitArray<FF_CNT> ffBitmask;
-         BitArray<INPUT_PROP_CNT> propBitmask;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0012-Disable-gpuservice-on-old-BPF-less-kernel.patch b/patches/trebledroid/platform_frameworks_native/0012-Disable-gpuservice-on-old-BPF-less-kernel.patch
deleted file mode 100644
index 22a84c9f..00000000
--- a/patches/trebledroid/platform_frameworks_native/0012-Disable-gpuservice-on-old-BPF-less-kernel.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 781e66a1e51e184970de933428825d2b4cc958bb Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 7 May 2024 22:34:40 +0000
-Subject: [PATCH 12/13] Disable gpuservice on old BPF-less kernel
-
-Change-Id: I8e1626e2e9d12ee0dc03d758799bc88085899476
----
- services/gpuservice/gpumem/GpuMem.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/services/gpuservice/gpumem/GpuMem.cpp b/services/gpuservice/gpumem/GpuMem.cpp
-index 141fe021ee..90b8b5c52d 100644
---- a/services/gpuservice/gpumem/GpuMem.cpp
-+++ b/services/gpuservice/gpumem/GpuMem.cpp
-@@ -48,6 +48,7 @@ void GpuMem::initialize() {
-     if (fd < 0) {
-         ALOGE("Failed to retrieve pinned program from %s [%d(%s)]", kGpuMemTotalProgPath, errno,
-               strerror(errno));
-+        while(true) sleep(1);
-         return;
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_native/0013-SurfaceFlinger-Disable-SF-HWC-backpressure.patch b/patches/trebledroid/platform_frameworks_native/0013-SurfaceFlinger-Disable-SF-HWC-backpressure.patch
deleted file mode 100644
index 6d651c07..00000000
--- a/patches/trebledroid/platform_frameworks_native/0013-SurfaceFlinger-Disable-SF-HWC-backpressure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a84523098370e545cbf7c8bc29b4a5812c91a624 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 26 May 2024 21:34:17 +0800
-Subject: [PATCH 13/13] SurfaceFlinger: Disable SF HWC backpressure
-
----
- services/surfaceflinger/SurfaceFlinger.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
-index cf5f55d7bd..ac5567bfe1 100644
---- a/services/surfaceflinger/SurfaceFlinger.cpp
-+++ b/services/surfaceflinger/SurfaceFlinger.cpp
-@@ -2547,7 +2547,8 @@ bool SurfaceFlinger::commit(PhysicalDisplayId pacesetterId,
-         }
-     }
- 
--    if (pacesetterFrameTarget.isFramePending()) {
-+    if (base::GetBoolProperty("persist.sys.phh.enable_sf_hwc_backpressure"s, true)
-+            && pacesetterFrameTarget.isFramePending()) {
-         if (mBackpressureGpuComposition || pacesetterFrameTarget.didMissHwcFrame()) {
-             if (FlagManager::getInstance().vrr_config()) {
-                 mScheduler->getVsyncSchedule()->getTracker().onFrameMissed(
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch b/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
deleted file mode 100644
index 0ecbac5b..00000000
--- a/patches/trebledroid/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 874d9e14f0b04c6118c065160f72669a72eb0bdd Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 14 Nov 2021 13:47:29 -0500
-Subject: [PATCH] Pie MTK IMS calls static
- ImsManager.updateImsServiceConfig(Context,int,boolean). Bring it back
-
-Change-Id: I3dd66d436629d37c8ec795df6569736195ae570e
----
- src/java/com/android/ims/ImsManager.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
-index 217a26f2..b687e4bf 100644
---- a/src/java/com/android/ims/ImsManager.java
-+++ b/src/java/com/android/ims/ImsManager.java
-@@ -1679,6 +1679,14 @@ public class ImsManager implements FeatureUpdates {
-         }
-     }
- 
-+    public static void updateImsServiceConfig(Context context, int phoneId, boolean force) {
-+        ImsManager mgr = ImsManager.getInstance(context, phoneId);
-+        if (mgr != null) {
-+            mgr.updateImsServiceConfig();
-+        }
-+        Rlog.e(TAG, "updateImsServiceConfig: ImsManager null, returning without update.");
-+    }
-+
-     /**
-      * Push configuration updates to the ImsService implementation.
-      */
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
deleted file mode 100644
index 1802723e..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2a5bdc9aa91e97175c5f2316aa3e3353abc569aa Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Mon, 5 Sep 2022 14:02:37 -0400
-Subject: [PATCH 01/16] SubscriptionController: Do not override default calling
- account from third-party apps
-
-When the user has selected a calling account from a third-party app as
-default, it should not be overridden by the rest of the telephony
-subsystem (e.g. SIM subcription updates, or default SIM slot selection).
-
-Otherwise, it creates a somewhat annoying situation where the user has
-to keep re-selecting the desired calling account after every reboot.
-
-Test: manual
-Change-Id: Iccab64e9b3b3ab4773bd8944d47c2006f229d472
----
- .../SubscriptionManagerService.java            | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
-index 8757c9791a..489c0b36fc 100644
---- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
-+++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
-@@ -85,6 +85,7 @@ import android.util.Base64;
- import android.util.EventLog;
- import android.util.IndentingPrintWriter;
- import android.util.LocalLog;
-+import android.util.Log;
- 
- import com.android.internal.R;
- import com.android.internal.annotations.VisibleForTesting;
-@@ -3153,7 +3154,22 @@ public class SubscriptionManagerService extends ISub.Stub {
- 
-                 TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
-                 if (telecomManager != null) {
--                    telecomManager.setUserSelectedOutgoingPhoneAccount(newHandle);
-+                    PhoneAccountHandle currentHandle = telecomManager.getUserSelectedOutgoingPhoneAccount();
-+                    log("[setDefaultVoiceSubId] current phoneAccountHandle=" + currentHandle);
-+
-+                    String currentPackageName =
-+                        currentHandle == null ? null : currentHandle.getComponentName().getPackageName();
-+                    boolean currentIsSim = "com.android.phone".equals(currentPackageName);
-+                    // Do not override user selected outgoing calling account
-+                    // if the user has selected a third-party app as default
-+                    boolean shouldKeepOutgoingAccount = currentHandle != null && !currentIsSim;
-+
-+                    if (!shouldKeepOutgoingAccount) {
-+                        telecomManager.setUserSelectedOutgoingPhoneAccount(newHandle);
-+                        log("[setDefaultVoiceSubId] change to phoneAccountHandle=" + newHandle);
-+                    } else {
-+                        log("[setDefaultVoiceSubId] default phoneAccountHandle not changed.");
-+                    }
-                 }
- 
-                 updateDefaultSubId();
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
deleted file mode 100644
index 38a08a40..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ee9ad0472008edf6213cdb49932f986299a7cb46 Mon Sep 17 00:00:00 2001
-From: Artem Borisov <dedsa2002@gmail.com>
-Date: Sat, 10 Nov 2018 17:19:17 +0000
-Subject: [PATCH 02/16] Telephony: Don not call onUssdRelease for Huawei RIL
-
-Huawei RIL doesn't seem to work properly with USSD_MODE_NW_RELEASE,
-always releasing USSD when it should be finished instead.
-Let's explicitly call onUssdFinished in this case.
-
-Change-Id: I69faed1c51d4582834879975d6ab13daf7f48ad4
----
- src/java/com/android/internal/telephony/GsmCdmaPhone.java | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-index 4c7a3d3ffa..42d5d0fdcf 100644
---- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -3128,7 +3128,11 @@ public class GsmCdmaPhone extends Phone {
-         if (found != null) {
-             // Complete pending USSD
-             if (isUssdRelease) {
--                found.onUssdRelease();
-+                if (SystemProperties.getBoolean("persist.sys.radio.huawei", false)) {
-+                    found.onUssdFinished(ussdMessage, isUssdRequest);
-+                } else {
-+                    found.onUssdRelease();
-+                }
-             } else if (isUssdError) {
-                 found.onUssdFinishedError();
-             } else {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
deleted file mode 100644
index 20634bfb..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c20adcb65c2ee9dbdfc2507c88ea1a5efe24bf1 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 6 Dec 2021 16:28:22 -0500
-Subject: [PATCH 03/16] Fix baseband being too long to fit into a 91 chars
- property, preventing telephony subsystem from starting
-
-Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57
----
- src/java/com/android/internal/telephony/GsmCdmaPhone.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-index 42d5d0fdcf..79a23ec160 100644
---- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -3438,7 +3438,7 @@ public class GsmCdmaPhone extends Phone {
-                 String version = (String)ar.result;
-                 if (version != null) {
-                     int length = version.length();
--                    final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2;
-+                    final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2 - 2;
-                     TelephonyManager.from(mContext).setBasebandVersionForPhone(getPhoneId(),
-                             length <= MAX_VERSION_LEN ? version
-                                 : version.substring(length - MAX_VERSION_LEN, length));
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0004-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0004-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
deleted file mode 100644
index c8c791fc..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0004-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 68b31d894f3898314b118b21d633b27a75a47ad4 Mon Sep 17 00:00:00 2001
-From: ironydelerium <42721860+ironydelerium@users.noreply.github.com>
-Date: Fri, 31 Dec 2021 02:20:28 -0800
-Subject: [PATCH 04/16] Reintroduce 'public void
- TelephonyMetrics.writeRilSendSms(int, int, int, int)'. (#8)
-
-The MediaTek IMS package for Android Q, at the very least (likely for the rest, too)
-invoke this method in their `sendSms` method; Google, in their infinite wisdom,
-decided that this method needed a message ID passed in as well, changing the signature
-to 'public void TelephonyMetrics.writeRilSendSms(int, int, int, int, long)' and resulting
-in a MethodNotFoundException being raised in com.mediatek.ims, crashing it.
-
-Fixes https://github.com/phhusson/treble_experimentations/issues/2125.
-
-Co-authored-by: Sarah Vandomelen <sarah@sightworks.com>
----
- .../telephony/metrics/TelephonyMetrics.java         | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
-index 3fdbfe0ed7..fb8011c3df 100644
---- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
-+++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
-@@ -2320,6 +2320,19 @@ public class TelephonyMetrics {
-         smsSession.increaseExpectedResponse();
-     }
- 
-+    /**
-+     * Write Send SMS event (backwards-compatible method for R and earlier IMS implementations)
-+     *
-+     * @param phoneId Phone id
-+     * @param rilSerial RIL request serial number
-+     * @param tech SMS RAT
-+     * @param format SMS format. Either {@link SmsMessage#FORMAT_3GPP} or
-+     *         {@link SmsMessage#FORMAT_3GPP2}.
-+     */
-+    public void writeRilSendSms(int phoneId, int rilSerial, int tech, int format) {
-+        writeRilSendSms(phoneId, rilSerial, tech, format, 0);
-+    }
-+
-     /**
-      * Write Send SMS event using ImsService. Expecting response from
-      * {@link #writeOnSmsSolicitedResponse}.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0005-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0005-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
deleted file mode 100644
index 7486971e..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0005-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
+++ /dev/null
@@ -1,1579 +0,0 @@
-From 2d4e756740ee2da2c722bcef6f98b7ded9512337 Mon Sep 17 00:00:00 2001
-From: Daniel Zhang <danielzhang130@gmail.com>
-Date: Sat, 30 Mar 2024 14:05:14 -0400
-Subject: [PATCH 05/16] Revert "Remove deprecated IRadio <1.4 APIs and
- references"
-
-This reverts commit 67a3837ed4d5e76369316d713b9ac52dbc5518aa.
-
-Change-Id: I6802400fb4ffcf0181441662c267f9eabc4e5cf7
----
- .../internal/telephony/BaseCommands.java      |  25 +++
- .../internal/telephony/CommandsInterface.java | 141 +++++++++++++++-
- .../internal/telephony/GsmCdmaPhone.java      |   2 +
- .../com/android/internal/telephony/Phone.java |  73 +++++++++
- .../com/android/internal/telephony/RIL.java   | 112 ++++++++++++-
- .../telephony/data/CellularDataService.java   |  17 +-
- .../imsphone/ImsPhoneCommandInterface.java    |  64 +++++++-
- .../telephony/uicc/UiccController.java        |   7 +-
- .../internal/telephony/GsmCdmaPhoneTest.java  |   5 +
- .../android/internal/telephony/RILTest.java   |  68 +++++++-
- .../internal/telephony/SimulatedCommands.java | 154 ++++++++++++++++--
- .../telephony/SimulatedCommandsVerifier.java  |  84 +++++++++-
- .../data/DataServiceManagerTest.java          |  12 +-
- .../telephony/uicc/UiccControllerTest.java    |  34 ++++
- 14 files changed, 740 insertions(+), 58 deletions(-)
-
-diff --git a/src/java/com/android/internal/telephony/BaseCommands.java b/src/java/com/android/internal/telephony/BaseCommands.java
-index 6f66545e1a..54066553a1 100644
---- a/src/java/com/android/internal/telephony/BaseCommands.java
-+++ b/src/java/com/android/internal/telephony/BaseCommands.java
-@@ -68,6 +68,8 @@ public abstract class BaseCommands implements CommandsInterface {
-     protected RegistrantList mVoicePrivacyOnRegistrants = new RegistrantList();
-     protected RegistrantList mVoicePrivacyOffRegistrants = new RegistrantList();
-     @UnsupportedAppUsage
-+    protected Registrant mUnsolOemHookRawRegistrant;
-+    @UnsupportedAppUsage
-     protected RegistrantList mOtaProvisionRegistrants = new RegistrantList();
-     @UnsupportedAppUsage
-     protected RegistrantList mCallWaitingInfoRegistrants = new RegistrantList();
-@@ -674,6 +676,17 @@ public abstract class BaseCommands implements CommandsInterface {
-         mSignalInfoRegistrants.addUnique(h, what, obj);
-     }
- 
-+    public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {
-+        mUnsolOemHookRawRegistrant = new Registrant (h, what, obj);
-+    }
-+
-+    public void unSetOnUnsolOemHookRaw(Handler h) {
-+        if (mUnsolOemHookRawRegistrant != null && mUnsolOemHookRawRegistrant.getHandler() == h) {
-+            mUnsolOemHookRawRegistrant.clear();
-+            mUnsolOemHookRawRegistrant = null;
-+        }
-+    }
-+
-     @Override
-     public void unregisterForSignalInfo(Handler h) {
-         mSignalInfoRegistrants.remove(h);
-@@ -992,6 +1005,18 @@ public abstract class BaseCommands implements CommandsInterface {
-         mPhoneRadioCapabilityChangedRegistrants.remove(h);
-     }
- 
-+    @Override
-+    public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
-+    }
-+
-+    @Override
-+    public void stopLceService(Message result) {
-+    }
-+
-+    @Override
-+    public void pullLceData(Message result) {
-+    }
-+
-     @Override
-     public void registerForLceInfo(Handler h, int what, Object obj) {
-         synchronized (mStateMonitor) {
-diff --git a/src/java/com/android/internal/telephony/CommandsInterface.java b/src/java/com/android/internal/telephony/CommandsInterface.java
-index ee7447cf99..0f0455f005 100644
---- a/src/java/com/android/internal/telephony/CommandsInterface.java
-+++ b/src/java/com/android/internal/telephony/CommandsInterface.java
-@@ -898,6 +898,18 @@ public interface CommandsInterface {
-      */
-     void getCurrentCalls (Message result);
- 
-+    /**
-+     *  returned message
-+     *  retMsg.obj = AsyncResult ar
-+     *  ar.exception carries exception on failure
-+     *  ar.userObject contains the orignal value of result.obj
-+     *  ar.result contains a List of DataCallResponse
-+     *  @deprecated Do not use.
-+     */
-+    @UnsupportedAppUsage
-+    @Deprecated
-+    void getPDPContextList(Message result);
-+
-     /**
-      *  returned message
-      *  retMsg.obj = AsyncResult ar
-@@ -955,6 +967,25 @@ public interface CommandsInterface {
-      */
-     void getIMSIForApp(String aid, Message result);
- 
-+    /**
-+     *  returned message
-+     *  retMsg.obj = AsyncResult ar
-+     *  ar.exception carries exception on failure
-+     *  ar.userObject contains the orignal value of result.obj
-+     *  ar.result is String containing IMEI on success
-+     */
-+    void getIMEI(Message result);
-+
-+    /**
-+     *  returned message
-+     *  retMsg.obj = AsyncResult ar
-+     *  ar.exception carries exception on failure
-+     *  ar.userObject contains the orignal value of result.obj
-+     *  ar.result is String containing IMEISV on success
-+     */
-+    @UnsupportedAppUsage
-+    void getIMEISV(Message result);
-+
-     /**
-      * Hang up one individual connection.
-      *  returned message
-@@ -1070,6 +1101,25 @@ public interface CommandsInterface {
-      */
-     void getLastCallFailCause (Message result);
- 
-+
-+    /**
-+     * Reason for last PDP context deactivate or failure to activate
-+     * cause code returned as int[0] in Message.obj.response
-+     * returns an integer cause code defined in TS 24.008
-+     * section 6.1.3.1.3 or close approximation
-+     * @deprecated Do not use.
-+     */
-+    @UnsupportedAppUsage
-+    @Deprecated
-+    void getLastPdpFailCause (Message result);
-+
-+    /**
-+     * The preferred new alternative to getLastPdpFailCause
-+     * that is also CDMA-compatible.
-+     */
-+    @UnsupportedAppUsage
-+    void getLastDataCallFailCause (Message result);
-+
-     void setMute (boolean enableMute, Message response);
- 
-     void getMute (Message response);
-@@ -1498,6 +1548,8 @@ public interface CommandsInterface {
-      */
-     void cancelPendingUssd (Message response);
- 
-+    void resetRadio(Message result);
-+
-     /**
-      * Assign a specified band for RF configuration.
-      *
-@@ -1628,14 +1680,28 @@ public interface CommandsInterface {
-     @UnsupportedAppUsage
-     void reportStkServiceIsRunning(Message result);
- 
-+    @UnsupportedAppUsage
-+    void invokeOemRilRequestRaw(byte[] data, Message response);
-+
-     /**
-      * Sends carrier specific information to the vendor ril that can be used to
-      * encrypt the IMSI and IMPI.
-      *
--     * @param imsiEncryptionInfo the IMSI encryption info
-+     * @param publicKey the public key of the carrier used to encrypt IMSI/IMPI.
-+     * @param keyIdentifier the key identifier is optional information that is carrier
-+     *        specific.
-      * @param response callback message
-      */
--    void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo, Message response);
-+    void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo,
-+                                         Message response);
-+
-+    void invokeOemRilRequestStrings(String[] strings, Message response);
-+
-+    /**
-+     * Fires when RIL_UNSOL_OEM_HOOK_RAW is received from the RIL.
-+     */
-+    void setOnUnsolOemHookRaw(Handler h, int what, Object obj);
-+    void unSetOnUnsolOemHookRaw(Handler h);
- 
-     /**
-      * Send TERMINAL RESPONSE to the SIM, after processing a proactive command
-@@ -1818,13 +1884,15 @@ public interface CommandsInterface {
-     void queryTTYMode(Message response);
- 
-     /**
--     * Setup a packet data connection. On successful completion, the result
-+     * Setup a packet data connection On successful completion, the result
-      * message will return a SetupDataResult object containing the connection information.
-      *
-      * @param accessNetworkType
-      *            Access network to use. Values is one of AccessNetworkConstants.AccessNetworkType.
-      * @param dataProfile
-      *            Data profile for data call setup
-+     * @param isRoaming
-+     *            Device is roaming or not
-      * @param allowRoaming
-      *            Flag indicating data roaming is enabled or not
-      * @param reason
-@@ -1855,9 +1923,9 @@ public interface CommandsInterface {
-      * @param result
-      *            Callback message
-      */
--    void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
--            int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
--            TrafficDescriptor trafficDescriptor,
-+    void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
-+            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
-+            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
-             boolean matchAllRuleAllowed, Message result);
- 
-     /**
-@@ -1918,6 +1986,22 @@ public interface CommandsInterface {
-     @UnsupportedAppUsage
-     public void getIccCardStatus(Message result);
- 
-+    /**
-+     * Request the status of all the physical UICC slots.
-+     *
-+     * @param result Callback message containing a {@link java.util.ArrayList} of
-+     * {@link com.android.internal.telephony.uicc.IccSlotStatus} instances for all the slots.
-+     */
-+    void getIccSlotsStatus(Message result);
-+
-+    /**
-+     * Set the mapping from logical slots to physical slots.
-+     *
-+     * @param physicalSlots Mapping from logical slots to physical slots.
-+     * @param result Callback message is empty on completion.
-+     */
-+    void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result);
-+
-     /**
-      * Request the SIM application on the UICC to perform authentication
-      * challenge/response algorithm. The data string and challenge response are
-@@ -1995,20 +2079,24 @@ public interface CommandsInterface {
-      *
-      * @param dataProfile
-      *            data profile for initial APN attach
-+     * @param isRoaming
-+     *            indicating the device is roaming or not
-      * @param result
-      *            callback message contains the information of SUCCESS/FAILURE
-      */
--    void setInitialAttachApn(DataProfile dataProfile, Message result);
-+    void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result);
- 
-     /**
-      * Set data profiles in modem
-      *
-      * @param dps
-      *            Array of the data profiles set to modem
-+     * @param isRoaming
-+     *            Indicating if the device is roaming or not
-      * @param result
-      *            callback message contains the information of SUCCESS/FAILURE
-      */
--    void setDataProfile(DataProfile[] dps, Message result);
-+    void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result);
- 
-     /**
-      * Notifiy that we are testing an emergency call
-@@ -2172,6 +2260,15 @@ public interface CommandsInterface {
-     public void setUiccSubscription(int slotId, int appIndex, int subId, int subStatus,
-             Message result);
- 
-+    /**
-+     * Whether the device modem supports reporting the EID in either the slot or card status or
-+     * through ATR.
-+     * @return true if the modem supports EID.
-+     */
-+    default boolean supportsEid() {
-+        return false;
-+    }
-+
-     /**
-      * Tells the modem if data is allowed or not.
-      *
-@@ -2225,6 +2322,34 @@ public interface CommandsInterface {
-      */
-     public void unregisterForRadioCapabilityChanged(Handler h);
- 
-+    /**
-+     * Start LCE (Link Capacity Estimation) service with a desired reporting interval.
-+     *
-+     * @param reportIntervalMs
-+     *        LCE info reporting interval (ms).
-+     *
-+     * @param result Callback message contains the current LCE status.
-+     * {byte status, int actualIntervalMs}
-+     */
-+    public void startLceService(int reportIntervalMs, boolean pullMode, Message result);
-+
-+    /**
-+     * Stop LCE service.
-+     *
-+     * @param result Callback message contains the current LCE status:
-+     * {byte status, int actualIntervalMs}
-+     *
-+     */
-+    public void stopLceService(Message result);
-+
-+    /**
-+     * Pull LCE service for capacity data.
-+     *
-+     * @param result Callback message contains the capacity info:
-+     * {int capacityKbps, byte confidenceLevel, byte lceSuspendedTemporarily}
-+     */
-+    public void pullLceData(Message result);
-+
-     /**
-      * Register a LCE info listener.
-      *
-diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-index 79a23ec160..ed4bbe32ce 100644
---- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
-@@ -3209,6 +3209,7 @@ public class GsmCdmaPhone extends Phone {
-         handleNullCipherEnabledChange();
-         handleIdentifierDisclosureNotificationPreferenceChange();
-         handleNullCipherNotificationPreferenceChanged();
-+        startLceAfterRadioIsAvailable();
-     }
- 
-     private void handleRadioOn() {
-@@ -4662,6 +4663,7 @@ public class GsmCdmaPhone extends Phone {
-         } else {
-             loge("deleteAndCreatePhone: newVoiceRadioTech=" + newVoiceRadioTech +
-                     " is not CDMA or GSM (error) - aborting!");
-+            return;
-         }
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
-index c088406505..8bf98aa1e7 100644
---- a/src/java/com/android/internal/telephony/Phone.java
-+++ b/src/java/com/android/internal/telephony/Phone.java
-@@ -222,6 +222,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-     private static final int EVENT_UNSOL_OEM_HOOK_RAW               = 34;
-     protected static final int EVENT_GET_RADIO_CAPABILITY           = 35;
-     protected static final int EVENT_SS                             = 36;
-+    private static final int EVENT_CONFIG_LCE                       = 37;
-     private static final int EVENT_CHECK_FOR_NETWORK_AUTOMATIC      = 38;
-     protected static final int EVENT_VOICE_RADIO_TECH_CHANGED       = 39;
-     protected static final int EVENT_REQUEST_VOICE_RADIO_TECH_DONE  = 40;
-@@ -387,6 +388,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-     private final AtomicReference<RadioCapability> mRadioCapability =
-             new AtomicReference<RadioCapability>();
- 
-+    private static final int DEFAULT_REPORT_INTERVAL_MS = 200;
-+    private static final boolean LCE_PULL_MODE = true;
-+    private int mLceStatus = RILConstants.LCE_NOT_AVAILABLE;
-     protected TelephonyComponentFactory mTelephonyComponentFactory;
- 
-     private int mPreferredUsageSetting = SubscriptionManager.USAGE_SETTING_UNKNOWN;
-@@ -671,6 +675,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-         if (getPhoneType() != PhoneConstants.PHONE_TYPE_SIP) {
-             mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);
-         }
-+        mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,
-+                obtainMessage(EVENT_CONFIG_LCE));
-         //Initialize Telephony Analytics
-         if (mFeatureFlags.enableTelephonyAnalytics()) {
-             mTelephonyAnalytics = new TelephonyAnalytics(this);
-@@ -854,6 +860,16 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-                 // deprecated, ignore
-                 break;
- 
-+            case EVENT_CONFIG_LCE:
-+                ar = (AsyncResult) msg.obj;
-+                if (ar.exception != null) {
-+                    Rlog.d(LOG_TAG, "config LCE service failed: " + ar.exception);
-+                } else {
-+                    final ArrayList<Integer> statusInfo = (ArrayList<Integer>)ar.result;
-+                    mLceStatus = statusInfo.get(0);
-+                }
-+                break;
-+
-             case EVENT_CHECK_FOR_NETWORK_AUTOMATIC: {
-                 onCheckForNetworkSelectionModeAutomatic(msg);
-                 break;
-@@ -2767,6 +2783,47 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-         mCi.queryAvailableBandMode(response);
-     }
- 
-+    /**
-+     * Invokes RIL_REQUEST_OEM_HOOK_RAW on RIL implementation.
-+     *
-+     * @param data The data for the request.
-+     * @param response <strong>On success</strong>,
-+     * (byte[])(((AsyncResult)response.obj).result)
-+     * <strong>On failure</strong>,
-+     * (((AsyncResult)response.obj).result) == null and
-+     * (((AsyncResult)response.obj).exception) being an instance of
-+     * com.android.internal.telephony.gsm.CommandException
-+     *
-+     * @see #invokeOemRilRequestRaw(byte[], android.os.Message)
-+     * @deprecated OEM needs a vendor-extension hal and their apps should use that instead
-+     */
-+    @UnsupportedAppUsage
-+    @Deprecated
-+    public void invokeOemRilRequestRaw(byte[] data, Message response) {
-+        mCi.invokeOemRilRequestRaw(data, response);
-+    }
-+
-+    /**
-+     * Invokes RIL_REQUEST_OEM_HOOK_Strings on RIL implementation.
-+     *
-+     * @param strings The strings to make available as the request data.
-+     * @param response <strong>On success</strong>, "response" bytes is
-+     * made available as:
-+     * (String[])(((AsyncResult)response.obj).result).
-+     * <strong>On failure</strong>,
-+     * (((AsyncResult)response.obj).result) == null and
-+     * (((AsyncResult)response.obj).exception) being an instance of
-+     * com.android.internal.telephony.gsm.CommandException
-+     *
-+     * @see #invokeOemRilRequestStrings(java.lang.String[], android.os.Message)
-+     * @deprecated OEM needs a vendor-extension hal and their apps should use that instead
-+     */
-+    @UnsupportedAppUsage
-+    @Deprecated
-+    public void invokeOemRilRequestStrings(String[] strings, Message response) {
-+        mCi.invokeOemRilRequestStrings(strings, response);
-+    }
-+
-     /**
-      * Read one of the NV items defined in {@link RadioNVItems} / {@code ril_nv_items.h}.
-      * Used for device configuration by some CDMA operators.
-@@ -4532,6 +4589,13 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-         return false;
-     }
- 
-+    /**
-+     * Returns the status of Link Capacity Estimation (LCE) service.
-+     */
-+    public int getLceStatus() {
-+        return mLceStatus;
-+    }
-+
-     /**
-      * Returns the modem activity information
-      */
-@@ -4539,6 +4603,15 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
-         mCi.getModemActivityInfo(response, workSource);
-     }
- 
-+    /**
-+     * Starts LCE service after radio becomes available.
-+     * LCE service state may get destroyed on the modem when radio becomes unavailable.
-+     */
-+    public void startLceAfterRadioIsAvailable() {
-+        mCi.startLceService(DEFAULT_REPORT_INTERVAL_MS, LCE_PULL_MODE,
-+                obtainMessage(EVENT_CONFIG_LCE));
-+    }
-+
-     /**
-      * Control the data throttling at modem.
-      *
-diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 8b3be1ea84..53e288f321 100644
---- a/src/java/com/android/internal/telephony/RIL.java
-+++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -1325,6 +1325,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    @Override
-+    public void getIccSlotsStatus(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-+    @Override
-+    public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-     @Override
-     public void supplyIccPin(String pin, Message result) {
-         supplyIccPinForApp(pin, null, result);
-@@ -1514,7 +1524,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
-         if (!canMakeRequest("supplySimDepersonalization", simProxy, result,
--                RADIO_HAL_VERSION_1_5)) {
-+                RADIO_HAL_VERSION_1_4)) {
-             return;
-         }
- 
-@@ -2031,8 +2041,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     }
- 
-     @Override
--    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
--            int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
-+    public void setupDataCall(int accessNetworkType, DataProfile dataProfile,
-+            boolean isRoaming /* unused */, boolean allowRoaming, int reason,
-+            LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
-             TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
-         if (!canMakeRequest("setupDataCall", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-@@ -2662,6 +2673,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    /**
-+     * @deprecated
-+     */
-+    @Override
-+    @Deprecated
-+    public void getPDPContextList(Message result) {
-+        // TODO(b/280900995): remove this and references
-+        getDataCallList(result);
-+    }
-+
-     @Override
-     public void getDataCallList(Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
-@@ -2680,6 +2701,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-+    @Override
-+    public void invokeOemRilRequestRaw(byte[] data, Message response) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-+    @Override
-+    public void invokeOemRilRequestStrings(String[] strings, Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-     @Override
-     public void setSuppServiceNotifications(boolean enable, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
-@@ -3770,7 +3802,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     }
- 
-     @Override
--    public void setInitialAttachApn(DataProfile dataProfile, Message result) {
-+    public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming /* unused */,
-+            Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
-         if (!canMakeRequest("setInitialAttachApn", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-             return;
-@@ -4058,6 +4091,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    /**
-+     * Whether the device modem supports reporting the EID in either the slot or card status or
-+     * through ATR.
-+     * @return true if the modem supports EID.
-+     */
-+    @Override
-+    public boolean supportsEid() {
-+        // TODO(b/280900995): remove this and references
-+        return true;
-+    }
-+
-     @Override
-     public void setDataAllowed(boolean allowed, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
-@@ -4122,7 +4166,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     }
- 
-     @Override
--    public void setDataProfile(DataProfile[] dps, Message result) {
-+    public void setDataProfile(DataProfile[] dps, boolean isRoaming /* unused */, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
-         if (!canMakeRequest("setDataProfile", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-             return;
-@@ -4200,6 +4244,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    @Override
-+    public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-+    @Override
-+    public void stopLceService(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-     /**
-      * Control the data throttling at modem.
-      *
-@@ -4232,6 +4286,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    /**
-+     * This will only be called if the LCE service is started in PULL mode, which is
-+     * only enabled when using Radio HAL versions 1.1 and earlier.
-+     *
-+     * It is still possible for vendors to override this behavior and use the 1.1 version
-+     * of LCE; however, this is strongly discouraged and this functionality will be removed
-+     * when HAL 1.x support is dropped.
-+     *
-+     * @deprecated HAL 1.2 and later use an always-on LCE that relies on indications.
-+     */
-+    @Deprecated
-+    @Override
-+    public void pullLceData(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-     @Override
-     public void getModemActivityInfo(Message result, WorkSource workSource) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
-@@ -4462,6 +4532,33 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    @Override
-+    public void getIMEI(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-+    @Override
-+    public void getIMEISV(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-+    /**
-+     * @deprecated
-+     */
-+    @Deprecated
-+    @Override
-+    public void getLastPdpFailCause(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-+    /**
-+     * The preferred new alternative to getLastPdpFailCause
-+     */
-+    @Override
-+    public void getLastDataCallFailCause(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-     /**
-      * Enable or disable uicc applications on the SIM.
-      *
-@@ -4522,6 +4619,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 getRadioServiceProxy(RadioSimProxy.class), null, RADIO_HAL_VERSION_1_5);
-     }
- 
-+    @Override
-+    public void resetRadio(Message result) {
-+        // TODO(b/280900995): remove this and references
-+    }
-+
-     /**
-      * {@inheritDoc}
-      */
-diff --git a/src/java/com/android/internal/telephony/data/CellularDataService.java b/src/java/com/android/internal/telephony/data/CellularDataService.java
-index 80d6b531b9..c5923aae01 100644
---- a/src/java/com/android/internal/telephony/data/CellularDataService.java
-+++ b/src/java/com/android/internal/telephony/data/CellularDataService.java
-@@ -167,7 +167,6 @@ public class CellularDataService extends DataService {
-                 boolean isRoaming, boolean allowRoaming, int reason, LinkProperties linkProperties,
-                 int pduSessionId, NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
-                 boolean matchAllRuleAllowed, DataServiceCallback callback) {
--            // TODO: remove isRoaming parameter
-             if (DBG) log("setupDataCall " + getSlotIndex());
- 
-             Message message = null;
-@@ -178,9 +177,9 @@ public class CellularDataService extends DataService {
-                 mCallbackMap.put(message, callback);
-             }
- 
--            mPhone.mCi.setupDataCall(accessNetworkType, dataProfile, allowRoaming, reason,
--                    linkProperties, pduSessionId, sliceInfo, trafficDescriptor, matchAllRuleAllowed,
--                    message);
-+            mPhone.mCi.setupDataCall(accessNetworkType, dataProfile, isRoaming, allowRoaming,
-+                    reason, linkProperties, pduSessionId, sliceInfo, trafficDescriptor,
-+                    matchAllRuleAllowed, message);
-         }
- 
-         @Override
-@@ -200,8 +199,7 @@ public class CellularDataService extends DataService {
- 
-         @Override
-         public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming,
--                DataServiceCallback callback) {
--            // TODO: remove isRoaming parameter
-+                                        DataServiceCallback callback) {
-             if (DBG) log("setInitialAttachApn " + getSlotIndex());
- 
-             Message message = null;
-@@ -212,13 +210,12 @@ public class CellularDataService extends DataService {
-                 mCallbackMap.put(message, callback);
-             }
- 
--            mPhone.mCi.setInitialAttachApn(dataProfile, message);
-+            mPhone.mCi.setInitialAttachApn(dataProfile, isRoaming, message);
-         }
- 
-         @Override
-         public void setDataProfile(List<DataProfile> dps, boolean isRoaming,
--                DataServiceCallback callback) {
--            // TODO: remove isRoaming parameter
-+                                   DataServiceCallback callback) {
-             if (DBG) log("setDataProfile " + getSlotIndex());
- 
-             Message message = null;
-@@ -229,7 +226,7 @@ public class CellularDataService extends DataService {
-                 mCallbackMap.put(message, callback);
-             }
- 
--            mPhone.mCi.setDataProfile(dps.toArray(new DataProfile[dps.size()]), message);
-+            mPhone.mCi.setDataProfile(dps.toArray(new DataProfile[dps.size()]), isRoaming, message);
-         }
- 
-         @Override
-diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java
-index a7a9129196..71257636ef 100644
---- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java
-+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java
-@@ -56,6 +56,14 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     public void getIccCardStatus(Message result) {
-     }
- 
-+    @Override
-+    public void getIccSlotsStatus(Message result) {
-+    }
-+
-+    @Override
-+    public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
-+    }
-+
-     @Override
-     public void supplyIccPin(String pin, Message result) {
-     }
-@@ -98,6 +106,10 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     public void getCurrentCalls(Message result) {
-     }
- 
-+    @Override
-+    @Deprecated public void getPDPContextList(Message result) {
-+    }
-+
-     @Override
-     public void getDataCallList(Message result) {
-     }
-@@ -121,6 +133,14 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     public void getIMSIForApp(String aid, Message result) {
-     }
- 
-+    @Override
-+    public void getIMEI(Message result) {
-+    }
-+
-+    @Override
-+    public void getIMEISV(Message result) {
-+    }
-+
-     @Override
-     public void hangupConnection (int gsmIndex, Message result) {
-     }
-@@ -169,6 +189,15 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     public void getLastCallFailCause (Message result) {
-     }
- 
-+    @Deprecated
-+    @Override
-+    public void getLastPdpFailCause (Message result) {
-+    }
-+
-+    @Override
-+    public void getLastDataCallFailCause (Message result) {
-+    }
-+
-     @Override
-     public void setMute (boolean enableMute, Message response) {
-     }
-@@ -257,9 +286,10 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     }
- 
-     @Override
--    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
--            int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
--            TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed, Message result) {
-+    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
-+            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
-+            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
-+            boolean matchAllRuleAllowed, Message result) {
-     }
- 
-     @Override
-@@ -385,6 +415,18 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     public void cancelPendingUssd (Message response) {
-     }
- 
-+    @Override
-+    public void resetRadio(Message result) {
-+    }
-+
-+    @Override
-+    public void invokeOemRilRequestRaw(byte[] data, Message response) {
-+    }
-+
-+    @Override
-+    public void invokeOemRilRequestStrings(String[] strings, Message response) {
-+    }
-+
-     @Override
-     public void setBandMode (int bandMode, Message response) {
-     }
-@@ -554,11 +596,11 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     }
- 
-     @Override
--    public void setInitialAttachApn(DataProfile dataProfile, Message result) {
-+    public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result) {
-     }
- 
-     @Override
--    public void setDataProfile(DataProfile[] dps, Message result) {
-+    public void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result) {
-     }
- 
-     @Override
-@@ -597,6 +639,18 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
-     public void getRadioCapability(Message response) {
-     }
- 
-+    @Override
-+    public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
-+    }
-+
-+    @Override
-+    public void stopLceService(Message result) {
-+    }
-+
-+    @Override
-+    public void pullLceData(Message result) {
-+    }
-+
-     @Override
-     public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo,
-                                                 Message result) {
-diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java
-index 0459bf676e..ec35774eda 100644
---- a/src/java/com/android/internal/telephony/uicc/UiccController.java
-+++ b/src/java/com/android/internal/telephony/uicc/UiccController.java
-@@ -601,7 +601,7 @@ public class UiccController extends Handler {
-                     if (phoneId == 0) {
-                         if (DBG) {
-                             log("Received EVENT_RADIO_AVAILABLE/EVENT_RADIO_ON for phoneId 0, "
--                                    + "calling getSimSlotsStatus");
-+                                    + "calling getIccSlotsStatus");
-                         }
-                         mRadioConfig.getSimSlotsStatus(obtainMessage(EVENT_GET_SLOT_STATUS_DONE,
-                                 phoneId));
-@@ -1045,6 +1045,11 @@ public class UiccController extends Handler {
-             slotId = index;
-         }
- 
-+        if (!mCis[0].supportsEid()) {
-+            // we will never get EID from the HAL, so set mDefaultEuiccCardId to UNSUPPORTED_CARD_ID
-+            if (DBG) log("eid is not supported");
-+            mDefaultEuiccCardId = UNSUPPORTED_CARD_ID;
-+        }
-         mPhoneIdToSlotId[index] = slotId;
- 
-         if (VDBG) logPhoneIdToSlotIdMapping();
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java b/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
-index 9f96ce49b1..17dcac5943 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
-@@ -1013,6 +1013,9 @@ public class GsmCdmaPhoneTest extends TelephonyTest {
-         verify(mSimulatedCommandsVerifier).getBasebandVersion(nullable(Message.class));
-         verify(mSimulatedCommandsVerifier).getDeviceIdentity(nullable(Message.class));
-         verify(mSimulatedCommandsVerifier).getRadioCapability(nullable(Message.class));
-+        // once as part of constructor, and once on radio available
-+        verify(mSimulatedCommandsVerifier, times(2)).startLceService(anyInt(), anyBoolean(),
-+                nullable(Message.class));
- 
-         // EVENT_RADIO_ON
-         verify(mSimulatedCommandsVerifier).getVoiceRadioTechnology(nullable(Message.class));
-@@ -1035,6 +1038,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest {
-         // EVENT_RADIO_AVAILABLE
-         verify(mSimulatedCommandsVerifier, times(2)).getBasebandVersion(nullable(Message.class));
-         verify(mSimulatedCommandsVerifier, times(2)).getDeviceIdentity(nullable(Message.class));
-+        verify(mSimulatedCommandsVerifier, times(3)).startLceService(anyInt(), anyBoolean(),
-+                nullable(Message.class));
- 
-         // EVENT_RADIO_ON
-         verify(mSimulatedCommandsVerifier, times(2)).getVoiceRadioTechnology(
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/RILTest.java b/tests/telephonytests/src/com/android/internal/telephony/RILTest.java
-index bfe9649e78..b285f0f8d2 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/RILTest.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/RILTest.java
-@@ -64,6 +64,7 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_NV_READ_IT
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_NV_RESET_CONFIG;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_NV_WRITE_ITEM;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_OPERATOR;
-+import static com.android.internal.telephony.RILConstants.RIL_REQUEST_PULL_LCEDATA;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_RADIO_POWER;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_REPORT_SMS_MEMORY_STATUS;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING;
-@@ -81,8 +82,10 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SIGNAL_STR
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SIM_AUTHENTICATION;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SIM_CLOSE_CHANNEL;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SIM_OPEN_CHANNEL;
-+import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_LCE;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_START_NETWORK_SCAN;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM;
-+import static com.android.internal.telephony.RILConstants.RIL_REQUEST_STOP_LCE;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_UDUB;
- import static com.android.internal.telephony.RILConstants.RIL_REQUEST_VOICE_RADIO_TECH;
-@@ -114,6 +117,7 @@ import android.content.Context;
- import android.content.pm.ApplicationInfo;
- import android.hardware.radio.V1_0.Carrier;
- import android.hardware.radio.V1_0.CdmaSmsMessage;
-+import android.hardware.radio.V1_0.DataProfileInfo;
- import android.hardware.radio.V1_0.GsmSmsMessage;
- import android.hardware.radio.V1_0.ImsSmsMessage;
- import android.hardware.radio.V1_0.NvWriteItem;
-@@ -497,6 +501,7 @@ public class RILTest extends TelephonyTest {
-     @FlakyTest
-     @Test
-     public void testSupplySimDepersonalization() throws Exception {
-+
-         String controlKey = "1234";
-         PersoSubState persoType = PersoSubState.PERSOSUBSTATE_SIM_NETWORK_PUK;
- 
-@@ -515,7 +520,11 @@ public class RILTest extends TelephonyTest {
-         mRILUnderTest.supplySimDepersonalization(persoType, controlKey, obtainMessage());
-         verify(mRadioProxy).supplySimDepersonalization(
-                 mSerialNumberCaptor.capture(),
--                RILUtils.convertToHalPersoType(persoType),
-+                eq((int) invokeMethod(
-+                        mRILInstance,
-+                        "convertPersoTypeToHalPersoType",
-+                        new Class<?>[] {PersoSubState.class},
-+                        new Object[] {persoType})),
-                 eq(controlKey));
-         verifyRILResponse(
-                 mRILUnderTest,
-@@ -549,7 +558,11 @@ public class RILTest extends TelephonyTest {
-         mRILUnderTest.supplySimDepersonalization(persoType, controlKey, obtainMessage());
-         verify(mRadioProxy).supplySimDepersonalization(
-                 mSerialNumberCaptor.capture(),
--                RILUtils.convertToHalPersoType(persoType),
-+                eq((int) invokeMethod(
-+                        mRILInstance,
-+                        "convertPersoTypeToHalPersoType",
-+                        new Class<?>[] {PersoSubState.class},
-+                        new Object[] {persoType})),
-                 eq(controlKey));
-         verifyRILResponse(
-                 mRILUnderTest,
-@@ -1143,11 +1156,18 @@ public class RILTest extends TelephonyTest {
-                 .setApnSetting(apnSetting)
-                 .setPreferred(false)
-                 .build();
-+        boolean isRoaming = false;
- 
--        mRILUnderTest.setInitialAttachApn(dataProfile, obtainMessage());
--        verify(mRadioProxy).setInitialAttachApn_1_4(
-+        mRILUnderTest.setInitialAttachApn(dataProfile, isRoaming, obtainMessage());
-+        verify(mRadioProxy).setInitialAttachApn(
-                 mSerialNumberCaptor.capture(),
--                eq(RILUtils.convertToHalDataProfile14(dataProfile)));
-+                eq((DataProfileInfo) invokeMethod(
-+                        mRILInstance,
-+                        "convertToHalDataProfile10",
-+                        new Class<?>[] {DataProfile.class},
-+                        new Object[] {dataProfile})),
-+                eq(dataProfile.isPersistent()),
-+                eq(isRoaming));
-         verifyRILResponse(
-                 mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_SET_INITIAL_ATTACH_APN);
-     }
-@@ -1288,7 +1308,11 @@ public class RILTest extends TelephonyTest {
-         mRILUnderTest.nvResetConfig(resetType, obtainMessage());
-         verify(mRadioProxy).nvResetConfig(
-                 mSerialNumberCaptor.capture(),
--                RILUtils.convertToHalResetNvType(resetType));
-+                eq((Integer) invokeMethod(
-+                        mRILInstance,
-+                        "convertToHalResetNvType",
-+                        new Class<?>[] {Integer.TYPE},
-+                        new Object[] {resetType})));
-         verifyRILResponse(
-                 mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_NV_RESET_CONFIG);
-     }
-@@ -1341,6 +1365,33 @@ public class RILTest extends TelephonyTest {
-                 mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_GET_RADIO_CAPABILITY);
-     }
- 
-+    @FlakyTest
-+    @Test
-+    public void testStartLceService() throws Exception {
-+        int reportIntervalMs = 1000;
-+        boolean pullMode = false;
-+        mRILUnderTest.startLceService(reportIntervalMs, pullMode, obtainMessage());
-+        verify(mRadioProxy).startLceService(
-+                mSerialNumberCaptor.capture(), eq(reportIntervalMs), eq(pullMode));
-+        verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_START_LCE);
-+    }
-+
-+    @FlakyTest
-+    @Test
-+    public void testStopLceService() throws Exception {
-+        mRILUnderTest.stopLceService(obtainMessage());
-+        verify(mRadioProxy).stopLceService(mSerialNumberCaptor.capture());
-+        verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_STOP_LCE);
-+    }
-+
-+    @FlakyTest
-+    @Test
-+    public void testPullLceData() throws Exception {
-+        mRILUnderTest.pullLceData(obtainMessage());
-+        verify(mRadioProxy).pullLceData(mSerialNumberCaptor.capture());
-+        verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_PULL_LCEDATA);
-+    }
-+
-     @FlakyTest
-     @Test
-     public void testGetModemActivityInfo() throws Exception {
-@@ -2580,8 +2631,9 @@ public class RILTest extends TelephonyTest {
-                 .setPreferred(false)
-                 .build();
- 
--        mRILUnderTest.setupDataCall(AccessNetworkConstants.AccessNetworkType.EUTRAN, dp, false, 0,
--                null, DataCallResponse.PDU_SESSION_ID_NOT_SET, null, null, true, obtainMessage());
-+        mRILUnderTest.setupDataCall(AccessNetworkConstants.AccessNetworkType.EUTRAN, dp, false,
-+                false, 0, null, DataCallResponse.PDU_SESSION_ID_NOT_SET, null, null, true,
-+                obtainMessage());
-         ArgumentCaptor<DataProfile> dpiCaptor = ArgumentCaptor.forClass(DataProfile.class);
-         verify(mDataProxy).setupDataCall(mSerialNumberCaptor.capture(),
-                 eq(AccessNetworkConstants.AccessNetworkType.EUTRAN), dpiCaptor.capture(),
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java
-index 39c0cacf8a..e56b0a80a1 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java
-@@ -77,6 +77,7 @@ import com.android.internal.telephony.uicc.AdnCapacity;
- import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState;
- import com.android.internal.telephony.uicc.IccCardStatus;
- import com.android.internal.telephony.uicc.IccIoResult;
-+import com.android.internal.telephony.uicc.IccSlotStatus;
- import com.android.internal.telephony.uicc.ReceivedPhonebookRecords;
- import com.android.internal.telephony.uicc.SimPhonebookRecord;
- import com.android.telephony.Rlog;
-@@ -89,6 +90,7 @@ import java.util.concurrent.atomic.AtomicInteger;
- public class SimulatedCommands extends BaseCommands
-         implements CommandsInterface, SimulatedRadioControl {
-     private static final String LOG_TAG = "SimulatedCommands";
-+    private boolean mSupportsEid = true;
- 
-     private enum SimLockState {
-         NONE,
-@@ -126,6 +128,9 @@ public class SimulatedCommands extends BaseCommands
-     // arrive and returning null to the callers.
-     public static final  long ICC_SIM_CHALLENGE_TIMEOUT_MILLIS = 2500;
- 
-+    private String mImei;
-+    private String mImeiSv;
-+
-     //***** Instance Variables
- 
-     @UnsupportedAppUsage
-@@ -163,6 +168,7 @@ public class SimulatedCommands extends BaseCommands
-     private boolean mShouldReturnCellInfo = true;
-     private int[] mImsRegState;
-     private IccCardStatus mIccCardStatus;
-+    private IccSlotStatus mIccSlotStatus;
-     private IccIoResult mIccIoResultForApduLogicalChannel;
-     private int mChannelId = IccOpenLogicalChannelResponse.INVALID_CHANNEL;
- 
-@@ -170,7 +176,7 @@ public class SimulatedCommands extends BaseCommands
-     private Object mVoiceRegStateResult;
- 
-     int mPausedResponseCount;
--    ArrayList<Message> mPausedResponses = new ArrayList<>();
-+    ArrayList<Message> mPausedResponses = new ArrayList<Message>();
- 
-     int mNextCallFailCause = CallFailCause.NORMAL_CLEARING;
- 
-@@ -237,6 +243,26 @@ public class SimulatedCommands extends BaseCommands
-         }
-     }
- 
-+    public void setIccSlotStatus(IccSlotStatus iccSlotStatus) {
-+        mIccSlotStatus = iccSlotStatus;
-+    }
-+
-+    @Override
-+    public void getIccSlotsStatus(Message result) {
-+        SimulatedCommandsVerifier.getInstance().getIccSlotsStatus(result);
-+        if (mIccSlotStatus != null) {
-+            resultSuccess(result, mIccSlotStatus);
-+        } else {
-+            resultFail(result, null,
-+                    new CommandException(CommandException.Error.REQUEST_NOT_SUPPORTED));
-+        }
-+    }
-+
-+    @Override
-+    public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
-+        unimplemented(result);
-+    }
-+
-     @Override
-     public void supplyIccPin(String pin, Message result)  {
-         if (mSimLockedState != SimLockState.REQUIRE_PIN) {
-@@ -549,6 +575,15 @@ public class SimulatedCommands extends BaseCommands
-         }
-     }
- 
-+    /**
-+     *  @deprecated
-+     */
-+    @Deprecated
-+    @Override
-+    public void getPDPContextList(Message result) {
-+        getDataCallList(result);
-+    }
-+
-     /**
-      *  returned message
-      *  retMsg.obj = AsyncResult ar
-@@ -625,6 +660,40 @@ public class SimulatedCommands extends BaseCommands
-         resultSuccess(result, "012345678901234");
-     }
- 
-+    public void setIMEI(String imei) {
-+        mImei = imei;
-+    }
-+
-+    /**
-+     *  returned message
-+     *  retMsg.obj = AsyncResult ar
-+     *  ar.exception carries exception on failure
-+     *  ar.userObject contains the original value of result.obj
-+     *  ar.result is String containing IMEI on success
-+     */
-+    @Override
-+    public void getIMEI(Message result) {
-+        SimulatedCommandsVerifier.getInstance().getIMEI(result);
-+        resultSuccess(result, mImei != null ? mImei : FAKE_IMEI);
-+    }
-+
-+    public void setIMEISV(String imeisv) {
-+        mImeiSv = imeisv;
-+    }
-+
-+    /**
-+     *  returned message
-+     *  retMsg.obj = AsyncResult ar
-+     *  ar.exception carries exception on failure
-+     *  ar.userObject contains the original value of result.obj
-+     *  ar.result is String containing IMEISV on success
-+     */
-+    @Override
-+    public void getIMEISV(Message result) {
-+        SimulatedCommandsVerifier.getInstance().getIMEISV(result);
-+        resultSuccess(result, mImeiSv != null ? mImeiSv : FAKE_IMEISV);
-+    }
-+
-     /**
-      * Hang up one individual connection.
-      *  returned message
-@@ -832,6 +901,21 @@ public class SimulatedCommands extends BaseCommands
-         resultSuccess(result, mFailCause);
-     }
- 
-+    /**
-+     * @deprecated
-+     */
-+    @Deprecated
-+    @Override
-+    public void getLastPdpFailCause (Message result) {
-+        unimplemented(result);
-+    }
-+
-+    @Override
-+    public void getLastDataCallFailCause(Message result) {
-+        //
-+        unimplemented(result);
-+    }
-+
-     @Override
-     public void setMute (boolean enableMute, Message result) {unimplemented(result);}
- 
-@@ -1128,13 +1212,14 @@ public class SimulatedCommands extends BaseCommands
-     }
- 
-     @Override
--    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
--            int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
--            TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed, Message result) {
-+    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
-+            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
-+            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
-+            boolean matchAllRuleAllowed, Message result) {
- 
-         SimulatedCommandsVerifier.getInstance().setupDataCall(accessNetworkType, dataProfile,
--                allowRoaming, reason, linkProperties, pduSessionId, sliceInfo, trafficDescriptor,
--                matchAllRuleAllowed, result);
-+                isRoaming, allowRoaming, reason, linkProperties, pduSessionId, sliceInfo,
-+                trafficDescriptor, matchAllRuleAllowed, result);
- 
-         if (mSetupDataCallResult == null) {
-             try {
-@@ -1539,6 +1624,21 @@ public class SimulatedCommands extends BaseCommands
-         resultSuccess(response, null);
-     }
- 
-+
-+    @Override
-+    public void resetRadio(Message result) {
-+        unimplemented(result);
-+    }
-+
-+    @Override
-+    public void invokeOemRilRequestRaw(byte[] data, Message response) {
-+        // Just echo back data
-+        if (response != null) {
-+            AsyncResult.forMessage(response).result = data;
-+            response.sendToTarget();
-+        }
-+    }
-+
-     @Override
-     public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo,
-                                                 Message response) {
-@@ -1549,6 +1649,15 @@ public class SimulatedCommands extends BaseCommands
-         }
-     }
- 
-+    @Override
-+    public void invokeOemRilRequestStrings(String[] strings, Message response) {
-+        // Just echo back data
-+        if (response != null) {
-+            AsyncResult.forMessage(response).result = strings;
-+            response.sendToTarget();
-+        }
-+    }
-+
-     //***** SimulatedRadioControl
- 
- 
-@@ -2010,14 +2119,14 @@ public class SimulatedCommands extends BaseCommands
-     }
- 
-     @Override
--    public void setInitialAttachApn(DataProfile dataProfile, Message result) {
--        SimulatedCommandsVerifier.getInstance().setInitialAttachApn(dataProfile, result);
-+    public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result) {
-+        SimulatedCommandsVerifier.getInstance().setInitialAttachApn(dataProfile, isRoaming, result);
-         resultSuccess(result, null);
-     }
- 
-     @Override
--    public void setDataProfile(DataProfile[] dps, Message result) {
--        SimulatedCommandsVerifier.getInstance().setDataProfile(dps, result);
-+    public void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result) {
-+        SimulatedCommandsVerifier.getInstance().setDataProfile(dps, isRoaming, result);
-         resultSuccess(result, null);
-     }
- 
-@@ -2121,6 +2230,22 @@ public class SimulatedCommands extends BaseCommands
-         setRadioState(TelephonyManager.RADIO_POWER_UNAVAILABLE, false /* forceNotifyRegistrants */);
-     }
- 
-+    @Override
-+    public void startLceService(int report_interval_ms, boolean pullMode, Message result) {
-+        SimulatedCommandsVerifier.getInstance().startLceService(report_interval_ms, pullMode,
-+                result);
-+    }
-+
-+    @Override
-+    public void stopLceService(Message result) {
-+        unimplemented(result);
-+    }
-+
-+    @Override
-+    public void pullLceData(Message result) {
-+        unimplemented(result);
-+    }
-+
-     @Override
-     public void registerForLceInfo(Handler h, int what, Object obj) {
-         SimulatedCommandsVerifier.getInstance().registerForLceInfo(h, what, obj);
-@@ -2439,6 +2564,15 @@ public class SimulatedCommands extends BaseCommands
-                 new ReceivedPhonebookRecords(4, phonebookRecordInfoGroup), null));
-     }
- 
-+    public void setSupportsEid(boolean supportsEid) {
-+        mSupportsEid = supportsEid;
-+    }
-+
-+    @Override
-+    public boolean supportsEid() {
-+        return mSupportsEid;
-+    }
-+
-     @Override
-     public void getSimPhonebookCapacity(Message result) {
-         resultSuccess(result, new AdnCapacity(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommandsVerifier.java b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommandsVerifier.java
-index 6fc56169f3..1883513218 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommandsVerifier.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommandsVerifier.java
-@@ -687,6 +687,11 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void getPDPContextList(Message result) {
-+
-+    }
-+
-     @Override
-     public void getDataCallList(Message result) {
- 
-@@ -713,6 +718,16 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void getIMEI(Message result) {
-+
-+    }
-+
-+    @Override
-+    public void getIMEISV(Message result) {
-+
-+    }
-+
-     @Override
-     public void hangupConnection(int gsmIndex, Message result) {
- 
-@@ -773,6 +788,16 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void getLastPdpFailCause(Message result) {
-+
-+    }
-+
-+    @Override
-+    public void getLastDataCallFailCause(Message result) {
-+
-+    }
-+
-     @Override
-     public void setMute(boolean enableMute, Message response) {
- 
-@@ -1013,6 +1038,11 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void resetRadio(Message result) {
-+
-+    }
-+
-     @Override
-     public void setBandMode(int bandMode, Message response) {
- 
-@@ -1069,6 +1099,26 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void invokeOemRilRequestRaw(byte[] data, Message response) {
-+
-+    }
-+
-+    @Override
-+    public void invokeOemRilRequestStrings(String[] strings, Message response) {
-+
-+    }
-+
-+    @Override
-+    public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {
-+
-+    }
-+
-+    @Override
-+    public void unSetOnUnsolOemHookRaw(Handler h) {
-+
-+    }
-+
-     @Override
-     public void sendTerminalResponse(String contents, Message response) {
- 
-@@ -1160,9 +1210,10 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
-     }
- 
-     @Override
--    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean allowRoaming,
--            int reason, LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
--            TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed, Message result) {
-+    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
-+            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
-+            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
-+            boolean matchAllRuleAllowed, Message result) {
-     }
- 
-     @Override
-@@ -1195,6 +1246,14 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void getIccSlotsStatus(Message result) {
-+    }
-+
-+    @Override
-+    public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
-+    }
-+
-     @Override
-     public void requestIccSimAuthentication(int authContext, String data, String aid,
-                                             Message response) {
-@@ -1225,12 +1284,12 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
-     }
- 
-     @Override
--    public void setInitialAttachApn(DataProfile dataProfile, Message result) {
-+    public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result) {
- 
-     }
- 
-     @Override
--    public void setDataProfile(DataProfile[] dps, Message result) {
-+    public void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result) {
- 
-     }
- 
-@@ -1318,6 +1377,21 @@ public class SimulatedCommandsVerifier implements CommandsInterface {
- 
-     }
- 
-+    @Override
-+    public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
-+
-+    }
-+
-+    @Override
-+    public void stopLceService(Message result) {
-+
-+    }
-+
-+    @Override
-+    public void pullLceData(Message result) {
-+
-+    }
-+
-     @Override
-     public void registerForLceInfo(Handler h, int what, Object obj) {
- 
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/data/DataServiceManagerTest.java b/tests/telephonytests/src/com/android/internal/telephony/data/DataServiceManagerTest.java
-index 30f49ad63b..8b6ccfc908 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/data/DataServiceManagerTest.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/data/DataServiceManagerTest.java
-@@ -155,7 +155,7 @@ public class DataServiceManagerTest extends TelephonyTest {
-                 message);
-         waitAndVerifyResult(message, DataServiceCallback.RESULT_SUCCESS);
-         verify(mSimulatedCommandsVerifier).setupDataCall(anyInt(), any(DataProfile.class),
--                anyBoolean(), anyInt(), any(), anyInt(), any(), any(), anyBoolean(),
-+                anyBoolean(), anyBoolean(), anyInt(), any(), anyInt(), any(), any(), anyBoolean(),
-                 any(Message.class));
-     }
- 
-@@ -168,7 +168,7 @@ public class DataServiceManagerTest extends TelephonyTest {
-                 message);
-         waitAndVerifyResult(message, DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE);
-         verify(mSimulatedCommandsVerifier, never()).setupDataCall(anyInt(), any(DataProfile.class),
--                anyBoolean(), anyInt(), any(), anyInt(), any(), any(), anyBoolean(),
-+                anyBoolean(), anyBoolean(), anyInt(), any(), anyInt(), any(), any(), anyBoolean(),
-                 any(Message.class));
-     }
- 
-@@ -199,7 +199,7 @@ public class DataServiceManagerTest extends TelephonyTest {
-         mDataServiceManagerUT.setInitialAttachApn(mGeneralPurposeDataProfile, false, message);
-         waitAndVerifyResult(message, DataServiceCallback.RESULT_SUCCESS);
-         verify(mSimulatedCommandsVerifier).setInitialAttachApn(any(DataProfile.class),
--                any(Message.class));
-+                anyBoolean(), any(Message.class));
-     }
- 
-     @Test
-@@ -209,7 +209,7 @@ public class DataServiceManagerTest extends TelephonyTest {
-         mDataServiceManagerUT.setInitialAttachApn(mGeneralPurposeDataProfile, false, message);
-         waitAndVerifyResult(message, DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE);
-         verify(mSimulatedCommandsVerifier, never()).setInitialAttachApn(any(DataProfile.class),
--                any(Message.class));
-+                anyBoolean(), any(Message.class));
-     }
- 
-     @Test
-@@ -218,7 +218,7 @@ public class DataServiceManagerTest extends TelephonyTest {
-         Message message = mHandler.obtainMessage(1234);
-         mDataServiceManagerUT.setDataProfile(List.of(mGeneralPurposeDataProfile), false, message);
-         waitAndVerifyResult(message, DataServiceCallback.RESULT_SUCCESS);
--        verify(mSimulatedCommandsVerifier).setDataProfile(any(DataProfile[].class),
-+        verify(mSimulatedCommandsVerifier).setDataProfile(any(DataProfile[].class), anyBoolean(),
-                 any(Message.class));
-     }
- 
-@@ -229,7 +229,7 @@ public class DataServiceManagerTest extends TelephonyTest {
-         mDataServiceManagerUT.setDataProfile(List.of(mGeneralPurposeDataProfile), false, message);
-         waitAndVerifyResult(message, DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE);
-         verify(mSimulatedCommandsVerifier, never()).setDataProfile(any(DataProfile[].class),
--                any(Message.class));
-+                anyBoolean(), any(Message.class));
-     }
- 
-     @Test
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java
-index 9265a62ccb..2ab23f3f19 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java
-@@ -495,6 +495,40 @@ public class UiccControllerTest extends TelephonyTest {
-         assertEquals(uiccCardInfo, mUiccControllerUT.getAllUiccCardInfos().get(0));
-     }
- 
-+    @Test
-+    public void testEidNotSupported() {
-+        // Give UiccController a real context so it can use shared preferences
-+        mUiccControllerUT.mContext = InstrumentationRegistry.getContext();
-+
-+        // Mock out UiccSlots
-+        mUiccControllerUT.mUiccSlots[0] = mMockSlot;
-+        doReturn(true).when(mMockSlot).isEuicc();
-+        doReturn(mMockEuiccCard).when(mMockSlot).getUiccCard();
-+        doReturn(null).when(mMockEuiccCard).getEid();
-+
-+        // simulate card status loaded so that the UiccController sets the card ID
-+        IccCardStatus ics = new IccCardStatus();
-+        ics.setCardState(1 /* present */);
-+        ics.setUniversalPinState(3 /* disabled */);
-+        ics.atr = "abcdef0123456789abcdef";
-+        ics.iccid = "123451234567890";
-+        ics.mSlotPortMapping = new IccSlotPortMapping();
-+        ics.mSlotPortMapping.mPhysicalSlotIndex = UiccController.INVALID_SLOT_ID;
-+        // make it seem like EID is not supported by setting physical slot = -1 like on HAL < 1.2
-+
-+        mSimulatedCommands.setSupportsEid(false);
-+
-+        AsyncResult ar = new AsyncResult(null, ics, null);
-+        Message msg = Message.obtain(mUiccControllerUT, EVENT_GET_ICC_STATUS_DONE, ar);
-+        mUiccControllerUT.handleMessage(msg);
-+
-+        // assert that the default eUICC card Id is UNSUPPORTED_CARD_ID
-+        assertEquals(TelephonyManager.UNSUPPORTED_CARD_ID,
-+                mUiccControllerUT.getCardIdForDefaultEuicc());
-+
-+        mSimulatedCommands.setSupportsEid(true);
-+    }
-+
-     /**
-      * The default eUICC should not be the removable slot if there is a built-in eUICC.
-      */
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0006-Revert-Remove-deprecated-HAL-versions-for-IRadio.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0006-Revert-Remove-deprecated-HAL-versions-for-IRadio.patch
deleted file mode 100644
index e94a2139..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0006-Revert-Remove-deprecated-HAL-versions-for-IRadio.patch
+++ /dev/null
@@ -1,8486 +0,0 @@
-From 5e5041a5107d159d1b481665a1872447028cbd66 Mon Sep 17 00:00:00 2001
-From: Daniel Zhang <danielzhang130@gmail.com>
-Date: Sat, 30 Mar 2024 14:44:57 -0400
-Subject: [PATCH 06/16] Revert "Remove deprecated HAL versions for IRadio"
-
-This reverts commit 50fc709cc1d87e5d1e6d75c856bc4b6894070a39.
-
-Change-Id: Ia3aa57286fb5cce42065f7db8133fa3caf1fcd61
----
- Android.bp                                    |    1 +
- .../telephony/CellularNetworkService.java     |  105 +-
- .../internal/telephony/NetworkIndication.java |    5 +-
- .../internal/telephony/NetworkResponse.java   |   19 +
- .../com/android/internal/telephony/RIL.java   | 2377 +++++++++++------
- .../android/internal/telephony/RILUtils.java  |  399 ++-
- .../internal/telephony/RadioConfig.java       |    9 +-
- .../internal/telephony/RadioConfigProxy.java  |   22 +-
- .../internal/telephony/RadioDataProxy.java    |   88 +-
- .../internal/telephony/RadioIndication.java   |  103 +-
- .../telephony/RadioMessagingProxy.java        |    4 +-
- .../internal/telephony/RadioModemProxy.java   |   12 +-
- .../internal/telephony/RadioNetworkProxy.java |   92 +-
- .../internal/telephony/RadioResponse.java     |  327 ++-
- .../internal/telephony/RadioServiceProxy.java |   10 +-
- .../internal/telephony/RadioSimProxy.java     |   80 +-
- .../internal/telephony/RadioVoiceProxy.java   |    8 +-
- .../android/internal/telephony/RILTest.java   | 1382 +++++-----
- .../internal/telephony/SimulatedCommands.java |   31 +-
- 19 files changed, 3397 insertions(+), 1677 deletions(-)
-
-diff --git a/Android.bp b/Android.bp
-index c3b43735f1..331b722ace 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -99,6 +99,7 @@ java_library {
-         "android.hardware.radio.config-V1.1-java-shallow",
-         "android.hardware.radio.config-V1.2-java-shallow",
-         "android.hardware.radio.config-V1.3-java-shallow",
-+        "android.hardware.radio.deprecated-V1.0-java-shallow",
-         "ecc-protos-lite",
-         "libphonenumber-nogeocoder",
-         "PlatformProperties",
-diff --git a/src/java/com/android/internal/telephony/CellularNetworkService.java b/src/java/com/android/internal/telephony/CellularNetworkService.java
-index bff1d41327..41cbb662e4 100644
---- a/src/java/com/android/internal/telephony/CellularNetworkService.java
-+++ b/src/java/com/android/internal/telephony/CellularNetworkService.java
-@@ -286,6 +286,27 @@ public class CellularNetworkService extends NetworkService {
-             } else if (result instanceof android.hardware.radio.V1_5.RegStateResult) {
-                 return getNetworkRegistrationInfo(domain, transportType,
-                         (android.hardware.radio.V1_5.RegStateResult) result);
-+            } else if (result instanceof android.hardware.radio.V1_0.VoiceRegStateResult) {
-+                android.hardware.radio.V1_0.VoiceRegStateResult voiceRegState =
-+                        (android.hardware.radio.V1_0.VoiceRegStateResult) result;
-+                int regState = getRegStateFromHalRegState(voiceRegState.regState);
-+                int networkType = ServiceState.rilRadioTechnologyToNetworkType(voiceRegState.rat);
-+                int reasonForDenial = voiceRegState.reasonForDenial;
-+                boolean emergencyOnly = isEmergencyOnly(voiceRegState.regState);
-+                boolean cssSupported = voiceRegState.cssSupported;
-+                int roamingIndicator = voiceRegState.roamingIndicator;
-+                int systemIsInPrl = voiceRegState.systemIsInPrl;
-+                int defaultRoamingIndicator = voiceRegState.defaultRoamingIndicator;
-+                List<Integer> availableServices = getAvailableServices(
-+                        regState, domain, emergencyOnly);
-+                CellIdentity cellIdentity =
-+                        RILUtils.convertHalCellIdentity(voiceRegState.cellIdentity);
-+                final String rplmn = getPlmnFromCellIdentity(cellIdentity);
-+
-+                return new NetworkRegistrationInfo(domain, transportType, regState,
-+                        networkType, reasonForDenial, emergencyOnly, availableServices,
-+                        cellIdentity, rplmn, cssSupported, roamingIndicator, systemIsInPrl,
-+                        defaultRoamingIndicator);
-             } else if (result instanceof android.hardware.radio.V1_2.VoiceRegStateResult) {
-                 android.hardware.radio.V1_2.VoiceRegStateResult voiceRegState =
-                         (android.hardware.radio.V1_2.VoiceRegStateResult) result;
-@@ -316,6 +337,20 @@ public class CellularNetworkService extends NetworkService {
-             final int domain = NetworkRegistrationInfo.DOMAIN_PS;
-             final int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
- 
-+            int regState = NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN;
-+            int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
-+            int reasonForDenial = 0;
-+            boolean emergencyOnly = false;
-+            int maxDataCalls = 0;
-+            CellIdentity cellIdentity;
-+            boolean isEndcAvailable = false;
-+            boolean isNrAvailable = false;
-+            boolean isDcNrRestricted = false;
-+
-+            LteVopsSupportInfo lteVopsSupportInfo =
-+                    new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
-+                            LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
-+
-             if (result instanceof android.hardware.radio.network.RegStateResult) {
-                 return getNetworkRegistrationInfoAidl(domain, transportType,
-                         (android.hardware.radio.network.RegStateResult) result);
-@@ -325,46 +360,66 @@ public class CellularNetworkService extends NetworkService {
-             } else if (result instanceof android.hardware.radio.V1_5.RegStateResult) {
-                 return getNetworkRegistrationInfo(domain, transportType,
-                         (android.hardware.radio.V1_5.RegStateResult) result);
-+            } else if (result instanceof android.hardware.radio.V1_0.DataRegStateResult) {
-+                android.hardware.radio.V1_0.DataRegStateResult dataRegState =
-+                        (android.hardware.radio.V1_0.DataRegStateResult) result;
-+                regState = getRegStateFromHalRegState(dataRegState.regState);
-+                networkType = ServiceState.rilRadioTechnologyToNetworkType(dataRegState.rat);
-+                reasonForDenial = dataRegState.reasonDataDenied;
-+                emergencyOnly = isEmergencyOnly(dataRegState.regState);
-+                maxDataCalls = dataRegState.maxDataCalls;
-+                cellIdentity = RILUtils.convertHalCellIdentity(dataRegState.cellIdentity);
-+            } else if (result instanceof android.hardware.radio.V1_2.DataRegStateResult) {
-+                android.hardware.radio.V1_2.DataRegStateResult dataRegState =
-+                        (android.hardware.radio.V1_2.DataRegStateResult) result;
-+                regState = getRegStateFromHalRegState(dataRegState.regState);
-+                networkType = ServiceState.rilRadioTechnologyToNetworkType(dataRegState.rat);
-+                reasonForDenial = dataRegState.reasonDataDenied;
-+                emergencyOnly = isEmergencyOnly(dataRegState.regState);
-+                maxDataCalls = dataRegState.maxDataCalls;
-+                cellIdentity = RILUtils.convertHalCellIdentity(dataRegState.cellIdentity);
-             } else if (result instanceof android.hardware.radio.V1_4.DataRegStateResult) {
-                 android.hardware.radio.V1_4.DataRegStateResult dataRegState =
-                         (android.hardware.radio.V1_4.DataRegStateResult) result;
--                LteVopsSupportInfo lteVopsSupportInfo;
-+                regState = getRegStateFromHalRegState(dataRegState.base.regState);
-+                networkType = ServiceState.rilRadioTechnologyToNetworkType(dataRegState.base.rat);
-+
-+                reasonForDenial = dataRegState.base.reasonDataDenied;
-+                emergencyOnly = isEmergencyOnly(dataRegState.base.regState);
-+                maxDataCalls = dataRegState.base.maxDataCalls;
-+                cellIdentity = RILUtils.convertHalCellIdentity(dataRegState.base.cellIdentity);
-+                android.hardware.radio.V1_4.NrIndicators nrIndicators = dataRegState.nrIndicators;
-+
-                 // Check for lteVopsInfo only if its initialized and RAT is EUTRAN
-                 if (dataRegState.vopsInfo.getDiscriminator() == hidl_discriminator.lteVopsInfo
-                         && ServiceState.rilRadioTechnologyToAccessNetworkType(dataRegState.base.rat)
-                             == AccessNetworkType.EUTRAN) {
-                     android.hardware.radio.V1_4.LteVopsInfo vopsSupport =
-                             dataRegState.vopsInfo.lteVopsInfo();
--                    lteVopsSupportInfo = convertHalLteVopsSupportInfo(
--                            vopsSupport.isVopsSupported, vopsSupport.isEmcBearerSupported);
-+                    lteVopsSupportInfo = convertHalLteVopsSupportInfo(vopsSupport.isVopsSupported,
-+                        vopsSupport.isEmcBearerSupported);
-                 } else {
--                    lteVopsSupportInfo = new LteVopsSupportInfo(
--                            LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
--                            LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
-+                    lteVopsSupportInfo =
-+                        new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
-+                        LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
-                 }
--                int regState = getRegStateFromHalRegState(dataRegState.base.regState);
--                int networkType =
--                        ServiceState.rilRadioTechnologyToNetworkType(dataRegState.base.rat);
--                int reasonForDenial = dataRegState.base.reasonDataDenied;
--                boolean emergencyOnly = isEmergencyOnly(dataRegState.base.regState);
--                int maxDataCalls = dataRegState.base.maxDataCalls;
--                CellIdentity cellIdentity =
--                        RILUtils.convertHalCellIdentity(dataRegState.base.cellIdentity);
--                android.hardware.radio.V1_4.NrIndicators nrIndicators = dataRegState.nrIndicators;
--                boolean isEndcAvailable = nrIndicators.isEndcAvailable;
--                boolean isNrAvailable = nrIndicators.isNrAvailable;
--                boolean isDcNrRestricted = nrIndicators.isDcNrRestricted;
--                String rplmn = getPlmnFromCellIdentity(cellIdentity);
--                List<Integer> availableServices = getAvailableServices(
--                        regState, domain, emergencyOnly);
--                return new NetworkRegistrationInfo(domain, transportType, regState, networkType,
--                        reasonForDenial, emergencyOnly, availableServices, cellIdentity, rplmn,
--                        maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable,
--                        lteVopsSupportInfo);
-+
-+                isEndcAvailable = nrIndicators.isEndcAvailable;
-+                isNrAvailable = nrIndicators.isNrAvailable;
-+                isDcNrRestricted = nrIndicators.isDcNrRestricted;
-             } else {
-                 loge("Unknown type of DataRegStateResult " + result);
-                 return null;
-             }
-+
-+            String rplmn = getPlmnFromCellIdentity(cellIdentity);
-+            List<Integer> availableServices = getAvailableServices(
-+                    regState, domain, emergencyOnly);
-+
-+            return new NetworkRegistrationInfo(domain, transportType, regState, networkType,
-+                    reasonForDenial, emergencyOnly, availableServices, cellIdentity, rplmn,
-+                    maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable,
-+                    lteVopsSupportInfo);
-         }
- 
-         private @NonNull NetworkRegistrationInfo getNetworkRegistrationInfo(
-diff --git a/src/java/com/android/internal/telephony/NetworkIndication.java b/src/java/com/android/internal/telephony/NetworkIndication.java
-index 5c492349cd..0d5d871020 100644
---- a/src/java/com/android/internal/telephony/NetworkIndication.java
-+++ b/src/java/com/android/internal/telephony/NetworkIndication.java
-@@ -132,7 +132,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub {
-             android.hardware.radio.network.LinkCapacityEstimate lce) {
-         mRil.processIndication(HAL_SERVICE_NETWORK, indicationType);
- 
--        List<LinkCapacityEstimate> response = RILUtils.convertHalLinkCapacityEstimate(lce);
-+        List<LinkCapacityEstimate> response = RILUtils.convertHalLceData(lce);
- 
-         if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_LCEDATA_RECV, response);
- 
-@@ -211,8 +211,9 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub {
-             android.hardware.radio.network.SignalStrength signalStrength) {
-         mRil.processIndication(HAL_SERVICE_NETWORK, indicationType);
- 
--        SignalStrength ss = RILUtils.convertHalSignalStrength(signalStrength);
-+        SignalStrength ssInitial = RILUtils.convertHalSignalStrength(signalStrength);
- 
-+        SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);
-         // Note this is set to "verbose" because it happens frequently
-         if (mRil.isLogvOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);
- 
-diff --git a/src/java/com/android/internal/telephony/NetworkResponse.java b/src/java/com/android/internal/telephony/NetworkResponse.java
-index b4a37b3d60..b2571d981a 100644
---- a/src/java/com/android/internal/telephony/NetworkResponse.java
-+++ b/src/java/com/android/internal/telephony/NetworkResponse.java
-@@ -25,10 +25,12 @@ import android.os.AsyncResult;
- import android.telephony.BarringInfo;
- import android.telephony.CellInfo;
- import android.telephony.EmergencyRegistrationResult;
-+import android.telephony.LinkCapacityEstimate;
- import android.telephony.RadioAccessSpecifier;
- import android.telephony.SignalStrength;
- 
- import java.util.ArrayList;
-+import java.util.List;
- 
- /**
-  * Interface declaring response functions to solicited radio requests for network APIs.
-@@ -265,6 +267,23 @@ public class NetworkResponse extends IRadioNetworkResponse.Stub {
-         }
-     }
- 
-+    /**
-+     * @param responseInfo Response info struct containing response type, serial no. and error
-+     * @param lceInfo LceDataInfo indicating LCE data
-+     */
-+    public void pullLceDataResponse(RadioResponseInfo responseInfo,
-+            android.hardware.radio.network.LceDataInfo lceInfo) {
-+        RILRequest rr = mRil.processResponse(HAL_SERVICE_NETWORK, responseInfo);
-+
-+        if (rr != null) {
-+            List<LinkCapacityEstimate> ret = RILUtils.convertHalLceData(lceInfo);
-+            if (responseInfo.error == RadioError.NONE) {
-+                RadioResponse.sendMessageResponse(rr.mResult, ret);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, ret);
-+        }
-+    }
-+
-     /**
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      */
-diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 53e288f321..b44fb0f119 100644
---- a/src/java/com/android/internal/telephony/RIL.java
-+++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -60,6 +60,13 @@ import android.telephony.AccessNetworkConstants;
- import android.telephony.AccessNetworkConstants.AccessNetworkType;
- import android.telephony.BarringInfo;
- import android.telephony.CarrierRestrictionRules;
-+import android.telephony.CellInfo;
-+import android.telephony.CellSignalStrengthCdma;
-+import android.telephony.CellSignalStrengthGsm;
-+import android.telephony.CellSignalStrengthLte;
-+import android.telephony.CellSignalStrengthNr;
-+import android.telephony.CellSignalStrengthTdscdma;
-+import android.telephony.CellSignalStrengthWcdma;
- import android.telephony.ClientRequestStats;
- import android.telephony.DomainSelectionService;
- import android.telephony.ImsiEncryptionInfo;
-@@ -68,6 +75,8 @@ import android.telephony.NeighboringCellInfo;
- import android.telephony.NetworkScanRequest;
- import android.telephony.RadioAccessFamily;
- import android.telephony.RadioAccessSpecifier;
-+import android.telephony.ServiceState;
-+import android.telephony.SignalStrength;
- import android.telephony.SignalThresholdInfo;
- import android.telephony.SubscriptionManager;
- import android.telephony.TelephonyHistogram;
-@@ -117,6 +126,7 @@ import java.util.concurrent.atomic.AtomicLong;
- 
- /**
-  * RIL implementation of the CommandsInterface.
-+ *
-  * {@hide}
-  */
- public class RIL extends BaseCommands implements CommandsInterface {
-@@ -129,7 +139,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     static final int RIL_HISTOGRAM_BUCKET_COUNT = 5;
- 
-     /**
--     * Wake lock timeout should be longer than the longest timeout in the vendor ril.
-+     * Wake lock timeout should be longer than the longest timeout in
-+     * the vendor ril.
-      */
-     private static final int DEFAULT_WAKE_LOCK_TIMEOUT_MS = 60000;
- 
-@@ -150,6 +161,18 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     /** @hide */
-     public static final HalVersion RADIO_HAL_VERSION_UNKNOWN = HalVersion.UNKNOWN;
- 
-+    /** @hide */
-+    public static final HalVersion RADIO_HAL_VERSION_1_0 = new HalVersion(1, 0);
-+
-+    /** @hide */
-+    public static final HalVersion RADIO_HAL_VERSION_1_1 = new HalVersion(1, 1);
-+
-+    /** @hide */
-+    public static final HalVersion RADIO_HAL_VERSION_1_2 = new HalVersion(1, 2);
-+
-+    /** @hide */
-+    public static final HalVersion RADIO_HAL_VERSION_1_3 = new HalVersion(1, 3);
-+
-     /** @hide */
-     public static final HalVersion RADIO_HAL_VERSION_1_4 = new HalVersion(1, 4);
- 
-@@ -180,7 +203,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public final WakeLock mAckWakeLock;        // Wake lock associated with ack sent
-     final int mWakeLockTimeout;         // Timeout associated with request/response
-     final int mAckWakeLockTimeout;      // Timeout associated with ack sent
--    // The number of wakelock requests currently active. Don't release the lock until dec'd to 0.
-+    // The number of wakelock requests currently active.  Don't release the lock
-+    // until dec'd to 0
-     int mWakeLockCount;
- 
-     // Variables used to identify releasing of WL on wakelock timeouts
-@@ -320,10 +344,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                             }
-                             if (RILJ_LOGD) {
-                                 int count = mRequestList.size();
--                                riljLog("WAKE_LOCK_TIMEOUT mRequestList=" + count);
-+                                Rlog.d(RILJ_LOG_TAG, "WAKE_LOCK_TIMEOUT " +
-+                                        " mRequestList=" + count);
-                                 for (int i = 0; i < count; i++) {
-                                     rr = mRequestList.valueAt(i);
--                                    riljLog(i + ": [" + rr.mSerial + "] "
-+                                    Rlog.d(RILJ_LOG_TAG, i + ": [" + rr.mSerial + "] "
-                                             + RILUtils.requestToString(rr.mRequest));
-                                 }
-                             }
-@@ -334,7 +359,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 case EVENT_ACK_WAKE_LOCK_TIMEOUT:
-                     if (msg.arg1 == mAckWlSequenceNum && clearWakeLock(FOR_ACK_WAKELOCK)) {
-                         if (RILJ_LOGV) {
--                            riljLog("ACK_WAKE_LOCK_TIMEOUT");
-+                            Rlog.d(RILJ_LOG_TAG, "ACK_WAKE_LOCK_TIMEOUT");
-                         }
-                     }
-                     break;
-@@ -593,10 +618,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @VisibleForTesting
-     public void setCompatVersion(int rilRequest, @NonNull HalVersion halVersion) {
-         HalVersion oldVersion = getCompatVersion(rilRequest);
--        // Do not allow to set same or greater versions
-+        // Do not allow to set same or greater verions
-         if (oldVersion != null && halVersion.greaterOrEqual(oldVersion)) {
--            riljLoge("setCompatVersion with equal or greater one, ignored, halVersion=" + halVersion
--                    + ", oldVersion=" + oldVersion);
-+            riljLoge("setCompatVersion with equal or greater one, ignored, halVerion=" + halVersion
-+                    + ", oldVerion=" + oldVersion);
-             return;
-         }
-         mCompatOverrides.put(rilRequest, halVersion);
-@@ -657,7 +682,39 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 }
- 
-                 if (mRadioProxy == null) {
--                    riljLoge("IRadio <1.4 is no longer supported.");
-+                    try {
-+                        mRadioProxy = android.hardware.radio.V1_3.IRadio.getService(
-+                                HIDL_SERVICE_NAME[mPhoneId], true);
-+                        mHalVersion.put(HAL_SERVICE_RADIO, RADIO_HAL_VERSION_1_3);
-+                    } catch (NoSuchElementException e) {
-+                    }
-+                }
-+
-+                if (mRadioProxy == null) {
-+                    try {
-+                        mRadioProxy = android.hardware.radio.V1_2.IRadio.getService(
-+                                HIDL_SERVICE_NAME[mPhoneId], true);
-+                        mHalVersion.put(HAL_SERVICE_RADIO, RADIO_HAL_VERSION_1_2);
-+                    } catch (NoSuchElementException e) {
-+                    }
-+                }
-+
-+                if (mRadioProxy == null) {
-+                    try {
-+                        mRadioProxy = android.hardware.radio.V1_1.IRadio.getService(
-+                                HIDL_SERVICE_NAME[mPhoneId], true);
-+                        mHalVersion.put(HAL_SERVICE_RADIO, RADIO_HAL_VERSION_1_1);
-+                    } catch (NoSuchElementException e) {
-+                    }
-+                }
-+
-+                if (mRadioProxy == null) {
-+                    try {
-+                        mRadioProxy = android.hardware.radio.V1_0.IRadio.getService(
-+                                HIDL_SERVICE_NAME[mPhoneId], true);
-+                        mHalVersion.put(HAL_SERVICE_RADIO, RADIO_HAL_VERSION_1_0);
-+                    } catch (NoSuchElementException e) {
-+                    }
-                 }
- 
-                 if (mRadioProxy != null) {
-@@ -728,7 +785,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public synchronized RadioServiceProxy getRadioServiceProxy(int service) {
-         if (!SubscriptionManager.isValidPhoneId(mPhoneId)) return mServiceProxies.get(service);
-         if ((service >= HAL_SERVICE_IMS) && !isRadioServiceSupported(service)) {
--            riljLogw("getRadioServiceProxy: " + serviceToString(service) + " for "
-+            Rlog.w(RILJ_LOG_TAG, "getRadioServiceProxy: " + serviceToString(service) + " for "
-                     + HIDL_SERVICE_NAME[mPhoneId] + " is not supported\n"
-                     + android.util.Log.getStackTraceString(new RuntimeException()));
-             return mServiceProxies.get(service);
-@@ -894,7 +951,46 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-                 if (serviceProxy.isEmpty()
-                         && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
--                    riljLoge("IRadio <1.4 is no longer supported.");
-+                    try {
-+                        mHalVersion.put(service, RADIO_HAL_VERSION_1_3);
-+                        serviceProxy.setHidl(mHalVersion.get(service),
-+                                android.hardware.radio.V1_3.IRadio.getService(
-+                                        HIDL_SERVICE_NAME[mPhoneId], true));
-+                    } catch (NoSuchElementException e) {
-+                    }
-+                }
-+
-+                if (serviceProxy.isEmpty()
-+                        && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
-+                    try {
-+                        mHalVersion.put(service, RADIO_HAL_VERSION_1_2);
-+                        serviceProxy.setHidl(mHalVersion.get(service),
-+                                android.hardware.radio.V1_2.IRadio.getService(
-+                                        HIDL_SERVICE_NAME[mPhoneId], true));
-+                    } catch (NoSuchElementException e) {
-+                    }
-+                }
-+
-+                if (serviceProxy.isEmpty()
-+                        && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
-+                    try {
-+                        mHalVersion.put(service, RADIO_HAL_VERSION_1_1);
-+                        serviceProxy.setHidl(mHalVersion.get(service),
-+                                android.hardware.radio.V1_1.IRadio.getService(
-+                                        HIDL_SERVICE_NAME[mPhoneId], true));
-+                    } catch (NoSuchElementException e) {
-+                    }
-+                }
-+
-+                if (serviceProxy.isEmpty()
-+                        && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
-+                    try {
-+                        mHalVersion.put(service, RADIO_HAL_VERSION_1_0);
-+                        serviceProxy.setHidl(mHalVersion.get(service),
-+                                android.hardware.radio.V1_0.IRadio.getService(
-+                                        HIDL_SERVICE_NAME[mPhoneId], true));
-+                    } catch (NoSuchElementException e) {
-+                    }
-                 }
- 
-                 if (!serviceProxy.isEmpty()) {
-@@ -944,7 +1040,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                                 break;
-                         }
-                     } else {
--                        if (mHalVersion.get(service).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+                        if (mHalVersion.get(service)
-+                                .greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-                             throw new AssertionError("serviceProxy shouldn't be HIDL with HAL 2.0");
-                         }
-                         if (!mIsRadioProxyInitialized) {
-@@ -1265,6 +1362,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
-     }
- 
-+    
-     private boolean canMakeRequest(String request, RadioServiceProxy proxy, Message result,
-             HalVersion version) {
-         int service = HAL_SERVICE_RADIO;
-@@ -1307,14 +1405,34 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         return true;
-     }
- 
-+    private void handleRadioServiceNotAvailable(RadioServiceProxy proxy, Message result) {
-+        if (result != null) {
-+            riljLoge("RadioService is not available, " + proxy);
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));
-+            result.sendToTarget();
-+        }
-+    }
-+
-+    private void handleRadioProxyNotAvailable(Message result) {
-+        if (result != null) {
-+            riljLoge("RadioProxy is not available");
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));
-+            result.sendToTarget();
-+        }
-+    }
-+
-     @Override
-     public void getIccCardStatus(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getIccCardStatus", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SIM_STATUS, result, mRILDefaultWorkSource);
-+        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SIM_STATUS, result,
-+                mRILDefaultWorkSource);
- 
-         if (RILJ_LOGD) {
-             riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-@@ -1327,12 +1445,24 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void getIccSlotsStatus(Message result) {
--        // TODO(b/280900995): remove this and references
-+        if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "getIccSlotsStatus: REQUEST_NOT_SUPPORTED");
-+        if (result != null) {
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+            result.sendToTarget();
-+        }
-     }
- 
-     @Override
-     public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
--        // TODO(b/280900995): remove this and references
-+        if (RILJ_LOGD) {
-+            Rlog.d(RILJ_LOG_TAG, "setLogicalToPhysicalSlotMapping: REQUEST_NOT_SUPPORTED");
-+        }
-+        if (result != null) {
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+            result.sendToTarget();
-+        }
-     }
- 
-     @Override
-@@ -1343,7 +1473,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void supplyIccPinForApp(String pin, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("supplyIccPinForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1368,7 +1499,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void supplyIccPukForApp(String puk, String newPin, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("supplyIccPukForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1395,7 +1527,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void supplyIccPin2ForApp(String pin, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("supplyIccPin2ForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1420,7 +1553,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void supplyIccPuk2ForApp(String puk, String newPin2, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("supplyIccPuk2ForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1446,7 +1580,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void changeIccPinForApp(String oldPin, String newPin, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("changeIccPinForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1473,7 +1608,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void changeIccPin2ForApp(String oldPin2, String newPin2, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("changeIccPin2ForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1495,8 +1631,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void supplyNetworkDepersonalization(String netpin, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("supplyNetworkDepersonalization", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -1517,35 +1653,45 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void supplySimDepersonalization(PersoSubState persoType, String controlKey,
-             Message result) {
--        if (mHalVersion.get(HAL_SERVICE_SIM).less(RADIO_HAL_VERSION_1_5)
--                && PersoSubState.PERSOSUBSTATE_SIM_NETWORK == persoType) {
--            supplyNetworkDepersonalization(controlKey, result);
--            return;
--        }
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("supplySimDepersonalization", simProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_5)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_ENTER_SIM_DEPERSONALIZATION, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_ENTER_SIM_DEPERSONALIZATION, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " controlKey = " + controlKey + " persoType" + persoType);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " controlKey = " + controlKey + " persoType" + persoType);
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "supplySimDepersonalization", () -> {
-+                simProxy.supplySimDepersonalization(rr.mSerial, persoType,
-+                        RILUtils.convertNullToEmptyString(controlKey));
-+            });
-+        } else {
-+            if (PersoSubState.PERSOSUBSTATE_SIM_NETWORK == persoType) {
-+                supplyNetworkDepersonalization(controlKey, result);
-+                return;
-+            }
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "supplySimDepersonalization: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "supplySimDepersonalization", () -> {
--            simProxy.supplySimDepersonalization(rr.mSerial, persoType,
--                    RILUtils.convertNullToEmptyString(controlKey));
--        });
-     }
- 
-     @Override
-     public void getCurrentCalls(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("getCurrentCalls", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1570,93 +1716,131 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void enableModem(boolean enable, Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("enableModem", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_MODEM).greaterOrEqual(RADIO_HAL_VERSION_1_3)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_MODEM, result, mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_MODEM, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " enable = " + enable);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " enable = " + enable);
-+            radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "enableModem", () -> {
-+                modemProxy.enableModem(rr.mSerial, enable);
-+            });
-+        } else {
-+            if (RILJ_LOGV) riljLog("enableModem: not supported.");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "enableModem", () -> {
--            modemProxy.enableModem(rr.mSerial, enable);
--        });
-     }
- 
-     @Override
-     public void setSystemSelectionChannels(@NonNull List<RadioAccessSpecifier> specifiers,
-             Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setSystemSelectionChannels", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_3)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_SYSTEM_SELECTION_CHANNELS, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_SYSTEM_SELECTION_CHANNELS, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " setSystemSelectionChannels_1.3= " + specifiers);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " setSystemSelectionChannels= " + specifiers);
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setSystemSelectionChannels", () -> {
-+                networkProxy.setSystemSelectionChannels(rr.mSerial, specifiers);
-+            });
-+        } else {
-+            if (RILJ_LOGV) riljLog("setSystemSelectionChannels: not supported.");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setSystemSelectionChannels", () -> {
--            networkProxy.setSystemSelectionChannels(rr.mSerial, specifiers);
--        });
-     }
- 
-     @Override
-     public void getSystemSelectionChannels(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getSystemSelectionChannels", networkProxy, result,
--                RADIO_HAL_VERSION_1_6)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " getSystemSelectionChannels");
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " getSystemSelectionChannels");
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "getSystemSelectionChannels", () -> {
-+                networkProxy.getSystemSelectionChannels(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGV) riljLog("getSystemSelectionChannels: not supported.");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "getSystemSelectionChannels", () -> {
--            networkProxy.getSystemSelectionChannels(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void getModemStatus(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getModemStatus", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_MODEM).greaterOrEqual(RADIO_HAL_VERSION_1_3)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_MODEM_STATUS, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_MODEM_STATUS, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "getModemStatus", () -> {
-+                modemProxy.getModemStackStatus(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGV) riljLog("getModemStatus: not supported.");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "getModemStatus", () -> {
--            modemProxy.getModemStackStatus(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void dial(String address, boolean isEmergencyCall, EmergencyNumber emergencyNumberInfo,
-             boolean hasKnownUserIntentEmergency, int clirMode, UUSInfo uusInfo, Message result) {
--        if (isEmergencyCall && emergencyNumberInfo != null) {
-+        if (isEmergencyCall
-+                && mHalVersion.get(HAL_SERVICE_VOICE).greaterOrEqual(RADIO_HAL_VERSION_1_4)
-+                && emergencyNumberInfo != null) {
-             emergencyDial(address, emergencyNumberInfo, hasKnownUserIntentEmergency, clirMode,
-                     uusInfo, result);
-             return;
-         }
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("dial", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1675,21 +1859,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     private void emergencyDial(String address, EmergencyNumber emergencyNumberInfo,
-             boolean hasKnownUserIntentEmergency, int clirMode, UUSInfo uusInfo, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("emergencyDial", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_VOICE).greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_EMERGENCY_DIAL, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_EMERGENCY_DIAL, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                // Do not log function arg for privacy
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            // Do not log function arg for privacy
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "emergencyDial", () -> {
-+                voiceProxy.emergencyDial(rr.mSerial, RILUtils.convertNullToEmptyString(address),
-+                        emergencyNumberInfo, hasKnownUserIntentEmergency, clirMode, uusInfo);
-+            });
-+        } else {
-+            riljLoge("emergencyDial is not supported with 1.4 below IRadio");
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "emergencyDial", () -> {
--            voiceProxy.emergencyDial(rr.mSerial, RILUtils.convertNullToEmptyString(address),
--                    emergencyNumberInfo, hasKnownUserIntentEmergency, clirMode, uusInfo);
--        });
-     }
- 
-     @Override
-@@ -1700,7 +1889,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getIMSIForApp(String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getIMSIForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -1718,7 +1908,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void hangupConnection(int gsmIndex, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("hangupConnection", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1738,11 +1929,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void hangupWaitingOrBackground(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("hangupWaitingOrBackground", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
--
-         RILRequest rr = obtainRequest(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND, result,
-                 mRILDefaultWorkSource);
- 
-@@ -1759,8 +1949,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void hangupForegroundResumeBackground(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("hangupForegroundResumeBackground", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1779,8 +1969,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void switchWaitingOrHoldingAndActive(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("switchWaitingOrHoldingAndActive", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1799,10 +1989,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void conference(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("conference", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
--
-         RILRequest rr = obtainRequest(RIL_REQUEST_CONFERENCE, result, mRILDefaultWorkSource);
- 
-         if (RILJ_LOGD) {
-@@ -1817,7 +2007,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void rejectCall(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("rejectCall", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1835,7 +2026,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getLastCallFailCause(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("getLastCallFailCause", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1854,7 +2046,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getSignalStrength(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getSignalStrength", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -1872,8 +2065,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getVoiceRegistrationState(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getVoiceRegistrationState", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -1897,8 +2090,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getDataRegistrationState(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getDataRegistrationState", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -1922,7 +2115,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getOperator(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getOperator", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -1942,7 +2136,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setRadioPower(boolean on, boolean forEmergencyCall,
-             boolean preferredForEmergencyCall, Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("setRadioPower", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -1963,7 +2158,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendDtmf(char c, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("sendDtmf", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -1981,8 +2177,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void sendSMS(String smscPdu, String pdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("sendSMS", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -2020,8 +2218,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void sendSMSExpectMore(String smscPdu, String pdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("sendSMSExpectMore", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -2041,12 +2241,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     }
- 
-     @Override
--    public void setupDataCall(int accessNetworkType, DataProfile dataProfile,
--            boolean isRoaming /* unused */, boolean allowRoaming, int reason,
--            LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
--            TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed, Message result) {
-+    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
-+            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
-+            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
-+            boolean matchAllRuleAllowed, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("setupDataCall", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
- 
-@@ -2056,16 +2257,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-                     + ",reason=" + RILUtils.setupDataReasonToString(reason)
-                     + ",accessNetworkType=" + AccessNetworkType.toString(accessNetworkType)
--                    + ",dataProfile=" + dataProfile + ",allowRoaming=" + allowRoaming
-+                    + ",dataProfile=" + dataProfile + ",isRoaming=" + isRoaming
-+                    + ",allowRoaming=" + allowRoaming
-                     + ",linkProperties=" + linkProperties + ",pduSessionId=" + pduSessionId
-                     + ",sliceInfo=" + sliceInfo + ",trafficDescriptor=" + trafficDescriptor
-                     + ",matchAllRuleAllowed=" + matchAllRuleAllowed);
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "setupDataCall", () -> {
--            dataProxy.setupDataCall(rr.mSerial, accessNetworkType, dataProfile, allowRoaming,
--                    reason, linkProperties, pduSessionId, sliceInfo, trafficDescriptor,
--                    matchAllRuleAllowed);
-+            dataProxy.setupDataCall(rr.mSerial, mPhoneId, accessNetworkType, dataProfile,
-+                    isRoaming, allowRoaming, reason, linkProperties, pduSessionId, sliceInfo,
-+                    trafficDescriptor, matchAllRuleAllowed);
-         });
-     }
- 
-@@ -2079,7 +2281,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void iccIOForApp(int command, int fileId, String path, int p1, int p2, int p3,
-             String data, String pin2, String aid, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("iccIOForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -2108,8 +2311,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void sendUSSD(String ussd, Message result) {
--        RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("sendUSSD", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioVoiceProxy voiceProxy =
-+                getRadioServiceProxy(RadioVoiceProxy.class);
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2129,8 +2334,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void cancelPendingUssd(Message result) {
--        RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("cancelPendingUssd", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioVoiceProxy voiceProxy =
-+                getRadioServiceProxy(RadioVoiceProxy.class);
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2148,7 +2355,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getCLIR(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("getCLIR", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2166,7 +2374,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setCLIR(int clirMode, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("setCLIR", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2186,7 +2395,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void queryCallForwardStatus(int cfReason, int serviceClass, String number,
-             Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("queryCallForwardStatus", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2195,7 +2405,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-         if (RILJ_LOGD) {
-             riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " cfReason = " + cfReason + " serviceClass = " + serviceClass);
-+                    + " cfreason = " + cfReason + " serviceClass = " + serviceClass);
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "queryCallForwardStatus", () -> {
-@@ -2207,7 +2417,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setCallForward(int action, int cfReason, int serviceClass, String number,
-             int timeSeconds, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("setCallForward", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2228,7 +2439,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void queryCallWaiting(int serviceClass, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("queryCallWaiting", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2248,7 +2460,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setCallWaiting(boolean enable, int serviceClass, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("setCallWaiting", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2266,9 +2479,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void acknowledgeLastIncomingGsmSms(boolean success, int cause, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("acknowledgeLastIncomingGsmSms", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -2279,15 +2493,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                     + " success = " + success + " cause = " + cause);
-         }
- 
--        radioServiceInvokeHelper(HAL_SERVICE_MESSAGING, rr, "acknowledgeLastIncomingGsmSms", () -> {
--            messagingProxy.acknowledgeLastIncomingGsmSms(rr.mSerial, success, cause);
--        });
-+        radioServiceInvokeHelper(
-+                HAL_SERVICE_MESSAGING, rr, "acknowledgeLastIncomingGsmSms", () -> {
-+                    messagingProxy.acknowledgeLastIncomingGsmSms(rr.mSerial, success, cause);
-+                });
-     }
- 
-     @Override
-     public void acceptCall(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("acceptCall", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2306,7 +2522,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void deactivateDataCall(int cid, int reason, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("deactivateDataCall", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
- 
-@@ -2335,7 +2552,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void queryFacilityLockForApp(String facility, String password, int serviceClass,
-             String appId, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("queryFacilityLockForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -2351,8 +2569,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "queryFacilityLockForApp", () -> {
-             simProxy.getFacilityLockForApp(rr.mSerial,
-                     RILUtils.convertNullToEmptyString(facility),
--                    RILUtils.convertNullToEmptyString(password), serviceClass,
--                    RILUtils.convertNullToEmptyString(appId));
-+                    RILUtils.convertNullToEmptyString(password),
-+                    serviceClass, RILUtils.convertNullToEmptyString(appId));
-         });
- 
-     }
-@@ -2367,7 +2585,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setFacilityLockForApp(String facility, boolean lockState, String password,
-             int serviceClass, String appId, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("setFacilityLockForApp", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -2391,7 +2610,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void changeBarringPassword(String facility, String oldPwd, String newPwd,
-             Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("changeBarringPassword", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2415,8 +2635,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getNetworkSelectionMode(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getNetworkSelectionMode", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2435,8 +2655,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setNetworkSelectionModeAutomatic(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setNetworkSelectionModeAutomatic", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2447,8 +2667,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-         }
- 
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setNetworkSelectionModeAutomatic",
--                () -> {
-+        radioServiceInvokeHelper(
-+                HAL_SERVICE_NETWORK, rr, "setNetworkSelectionModeAutomatic", () -> {
-                     networkProxy.setNetworkSelectionModeAutomatic(rr.mSerial);
-                 });
-     }
-@@ -2456,8 +2676,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setNetworkSelectionModeManual(String operatorNumeric, int ran, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setNetworkSelectionModeManual", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2478,7 +2698,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getAvailableNetworks(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getAvailableNetworks", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2503,50 +2724,70 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void startNetworkScan(NetworkScanRequest networkScanRequest, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("startNetworkScan", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_1)) {
-+            HalVersion overrideHalVersion = getCompatVersion(RIL_REQUEST_START_NETWORK_SCAN);
-+            if (RILJ_LOGD) {
-+                riljLog("startNetworkScan: overrideHalVersion=" + overrideHalVersion);
-+            }
- 
--        HalVersion overrideHalVersion = getCompatVersion(RIL_REQUEST_START_NETWORK_SCAN);
--        if (RILJ_LOGD) {
--            riljLog("startNetworkScan: overrideHalVersion=" + overrideHalVersion);
--        }
-+            RILRequest rr = obtainRequest(RIL_REQUEST_START_NETWORK_SCAN, result,
-+                    mRILDefaultWorkSource, networkScanRequest);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_START_NETWORK_SCAN, result,
--                mRILDefaultWorkSource, networkScanRequest);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "startNetworkScan", () -> {
-+                networkProxy.startNetworkScan(rr.mSerial, networkScanRequest, overrideHalVersion,
-+                        result);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "startNetworkScan: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "startNetworkScan", () -> {
--            networkProxy.startNetworkScan(rr.mSerial, networkScanRequest, overrideHalVersion,
--                    result);
--        });
-     }
- 
-     @Override
-     public void stopNetworkScan(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("stopNetworkScan", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_STOP_NETWORK_SCAN, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_STOP_NETWORK_SCAN, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "stopNetworkScan", () -> {
-+                networkProxy.stopNetworkScan(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "stopNetworkScan: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "stopNetworkScan", () -> {
--            networkProxy.stopNetworkScan(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void startDtmf(char c, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("startDtmf", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2565,7 +2806,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void stopDtmf(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("stopDtmf", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2583,7 +2825,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void separateConnection(int gsmIndex, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("separateConnection", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2603,7 +2846,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getBasebandVersion(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getBasebandVersion", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -2621,7 +2865,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setMute(boolean enableMute, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("setMute", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2640,7 +2885,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getMute(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("getMute", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2658,7 +2904,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void queryCLIP(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("queryCLIP", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2679,14 +2926,14 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     @Deprecated
-     public void getPDPContextList(Message result) {
--        // TODO(b/280900995): remove this and references
-         getDataCallList(result);
-     }
- 
-     @Override
-     public void getDataCallList(Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("getDataCallList", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
- 
-@@ -2701,22 +2948,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         });
-     }
- 
-+    // TODO(b/171260715) Remove when HAL definition is removed
-     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-     @Override
-     public void invokeOemRilRequestRaw(byte[] data, Message response) {
--        // TODO(b/280900995): remove this and references
-     }
- 
-+    // TODO(b/171260715) Remove when HAL definition is removed
-     @Override
-     public void invokeOemRilRequestStrings(String[] strings, Message result) {
--        // TODO(b/280900995): remove this and references
-     }
- 
-     @Override
-     public void setSuppServiceNotifications(boolean enable, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setSuppServiceNotifications", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2735,8 +2982,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void writeSmsToSim(int status, String smsc, String pdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("writeSmsToSim", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -2756,8 +3005,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void deleteSmsOnSim(int index, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("deleteSmsOnSim", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -2776,7 +3027,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setBandMode(int bandMode, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setBandMode", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2795,8 +3047,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void queryAvailableBandMode(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("queryAvailableBandMode", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2815,7 +3067,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendEnvelope(String contents, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("sendEnvelope", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -2835,7 +3088,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendTerminalResponse(String contents, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("sendTerminalResponse", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -2857,7 +3111,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendEnvelopeWithStatus(String contents, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("sendEnvelopeWithStatus", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -2878,7 +3133,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void explicitCallTransfer(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("explicitCallTransfer", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -2897,8 +3153,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setPreferredNetworkType(@PrefNetworkMode int networkType , Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setPreferredNetworkType", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2920,8 +3176,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getPreferredNetworkType(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getPreferredNetworkType", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2940,18 +3196,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setAllowedNetworkTypesBitmap(
-             @TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message result) {
-+        RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-+            return;
-+        }
-         if (mHalVersion.get(HAL_SERVICE_NETWORK).less(RADIO_HAL_VERSION_1_6)) {
-             // For older HAL, redirects the call to setPreferredNetworkType.
-             setPreferredNetworkType(
-                     RadioAccessFamily.getNetworkTypeFromRaf(networkTypeBitmask), result);
-             return;
-         }
--        RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setAllowedNetworkTypesBitmap", networkProxy, result,
--                RADIO_HAL_VERSION_1_6)) {
--            return;
--        }
--
-         RILRequest rr = obtainRequest(RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP, result,
-                 mRILDefaultWorkSource);
- 
-@@ -2968,8 +3223,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getAllowedNetworkTypesBitmap(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getAllowedNetworkTypesBitmap", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -2988,7 +3243,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setLocationUpdates(boolean enable, WorkSource workSource, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setLocationUpdates", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3011,21 +3267,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void isNrDualConnectivityEnabled(Message result, WorkSource workSource) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("isNrDualConnectivityEnabled", networkProxy, result,
--                RADIO_HAL_VERSION_1_6)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED, result,
-+                    getDefaultWorkSourceIfInvalid(workSource));
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED, result,
--                getDefaultWorkSourceIfInvalid(workSource));
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "isNrDualConnectivityEnabled", () -> {
-+                networkProxy.isNrDualConnectivityEnabled(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "isNrDualConnectivityEnabled: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "isNrDualConnectivityEnabled", () -> {
--            networkProxy.isNrDualConnectivityEnabled(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -3043,22 +3309,30 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setNrDualConnectivityState(int nrDualConnectivityState, Message result,
-             WorkSource workSource) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setNrDualConnectivityState", networkProxy, result,
--                RADIO_HAL_VERSION_1_6)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_NR_DUAL_CONNECTIVITY, result,
-+                    getDefaultWorkSourceIfInvalid(workSource));
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_NR_DUAL_CONNECTIVITY, result,
--                getDefaultWorkSourceIfInvalid(workSource));
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " enable = " + nrDualConnectivityState);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " enable = " + nrDualConnectivityState);
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setNrDualConnectivityState", () -> {
-+                networkProxy.setNrDualConnectivityState(rr.mSerial, (byte) nrDualConnectivityState);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "enableNrDualConnectivity: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setNrDualConnectivityState", () -> {
--            networkProxy.setNrDualConnectivityState(rr.mSerial, (byte) nrDualConnectivityState);
--        });
-     }
- 
-     private void setVoNrEnabled(boolean enabled) {
-@@ -3075,26 +3349,28 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void isVoNrEnabled(Message result, WorkSource workSource) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        // Send null result so errors aren't sent in canMakeRequest
--        if (!canMakeRequest("isVoNrEnabled", voiceProxy, null, RADIO_HAL_VERSION_2_0)) {
--            boolean isEnabled = isVoNrEnabled();
--            if (result != null) {
--                AsyncResult.forMessage(result, isEnabled, null);
--                result.sendToTarget();
--            }
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_VOICE).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_IS_VONR_ENABLED, result,
-+                    getDefaultWorkSourceIfInvalid(workSource));
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_IS_VONR_ENABLED, result,
--                getDefaultWorkSourceIfInvalid(workSource));
--
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
--        }
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "isVoNrEnabled", () -> {
--            voiceProxy.isVoNrEnabled(rr.mSerial);
--        });
-+            radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "isVoNrEnabled", () -> {
-+                voiceProxy.isVoNrEnabled(rr.mSerial);
-+            });
-+        } else {
-+            boolean isEnabled = isVoNrEnabled();
-+            if (result != null) {
-+                AsyncResult.forMessage(result, isEnabled, null);
-+                result.sendToTarget();
-+            }
-+        }
-     }
- 
-     /**
-@@ -3105,8 +3381,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setVoNrEnabled(boolean enabled, Message result, WorkSource workSource) {
-         setVoNrEnabled(enabled);
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        // Send null result so errors aren't sent in canMakeRequest
--        if (!canMakeRequest("setVoNrEnabled", voiceProxy, null, RADIO_HAL_VERSION_2_0)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-+            return;
-+        }
-+        if (mHalVersion.get(HAL_SERVICE_VOICE).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_VONR, result,
-+                    getDefaultWorkSourceIfInvalid(workSource));
-+
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
-+
-+            radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "setVoNrEnabled", () -> {
-+                voiceProxy.setVoNrEnabled(rr.mSerial, enabled);
-+            });
-+        } else {
-             /* calling a query api to let HAL know that VoNREnabled state is updated.
-                This is a work around as new AIDL API is not allowed for older HAL version devices.
-                HAL can check the value of PROPERTY_IS_VONR_ENABLED property to determine
-@@ -3117,25 +3407,14 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 AsyncResult.forMessage(result, null, null);
-                 result.sendToTarget();
-             }
--            return;
--        }
--
--        RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_VONR, result,
--                getDefaultWorkSourceIfInvalid(workSource));
--
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_VOICE, rr, "setVoNrEnabled", () -> {
--            voiceProxy.setVoNrEnabled(rr.mSerial, enabled);
--        });
-     }
- 
-     @Override
-     public void setCdmaSubscriptionSource(int cdmaSubscription, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("setCdmaSubscriptionSource", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3155,8 +3434,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void queryCdmaRoamingPreference(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("queryCdmaRoamingPreference", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3175,8 +3454,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setCdmaRoamingPreference(int cdmaRoamingType, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setCdmaRoamingPreference", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3196,7 +3475,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void queryTTYMode(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("queryTTYMode", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3214,7 +3494,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setTTYMode(int ttyMode, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("setTTYMode", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3233,8 +3514,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setPreferredVoicePrivacy(boolean enable, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("setPreferredVoicePrivacy", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3254,8 +3535,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getPreferredVoicePrivacy(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("getPreferredVoicePrivacy", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3274,7 +3555,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendCDMAFeatureCode(String featureCode, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("sendCDMAFeatureCode", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3294,7 +3576,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendBurstDtmf(String dtmfString, int on, int off, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("sendBurstDtmf", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3313,9 +3596,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void sendCdmaSMSExpectMore(byte[] pdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("sendCdmaSMSExpectMore", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3339,8 +3623,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void sendCdmaSms(byte[] pdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("sendCdmaSms", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3360,9 +3646,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void acknowledgeLastIncomingCdmaSms(boolean success, int cause, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("acknowledgeLastIncomingCdmaSms", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3374,17 +3661,18 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                     + " success = " + success + " cause = " + cause);
-         }
- 
--        radioServiceInvokeHelper(HAL_SERVICE_MESSAGING, rr, "acknowledgeLastIncomingCdmaSms",
--                () -> {
-+        radioServiceInvokeHelper(
-+                HAL_SERVICE_MESSAGING, rr, "acknowledgeLastIncomingCdmaSms", () -> {
-                     messagingProxy.acknowledgeLastIncomingCdmaSms(rr.mSerial, success, cause);
-                 });
-     }
- 
-     @Override
-     public void getGsmBroadcastConfig(Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("getGsmBroadcastConfig", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3402,9 +3690,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void setGsmBroadcastConfig(SmsBroadcastConfigInfo[] config, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("setGsmBroadcastConfig", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3426,9 +3715,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void setGsmBroadcastActivation(boolean activate, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("setGsmBroadcastActivation", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3447,9 +3737,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void getCdmaBroadcastConfig(Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("getCdmaBroadcastConfig", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3467,9 +3758,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void setCdmaBroadcastConfig(CdmaSmsBroadcastConfigInfo[] configs, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("setCdmaBroadcastConfig", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3491,9 +3783,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void setCdmaBroadcastActivation(boolean activate, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("setCdmaBroadcastActivation", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3513,7 +3806,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getCDMASubscription(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getCDMASubscription", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3530,8 +3824,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void writeSmsToRuim(int status, byte[] pdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("writeSmsToRuim", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3550,8 +3846,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void deleteSmsOnRuim(int index, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("deleteSmsOnRuim", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3571,11 +3869,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getDeviceIdentity(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getDeviceIdentity", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_DEVICE_IDENTITY, result, mRILDefaultWorkSource);
-+        RILRequest rr = obtainRequest(RIL_REQUEST_DEVICE_IDENTITY, result,
-+                mRILDefaultWorkSource);
- 
-         if (RILJ_LOGD) {
-             riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-@@ -3589,26 +3889,38 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getImei(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getImei", modemProxy, result, RADIO_HAL_VERSION_2_1)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_MODEM).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_DEVICE_IMEI, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_DEVICE_IMEI, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "getImei", () -> {
-+                modemProxy.getImei(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.e(RILJ_LOG_TAG, "getImei: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "getImei", () -> {
--            modemProxy.getImei(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void exitEmergencyCallbackMode(Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("exitEmergencyCallbackMode", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -3626,12 +3938,15 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void getSmscAddress(Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("getSmscAddress", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SMSC_ADDRESS, result, mRILDefaultWorkSource);
-+        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SMSC_ADDRESS, result,
-+                mRILDefaultWorkSource);
- 
-         if (RILJ_LOGD) {
-             riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-@@ -3644,8 +3959,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void setSmscAddress(String address, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("setSmscAddress", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3657,15 +3974,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_MESSAGING, rr, "setSmscAddress", () -> {
--            messagingProxy.setSmscAddress(rr.mSerial, RILUtils.convertNullToEmptyString(address));
-+            messagingProxy.setSmscAddress(rr.mSerial,
-+                    RILUtils.convertNullToEmptyString(address));
-         });
-     }
- 
-     @Override
-     public void reportSmsMemoryStatus(boolean available, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("reportSmsMemoryStatus", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3685,7 +4004,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void reportStkServiceIsRunning(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("reportStkServiceIsRunning", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3704,7 +4024,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getCdmaSubscriptionSource(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getCdmaSubscriptionSource", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3722,9 +4043,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void acknowledgeIncomingGsmSmsWithPdu(boolean success, String ackPdu, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("acknowledgeIncomingGsmSmsWithPdu", messagingProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3736,8 +4058,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                     + " success = " + success);
-         }
- 
--        radioServiceInvokeHelper(HAL_SERVICE_MESSAGING, rr, "acknowledgeIncomingGsmSmsWithPdu",
--                () -> {
-+        radioServiceInvokeHelper(
-+                HAL_SERVICE_MESSAGING, rr, "acknowledgeIncomingGsmSmsWithPdu", () -> {
-                     messagingProxy.acknowledgeIncomingGsmSmsWithPdu(rr.mSerial, success,
-                             RILUtils.convertNullToEmptyString(ackPdu));
-                 });
-@@ -3746,8 +4068,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getVoiceRadioTechnology(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getVoiceRadioTechnology", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3765,7 +4087,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getCellInfoList(Message result, WorkSource workSource) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getCellInfoList", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3784,7 +4107,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setCellInfoListRate(int rateInMillis, Message result, WorkSource workSource) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setCellInfoListRate", networkProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3802,10 +4126,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     }
- 
-     @Override
--    public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming /* unused */,
--            Message result) {
-+    public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("setInitialAttachApn", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
- 
-@@ -3813,19 +4137,20 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 mRILDefaultWorkSource);
- 
-         if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest) + dataProfile);
-+            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                    + dataProfile);
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "setInitialAttachApn", () -> {
--            dataProxy.setInitialAttachApn(rr.mSerial, dataProfile);
-+            dataProxy.setInitialAttachApn(rr.mSerial, dataProfile, isRoaming);
-         });
-     }
- 
-     @Override
-     public void getImsRegistrationState(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getImsRegistrationState", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -3844,8 +4169,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendImsGsmSms(String smscPdu, String pdu, int retry, int messageRef,
-             Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("sendImsGsmSms", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3865,8 +4192,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void sendImsCdmaSms(byte[] pdu, int retry, int messageRef, Message result) {
--        RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
--        if (!canMakeRequest("sendImsCdmaSms", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        RadioMessagingProxy messagingProxy =
-+                getRadioServiceProxy(RadioMessagingProxy.class);
-+        if (messagingProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(messagingProxy, result);
-             return;
-         }
- 
-@@ -3888,8 +4217,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void iccTransmitApduBasicChannel(int cla, int instruction, int p1, int p2, int p3,
-             String data, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("iccTransmitApduBasicChannel", simProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3908,14 +4237,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "iccTransmitApduBasicChannel", () -> {
--            simProxy.iccTransmitApduBasicChannel(rr.mSerial, cla, instruction, p1, p2, p3, data);
-+            simProxy.iccTransmitApduBasicChannel(
-+                    rr.mSerial, cla, instruction, p1, p2, p3, data);
-         });
-     }
- 
-     @Override
-     public void iccOpenLogicalChannel(String aid, int p2, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("iccOpenLogicalChannel", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3931,14 +4262,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "iccOpenLogicalChannel", () -> {
--            simProxy.iccOpenLogicalChannel(rr.mSerial, RILUtils.convertNullToEmptyString(aid), p2);
-+            simProxy.iccOpenLogicalChannel(rr.mSerial, RILUtils.convertNullToEmptyString(aid),
-+                    p2);
-         });
-     }
- 
-     @Override
-     public void iccCloseLogicalChannel(int channel, boolean isEs10, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("iccCloseLogicalChannel", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3962,8 +4295,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("iccTransmitApduLogicalChannel", simProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -3984,15 +4317,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "iccTransmitApduLogicalChannel", () -> {
--            simProxy.iccTransmitApduLogicalChannel(rr.mSerial, channel, cla, instruction, p1, p2,
--                    p3, data, isEs10Command);
-+            simProxy.iccTransmitApduLogicalChannel(
-+                    rr.mSerial, channel, cla, instruction, p1, p2, p3, data, isEs10Command);
-         });
-     }
- 
-     @Override
-     public void nvReadItem(int itemID, Message result, WorkSource workSource) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("nvReadItem", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4012,7 +4346,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void nvWriteItem(int itemId, String itemValue, Message result, WorkSource workSource) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("nvWriteItem", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4033,7 +4368,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void nvWriteCdmaPrl(byte[] preferredRoamingList, Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("nvWriteCdmaPrl", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4053,7 +4389,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void nvResetConfig(int resetType, Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("nvResetConfig", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4073,7 +4410,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setUiccSubscription(int slotId, int appIndex, int subId, int subStatus,
-             Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("setUiccSubscription", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -4098,14 +4436,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
-      */
-     @Override
-     public boolean supportsEid() {
--        // TODO(b/280900995): remove this and references
--        return true;
-+        // EID should be supported as long as HAL >= 1.2.
-+        //  - in HAL 1.2 we have EID through ATR
-+        //  - in later HAL versions we also have EID through slot / card status.
-+        return mHalVersion.get(HAL_SERVICE_RADIO).greaterOrEqual(RADIO_HAL_VERSION_1_2);
-     }
- 
-     @Override
-     public void setDataAllowed(boolean allowed, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("setDataAllowed", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
- 
-@@ -4124,7 +4465,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getHardwareConfig(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getHardwareConfig", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4145,8 +4487,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void requestIccSimAuthentication(int authContext, String data, String aid,
-             Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("requestIccSimAuthentication", simProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -4166,9 +4508,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     }
- 
-     @Override
--    public void setDataProfile(DataProfile[] dps, boolean isRoaming /* unused */, Message result) {
-+    public void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("setDataProfile", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
- 
-@@ -4183,14 +4526,15 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "setDataProfile", () -> {
--            dataProxy.setDataProfile(rr.mSerial, dps);
-+            dataProxy.setDataProfile(rr.mSerial, dps, isRoaming);
-         });
-     }
- 
-     @Override
-     public void requestShutdown(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("requestShutdown", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4208,7 +4552,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getRadioCapability(Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getRadioCapability", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4227,7 +4572,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setRadioCapability(RadioCapability rc, Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("setRadioCapability", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4246,12 +4592,65 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-     @Override
-     public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
--        // TODO(b/280900995): remove this and references
-+        if (mHalVersion.get(HAL_SERVICE_RADIO).greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
-+            // We have a 1.2 or later radio, so the LCE 1.0 LCE service control path is unused.
-+            // Instead the LCE functionality is always-on and provides unsolicited indications.
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "startLceService: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-+            return;
-+        }
-+
-+        IRadio radioProxy = getRadioProxy();
-+        if (radioProxy == null) {
-+            handleRadioProxyNotAvailable(result);
-+            return;
-+        }
-+
-+        RILRequest rr = obtainRequest(RIL_REQUEST_START_LCE, result, mRILDefaultWorkSource);
-+
-+        if (RILJ_LOGD) {
-+            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                    + " reportIntervalMs = " + reportIntervalMs + " pullMode = " + pullMode);
-+        }
-+
-+        radioServiceInvokeHelper(HAL_SERVICE_RADIO, rr, "startLceService", () -> {
-+            radioProxy.startLceService(rr.mSerial, reportIntervalMs, pullMode);
-+        });
-     }
- 
-     @Override
-     public void stopLceService(Message result) {
--        // TODO(b/280900995): remove this and references
-+        if (mHalVersion.get(HAL_SERVICE_RADIO).greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
-+            // We have a 1.2 or later radio, so the LCE 1.0 LCE service control is unused.
-+            // Instead the LCE functionality is always-on and provides unsolicited indications.
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "stopLceService: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-+            return;
-+        }
-+
-+        IRadio radioProxy = getRadioProxy();
-+        if (radioProxy == null) {
-+            handleRadioProxyNotAvailable(result);
-+            return;
-+        }
-+
-+        RILRequest rr = obtainRequest(RIL_REQUEST_STOP_LCE, result, mRILDefaultWorkSource);
-+
-+        if (RILJ_LOGD) {
-+            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+        }
-+
-+        radioServiceInvokeHelper(HAL_SERVICE_RADIO, rr, "stopLceService", () -> {
-+            radioProxy.stopLceService(rr.mSerial);
-+        });
-     }
- 
-     /**
-@@ -4267,23 +4666,33 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setDataThrottling(Message result, WorkSource workSource, int dataThrottlingAction,
-             long completionWindowMillis) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("setDataThrottling", dataProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_DATA_THROTTLING, result,
-+                    getDefaultWorkSourceIfInvalid(workSource));
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_DATA_THROTTLING, result,
--                getDefaultWorkSourceIfInvalid(workSource));
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> "
-+                        + RILUtils.requestToString(rr.mRequest)
-+                        + " dataThrottlingAction = " + dataThrottlingAction
-+                        + " completionWindowMillis " + completionWindowMillis);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " dataThrottlingAction = " + dataThrottlingAction
--                    + " completionWindowMillis " + completionWindowMillis);
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "setDataThrottling", () -> {
-+                dataProxy.setDataThrottling(rr.mSerial, (byte) dataThrottlingAction,
-+                        completionWindowMillis);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "setDataThrottling: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "setDataThrottling", () -> {
--            dataProxy.setDataThrottling(rr.mSerial, (byte) dataThrottlingAction,
--                    completionWindowMillis);
--        });
-     }
- 
-     /**
-@@ -4299,13 +4708,40 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Deprecated
-     @Override
-     public void pullLceData(Message result) {
--        // TODO(b/280900995): remove this and references
-+        if (mHalVersion.get(HAL_SERVICE_RADIO).greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
-+            // We have a 1.2 or later radio, so the LCE 1.0 LCE service control path is unused.
-+            // Instead the LCE functionality is always-on and provides unsolicited indications.
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "pullLceData: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-+            return;
-+        }
-+
-+        IRadio radioProxy = getRadioProxy();
-+        if (radioProxy == null) {
-+            handleRadioProxyNotAvailable(result);
-+            return;
-+        }
-+
-+        RILRequest rr = obtainRequest(RIL_REQUEST_PULL_LCEDATA, result, mRILDefaultWorkSource);
-+
-+        if (RILJ_LOGD) {
-+            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+        }
-+
-+        radioServiceInvokeHelper(HAL_SERVICE_RADIO, rr, "pullLceData", () -> {
-+            radioProxy.pullLceData(rr.mSerial);
-+        });
-     }
- 
-     @Override
-     public void getModemActivityInfo(Message result, WorkSource workSource) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("getModemActivityInfo", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4318,7 +4754,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-         radioServiceInvokeHelper(HAL_SERVICE_MODEM, rr, "getModemActivityInfo", () -> {
-             modemProxy.getModemActivityInfo(rr.mSerial);
--            Message msg = mRilHandler.obtainMessage(EVENT_BLOCKING_RESPONSE_TIMEOUT, rr.mSerial);
-+            Message msg =
-+                    mRilHandler.obtainMessage(EVENT_BLOCKING_RESPONSE_TIMEOUT, rr.mSerial);
-             mRilHandler.sendMessageDelayed(msg, DEFAULT_BLOCKING_MESSAGE_RESPONSE_TIMEOUT_MS);
-         });
-     }
-@@ -4329,7 +4766,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         Objects.requireNonNull(carrierRestrictionRules, "Carrier restriction cannot be null.");
- 
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("setAllowedCarriers", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -4342,14 +4780,15 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "setAllowedCarriers", () -> {
--            simProxy.setAllowedCarriers(rr.mSerial, carrierRestrictionRules);
-+            simProxy.setAllowedCarriers(rr.mSerial, carrierRestrictionRules, result);
-         });
-     }
- 
-     @Override
-     public void getAllowedCarriers(Message result, WorkSource workSource) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getAllowedCarriers", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -4368,7 +4807,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void sendDeviceState(int stateType, boolean state, Message result) {
-         RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
--        if (!canMakeRequest("sendDeviceState", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (modemProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(modemProxy, result);
-             return;
-         }
- 
-@@ -4387,8 +4827,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setUnsolResponseFilter(int filter, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setUnsolResponseFilter", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
- 
-@@ -4409,23 +4849,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setSignalStrengthReportingCriteria(
-             @NonNull List<SignalThresholdInfo> signalThresholdInfos, @Nullable Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setSignalStrengthReportingCriteria", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA,
-+                    result, mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(
-+                    HAL_SERVICE_NETWORK, rr, "setSignalStrengthReportingCriteria", () -> {
-+                        networkProxy.setSignalStrengthReportingCriteria(rr.mSerial,
-+                                signalThresholdInfos);
-+                    });
-+        } else {
-+            riljLoge("setSignalStrengthReportingCriteria ignored on IRadio version less than 1.2");
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setSignalStrengthReportingCriteria",
--                () -> {
--                    networkProxy.setSignalStrengthReportingCriteria(rr.mSerial,
--                            signalThresholdInfos);
--                });
-     }
- 
-     @Override
-@@ -4433,30 +4876,35 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             int hysteresisUlKbps, int[] thresholdsDlKbps, int[] thresholdsUlKbps, int ran,
-             Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setLinkCapacityReportingCriteria", networkProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(
-+                    HAL_SERVICE_NETWORK, rr, "setLinkCapacityReportingCriteria", () -> {
-+                        networkProxy.setLinkCapacityReportingCriteria(rr.mSerial, hysteresisMs,
-+                                hysteresisDlKbps, hysteresisUlKbps, thresholdsDlKbps,
-+                                thresholdsUlKbps,
-+                                ran);
-+                    });
-+        } else {
-+            riljLoge("setLinkCapacityReportingCriteria ignored on IRadio version less than 1.2");
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setLinkCapacityReportingCriteria",
--                () -> {
--                    networkProxy.setLinkCapacityReportingCriteria(rr.mSerial, hysteresisMs,
--                            hysteresisDlKbps, hysteresisUlKbps, thresholdsDlKbps, thresholdsUlKbps,
--                            ran);
--                });
-     }
- 
-     @Override
-     public void setSimCardPower(int state, Message result, WorkSource workSource) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("setSimCardPower", simProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
- 
-@@ -4469,7 +4917,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         }
- 
-         radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "setSimCardPower", () -> {
--            simProxy.setSimCardPower(rr.mSerial, state);
-+            simProxy.setSimCardPower(rr.mSerial, state, result);
-         });
-     }
- 
-@@ -4478,20 +4926,30 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             Message result) {
-         Objects.requireNonNull(imsiEncryptionInfo, "ImsiEncryptionInfo cannot be null.");
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("setCarrierInfoForImsiEncryption", simProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_CARRIER_INFO_IMSI_ENCRYPTION, result,
-+                    mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_CARRIER_INFO_IMSI_ENCRYPTION, result,
--                mRILDefaultWorkSource);
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "setCarrierInfoForImsiEncryption", () -> {
-+                simProxy.setCarrierInfoForImsiEncryption(rr.mSerial, imsiEncryptionInfo);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "setCarrierInfoForImsiEncryption: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "setCarrierInfoForImsiEncryption", () -> {
--            simProxy.setCarrierInfoForImsiEncryption(rr.mSerial, imsiEncryptionInfo);
--        });
-     }
- 
-     @Override
-@@ -4499,47 +4957,67 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             int intervalMillis, Message result) {
-         Objects.requireNonNull(packetData, "KeepaliveRequest cannot be null.");
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("startNattKeepalive", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_START_KEEPALIVE, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_START_KEEPALIVE, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "startNattKeepalive", () -> {
-+                dataProxy.startKeepalive(rr.mSerial, contextId, packetData, intervalMillis, result);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "startNattKeepalive: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "startNattKeepalive", () -> {
--            dataProxy.startKeepalive(rr.mSerial, contextId, packetData, intervalMillis, result);
--        });
-     }
- 
-     @Override
-     public void stopNattKeepalive(int sessionHandle, Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("stopNattKeepalive", dataProxy, result, RADIO_HAL_VERSION_1_4)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_STOP_KEEPALIVE, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_STOP_KEEPALIVE, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "stopNattKeepalive", () -> {
-+                dataProxy.stopKeepalive(rr.mSerial, sessionHandle);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "stopNattKeepalive: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "stopNattKeepalive", () -> {
--            dataProxy.stopKeepalive(rr.mSerial, sessionHandle);
--        });
-     }
- 
-     @Override
-     public void getIMEI(Message result) {
--        // TODO(b/280900995): remove this and references
-+        throw new RuntimeException("getIMEI not expected to be called");
-     }
- 
-     @Override
-     public void getIMEISV(Message result) {
--        // TODO(b/280900995): remove this and references
-+        throw new RuntimeException("getIMEISV not expected to be called");
-     }
- 
-     /**
-@@ -4548,7 +5026,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Deprecated
-     @Override
-     public void getLastPdpFailCause(Message result) {
--        // TODO(b/280900995): remove this and references
-+        throw new RuntimeException("getLastPdpFailCause not expected to be called");
-     }
- 
-     /**
-@@ -4556,7 +5034,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-      */
-     @Override
-     public void getLastDataCallFailCause(Message result) {
--        // TODO(b/280900995): remove this and references
-+        throw new RuntimeException("getLastDataCallFailCause not expected to be called");
-     }
- 
-     /**
-@@ -4568,21 +5046,30 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void enableUiccApplications(boolean enable, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("enableUiccApplications", simProxy, result, RADIO_HAL_VERSION_1_5)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_5)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_UICC_APPLICATIONS, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_ENABLE_UICC_APPLICATIONS, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " " + enable);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " " + enable);
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "enableUiccApplications", () -> {
-+                simProxy.enableUiccApplications(rr.mSerial, enable);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "enableUiccApplications: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "enableUiccApplications", () -> {
--            simProxy.enableUiccApplications(rr.mSerial, enable);
--        });
-     }
- 
-     /**
-@@ -4593,21 +5080,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void areUiccApplicationsEnabled(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("areUiccApplicationsEnabled", simProxy, result,
--                RADIO_HAL_VERSION_1_5)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_5)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_UICC_APPLICATIONS_ENABLEMENT, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_UICC_APPLICATIONS_ENABLEMENT, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "areUiccApplicationsEnabled", () -> {
-+                simProxy.areUiccApplicationsEnabled(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "areUiccApplicationsEnabled: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "areUiccApplicationsEnabled", () -> {
--            simProxy.areUiccApplicationsEnabled(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -4615,13 +5112,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
-      */
-     @Override
-     public boolean canToggleUiccApplicationsEnablement() {
--        return canMakeRequest("canToggleUiccApplicationsEnablement",
--                getRadioServiceProxy(RadioSimProxy.class), null, RADIO_HAL_VERSION_1_5);
-+        return !getRadioServiceProxy(RadioSimProxy.class).isEmpty()
-+                && mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_5);
-     }
- 
-     @Override
-     public void resetRadio(Message result) {
--        // TODO(b/280900995): remove this and references
-+        throw new RuntimeException("resetRadio not expected to be called");
-     }
- 
-     /**
-@@ -4630,8 +5127,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void handleCallSetupRequestFromSim(boolean accept, Message result) {
-         RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
--        if (!canMakeRequest("handleCallSetupRequestFromSim", voiceProxy, result,
--                RADIO_HAL_VERSION_1_4)) {
-+        if (voiceProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(voiceProxy, result);
-             return;
-         }
- 
-@@ -4653,19 +5150,29 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getBarringInfo(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getBarringInfo", networkProxy, result, RADIO_HAL_VERSION_1_5)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_1_5)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_BARRING_INFO, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_BARRING_INFO, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "getBarringInfo", () -> {
-+                networkProxy.getBarringInfo(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "getBarringInfo: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "getBarringInfo", () -> {
--            networkProxy.getBarringInfo(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -4674,19 +5181,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void allocatePduSessionId(Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("allocatePduSessionId", dataProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_ALLOCATE_PDU_SESSION_ID, result,
-+                    mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_ALLOCATE_PDU_SESSION_ID, result,
--                mRILDefaultWorkSource);
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "allocatePduSessionId", () -> {
-+                dataProxy.allocatePduSessionId(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "allocatePduSessionId: REQUEST_NOT_SUPPORTED");
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+            result.sendToTarget();
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "allocatePduSessionId", () -> {
--            dataProxy.allocatePduSessionId(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -4695,19 +5209,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void releasePduSessionId(Message result, int pduSessionId) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("releasePduSessionId", dataProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_RELEASE_PDU_SESSION_ID, result,
-+                    mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_RELEASE_PDU_SESSION_ID, result,
--                mRILDefaultWorkSource);
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "releasePduSessionId", () -> {
-+                dataProxy.releasePduSessionId(rr.mSerial, pduSessionId);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "releasePduSessionId: REQUEST_NOT_SUPPORTED");
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+            result.sendToTarget();
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "releasePduSessionId", () -> {
--            dataProxy.releasePduSessionId(rr.mSerial, pduSessionId);
--        });
-     }
- 
-     /**
-@@ -4716,18 +5237,28 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void startHandover(Message result, int callId) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("startHandover", dataProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_START_HANDOVER, result,
-+                    mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_START_HANDOVER, result, mRILDefaultWorkSource);
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
--        }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "startHandover", () -> {
--            dataProxy.startHandover(rr.mSerial, callId);
--        });
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "startHandover", () -> {
-+                dataProxy.startHandover(rr.mSerial, callId);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "startHandover: REQUEST_NOT_SUPPORTED");
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-+        }
-     }
- 
-     /**
-@@ -4736,18 +5267,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void cancelHandover(Message result, int callId) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("cancelHandover", dataProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_CANCEL_HANDOVER, result,
-+                    mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_CANCEL_HANDOVER, result, mRILDefaultWorkSource);
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "cancelHandover", () -> {
-+                dataProxy.cancelHandover(rr.mSerial, callId);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "cancelHandover: REQUEST_NOT_SUPPORTED");
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+            result.sendToTarget();
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "cancelHandover", () -> {
--            dataProxy.cancelHandover(rr.mSerial, callId);
--        });
-     }
- 
-     /**
-@@ -4756,78 +5295,118 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getSlicingConfig(Message result) {
-         RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class);
--        if (!canMakeRequest("getSlicingConfig", dataProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (dataProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(dataProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_DATA).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_SLICING_CONFIG, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SLICING_CONFIG, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "getSlicingConfig", () -> {
-+                dataProxy.getSlicingConfig(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) Rlog.d(RILJ_LOG_TAG, "getSlicingConfig: REQUEST_NOT_SUPPORTED");
-+            AsyncResult.forMessage(result, null,
-+                    CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+            result.sendToTarget();
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_DATA, rr, "getSlicingConfig", () -> {
--            dataProxy.getSlicingConfig(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void getSimPhonebookRecords(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getSimPhonebookRecords", simProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_SIM_PHONEBOOK_RECORDS, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SIM_PHONEBOOK_RECORDS, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "getSimPhonebookRecords", () -> {
-+                simProxy.getSimPhonebookRecords(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "getSimPhonebookRecords: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "getSimPhonebookRecords", () -> {
--            simProxy.getSimPhonebookRecords(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void getSimPhonebookCapacity(Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("getSimPhonebookCapacity", simProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_SIM_PHONEBOOK_CAPACITY, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SIM_PHONEBOOK_CAPACITY, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "getSimPhonebookCapacity", () -> {
-+                simProxy.getSimPhonebookCapacity(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "getSimPhonebookCapacity: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "getSimPhonebookCapacity", () -> {
--            simProxy.getSimPhonebookCapacity(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void updateSimPhonebookRecord(SimPhonebookRecord phonebookRecord, Message result) {
-         RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
--        if (!canMakeRequest("updateSimPhonebookRecord", simProxy, result, RADIO_HAL_VERSION_1_6)) {
-+        if (simProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(simProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_SIM).greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_UPDATE_SIM_PHONEBOOK_RECORD, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_UPDATE_SIM_PHONEBOOK_RECORD, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " with " + phonebookRecord.toString());
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " with " + phonebookRecord.toString());
-+            radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "updateSimPhonebookRecord", () -> {
-+                simProxy.updateSimPhonebookRecords(rr.mSerial, phonebookRecord);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "updateSimPhonebookRecords: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_SIM, rr, "updateSimPhonebookRecord", () -> {
--            simProxy.updateSimPhonebookRecords(rr.mSerial, phonebookRecord);
--        });
-     }
- 
-     /**
-@@ -4840,19 +5419,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     public void setUsageSetting(Message result,
-             /* @TelephonyManager.UsageSetting */ int usageSetting) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setUsageSetting", networkProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_USAGE_SETTING, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_USAGE_SETTING, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setUsageSetting", () -> {
-+                networkProxy.setUsageSetting(rr.mSerial, usageSetting);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "setUsageSetting: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setUsageSetting", () -> {
--            networkProxy.setUsageSetting(rr.mSerial, usageSetting);
--        });
-     }
- 
-     /**
-@@ -4863,39 +5454,63 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void getUsageSetting(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("getUsageSetting", networkProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_GET_USAGE_SETTING, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_GET_USAGE_SETTING, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "getUsageSetting", () -> {
-+                networkProxy.getUsageSetting(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "getUsageSetting: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "getUsageSetting", () -> {
--            networkProxy.getUsageSetting(rr.mSerial);
--        });
-     }
- 
-     @Override
-     public void setSrvccCallInfo(SrvccConnection[] srvccConnections, Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("setSrvccCallInfo", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_SRVCC_CALL_INFO, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_SRVCC_CALL_INFO, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                // Do not log function arg for privacy
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            // Do not log function arg for privacy
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "setSrvccCallInfo", () -> {
-+                imsProxy.setSrvccCallInfo(rr.mSerial,
-+                        RILUtils.convertToHalSrvccCall(srvccConnections));
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "setSrvccCallInfo: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "setSrvccCallInfo", () -> {
--            imsProxy.setSrvccCallInfo(rr.mSerial, RILUtils.convertToHalSrvccCall(srvccConnections));
--        });
-     }
- 
-     @Override
-@@ -4905,108 +5520,168 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             @RegistrationManager.SuggestedAction int suggestedAction,
-             int capabilities, Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("updateImsRegistrationInfo", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_UPDATE_IMS_REGISTRATION_INFO, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_UPDATE_IMS_REGISTRATION_INFO, result,
--                mRILDefaultWorkSource);
--
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " state=" + state + ", radioTech=" + imsRadioTech
--                    + ", suggested=" + suggestedAction + ", cap=" + capabilities);
--        }
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " state=" + state + ", radioTech=" + imsRadioTech
-+                        + ", suggested=" + suggestedAction + ", cap=" + capabilities);
-+            }
- 
--        android.hardware.radio.ims.ImsRegistration registrationInfo =
--                new android.hardware.radio.ims.ImsRegistration();
--        registrationInfo.regState = RILUtils.convertImsRegistrationState(state);
--        registrationInfo.accessNetworkType = RILUtils.convertImsRegistrationTech(imsRadioTech);
--        registrationInfo.suggestedAction = suggestedAction;
--        registrationInfo.capabilities = RILUtils.convertImsCapability(capabilities);
-+            android.hardware.radio.ims.ImsRegistration registrationInfo =
-+                    new android.hardware.radio.ims.ImsRegistration();
-+            registrationInfo.regState = RILUtils.convertImsRegistrationState(state);
-+            registrationInfo.accessNetworkType = RILUtils.convertImsRegistrationTech(imsRadioTech);
-+            registrationInfo.suggestedAction = suggestedAction;
-+            registrationInfo.capabilities = RILUtils.convertImsCapability(capabilities);
- 
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "updateImsRegistrationInfo", () -> {
--            imsProxy.updateImsRegistrationInfo(rr.mSerial, registrationInfo);
--        });
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "updateImsRegistrationInfo", () -> {
-+                imsProxy.updateImsRegistrationInfo(rr.mSerial, registrationInfo);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "updateImsRegistrationInfo: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-+        }
-     }
- 
-     @Override
--    public void startImsTraffic(int token, int trafficType, int accessNetworkType,
--            int trafficDirection, Message result) {
-+    public void startImsTraffic(int token,
-+            int trafficType, int accessNetworkType, int trafficDirection, Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("startImsTraffic", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_START_IMS_TRAFFIC, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_START_IMS_TRAFFIC, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + "{" + token + ", " + trafficType + ", "
-+                        + accessNetworkType + ", " + trafficDirection + "}");
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + "{" + token + ", " + trafficType + ", "
--                    + accessNetworkType + ", " + trafficDirection + "}");
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "startImsTraffic", () -> {
-+                imsProxy.startImsTraffic(rr.mSerial, token,
-+                        RILUtils.convertImsTrafficType(trafficType), accessNetworkType,
-+                        RILUtils.convertImsTrafficDirection(trafficDirection));
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "startImsTraffic: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "startImsTraffic", () -> {
--            imsProxy.startImsTraffic(rr.mSerial, token, RILUtils.convertImsTrafficType(trafficType),
--                    accessNetworkType, RILUtils.convertImsTrafficDirection(trafficDirection));
--        });
-     }
- 
-     @Override
-     public void stopImsTraffic(int token, Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("stopImsTraffic", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_STOP_IMS_TRAFFIC, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_STOP_IMS_TRAFFIC, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + "{" + token + "}");
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + "{" + token + "}");
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "stopImsTraffic", () -> {
-+                imsProxy.stopImsTraffic(rr.mSerial, token);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "stopImsTraffic: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "stopImsTraffic", () -> {
--            imsProxy.stopImsTraffic(rr.mSerial, token);
--        });
-     }
- 
-     @Override
-     public void triggerEpsFallback(int reason, Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("triggerEpsFallback", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_TRIGGER_EPS_FALLBACK, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_TRIGGER_EPS_FALLBACK, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " reason=" + reason);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " reason=" + reason);
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "triggerEpsFallback", () -> {
-+                imsProxy.triggerEpsFallback(rr.mSerial, reason);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "triggerEpsFallback: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "triggerEpsFallback", () -> {
--            imsProxy.triggerEpsFallback(rr.mSerial, reason);
--        });
-     }
- 
-     @Override
--    public void sendAnbrQuery(int mediaType, int direction, int bitsPerSecond, Message result) {
-+    public void sendAnbrQuery(int mediaType, int direction, int bitsPerSecond,
-+            Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("sendAnbrQuery", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SEND_ANBR_QUERY, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SEND_ANBR_QUERY, result, mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "sendAnbrQuery", () -> {
-+                imsProxy.sendAnbrQuery(rr.mSerial, mediaType, direction, bitsPerSecond);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "sendAnbrQuery: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "sendAnbrQuery", () -> {
--            imsProxy.sendAnbrQuery(rr.mSerial, mediaType, direction, bitsPerSecond);
--        });
-     }
- 
-     /**
-@@ -5015,21 +5690,32 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setEmergencyMode(int emcMode, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setEmergencyMode", networkProxy, result, RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_EMERGENCY_MODE, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_EMERGENCY_MODE, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " mode=" + EmergencyConstants.emergencyModeToString(emcMode));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " mode=" + EmergencyConstants.emergencyModeToString(emcMode));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setEmergencyMode", () -> {
-+                networkProxy.setEmergencyMode(rr.mSerial, emcMode);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "setEmergencyMode: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setEmergencyMode", () -> {
--            networkProxy.setEmergencyMode(rr.mSerial, emcMode);
--        });
-     }
- 
-     /**
-@@ -5040,24 +5726,34 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             @NonNull @AccessNetworkConstants.RadioAccessNetworkType int[] accessNetwork,
-             @DomainSelectionService.EmergencyScanType int scanType, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("triggerEmergencyNetworkScan", networkProxy, result,
--                RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_TRIGGER_EMERGENCY_NETWORK_SCAN, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_TRIGGER_EMERGENCY_NETWORK_SCAN, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " networkType=" + RILUtils.accessNetworkTypesToString(accessNetwork)
-+                        + ", scanType=" + RILUtils.scanTypeToString(scanType));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " networkType=" + RILUtils.accessNetworkTypesToString(accessNetwork)
--                    + ", scanType=" + RILUtils.scanTypeToString(scanType));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "triggerEmergencyNetworkScan", () -> {
-+                networkProxy.triggerEmergencyNetworkScan(rr.mSerial,
-+                        RILUtils.convertEmergencyNetworkScanTrigger(accessNetwork, scanType));
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "triggerEmergencyNetworkScan: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "triggerEmergencyNetworkScan", () -> {
--            networkProxy.triggerEmergencyNetworkScan(rr.mSerial,
--                    RILUtils.convertEmergencyNetworkScanTrigger(accessNetwork, scanType));
--        });
-     }
- 
-     /**
-@@ -5066,22 +5762,32 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void cancelEmergencyNetworkScan(boolean resetScan, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("cancelEmergencyNetworkScan", networkProxy, result,
--                RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_CANCEL_EMERGENCY_NETWORK_SCAN, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_CANCEL_EMERGENCY_NETWORK_SCAN, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " resetScan=" + resetScan);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " resetScan=" + resetScan);
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "cancelEmergencyNetworkScan", () -> {
-+                networkProxy.cancelEmergencyNetworkScan(rr.mSerial, resetScan);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "cancelEmergencyNetworkScan: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "cancelEmergencyNetworkScan", () -> {
--            networkProxy.cancelEmergencyNetworkScan(rr.mSerial, resetScan);
--        });
-     }
- 
-     /**
-@@ -5090,20 +5796,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void exitEmergencyMode(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("exitEmergencyMode", networkProxy, result, RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_EXIT_EMERGENCY_MODE, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_EXIT_EMERGENCY_MODE, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "exitEmergencyMode", () -> {
-+                networkProxy.exitEmergencyMode(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "exitEmergencyMode: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "exitEmergencyMode", () -> {
--            networkProxy.exitEmergencyMode(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -5115,22 +5832,32 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setNullCipherAndIntegrityEnabled(boolean enabled, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setNullCipherAndIntegrityEnabled", networkProxy, result,
--                RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_NULL_CIPHER_AND_INTEGRITY_ENABLED, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_NULL_CIPHER_AND_INTEGRITY_ENABLED, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(
-+                    HAL_SERVICE_NETWORK, rr, "setNullCipherAndIntegrityEnabled", () -> {
-+                        networkProxy.setNullCipherAndIntegrityEnabled(rr.mSerial, enabled);
-+                    });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "setNullCipherAndIntegrityEnabled: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setNullCipherAndIntegrityEnabled",
--                () -> {
--                    networkProxy.setNullCipherAndIntegrityEnabled(rr.mSerial, enabled);
--                });
-     }
- 
-     /**
-@@ -5141,21 +5868,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void isNullCipherAndIntegrityEnabled(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("isNullCipherAndIntegrityEnabled", networkProxy, result,
--                RADIO_HAL_VERSION_2_1)) {
--            return;
--        }
-+        if (networkProxy.isEmpty()) return;
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            try {
-+                networkProxy.isNullCipherAndIntegrityEnabled(rr.mSerial);
-+            } catch (RemoteException | RuntimeException e) {
-+                handleRadioProxyExceptionForRR(
-+                        HAL_SERVICE_NETWORK, "isNullCipherAndIntegrityEnabled", e);
-+            }
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "isNullCipherAndIntegrityEnabled: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "isNullCipherAndIntegrityEnabled", () -> {
--            networkProxy.isNullCipherAndIntegrityEnabled(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -5164,20 +5901,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void updateImsCallStatus(@NonNull List<ImsCallInfo> imsCallInfo, Message result) {
-         RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class);
--        if (!canMakeRequest("updateImsCallStatus", imsProxy, result, RADIO_HAL_VERSION_2_0)) {
-+        if (imsProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(imsProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_0)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_UPDATE_IMS_CALL_STATUS, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_UPDATE_IMS_CALL_STATUS, result,
--                mRILDefaultWorkSource);
--
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " " + imsCallInfo);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " " + imsCallInfo);
-+            }
-+            radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "updateImsCallStatus", () -> {
-+                imsProxy.updateImsCallStatus(rr.mSerial, RILUtils.convertImsCallInfo(imsCallInfo));
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "updateImsCallStatus: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--        radioServiceInvokeHelper(HAL_SERVICE_IMS, rr, "updateImsCallStatus", () -> {
--            imsProxy.updateImsCallStatus(rr.mSerial, RILUtils.convertImsCallInfo(imsCallInfo));
--        });
-     }
- 
-     /**
-@@ -5186,21 +5934,32 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void setN1ModeEnabled(boolean enable, Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("setN1ModeEnabled", networkProxy, result, RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_SET_N1_MODE_ENABLED, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_SET_N1_MODE_ENABLED, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
-+                        + " enable=" + enable);
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)
--                    + " enable=" + enable);
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setN1ModeEnabled", () -> {
-+                networkProxy.setN1ModeEnabled(rr.mSerial, enable);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "setN1ModeEnabled: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setN1ModeEnabled", () -> {
--            networkProxy.setN1ModeEnabled(rr.mSerial, enable);
--        });
-     }
- 
-     /**
-@@ -5209,20 +5968,31 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @Override
-     public void isN1ModeEnabled(Message result) {
-         RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
--        if (!canMakeRequest("isN1ModeEnabled", networkProxy, result, RADIO_HAL_VERSION_2_1)) {
-+        if (networkProxy.isEmpty()) {
-+            handleRadioServiceNotAvailable(networkProxy, result);
-             return;
-         }
-+        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
-+            RILRequest rr = obtainRequest(RIL_REQUEST_IS_N1_MODE_ENABLED, result,
-+                    mRILDefaultWorkSource);
- 
--        RILRequest rr = obtainRequest(RIL_REQUEST_IS_N1_MODE_ENABLED, result,
--                mRILDefaultWorkSource);
-+            if (RILJ_LOGD) {
-+                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            }
- 
--        if (RILJ_LOGD) {
--            riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
-+            radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "isN1ModeEnabled", () -> {
-+                networkProxy.isN1ModeEnabled(rr.mSerial);
-+            });
-+        } else {
-+            if (RILJ_LOGD) {
-+                Rlog.d(RILJ_LOG_TAG, "isN1ModeEnabled: REQUEST_NOT_SUPPORTED");
-+            }
-+            if (result != null) {
-+                AsyncResult.forMessage(result, null,
-+                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                result.sendToTarget();
-+            }
-         }
--
--        radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "isN1ModeEnabled", () -> {
--            networkProxy.isN1ModeEnabled(rr.mSerial);
--        });
-     }
- 
-     /**
-@@ -5286,7 +6056,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 });
-     }
- 
--   /**
-+    /**
-      * {@inheritDoc}
-      */
-     @Override
-@@ -5311,7 +6081,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setSecurityAlgorithmsUpdatedEnabled",
-                 () -> {
-                     networkProxy.setSecurityAlgorithmsUpdatedEnabled(rr.mSerial, enable);
--            });
-+           });
-     }
- 
-     /**
-@@ -5363,7 +6133,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-             rr = mRequestList.get(serial);
-         }
-         if (rr == null) {
--            riljLogw("processRequestAck: Unexpected solicited ack response! serial: " + serial);
-+            Rlog.w(RILJ_LOG_TAG, "processRequestAck: Unexpected solicited ack response! "
-+                    + "serial: " + serial);
-         } else {
-             decrementWakeLock(rr);
-             if (RILJ_LOGD) {
-@@ -5421,7 +6192,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 rr = mRequestList.get(serial);
-             }
-             if (rr == null) {
--                riljLogw("Unexpected solicited ack response! sn: " + serial);
-+                Rlog.w(RILJ_LOG_TAG, "Unexpected solicited ack response! sn: " + serial);
-             } else {
-                 decrementWakeLock(rr);
-                 if (mRadioBugDetector != null) {
-@@ -5437,8 +6208,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
- 
-         rr = findAndRemoveRequestFromList(serial);
-         if (rr == null) {
--            riljLoge("processResponse: Unexpected response! serial: " + serial
--                    + ", error: " + error);
-+            Rlog.e(RILJ_LOG_TAG, "processResponse: Unexpected response! serial: " + serial
-+                    + " ,error: " + error);
-             return null;
-         }
-         Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_NETWORK, "RIL", rr.mSerial);
-@@ -5624,7 +6395,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                     riljLoge("sendAck: " + e);
-                 }
-             } else {
--                riljLoge("Error trying to send ack, radioProxy = null");
-+                Rlog.e(RILJ_LOG_TAG, "Error trying to send ack, radioProxy = null");
-             }
-         } else {
-             RadioServiceProxy serviceProxy = getRadioServiceProxy(service);
-@@ -5636,7 +6407,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                     riljLoge("sendAck: " + e);
-                 }
-             } else {
--                riljLoge("Error trying to send ack, serviceProxy is empty");
-+                Rlog.e(RILJ_LOG_TAG, "Error trying to send ack, serviceProxy is empty");
-             }
-         }
-         rr.release();
-@@ -5663,11 +6434,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     private void acquireWakeLock(RILRequest rr, int wakeLockType) {
-         synchronized (rr) {
-             if (rr.mWakeLockType != INVALID_WAKELOCK) {
--                riljLog("Failed to acquire wakelock for " + rr.serialString());
-+                Rlog.d(RILJ_LOG_TAG, "Failed to aquire wakelock for " + rr.serialString());
-                 return;
-             }
- 
--            switch (wakeLockType) {
-+            switch(wakeLockType) {
-                 case FOR_WAKELOCK:
-                     synchronized (mWakeLock) {
-                         mWakeLock.acquire();
-@@ -5699,7 +6470,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                     }
-                     break;
-                 default: //WTF
--                    riljLogw("Acquiring Invalid Wakelock type " + wakeLockType);
-+                    Rlog.w(RILJ_LOG_TAG, "Acquiring Invalid Wakelock type " + wakeLockType);
-                     return;
-             }
-             rr.mWakeLockType = wakeLockType;
-@@ -5753,7 +6524,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 case INVALID_WAKELOCK:
-                     break;
-                 default:
--                    riljLogw("Decrementing Invalid Wakelock type " + rr.mWakeLockType);
-+                    Rlog.w(RILJ_LOG_TAG, "Decrementing Invalid Wakelock type " + rr.mWakeLockType);
-             }
-             rr.mWakeLockType = INVALID_WAKELOCK;
-         }
-@@ -5764,7 +6535,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         if (wakeLockType == FOR_WAKELOCK) {
-             synchronized (mWakeLock) {
-                 if (mWakeLockCount == 0 && !mWakeLock.isHeld()) return false;
--                riljLog("NOTE: mWakeLockCount is " + mWakeLockCount + " at time of clearing");
-+                Rlog.d(RILJ_LOG_TAG, "NOTE: mWakeLockCount is " + mWakeLockCount
-+                        + " at time of clearing");
-                 mWakeLockCount = 0;
-                 mWakeLock.release();
-                 mClientWakelockTracker.stopTrackingAll();
-@@ -5791,14 +6563,15 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         synchronized (mRequestList) {
-             int count = mRequestList.size();
-             if (RILJ_LOGD && loggable) {
--                riljLog("clearRequestList " + " mWakeLockCount=" + mWakeLockCount
--                        + " mRequestList=" + count);
-+                Rlog.d(RILJ_LOG_TAG, "clearRequestList " + " mWakeLockCount="
-+                        + mWakeLockCount + " mRequestList=" + count);
-             }
- 
-             for (int i = 0; i < count; i++) {
-                 rr = mRequestList.valueAt(i);
-                 if (RILJ_LOGD && loggable) {
--                    riljLog(i + ": [" + rr.mSerial + "] " + RILUtils.requestToString(rr.mRequest));
-+                    Rlog.d(RILJ_LOG_TAG, i + ": [" + rr.mSerial + "] "
-+                            + RILUtils.requestToString(rr.mRequest));
-                 }
-                 rr.onError(error, null);
-                 decrementWakeLock(rr);
-@@ -6076,22 +6849,18 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         Rlog.v(RILJ_LOG_TAG, msg + (" [PHONE" + mPhoneId + "]"));
-     }
- 
--    void riljLogw(String msg) {
--        Rlog.w(RILJ_LOG_TAG, msg + (" [PHONE" + mPhoneId + "]"));
--    }
--
-     boolean isLogOrTrace() {
--        return RILJ_LOGD || Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK);
-+        return RIL.RILJ_LOGD || Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK);
-     }
- 
-     boolean isLogvOrTrace() {
--        return RILJ_LOGV || Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK);
-+        return RIL.RILJ_LOGV || Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK);
-     }
- 
-     @UnsupportedAppUsage
-     void unsljLog(int response) {
-         String logStr = RILUtils.responseToString(response);
--        if (RILJ_LOGD) {
-+        if (RIL.RILJ_LOGD) {
-             riljLog("[UNSL]< " + logStr);
-         }
-         Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
-@@ -6100,7 +6869,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @UnsupportedAppUsage
-     void unsljLogMore(int response, String more) {
-         String logStr = RILUtils.responseToString(response) + " " + more;
--        if (RILJ_LOGD) {
-+        if (RIL.RILJ_LOGD) {
-             riljLog("[UNSL]< " + logStr);
-         }
-         Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
-@@ -6109,7 +6878,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @UnsupportedAppUsage
-     void unsljLogRet(int response, Object ret) {
-         String logStr = RILUtils.responseToString(response) + " " + retToString(response, ret);
--        if (RILJ_LOGD) {
-+        if (RIL.RILJ_LOGD) {
-             riljLog("[UNSL]< " + logStr);
-         }
-         Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
-@@ -6118,7 +6887,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-     @UnsupportedAppUsage
-     void unsljLogvRet(int response, Object ret) {
-         String logStr = RILUtils.responseToString(response) + " " + retToString(response, ret);
--        if (RILJ_LOGV) {
-+        if (RIL.RILJ_LOGV) {
-             riljLogv("[UNSL]< " + logStr);
-         }
-         Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
-@@ -6171,6 +6940,58 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         return mClientWakelockTracker.getClientRequestStats();
-     }
- 
-+    /**
-+     * Fixup for SignalStrength 1.0 to Assume GSM to WCDMA when
-+     * The current RAT type is one of the UMTS RATs.
-+     * @param signalStrength the initial signal strength
-+     * @return a new SignalStrength if RAT is UMTS or existing SignalStrength
-+     */
-+    public SignalStrength fixupSignalStrength10(SignalStrength signalStrength) {
-+        List<CellSignalStrengthGsm> gsmList = signalStrength.getCellSignalStrengths(
-+                CellSignalStrengthGsm.class);
-+        // If GSM is not the primary type, then bail out; no fixup needed.
-+        if (gsmList.isEmpty() || !gsmList.get(0).isValid()) {
-+            return signalStrength;
-+        }
-+
-+        CellSignalStrengthGsm gsmStrength = gsmList.get(0);
-+
-+        // Use the voice RAT which is a guarantee in GSM and UMTS
-+        int voiceRat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
-+        Phone phone = PhoneFactory.getPhone(mPhoneId);
-+        if (phone != null) {
-+            ServiceState ss = phone.getServiceState();
-+            if (ss != null) {
-+                voiceRat = ss.getRilVoiceRadioTechnology();
-+            }
-+        }
-+        switch (voiceRat) {
-+            case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS: /* fallthrough */
-+            case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA: /* fallthrough */
-+            case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA: /* fallthrough */
-+            case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA: /* fallthrough */
-+            case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: /* fallthrough */
-+                break;
-+            default:
-+                // If we are not currently on WCDMA/HSPA, then we don't need to do a fixup.
-+                return signalStrength;
-+        }
-+
-+        // The service state reports WCDMA, and the SignalStrength is reported for GSM, so at this
-+        // point we take an educated guess that the GSM SignalStrength report is actually for
-+        // WCDMA. Also, if we are in WCDMA/GSM we can safely assume that there are no other valid
-+        // signal strength reports (no SRLTE, which is the only supported case in HAL 1.0).
-+        // Thus, we just construct a new SignalStrength and migrate RSSI and BER from the
-+        // GSM report to the WCDMA report, leaving everything else empty.
-+        return new SignalStrength(
-+                new CellSignalStrengthCdma(), new CellSignalStrengthGsm(),
-+                new CellSignalStrengthWcdma(gsmStrength.getRssi(),
-+                        gsmStrength.getBitErrorRate(),
-+                        CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE),
-+                new CellSignalStrengthTdscdma(), new CellSignalStrengthLte(),
-+                new CellSignalStrengthNr());
-+    }
-+
-     void notifyBarringInfoChanged(@NonNull BarringInfo barringInfo) {
-         mLastBarringInfo = barringInfo;
-         mBarringInfoChangedRegistrants.notifyRegistrants(new AsyncResult(null, barringInfo, null));
-diff --git a/src/java/com/android/internal/telephony/RILUtils.java b/src/java/com/android/internal/telephony/RILUtils.java
-index 8897db4e45..04e90f7f83 100644
---- a/src/java/com/android/internal/telephony/RILUtils.java
-+++ b/src/java/com/android/internal/telephony/RILUtils.java
-@@ -886,6 +886,41 @@ public class RILUtils {
-         return new SmsMessage(addr, env);
-     }
- 
-+    /**
-+     * Convert to DataProfileInfo defined in radio/1.0/types.hal
-+     * @param dp Data profile
-+     * @return The converted DataProfileInfo
-+     */
-+    public static android.hardware.radio.V1_0.DataProfileInfo convertToHalDataProfile10(
-+            DataProfile dp) {
-+        android.hardware.radio.V1_0.DataProfileInfo dpi =
-+                new android.hardware.radio.V1_0.DataProfileInfo();
-+
-+        dpi.profileId = dp.getProfileId();
-+        dpi.apn = dp.getApn();
-+        dpi.protocol = ApnSetting.getProtocolStringFromInt(dp.getProtocolType());
-+        dpi.roamingProtocol = ApnSetting.getProtocolStringFromInt(dp.getRoamingProtocolType());
-+        dpi.authType = dp.getAuthType();
-+        dpi.user = TextUtils.emptyIfNull(dp.getUserName());
-+        dpi.password = TextUtils.emptyIfNull(dp.getPassword());
-+        dpi.type = dp.getType();
-+        dpi.maxConnsTime = dp.getMaxConnectionsTime();
-+        dpi.maxConns = dp.getMaxConnections();
-+        dpi.waitTime = dp.getWaitTime();
-+        dpi.enabled = dp.isEnabled();
-+        dpi.supportedApnTypesBitmap = dp.getSupportedApnTypesBitmask();
-+        // Shift by 1 bit due to the discrepancy between
-+        // android.hardware.radio.V1_0.RadioAccessFamily and the bitmask version of
-+        // ServiceState.RIL_RADIO_TECHNOLOGY_XXXX.
-+        dpi.bearerBitmap = ServiceState.convertNetworkTypeBitmaskToBearerBitmask(
-+                dp.getBearerBitmask()) << 1;
-+        dpi.mtu = dp.getMtuV4();
-+        dpi.mvnoType = android.hardware.radio.V1_0.MvnoType.NONE;
-+        dpi.mvnoMatchData = "";
-+
-+        return dpi;
-+    }
-+
-     /**
-      * Convert to DataProfileInfo defined in radio/1.4/types.hal
-      * @param dp Data profile
-@@ -2180,15 +2215,21 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert LinkCapacityEstimate defined in radio/1.2, 1.6/types.hal to
--     * a list of LinkCapacityEstimates
--     * @param lceObj LinkCapacityEstimate defined in radio/1.2, 1.6/types.hal
-+     * Convert LceDataInfo defined in radio/1.0/types.hal and LinkCapacityEstimate defined in
-+     * radio/1.2, 1.6/types.hal to a list of LinkCapacityEstimates
-+     * @param lceObj LceDataInfo defined in radio/1.0/types.hal or LinkCapacityEstimate defined in
-+     *        radio/1.2, 1.6/types.hal
-      * @return The converted list of LinkCapacityEstimates
-      */
--    public static List<LinkCapacityEstimate> convertHalLinkCapacityEstimate(Object lceObj) {
-+    public static List<LinkCapacityEstimate> convertHalLceData(Object lceObj) {
-         final List<LinkCapacityEstimate> lceList = new ArrayList<>();
-         if (lceObj == null) return lceList;
--        if (lceObj instanceof android.hardware.radio.V1_2.LinkCapacityEstimate) {
-+        if (lceObj instanceof android.hardware.radio.V1_0.LceDataInfo) {
-+            android.hardware.radio.V1_0.LceDataInfo lce =
-+                    (android.hardware.radio.V1_0.LceDataInfo) lceObj;
-+            lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_COMBINED,
-+                    lce.lastHopCapacityKbps, LinkCapacityEstimate.INVALID));
-+        } else if (lceObj instanceof android.hardware.radio.V1_2.LinkCapacityEstimate) {
-             android.hardware.radio.V1_2.LinkCapacityEstimate lce =
-                     (android.hardware.radio.V1_2.LinkCapacityEstimate) lceObj;
-             lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_COMBINED,
-@@ -2216,13 +2257,26 @@ public class RILUtils {
-         return lceList;
-     }
- 
-+    /**
-+     * Convert LceDataInfo defined in LceDataInfo.aidl to a list of LinkCapacityEstimates
-+     * @param lce LceDataInfo defined in LceDataInfo.aidl
-+     * @return The converted list of LinkCapacityEstimates
-+     */
-+    public static List<LinkCapacityEstimate> convertHalLceData(
-+            android.hardware.radio.network.LceDataInfo lce) {
-+        final List<LinkCapacityEstimate> lceList = new ArrayList<>();
-+        lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_COMBINED,
-+                lce.lastHopCapacityKbps, LinkCapacityEstimate.INVALID));
-+        return lceList;
-+    }
-+
-     /**
-      * Convert LinkCapacityEstimate defined in LinkCapacityEstimate.aidl to a list of
-      * LinkCapacityEstimates
-      * @param lce LinkCapacityEstimate defined in LinkCapacityEstimate.aidl
-      * @return The converted list of LinkCapacityEstimates
-      */
--    public static List<LinkCapacityEstimate> convertHalLinkCapacityEstimate(
-+    public static List<LinkCapacityEstimate> convertHalLceData(
-             android.hardware.radio.network.LinkCapacityEstimate lce) {
-         final List<LinkCapacityEstimate> lceList = new ArrayList<>();
-         int primaryDownlinkCapacityKbps = lce.downlinkCapacityKbps;
-@@ -2246,9 +2300,9 @@ public class RILUtils {
- 
- 
-     /**
--     * Convert a list of CellInfo defined in radio/1.4, 1.5, 1.6/types.hal to a list of
-+     * Convert a list of CellInfo defined in radio/1.0, 1.2, 1.4, 1.5, 1.6/types.hal to a list of
-      * CellInfos
--     * @param records List of CellInfo defined in radio/1.4, 1.5, 1.6/types.hal
-+     * @param records List of CellInfo defined in radio/1.0, 1.2, 1.4, 1.5, 1.6/types.hal
-      * @return The converted list of CellInfos
-      */
-     public static ArrayList<CellInfo> convertHalCellInfoList(ArrayList<Object> records) {
-@@ -2278,8 +2332,8 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellInfo defined in radio/1.4, 1.5, 1.6/types.hal to CellInfo
--     * @param cellInfo CellInfo defined in radio/1.4, 1.5, 1.6/types.hal
-+     * Convert a CellInfo defined in radio/1.0, 1.2, 1.4, 1.5, 1.6/types.hal to CellInfo
-+     * @param cellInfo CellInfo defined in radio/1.0, 1.2, 1.4, 1.5, 1.6/types.hal
-      * @param nanotime time the CellInfo was created
-      * @return The converted CellInfo
-      */
-@@ -2301,7 +2355,87 @@ public class RILUtils {
-         CellSignalStrengthTdscdma tdscdmaSs = null;
-         CellIdentityNr nrCi = null;
-         CellSignalStrengthNr nrSs = null;
--        if (cellInfo instanceof android.hardware.radio.V1_4.CellInfo) {
-+        if (cellInfo instanceof android.hardware.radio.V1_0.CellInfo) {
-+            final android.hardware.radio.V1_0.CellInfo record =
-+                    (android.hardware.radio.V1_0.CellInfo) cellInfo;
-+            connectionStatus = CellInfo.CONNECTION_UNKNOWN;
-+            registered = record.registered;
-+            switch (record.cellInfoType) {
-+                case android.hardware.radio.V1_0.CellInfoType.GSM:
-+                    type = CellInfo.TYPE_GSM;
-+                    android.hardware.radio.V1_0.CellInfoGsm gsm = record.gsm.get(0);
-+                    gsmCi = convertHalCellIdentityGsm(gsm.cellIdentityGsm);
-+                    gsmSs = convertHalGsmSignalStrength(gsm.signalStrengthGsm);
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.CDMA:
-+                    type = CellInfo.TYPE_CDMA;
-+                    android.hardware.radio.V1_0.CellInfoCdma cdma = record.cdma.get(0);
-+                    cdmaCi = convertHalCellIdentityCdma(cdma.cellIdentityCdma);
-+                    cdmaSs = convertHalCdmaSignalStrength(
-+                            cdma.signalStrengthCdma, cdma.signalStrengthEvdo);
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.LTE:
-+                    type = CellInfo.TYPE_LTE;
-+                    android.hardware.radio.V1_0.CellInfoLte lte = record.lte.get(0);
-+                    lteCi = convertHalCellIdentityLte(lte.cellIdentityLte);
-+                    lteSs = convertHalLteSignalStrength(lte.signalStrengthLte);
-+                    lteCc = new CellConfigLte();
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.WCDMA:
-+                    type = CellInfo.TYPE_WCDMA;
-+                    android.hardware.radio.V1_0.CellInfoWcdma wcdma = record.wcdma.get(0);
-+                    wcdmaCi = convertHalCellIdentityWcdma(wcdma.cellIdentityWcdma);
-+                    wcdmaSs = convertHalWcdmaSignalStrength(wcdma.signalStrengthWcdma);
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.TD_SCDMA:
-+                    type = CellInfo.TYPE_TDSCDMA;
-+                    android.hardware.radio.V1_0.CellInfoTdscdma tdscdma = record.tdscdma.get(0);
-+                    tdscdmaCi = convertHalCellIdentityTdscdma(tdscdma.cellIdentityTdscdma);
-+                    tdscdmaSs = convertHalTdscdmaSignalStrength(tdscdma.signalStrengthTdscdma);
-+                    break;
-+                default: return null;
-+            }
-+        } else if (cellInfo instanceof android.hardware.radio.V1_2.CellInfo) {
-+            final android.hardware.radio.V1_2.CellInfo record =
-+                    (android.hardware.radio.V1_2.CellInfo) cellInfo;
-+            connectionStatus = record.connectionStatus;
-+            registered = record.registered;
-+            switch(record.cellInfoType) {
-+                case android.hardware.radio.V1_0.CellInfoType.GSM:
-+                    type = CellInfo.TYPE_GSM;
-+                    android.hardware.radio.V1_2.CellInfoGsm gsm = record.gsm.get(0);
-+                    gsmCi = convertHalCellIdentityGsm(gsm.cellIdentityGsm);
-+                    gsmSs = convertHalGsmSignalStrength(gsm.signalStrengthGsm);
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.CDMA:
-+                    type = CellInfo.TYPE_CDMA;
-+                    android.hardware.radio.V1_2.CellInfoCdma cdma = record.cdma.get(0);
-+                    cdmaCi = convertHalCellIdentityCdma(cdma.cellIdentityCdma);
-+                    cdmaSs = convertHalCdmaSignalStrength(
-+                            cdma.signalStrengthCdma, cdma.signalStrengthEvdo);
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.LTE:
-+                    type = CellInfo.TYPE_LTE;
-+                    android.hardware.radio.V1_2.CellInfoLte lte = record.lte.get(0);
-+                    lteCi = convertHalCellIdentityLte(lte.cellIdentityLte);
-+                    lteSs = convertHalLteSignalStrength(lte.signalStrengthLte);
-+                    lteCc = new CellConfigLte();
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.WCDMA:
-+                    type = CellInfo.TYPE_WCDMA;
-+                    android.hardware.radio.V1_2.CellInfoWcdma wcdma = record.wcdma.get(0);
-+                    wcdmaCi = convertHalCellIdentityWcdma(wcdma.cellIdentityWcdma);
-+                    wcdmaSs = convertHalWcdmaSignalStrength(wcdma.signalStrengthWcdma);
-+                    break;
-+                case android.hardware.radio.V1_0.CellInfoType.TD_SCDMA:
-+                    type = CellInfo.TYPE_TDSCDMA;
-+                    android.hardware.radio.V1_2.CellInfoTdscdma tdscdma = record.tdscdma.get(0);
-+                    tdscdmaCi = convertHalCellIdentityTdscdma(tdscdma.cellIdentityTdscdma);
-+                    tdscdmaSs = convertHalTdscdmaSignalStrength(tdscdma.signalStrengthTdscdma);
-+                    break;
-+                default: return null;
-+            }
-+        } else if (cellInfo instanceof android.hardware.radio.V1_4.CellInfo) {
-             final android.hardware.radio.V1_4.CellInfo record =
-                     (android.hardware.radio.V1_4.CellInfo) cellInfo;
-             connectionStatus = record.connectionStatus;
-@@ -2531,13 +2665,43 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellIdentity defined in radio/1.2, 1.5/types.hal to CellIdentity
--     * @param halCi CellIdentity defined in radio/1.2, 1.5/types.hal
-+     * Convert a CellIdentity defined in radio/1.0, 1.2, 1.5/types.hal to CellIdentity
-+     * @param halCi CellIdentity defined in radio/1.0, 1.2, 1.5/types.hal
-      * @return The converted CellIdentity
-      */
-     public static CellIdentity convertHalCellIdentity(Object halCi) {
-         if (halCi == null) return null;
--        if (halCi instanceof android.hardware.radio.V1_2.CellIdentity) {
-+        if (halCi instanceof android.hardware.radio.V1_0.CellIdentity) {
-+            android.hardware.radio.V1_0.CellIdentity ci =
-+                    (android.hardware.radio.V1_0.CellIdentity) halCi;
-+            switch (ci.cellInfoType) {
-+                case CellInfo.TYPE_GSM:
-+                    if (ci.cellIdentityGsm.size() == 1) {
-+                        return convertHalCellIdentityGsm(ci.cellIdentityGsm.get(0));
-+                    }
-+                    break;
-+                case CellInfo.TYPE_CDMA:
-+                    if (ci.cellIdentityCdma.size() == 1) {
-+                        return convertHalCellIdentityCdma(ci.cellIdentityCdma.get(0));
-+                    }
-+                    break;
-+                case CellInfo.TYPE_LTE:
-+                    if (ci.cellIdentityLte.size() == 1) {
-+                        return convertHalCellIdentityLte(ci.cellIdentityLte.get(0));
-+                    }
-+                    break;
-+                case CellInfo.TYPE_WCDMA:
-+                    if (ci.cellIdentityWcdma.size() == 1) {
-+                        return convertHalCellIdentityWcdma(ci.cellIdentityWcdma.get(0));
-+                    }
-+                    break;
-+                case CellInfo.TYPE_TDSCDMA:
-+                    if (ci.cellIdentityTdscdma.size() == 1) {
-+                        return convertHalCellIdentityTdscdma(ci.cellIdentityTdscdma.get(0));
-+                    }
-+                    break;
-+            }
-+        } else if (halCi instanceof android.hardware.radio.V1_2.CellIdentity) {
-             android.hardware.radio.V1_2.CellIdentity ci =
-                     (android.hardware.radio.V1_2.CellIdentity) halCi;
-             switch (ci.cellInfoType) {
-@@ -2614,13 +2778,19 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellIdentityGsm defined in radio/1.2, 1.5/types.hal to CellIdentityGsm
--     * @param gsm CellIdentityGsm defined in radio/1.2, 1.5/types.hal
-+     * Convert a CellIdentityGsm defined in radio/1.0, 1.2, 1.5/types.hal to CellIdentityGsm
-+     * @param gsm CellIdentityGsm defined in radio/1.0, 1.2, 1.5/types.hal
-      * @return The converted CellIdentityGsm
-      */
-     public static CellIdentityGsm convertHalCellIdentityGsm(Object gsm) {
-         if (gsm == null) return null;
--        if (gsm instanceof android.hardware.radio.V1_2.CellIdentityGsm) {
-+        if (gsm instanceof android.hardware.radio.V1_0.CellIdentityGsm) {
-+            android.hardware.radio.V1_0.CellIdentityGsm ci =
-+                    (android.hardware.radio.V1_0.CellIdentityGsm) gsm;
-+            return new CellIdentityGsm(ci.lac, ci.cid, ci.arfcn,
-+                    ci.bsic == (byte) 0xFF ? CellInfo.UNAVAILABLE : ci.bsic, ci.mcc, ci.mnc, "", "",
-+                    new ArraySet<>());
-+        } else if (gsm instanceof android.hardware.radio.V1_2.CellIdentityGsm) {
-             android.hardware.radio.V1_2.CellIdentityGsm ci =
-                     (android.hardware.radio.V1_2.CellIdentityGsm) gsm;
-             return new CellIdentityGsm(ci.base.lac, ci.base.cid, ci.base.arfcn,
-@@ -2653,13 +2823,18 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellIdentityCdma defined in radio/1.2/types.hal to CellIdentityCdma
--     * @param cdma CellIdentityCdma defined in radio/1.2/types.hal
-+     * Convert a CellIdentityCdma defined in radio/1.0, 1.2/types.hal to CellIdentityCdma
-+     * @param cdma CellIdentityCdma defined in radio/1.0, 1.2/types.hal
-      * @return The converted CellIdentityCdma
-      */
-     public static CellIdentityCdma convertHalCellIdentityCdma(Object cdma) {
-         if (cdma == null) return null;
--        if (cdma instanceof android.hardware.radio.V1_2.CellIdentityCdma) {
-+        if (cdma instanceof android.hardware.radio.V1_0.CellIdentityCdma) {
-+            android.hardware.radio.V1_0.CellIdentityCdma ci =
-+                    (android.hardware.radio.V1_0.CellIdentityCdma) cdma;
-+            return new CellIdentityCdma(ci.networkId, ci.systemId, ci.baseStationId, ci.longitude,
-+                    ci.latitude, "", "");
-+        } else if (cdma instanceof android.hardware.radio.V1_2.CellIdentityCdma) {
-             android.hardware.radio.V1_2.CellIdentityCdma ci =
-                     (android.hardware.radio.V1_2.CellIdentityCdma) cdma;
-             return new CellIdentityCdma(ci.base.networkId, ci.base.systemId, ci.base.baseStationId,
-@@ -2682,13 +2857,18 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellIdentityLte defined in radio/1.2, 1.5/types.hal to CellIdentityLte
--     * @param lte CellIdentityLte defined in radio/1.2, 1.5/types.hal
-+     * Convert a CellIdentityLte defined in radio/1.0, 1.2, 1.5/types.hal to CellIdentityLte
-+     * @param lte CellIdentityLte defined in radio/1.0, 1.2, 1.5/types.hal
-      * @return The converted CellIdentityLte
-      */
-     public static CellIdentityLte convertHalCellIdentityLte(Object lte) {
-         if (lte == null) return null;
--        if (lte instanceof android.hardware.radio.V1_2.CellIdentityLte) {
-+        if (lte instanceof android.hardware.radio.V1_0.CellIdentityLte) {
-+            android.hardware.radio.V1_0.CellIdentityLte ci =
-+                    (android.hardware.radio.V1_0.CellIdentityLte) lte;
-+            return new CellIdentityLte(ci.ci, ci.pci, ci.tac, ci.earfcn, new int[] {},
-+                    CellInfo.UNAVAILABLE, ci.mcc, ci.mnc, "", "", new ArraySet<>(), null);
-+        } else if (lte instanceof android.hardware.radio.V1_2.CellIdentityLte) {
-             android.hardware.radio.V1_2.CellIdentityLte ci =
-                     (android.hardware.radio.V1_2.CellIdentityLte) lte;
-             return new CellIdentityLte(ci.base.ci, ci.base.pci, ci.base.tac, ci.base.earfcn,
-@@ -2722,13 +2902,18 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellIdentityWcdma defined in radio/1.2, 1.5/types.hal to CellIdentityWcdma
--     * @param wcdma CellIdentityWcdma defined in radio/1.2, 1.5/types.hal
-+     * Convert a CellIdentityWcdma defined in radio/1.0, 1.2, 1.5/types.hal to CellIdentityWcdma
-+     * @param wcdma CellIdentityWcdma defined in radio/1.0, 1.2, 1.5/types.hal
-      * @return The converted CellIdentityWcdma
-      */
-     public static CellIdentityWcdma convertHalCellIdentityWcdma(Object wcdma) {
-         if (wcdma == null) return null;
--        if (wcdma instanceof android.hardware.radio.V1_2.CellIdentityWcdma) {
-+        if (wcdma instanceof android.hardware.radio.V1_0.CellIdentityWcdma) {
-+            android.hardware.radio.V1_0.CellIdentityWcdma ci =
-+                    (android.hardware.radio.V1_0.CellIdentityWcdma) wcdma;
-+            return new CellIdentityWcdma(ci.lac, ci.cid, ci.psc, ci.uarfcn, ci.mcc, ci.mnc, "", "",
-+                    new ArraySet<>(), null);
-+        } else if (wcdma instanceof android.hardware.radio.V1_2.CellIdentityWcdma) {
-             android.hardware.radio.V1_2.CellIdentityWcdma ci =
-                     (android.hardware.radio.V1_2.CellIdentityWcdma) wcdma;
-             return new CellIdentityWcdma(ci.base.lac, ci.base.cid, ci.base.psc, ci.base.uarfcn,
-@@ -2760,13 +2945,18 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a CellIdentityTdscdma defined in radio/1.2, 1.5/types.hal to CellIdentityTdscdma
--     * @param tdscdma CellIdentityTdscdma defined in radio/1.2, 1.5/types.hal
-+     * Convert a CellIdentityTdscdma defined in radio/1.0, 1.2, 1.5/types.hal to CellIdentityTdscdma
-+     * @param tdscdma CellIdentityTdscdma defined in radio/1.0, 1.2, 1.5/types.hal
-      * @return The converted CellIdentityTdscdma
-      */
-     public static CellIdentityTdscdma convertHalCellIdentityTdscdma(Object tdscdma) {
-         if (tdscdma == null) return null;
--        if (tdscdma instanceof android.hardware.radio.V1_2.CellIdentityTdscdma) {
-+        if (tdscdma instanceof android.hardware.radio.V1_0.CellIdentityTdscdma) {
-+            android.hardware.radio.V1_0.CellIdentityTdscdma ci =
-+                    (android.hardware.radio.V1_0.CellIdentityTdscdma) tdscdma;
-+            return new CellIdentityTdscdma(ci.mcc, ci.mnc, ci.lac, ci.cid, ci.cpid,
-+                    CellInfo.UNAVAILABLE, "", "", Collections.emptyList(), null);
-+        } else if (tdscdma instanceof android.hardware.radio.V1_2.CellIdentityTdscdma) {
-             android.hardware.radio.V1_2.CellIdentityTdscdma ci =
-                     (android.hardware.radio.V1_2.CellIdentityTdscdma) tdscdma;
-             return new CellIdentityTdscdma(ci.base.mcc, ci.base.mnc, ci.base.lac, ci.base.cid,
-@@ -2786,7 +2976,7 @@ public class RILUtils {
- 
-     /**
-      * Convert a CellIdentityTdscdma defined in CellIdentityTdscdma.aidl to CellIdentityTdscdma
--     * @param cid CellIdentityTdscdma defined in radio/1.2, 1.5/types.hal
-+     * @param cid CellIdentityTdscdma defined in radio/1.0, 1.2, 1.5/types.hal
-      * @return The converted CellIdentityTdscdma
-      */
-     public static CellIdentityTdscdma convertHalCellIdentityTdscdma(
-@@ -2835,13 +3025,31 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a SignalStrength defined in radio/1.4, 1.6/types.hal to SignalStrength
--     * @param ss SignalStrength defined in radio/1.4, 1.6/types.hal
-+     * Convert a SignalStrength defined in radio/1.0, 1.2, 1.4, 1.6/types.hal to SignalStrength
-+     * @param ss SignalStrength defined in radio/1.0, 1.2, 1.4, 1.6/types.hal
-      * @return The converted SignalStrength
-      */
-     public static SignalStrength convertHalSignalStrength(Object ss) {
-         if (ss == null) return null;
--        if (ss instanceof android.hardware.radio.V1_4.SignalStrength) {
-+        if (ss instanceof android.hardware.radio.V1_0.SignalStrength) {
-+            android.hardware.radio.V1_0.SignalStrength signalStrength =
-+                    (android.hardware.radio.V1_0.SignalStrength) ss;
-+            return new SignalStrength(
-+                    convertHalCdmaSignalStrength(signalStrength.cdma, signalStrength.evdo),
-+                    convertHalGsmSignalStrength(signalStrength.gw), new CellSignalStrengthWcdma(),
-+                    convertHalTdscdmaSignalStrength(signalStrength.tdScdma),
-+                    convertHalLteSignalStrength(signalStrength.lte),
-+                    new CellSignalStrengthNr());
-+        } else if (ss instanceof android.hardware.radio.V1_2.SignalStrength) {
-+            android.hardware.radio.V1_2.SignalStrength signalStrength =
-+                    (android.hardware.radio.V1_2.SignalStrength) ss;
-+            return new SignalStrength(
-+                    convertHalCdmaSignalStrength(signalStrength.cdma, signalStrength.evdo),
-+                    convertHalGsmSignalStrength(signalStrength.gsm),
-+                    convertHalWcdmaSignalStrength(signalStrength.wcdma),
-+                    convertHalTdscdmaSignalStrength(signalStrength.tdScdma),
-+                    convertHalLteSignalStrength(signalStrength.lte), new CellSignalStrengthNr());
-+        } else if (ss instanceof android.hardware.radio.V1_4.SignalStrength) {
-             android.hardware.radio.V1_4.SignalStrength signalStrength =
-                     (android.hardware.radio.V1_4.SignalStrength) ss;
-             return new SignalStrength(
-@@ -2989,19 +3197,29 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a WcdmaSignalStrength defined in radio/1.2/types.hal to CellSignalStrengthWcdma
--     * @param wcdma WcdmaSignalStrength defined in radio/1.2/types.hal
-+     * Convert a WcdmaSignalStrength defined in radio/1.0, 1.2/types.hal to CellSignalStrengthWcdma
-+     * @param wcdma WcdmaSignalStrength defined in radio/1.0, 1.2/types.hal
-      * @return The converted CellSignalStrengthWcdma
-      */
-     public static CellSignalStrengthWcdma convertHalWcdmaSignalStrength(Object wcdma) {
-         if (wcdma == null) return null;
--        android.hardware.radio.V1_2.WcdmaSignalStrength ss =
--                (android.hardware.radio.V1_2.WcdmaSignalStrength) wcdma;
--        CellSignalStrengthWcdma ret = new CellSignalStrengthWcdma(
--                CellSignalStrength.getRssiDbmFromAsu(ss.base.signalStrength),
--                ss.base.bitErrorRate, CellSignalStrength.getRscpDbmFromAsu(ss.rscp),
--                CellSignalStrength.getEcNoDbFromAsu(ss.ecno));
--        if (ret.getRssi() == CellInfo.UNAVAILABLE && ret.getRscp() == CellInfo.UNAVAILABLE) {
-+        CellSignalStrengthWcdma ret = null;
-+        if (wcdma instanceof android.hardware.radio.V1_0.WcdmaSignalStrength) {
-+            android.hardware.radio.V1_0.WcdmaSignalStrength ss =
-+                    (android.hardware.radio.V1_0.WcdmaSignalStrength) wcdma;
-+            ret = new CellSignalStrengthWcdma(
-+                    CellSignalStrength.getRssiDbmFromAsu(ss.signalStrength), ss.bitErrorRate,
-+                    CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE);
-+        } else if (wcdma instanceof android.hardware.radio.V1_2.WcdmaSignalStrength) {
-+            android.hardware.radio.V1_2.WcdmaSignalStrength ss =
-+                    (android.hardware.radio.V1_2.WcdmaSignalStrength) wcdma;
-+            ret = new CellSignalStrengthWcdma(
-+                    CellSignalStrength.getRssiDbmFromAsu(ss.base.signalStrength),
-+                    ss.base.bitErrorRate, CellSignalStrength.getRscpDbmFromAsu(ss.rscp),
-+                    CellSignalStrength.getEcNoDbFromAsu(ss.ecno));
-+        }
-+        if (ret != null && ret.getRssi() == CellInfo.UNAVAILABLE
-+                && ret.getRscp() == CellInfo.UNAVAILABLE) {
-             ret.setDefaultValues();
-             ret.updateLevel(null, null);
-         }
-@@ -3027,18 +3245,29 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a TdscdmaSignalStrength defined in radio/1.2/types.hal to CellSignalStrengthTdscdma
--     * @param tdscdma TdscdmaSignalStrength defined in radio/1.2/types.hal
-+     * Convert a TdScdmaSignalStrength defined in radio/1.0/types.hal or TdscdmaSignalStrength
-+     * defined in radio/1.2/types.hal to CellSignalStrengthTdscdma
-+     * @param tdscdma TdScdmaSignalStrength defined in radio/1.0/types.hal or TdscdmaSignalStrength
-+     *        defined in radio/1.2/types.hal
-      * @return The converted CellSignalStrengthTdscdma
-      */
-     public static CellSignalStrengthTdscdma convertHalTdscdmaSignalStrength(Object tdscdma) {
-         if (tdscdma == null) return null;
--        android.hardware.radio.V1_2.TdscdmaSignalStrength ss =
--                (android.hardware.radio.V1_2.TdscdmaSignalStrength) tdscdma;
--        CellSignalStrengthTdscdma ret = new CellSignalStrengthTdscdma(
--                CellSignalStrength.getRssiDbmFromAsu(ss.signalStrength), ss.bitErrorRate,
--                CellSignalStrength.getRscpDbmFromAsu(ss.rscp));
--        if (ret.getRssi() == CellInfo.UNAVAILABLE && ret.getRscp() == CellInfo.UNAVAILABLE) {
-+        CellSignalStrengthTdscdma ret = null;
-+        if (tdscdma instanceof android.hardware.radio.V1_0.TdScdmaSignalStrength) {
-+            android.hardware.radio.V1_0.TdScdmaSignalStrength ss =
-+                    (android.hardware.radio.V1_0.TdScdmaSignalStrength) tdscdma;
-+            ret = new CellSignalStrengthTdscdma(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,
-+                    ss.rscp != CellInfo.UNAVAILABLE ? -ss.rscp : ss.rscp);
-+        } else if (tdscdma instanceof android.hardware.radio.V1_2.TdscdmaSignalStrength) {
-+            android.hardware.radio.V1_2.TdscdmaSignalStrength ss =
-+                    (android.hardware.radio.V1_2.TdscdmaSignalStrength) tdscdma;
-+            ret = new CellSignalStrengthTdscdma(
-+                    CellSignalStrength.getRssiDbmFromAsu(ss.signalStrength), ss.bitErrorRate,
-+                    CellSignalStrength.getRscpDbmFromAsu(ss.rscp));
-+        }
-+        if (ret != null && ret.getRssi() == CellInfo.UNAVAILABLE
-+                && ret.getRscp() == CellInfo.UNAVAILABLE) {
-             ret.setDefaultValues();
-             ret.updateLevel(null, null);
-         }
-@@ -3223,9 +3452,9 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert SetupDataCallResult defined in radio/1.4, 1.5, 1.6/types.hal into
-+     * Convert SetupDataCallResult defined in radio/1.0, 1.4, 1.5, 1.6/types.hal into
-      * DataCallResponse
--     * @param dcResult SetupDataCallResult defined in radio/1.4, 1.5, 1.6/types.hal
-+     * @param dcResult SetupDataCallResult defined in radio/1.0, 1.4, 1.5, 1.6/types.hal
-      * @return The converted DataCallResponse
-      */
-     @VisibleForTesting
-@@ -3236,10 +3465,10 @@ public class RILUtils {
-         long suggestedRetryTime;
-         String ifname;
-         int protocolType;
--        String[] addresses;
--        String[] dnses;
--        String[] gateways;
--        String[] pcscfs;
-+        String[] addresses = null;
-+        String[] dnses = null;
-+        String[] gateways = null;
-+        String[] pcscfs = null;
-         Qos defaultQos = null;
-         @DataCallResponse.HandoverFailureMode
-         int handoverFailureMode = DataCallResponse.HANDOVER_FAILURE_MODE_LEGACY;
-@@ -3249,7 +3478,34 @@ public class RILUtils {
-         NetworkSliceInfo sliceInfo = null;
-         List<TrafficDescriptor> trafficDescriptors = new ArrayList<>();
- 
--        if (dcResult instanceof android.hardware.radio.V1_4.SetupDataCallResult) {
-+        if (dcResult instanceof android.hardware.radio.V1_0.SetupDataCallResult) {
-+            final android.hardware.radio.V1_0.SetupDataCallResult result =
-+                    (android.hardware.radio.V1_0.SetupDataCallResult) dcResult;
-+            cause = result.status;
-+            suggestedRetryTime = result.suggestedRetryTime;
-+            cid = result.cid;
-+            active = result.active;
-+            protocolType = ApnSetting.getProtocolIntFromString(result.type);
-+            ifname = result.ifname;
-+            if (!TextUtils.isEmpty(result.addresses)) {
-+                addresses = result.addresses.split("\\s+");
-+            }
-+            if (!TextUtils.isEmpty(result.dnses)) {
-+                dnses = result.dnses.split("\\s+");
-+            }
-+            if (!TextUtils.isEmpty(result.gateways)) {
-+                gateways = result.gateways.split("\\s+");
-+            }
-+            if (!TextUtils.isEmpty(result.pcscf)) {
-+                pcscfs = result.pcscf.split("\\s+");
-+            }
-+            mtu = mtuV4 = mtuV6 = result.mtu;
-+            if (addresses != null) {
-+                for (String address : addresses) {
-+                    laList.add(convertToLinkAddress(address));
-+                }
-+            }
-+        } else if (dcResult instanceof android.hardware.radio.V1_4.SetupDataCallResult) {
-             final android.hardware.radio.V1_4.SetupDataCallResult result =
-                     (android.hardware.radio.V1_4.SetupDataCallResult) dcResult;
-             cause = result.cause;
-@@ -3802,10 +4058,10 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert a list of SetupDataCallResult defined in radio/1.4, 1.5, 1.6/types.hal into
-+     * Convert a list of SetupDataCallResult defined in radio/1.0, 1.4, 1.5, 1.6/types.hal into
-      * a list of DataCallResponse
-      * @param dataCallResultList List of SetupDataCallResult defined in
--     *        radio/1.4, 1.5, 1.6/types.hal
-+     *        radio/1.0, 1.4, 1.5, 1.6/types.hal
-      * @return The converted list of DataCallResponses
-      */
-     @VisibleForTesting
-@@ -3895,8 +4151,8 @@ public class RILUtils {
-     }
- 
-     /**
--     * Convert Call defined in radio/1.2, 1.6/types.hal to DriverCall
--     * @param halCall Call defined in radio/1.2, 1.6/types.hal
-+     * Convert Call defined in radio/1.0, 1.2, 1.6/types.hal to DriverCall
-+     * @param halCall Call defined in radio/1.0, 1.2, 1.6/types.hal
-      * @return The converted DriverCall
-      */
-     public static DriverCall convertToDriverCall(Object halCall) {
-@@ -3912,13 +4168,17 @@ public class RILUtils {
-             call16 = null;
-             call12 = (android.hardware.radio.V1_2.Call) halCall;
-             call10 = call12.base;
-+        } else if (halCall instanceof android.hardware.radio.V1_0.Call) {
-+            call16 = null;
-+            call12 = null;
-+            call10 = (android.hardware.radio.V1_0.Call) halCall;
-         } else {
-             call16 = null;
-             call12 = null;
-             call10 = null;
-         }
-         if (call10 != null) {
--            dc.state = DriverCall.stateFromCLCC(call10.state);
-+            dc.state = DriverCall.stateFromCLCC((int) (call10.state));
-             dc.index = call10.index;
-             dc.TOA = call10.toa;
-             dc.isMpty = call10.isMpty;
-@@ -3927,9 +4187,10 @@ public class RILUtils {
-             dc.isVoice = call10.isVoice;
-             dc.isVoicePrivacy = call10.isVoicePrivacy;
-             dc.number = call10.number;
--            dc.numberPresentation = DriverCall.presentationFromCLIP(call10.numberPresentation);
-+            dc.numberPresentation = DriverCall.presentationFromCLIP(
-+                    (int) (call10.numberPresentation));
-             dc.name = call10.name;
--            dc.namePresentation = DriverCall.presentationFromCLIP(call10.namePresentation);
-+            dc.namePresentation = DriverCall.presentationFromCLIP((int) (call10.namePresentation));
-             if (call10.uusInfo.size() == 1) {
-                 dc.uusInfo = new UUSInfo();
-                 dc.uusInfo.setType(call10.uusInfo.get(0).uusType);
-@@ -3943,7 +4204,7 @@ public class RILUtils {
-             dc.number = PhoneNumberUtils.stringFromStringAndTOA(dc.number, dc.TOA);
-         }
-         if (call12 != null) {
--            dc.audioQuality = call12.audioQuality;
-+            dc.audioQuality = (int) (call12.audioQuality);
-         }
-         if (call16 != null) {
-             dc.forwardedNumber = call16.forwardedNumber;
-@@ -3958,7 +4219,7 @@ public class RILUtils {
-      */
-     public static DriverCall convertToDriverCall(android.hardware.radio.voice.Call halCall) {
-         DriverCall dc = new DriverCall();
--        dc.state = DriverCall.stateFromCLCC(halCall.state);
-+        dc.state = DriverCall.stateFromCLCC((int) halCall.state);
-         dc.index = halCall.index;
-         dc.TOA = halCall.toa;
-         dc.isMpty = halCall.isMpty;
-@@ -3967,9 +4228,9 @@ public class RILUtils {
-         dc.isVoice = halCall.isVoice;
-         dc.isVoicePrivacy = halCall.isVoicePrivacy;
-         dc.number = halCall.number;
--        dc.numberPresentation = DriverCall.presentationFromCLIP(halCall.numberPresentation);
-+        dc.numberPresentation = DriverCall.presentationFromCLIP((int) halCall.numberPresentation);
-         dc.name = halCall.name;
--        dc.namePresentation = DriverCall.presentationFromCLIP(halCall.namePresentation);
-+        dc.namePresentation = DriverCall.presentationFromCLIP((int) halCall.namePresentation);
-         if (halCall.uusInfo.length == 1) {
-             dc.uusInfo = new UUSInfo();
-             dc.uusInfo.setType(halCall.uusInfo[0].uusType);
-@@ -3980,7 +4241,7 @@ public class RILUtils {
-         }
-         // Make sure there's a leading + on addresses with a TOA of 145
-         dc.number = PhoneNumberUtils.stringFromStringAndTOA(dc.number, dc.TOA);
--        dc.audioQuality = halCall.audioQuality;
-+        dc.audioQuality = (int) halCall.audioQuality;
-         dc.forwardedNumber = halCall.forwardedNumber;
-         return dc;
-     }
-diff --git a/src/java/com/android/internal/telephony/RadioConfig.java b/src/java/com/android/internal/telephony/RadioConfig.java
-index 13f65028b6..1b8b15628e 100644
---- a/src/java/com/android/internal/telephony/RadioConfig.java
-+++ b/src/java/com/android/internal/telephony/RadioConfig.java
-@@ -62,6 +62,7 @@ public class RadioConfig extends Handler {
-     static final int EVENT_HIDL_SERVICE_DEAD = 1;
-     static final int EVENT_AIDL_SERVICE_DEAD = 2;
-     static final HalVersion RADIO_CONFIG_HAL_VERSION_UNKNOWN = new HalVersion(-1, -1);
-+    static final HalVersion RADIO_CONFIG_HAL_VERSION_1_0 = new HalVersion(1, 0);
-     static final HalVersion RADIO_CONFIG_HAL_VERSION_1_1 = new HalVersion(1, 1);
-     static final HalVersion RADIO_CONFIG_HAL_VERSION_1_3 = new HalVersion(1, 3);
-     static final HalVersion RADIO_CONFIG_HAL_VERSION_2_0 = new HalVersion(2, 0);
-@@ -319,7 +320,13 @@ public class RadioConfig extends Handler {
-         }
- 
-         if (mRadioConfigProxy.isEmpty()) {
--            loge("IRadioConfig <1.1 is no longer supported.");
-+            try {
-+                mRadioConfigProxy.setHidl(RADIO_CONFIG_HAL_VERSION_1_0,
-+                        android.hardware.radio.config.V1_0.IRadioConfig.getService(true));
-+            } catch (RemoteException | NoSuchElementException e) {
-+                mRadioConfigProxy.clear();
-+                loge("getHidlRadioConfigProxy1_0: RadioConfigProxy getService | linkToDeath: " + e);
-+            }
-         }
- 
-         if (!mRadioConfigProxy.isEmpty()) {
-diff --git a/src/java/com/android/internal/telephony/RadioConfigProxy.java b/src/java/com/android/internal/telephony/RadioConfigProxy.java
-index b6c6d68470..79f3d70b9e 100644
---- a/src/java/com/android/internal/telephony/RadioConfigProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioConfigProxy.java
-@@ -35,7 +35,7 @@ public class RadioConfigProxy {
-     private final RadioConfigHidlServiceDeathRecipient mRadioConfigHidlServiceDeathRecipient;
-     private final RadioConfigAidlServiceDeathRecipient mRadioConfigAidlServiceDeathRecipient;
- 
--    private volatile android.hardware.radio.config.V1_1.IRadioConfig mHidlRadioConfigProxy = null;
-+    private volatile android.hardware.radio.config.V1_0.IRadioConfig mHidlRadioConfigProxy = null;
-     private volatile android.hardware.radio.config.IRadioConfig mAidlRadioConfigProxy = null;
- 
-     private HalVersion mRadioConfigHalVersion = RadioConfig.RADIO_CONFIG_HAL_VERSION_UNKNOWN;
-@@ -57,19 +57,27 @@ public class RadioConfigProxy {
-      */
-     public void setHidl(
-             HalVersion radioConfigHalVersion,
--            android.hardware.radio.config.V1_1.IRadioConfig radioConfig) {
-+            android.hardware.radio.config.V1_0.IRadioConfig radioConfig) {
-         mRadioConfigHalVersion = radioConfigHalVersion;
-         mHidlRadioConfigProxy = radioConfig;
-         mIsAidl = false;
-         mRadioConfigHidlServiceDeathRecipient.setService(radioConfig);
-     }
- 
-+    /**
-+     * Get HIDL IRadioConfig V1_0
-+     * @return IRadioConfigV1_0
-+     */
-+    public android.hardware.radio.config.V1_0.IRadioConfig getHidl10() {
-+        return mHidlRadioConfigProxy;
-+    }
-+
-     /**
-      * Get HIDL IRadioConfig V1_1
-      * @return IRadioConfigV1_1
-      */
-     public android.hardware.radio.config.V1_1.IRadioConfig getHidl11() {
--        return mHidlRadioConfigProxy;
-+        return (android.hardware.radio.config.V1_1.IRadioConfig) mHidlRadioConfigProxy;
-     }
- 
-     /**
-@@ -184,7 +192,7 @@ public class RadioConfigProxy {
-         if (isAidl()) {
-             getAidl().getSimSlotsStatus(serial);
-         } else {
--            getHidl11().getSimSlotsStatus(serial);
-+            getHidl10().getSimSlotsStatus(serial);
-         }
-     }
- 
-@@ -219,7 +227,7 @@ public class RadioConfigProxy {
-         if (isAidl()) {
-             getAidl().setSimSlotsMapping(serial, RILUtils.convertSimSlotsMapping(slotMapping));
-         } else {
--            getHidl11().setSimSlotsMapping(serial,
-+            getHidl10().setSimSlotsMapping(serial,
-                     RILUtils.convertSlotMappingToList(slotMapping));
-         }
-     }
-@@ -267,13 +275,13 @@ public class RadioConfigProxy {
-         private static final String TAG = "RadioConfigHidlSDR";
- 
-         private final RadioConfig mRadioConfig;
--        private android.hardware.radio.config.V1_1.IRadioConfig mService;
-+        private android.hardware.radio.config.V1_0.IRadioConfig mService;
- 
-         RadioConfigHidlServiceDeathRecipient(RadioConfig radioConfig) {
-             mRadioConfig = radioConfig;
-         }
- 
--        public void setService(android.hardware.radio.config.V1_1.IRadioConfig service) {
-+        public void setService(android.hardware.radio.config.V1_0.IRadioConfig service) {
-             mService = service;
-         }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioDataProxy.java b/src/java/com/android/internal/telephony/RadioDataProxy.java
-index 40db9e5b3d..9671077b0f 100644
---- a/src/java/com/android/internal/telephony/RadioDataProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioDataProxy.java
-@@ -22,7 +22,9 @@ import android.os.AsyncResult;
- import android.os.Message;
- import android.os.RemoteException;
- import android.telephony.Rlog;
-+import android.telephony.ServiceState;
- import android.telephony.data.DataProfile;
-+import android.telephony.data.DataService;
- import android.telephony.data.NetworkSliceInfo;
- import android.telephony.data.TrafficDescriptor;
- 
-@@ -32,8 +34,8 @@ import java.net.InetAddress;
- import java.util.ArrayList;
- 
- /**
-- * A holder for IRadioData.
-- * Use getAidl to get IRadioData and call the AIDL implementations of the HAL APIs.
-+ * A holder for IRadioData. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get IRadioData and call the AIDL implementations of the HAL APIs.
-  */
- public class RadioDataProxy extends RadioServiceProxy {
-     private static final String TAG = "RadioDataProxy";
-@@ -127,8 +129,12 @@ public class RadioDataProxy extends RadioServiceProxy {
-         if (isEmpty()) return;
-         if (isAidl()) {
-             mDataProxy.deactivateDataCall(serial, cid, reason);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_2)) {
-+            ((android.hardware.radio.V1_2.IRadio) mRadioProxy).deactivateDataCall_1_2(
-+                    serial, cid, reason);
-         } else {
--            mRadioProxy.deactivateDataCall_1_2(serial, cid, reason);
-+            mRadioProxy.deactivateDataCall(serial, cid,
-+                    reason == DataService.REQUEST_REASON_SHUTDOWN);
-         }
-     }
- 
-@@ -210,9 +216,11 @@ public class RadioDataProxy extends RadioServiceProxy {
-      * Call IRadioData#setDataProfile
-      * @param serial Serial number of request
-      * @param profiles Array of DataProfiles to set
-+     * @param isRoaming Whether or not the device is roaming
-      * @throws RemoteException
-      */
--    public void setDataProfile(int serial, DataProfile[] profiles) throws RemoteException {
-+    public void setDataProfile(int serial, DataProfile[] profiles, boolean isRoaming)
-+            throws RemoteException {
-         if (isEmpty()) return;
-         if (isAidl()) {
-             android.hardware.radio.data.DataProfileInfo[] dpis =
-@@ -227,12 +235,22 @@ public class RadioDataProxy extends RadioServiceProxy {
-                 dpis.add(RILUtils.convertToHalDataProfile15(dp));
-             }
-             ((android.hardware.radio.V1_5.IRadio) mRadioProxy).setDataProfile_1_5(serial, dpis);
--        } else {
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-             ArrayList<android.hardware.radio.V1_4.DataProfileInfo> dpis = new ArrayList<>();
-             for (DataProfile dp : profiles) {
-                 dpis.add(RILUtils.convertToHalDataProfile14(dp));
-             }
--            mRadioProxy.setDataProfile_1_4(serial, dpis);
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setDataProfile_1_4(serial, dpis);
-+        } else {
-+            ArrayList<android.hardware.radio.V1_0.DataProfileInfo> dpis = new ArrayList<>();
-+            for (DataProfile dp : profiles) {
-+                if (dp.isPersistent()) {
-+                    dpis.add(RILUtils.convertToHalDataProfile10(dp));
-+                }
-+            }
-+            if (!dpis.isEmpty()) {
-+                mRadioProxy.setDataProfile(serial, dpis, isRoaming);
-+            }
-         }
-     }
- 
-@@ -259,9 +277,10 @@ public class RadioDataProxy extends RadioServiceProxy {
-      * Call IRadioData#setInitialAttachApn
-      * @param serial Serial number of request
-      * @param dataProfile Data profile containing APN settings
-+     * @param isRoaming Whether or not the device is roaming
-      * @throws RemoteException
-      */
--    public void setInitialAttachApn(int serial, DataProfile dataProfile)
-+    public void setInitialAttachApn(int serial, DataProfile dataProfile, boolean isRoaming)
-             throws RemoteException {
-         if (isEmpty()) return;
-         if (isAidl()) {
-@@ -269,17 +288,22 @@ public class RadioDataProxy extends RadioServiceProxy {
-         } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {
-             ((android.hardware.radio.V1_5.IRadio) mRadioProxy).setInitialAttachApn_1_5(serial,
-                     RILUtils.convertToHalDataProfile15(dataProfile));
--        } else {
--            mRadioProxy.setInitialAttachApn_1_4(serial,
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setInitialAttachApn_1_4(serial,
-                     RILUtils.convertToHalDataProfile14(dataProfile));
-+        } else {
-+            mRadioProxy.setInitialAttachApn(serial, RILUtils.convertToHalDataProfile10(dataProfile),
-+                    dataProfile.isPersistent(), isRoaming);
-         }
-     }
- 
-     /**
-      * Call IRadioData#setupDataCall
-      * @param serial Serial number of request
-+     * @param phoneId Phone ID of the requestor
-      * @param accessNetwork Access network to setup the data call
-      * @param dataProfileInfo Data profile info
-+     * @param isRoaming Whether or not the device is roaming
-      * @param roamingAllowed Whether or not data roaming is allowed by the user
-      * @param reason Request reason
-      * @param linkProperties LinkProperties containing address and DNS info
-@@ -292,14 +316,15 @@ public class RadioDataProxy extends RadioServiceProxy {
-      *                            is allowed
-      * @throws RemoteException
-      */
--    public void setupDataCall(int serial, int accessNetwork, DataProfile dataProfileInfo,
--            boolean roamingAllowed, int reason, LinkProperties linkProperties, int pduSessionId,
--            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
--            boolean matchAllRuleAllowed) throws RemoteException {
-+    public void setupDataCall(int serial, int phoneId, int accessNetwork,
-+            DataProfile dataProfileInfo, boolean isRoaming, boolean roamingAllowed, int reason,
-+            LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,
-+            TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed)
-+            throws RemoteException {
-         if (isEmpty()) return;
-         ArrayList<String> addresses = new ArrayList<>();
-         ArrayList<String> dnses = new ArrayList<>();
--        String[] dnsesArr;
-+        String[] dnsesArr = null;
-         if (linkProperties != null) {
-             for (InetAddress address : linkProperties.getAddresses()) {
-                 addresses.add(address.getHostAddress());
-@@ -336,10 +361,31 @@ public class RadioDataProxy extends RadioServiceProxy {
-                     accessNetwork, RILUtils.convertToHalDataProfile15(dataProfileInfo),
-                     roamingAllowed, reason, RILUtils.convertToHalLinkProperties15(linkProperties),
-                     dnses);
--        } else {
--            mRadioProxy.setupDataCall_1_4(serial, accessNetwork,
--                    RILUtils.convertToHalDataProfile14(dataProfileInfo),
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setupDataCall_1_4(serial,
-+                    accessNetwork, RILUtils.convertToHalDataProfile14(dataProfileInfo),
-                     roamingAllowed, reason, addresses, dnses);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_2)) {
-+            ((android.hardware.radio.V1_2.IRadio) mRadioProxy).setupDataCall_1_2(serial,
-+                    accessNetwork, RILUtils.convertToHalDataProfile10(dataProfileInfo),
-+                    dataProfileInfo.isPersistent(), roamingAllowed, isRoaming, reason, addresses,
-+                    dnses);
-+        } else {
-+            // Getting data RAT here is just a workaround to support the older 1.0 vendor RIL.
-+            // The new data service interface passes access network type instead of RAT for
-+            // setup data request. It is impossible to convert access network type back to RAT here,
-+            // so we directly get the data RAT from phone.
-+            int dataRat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
-+            Phone phone = PhoneFactory.getPhone(phoneId);
-+            if (phone != null) {
-+                ServiceState ss = phone.getServiceState();
-+                if (ss != null) {
-+                    dataRat = ss.getRilDataRadioTechnology();
-+                }
-+            }
-+            mRadioProxy.setupDataCall(serial, dataRat,
-+                    RILUtils.convertToHalDataProfile10(dataProfileInfo),
-+                    dataProfileInfo.isPersistent(), roamingAllowed, isRoaming);
-         }
-     }
- 
-@@ -369,7 +415,7 @@ public class RadioDataProxy extends RadioServiceProxy {
-      */
-     public void startKeepalive(int serial, int contextId, KeepalivePacketData packetData,
-             int intervalMillis, Message result) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_1)) return;
-         if (isAidl()) {
-             android.hardware.radio.data.KeepaliveRequest req =
-                     new android.hardware.radio.data.KeepaliveRequest();
-@@ -430,7 +476,7 @@ public class RadioDataProxy extends RadioServiceProxy {
-             req.destinationPort = packetData.getDstPort();
-             req.maxKeepaliveIntervalMillis = intervalMillis;
- 
--            mRadioProxy.startKeepalive(serial, req);
-+            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).startKeepalive(serial, req);
-         }
-     }
- 
-@@ -441,11 +487,11 @@ public class RadioDataProxy extends RadioServiceProxy {
-      * @throws RemoteException
-      */
-     public void stopKeepalive(int serial, int sessionHandle) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_1)) return;
-         if (isAidl()) {
-             mDataProxy.stopKeepalive(serial, sessionHandle);
-         } else {
--            mRadioProxy.stopKeepalive(serial, sessionHandle);
-+            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).stopKeepalive(serial, sessionHandle);
-         }
-     }
- }
-diff --git a/src/java/com/android/internal/telephony/RadioIndication.java b/src/java/com/android/internal/telephony/RadioIndication.java
-index aadfe62499..b29a7bf434 100644
---- a/src/java/com/android/internal/telephony/RadioIndication.java
-+++ b/src/java/com/android/internal/telephony/RadioIndication.java
-@@ -240,18 +240,28 @@ public class RadioIndication extends IRadioIndication.Stub {
-     }
- 
-     public void currentSignalStrength(int indicationType,
--            android.hardware.radio.V1_0.SignalStrength signalStrength) {
--        mRil.unsljLogMore(RIL_UNSOL_SIGNAL_STRENGTH, "unsupported on IRadio < 1.4");
-+                                      android.hardware.radio.V1_0.SignalStrength signalStrength) {
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+
-+        SignalStrength ssInitial = RILUtils.convertHalSignalStrength(signalStrength);
-+
-+        SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);
-+        // Note this is set to "verbose" because it happens frequently
-+        if (mRil.isLogvOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);
-+
-+        if (mRil.mSignalStrengthRegistrant != null) {
-+            mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult (null, ss, null));
-+        }
-     }
- 
-     /**
-      * Indicates current link capacity estimate.
-      */
-     public void currentLinkCapacityEstimate(int indicationType,
--            android.hardware.radio.V1_2.LinkCapacityEstimate lce) {
-+                                            android.hardware.radio.V1_2.LinkCapacityEstimate lce) {
-         mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
- 
--        List<LinkCapacityEstimate> response = RILUtils.convertHalLinkCapacityEstimate(lce);
-+        List<LinkCapacityEstimate> response = RILUtils.convertHalLceData(lce);
- 
-         if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_LCEDATA_RECV, response);
- 
-@@ -267,7 +277,7 @@ public class RadioIndication extends IRadioIndication.Stub {
-             android.hardware.radio.V1_6.LinkCapacityEstimate lce) {
-         mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
- 
--        List<LinkCapacityEstimate> response = RILUtils.convertHalLinkCapacityEstimate(lce);
-+        List<LinkCapacityEstimate> response = RILUtils.convertHalLceData(lce);
- 
-         if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_LCEDATA_RECV, response);
- 
-@@ -280,8 +290,16 @@ public class RadioIndication extends IRadioIndication.Stub {
-      * Indicates the current signal strength of the camped or primary serving cell.
-      */
-     public void currentSignalStrength_1_2(int indicationType,
--            android.hardware.radio.V1_2.SignalStrength signalStrength) {
--        mRil.unsljLogMore(RIL_UNSOL_SIGNAL_STRENGTH, "unsupported on IRadio < 1.4");
-+                                      android.hardware.radio.V1_2.SignalStrength signalStrength) {
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+
-+        SignalStrength ss = RILUtils.convertHalSignalStrength(signalStrength);
-+        // Note this is set to "verbose" because it happens frequently
-+        if (mRil.isLogvOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);
-+
-+        if (mRil.mSignalStrengthRegistrant != null) {
-+            mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult(null, ss, null));
-+        }
-     }
- 
-     /**
-@@ -341,7 +359,8 @@ public class RadioIndication extends IRadioIndication.Stub {
-      */
-     public void currentPhysicalChannelConfigs(int indicationType,
-             ArrayList<android.hardware.radio.V1_2.PhysicalChannelConfig> configs) {
--        mRil.unsljLogMore(RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG, "unsupported on IRadio < 1.4");
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+        physicalChannelConfigsIndication(configs);
-     }
- 
-     /**
-@@ -374,7 +393,7 @@ public class RadioIndication extends IRadioIndication.Stub {
-     /** Indicates current data call list. */
-     public void dataCallListChanged(int indicationType,
-             ArrayList<android.hardware.radio.V1_0.SetupDataCallResult> dcList) {
--        mRil.unsljLogMore(RIL_UNSOL_DATA_CALL_LIST_CHANGED, "unsupported on IRadio < 1.4");
-+        responseDataCallListChanged(indicationType, dcList);
-     }
- 
-     /** Indicates current data call list with radio HAL 1.4. */
-@@ -784,13 +803,15 @@ public class RadioIndication extends IRadioIndication.Stub {
-     /** Get unsolicited message for cellInfoList */
-     public void cellInfoList(int indicationType,
-             ArrayList<android.hardware.radio.V1_0.CellInfo> records) {
--        mRil.unsljLogMore(RIL_UNSOL_CELL_INFO_LIST, "unsupported on IRadio < 1.4");
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+        responseCellInfoList(records);
-     }
- 
-     /** Get unsolicited message for cellInfoList using HAL V1_2 */
-     public void cellInfoList_1_2(int indicationType,
-             ArrayList<android.hardware.radio.V1_2.CellInfo> records) {
--        mRil.unsljLogMore(RIL_UNSOL_CELL_INFO_LIST, "unsupported on IRadio < 1.4");
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+        responseCellInfoList(records);
-     }
- 
-     /** Get unsolicited message for cellInfoList using HAL V1_4 */
-@@ -833,20 +854,20 @@ public class RadioIndication extends IRadioIndication.Stub {
- 
-     /** Incremental network scan results */
-     public void networkScanResult(int indicationType,
--            android.hardware.radio.V1_1.NetworkScanResult result) {
--        mRil.unsljLogMore(RIL_UNSOL_NETWORK_SCAN_RESULT, "unsupported on IRadio < 1.4");
-+                                  android.hardware.radio.V1_1.NetworkScanResult result) {
-+        responseNetworkScan(indicationType, result);
-     }
- 
-     /** Incremental network scan results with HAL V1_2 */
-     public void networkScanResult_1_2(int indicationType,
--            android.hardware.radio.V1_2.NetworkScanResult result) {
--        mRil.unsljLogMore(RIL_UNSOL_NETWORK_SCAN_RESULT, "unsupported on IRadio < 1.4");
-+                                      android.hardware.radio.V1_2.NetworkScanResult result) {
-+        responseNetworkScan_1_2(indicationType, result);
-     }
- 
-     /** Incremental network scan results with HAL V1_4 */
-     public void networkScanResult_1_4(int indicationType,
--            android.hardware.radio.V1_4.NetworkScanResult result) {
--        responseNetworkScan(indicationType, result);
-+                                      android.hardware.radio.V1_4.NetworkScanResult result) {
-+        responseNetworkScan_1_4(indicationType, result);
-     }
- 
-     /** Incremental network scan results with HAL V1_5 */
-@@ -897,7 +918,8 @@ public class RadioIndication extends IRadioIndication.Stub {
-                 new AsyncResult (null, response, null));
-     }
- 
--    public void hardwareConfigChanged(int indicationType,
-+    public void hardwareConfigChanged(
-+            int indicationType,
-             ArrayList<android.hardware.radio.V1_0.HardwareConfig> configs) {
-         mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
- 
-@@ -910,7 +932,7 @@ public class RadioIndication extends IRadioIndication.Stub {
-     }
- 
-     public void radioCapabilityIndication(int indicationType,
--            android.hardware.radio.V1_0.RadioCapability rc) {
-+                                          android.hardware.radio.V1_0.RadioCapability rc) {
-         mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
- 
-         RadioCapability response = RILUtils.convertHalRadioCapability(rc, mRil);
-@@ -980,7 +1002,15 @@ public class RadioIndication extends IRadioIndication.Stub {
-     }
- 
-     public void lceData(int indicationType, LceDataInfo lce) {
--        mRil.unsljLogMore(RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG, "unsupported on IRadio < 1.4");
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+
-+        List<LinkCapacityEstimate> response = RILUtils.convertHalLceData(lce);
-+
-+        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_LCEDATA_RECV, response);
-+
-+        if (mRil.mLceInfoRegistrants != null) {
-+            mRil.mLceInfoRegistrants.notifyRegistrants(new AsyncResult(null, response, null));
-+        }
-     }
- 
-     public void pcoData(int indicationType, PcoDataInfo pco) {
-@@ -1168,7 +1198,16 @@ public class RadioIndication extends IRadioIndication.Stub {
-         List<PhysicalChannelConfig> response = new ArrayList<>(configs.size());
-         try {
-             for (Object obj : configs) {
--                if (obj instanceof android.hardware.radio.V1_4.PhysicalChannelConfig) {
-+                if (obj instanceof android.hardware.radio.V1_2.PhysicalChannelConfig) {
-+                    android.hardware.radio.V1_2.PhysicalChannelConfig config =
-+                            (android.hardware.radio.V1_2.PhysicalChannelConfig) obj;
-+
-+                    response.add(new PhysicalChannelConfig.Builder()
-+                            .setCellConnectionStatus(RILUtils.convertHalCellConnectionStatus(
-+                                    config.status))
-+                            .setCellBandwidthDownlinkKhz(config.cellBandwidthDownlink)
-+                            .build());
-+                } else if (obj instanceof android.hardware.radio.V1_4.PhysicalChannelConfig) {
-                     android.hardware.radio.V1_4.PhysicalChannelConfig config =
-                             (android.hardware.radio.V1_4.PhysicalChannelConfig) obj;
-                     PhysicalChannelConfig.Builder builder = new PhysicalChannelConfig.Builder();
-@@ -1242,6 +1281,28 @@ public class RadioIndication extends IRadioIndication.Stub {
-     }
- 
-     private void responseNetworkScan(int indicationType,
-+            android.hardware.radio.V1_1.NetworkScanResult result) {
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+
-+        ArrayList<CellInfo> cellInfos =
-+                RILUtils.convertHalCellInfoList(new ArrayList<>(result.networkInfos));
-+        NetworkScanResult nsr = new NetworkScanResult(result.status, result.error, cellInfos);
-+        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_NETWORK_SCAN_RESULT, nsr);
-+        mRil.mRilNetworkScanResultRegistrants.notifyRegistrants(new AsyncResult(null, nsr, null));
-+    }
-+
-+    private void responseNetworkScan_1_2(int indicationType,
-+            android.hardware.radio.V1_2.NetworkScanResult result) {
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+
-+        ArrayList<CellInfo> cellInfos =
-+                RILUtils.convertHalCellInfoList(new ArrayList<>(result.networkInfos));
-+        NetworkScanResult nsr = new NetworkScanResult(result.status, result.error, cellInfos);
-+        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_NETWORK_SCAN_RESULT, nsr);
-+        mRil.mRilNetworkScanResultRegistrants.notifyRegistrants(new AsyncResult(null, nsr, null));
-+    }
-+
-+    private void responseNetworkScan_1_4(int indicationType,
-             android.hardware.radio.V1_4.NetworkScanResult result) {
-         mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
- 
-diff --git a/src/java/com/android/internal/telephony/RadioMessagingProxy.java b/src/java/com/android/internal/telephony/RadioMessagingProxy.java
-index c652284a11..69ccf3612a 100644
---- a/src/java/com/android/internal/telephony/RadioMessagingProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioMessagingProxy.java
-@@ -25,8 +25,8 @@ import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
- import java.util.ArrayList;
- 
- /**
-- * A holder for IRadioMessaging.
-- * Use getAidl to get IRadioMessaging and call the AIDL implementations of the HAL APIs.
-+ * A holder for IRadioMessaging. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get IRadioMessaging and call the AIDL implementations of the HAL APIs.
-  */
- public class RadioMessagingProxy extends RadioServiceProxy {
-     private static final String TAG = "RadioMessagingProxy";
-diff --git a/src/java/com/android/internal/telephony/RadioModemProxy.java b/src/java/com/android/internal/telephony/RadioModemProxy.java
-index cdcbcc063e..4178293d06 100644
---- a/src/java/com/android/internal/telephony/RadioModemProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioModemProxy.java
-@@ -20,8 +20,8 @@ import android.os.RemoteException;
- import android.telephony.Rlog;
- 
- /**
-- * A holder for IRadioModem.
-- * Use getAidl to get IRadioModem and call the AIDL implementations of the HAL APIs.
-+ * A holder for IRadioModem. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get IRadioModem and call the AIDL implementations of the HAL APIs.
-  */
- public class RadioModemProxy extends RadioServiceProxy {
-     private static final String TAG = "RadioModemProxy";
-@@ -83,11 +83,11 @@ public class RadioModemProxy extends RadioServiceProxy {
-      * @throws RemoteException
-      */
-     public void enableModem(int serial, boolean on) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_3)) return;
-         if (isAidl()) {
-             mModemProxy.enableModem(serial, on);
-         } else {
--            mRadioProxy.enableModem(serial, on);
-+            ((android.hardware.radio.V1_3.IRadio) mRadioProxy).enableModem(serial, on);
-         }
-     }
- 
-@@ -166,11 +166,11 @@ public class RadioModemProxy extends RadioServiceProxy {
-      * @throws RemoteException
-      */
-     public void getModemStackStatus(int serial) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_3)) return;
-         if (isAidl()) {
-             mModemProxy.getModemStackStatus(serial);
-         } else {
--            mRadioProxy.getModemStackStatus(serial);
-+            ((android.hardware.radio.V1_3.IRadio) mRadioProxy).getModemStackStatus(serial);
-         }
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioNetworkProxy.java b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-index 4acc71acee..069e0667df 100644
---- a/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-@@ -33,17 +33,19 @@ import java.util.List;
- import java.util.stream.Collectors;
- 
- /**
-- * A holder for IRadioNetwork.
-- * Use getAidl to get IRadioNetwork and call the AIDL implementations of the HAL APIs.
-+ * A holder for IRadioNetwork. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get IRadioNetwork and call the AIDL implementations of the HAL APIs.
-  */
- public class RadioNetworkProxy extends RadioServiceProxy {
-     private static final String TAG = "RadioNetworkProxy";
-     private volatile android.hardware.radio.network.IRadioNetwork mNetworkProxy = null;
- 
--    private static final int INDICATION_FILTERS_ALL_V1_2 =
-+    private static final int INDICATION_FILTERS_ALL_V1_0 =
-             android.hardware.radio.V1_5.IndicationFilter.SIGNAL_STRENGTH
-                     | android.hardware.radio.V1_5.IndicationFilter.FULL_NETWORK_STATE
--                    | android.hardware.radio.V1_5.IndicationFilter.DATA_CALL_DORMANCY_CHANGED
-+                    | android.hardware.radio.V1_5.IndicationFilter.DATA_CALL_DORMANCY_CHANGED;
-+    private static final int INDICATION_FILTERS_ALL_V1_2 =
-+            INDICATION_FILTERS_ALL_V1_0
-                     | android.hardware.radio.V1_5.IndicationFilter.LINK_CAPACITY_ESTIMATE
-                     | android.hardware.radio.V1_5.IndicationFilter.PHYSICAL_CHANNEL_CONFIG;
-     private static final int INDICATION_FILTERS_ALL_V1_5 =
-@@ -119,8 +121,11 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             mNetworkProxy.getAllowedNetworkTypesBitmap(serial);
-         } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) {
-             ((android.hardware.radio.V1_6.IRadio) mRadioProxy).getAllowedNetworkTypesBitmap(serial);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy)
-+                    .getPreferredNetworkTypeBitmap(serial);
-         } else {
--            mRadioProxy.getPreferredNetworkTypeBitmap(serial);
-+            mRadioProxy.getPreferredNetworkType(serial);
-         }
-     }
- 
-@@ -273,8 +278,10 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             mNetworkProxy.getSignalStrength(serial);
-         } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) {
-             ((android.hardware.radio.V1_6.IRadio) mRadioProxy).getSignalStrength_1_6(serial);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).getSignalStrength_1_4(serial);
-         } else {
--            mRadioProxy.getSignalStrength_1_4(serial);
-+            mRadioProxy.getSignalStrength(serial);
-         }
-     }
- 
-@@ -387,8 +394,12 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-     public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask)
-             throws RemoteException {
-         if (isEmpty() || mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) return;
--        mRadioProxy.setPreferredNetworkTypeBitmap(serial,
--                RILUtils.convertToHalRadioAccessFamily(networkTypesBitmask));
-+        if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setPreferredNetworkTypeBitmap(serial,
-+                    RILUtils.convertToHalRadioAccessFamily(networkTypesBitmask));
-+        } else {
-+            mRadioProxy.setPreferredNetworkType(serial, networkTypesBitmask);
-+        }
-     }
- 
-     /**
-@@ -467,8 +478,11 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-         } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {
-             ((android.hardware.radio.V1_5.IRadio) mRadioProxy).setIndicationFilter_1_5(serial,
-                     filter & INDICATION_FILTERS_ALL_V1_5);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_2)) {
-+            ((android.hardware.radio.V1_2.IRadio) mRadioProxy).setIndicationFilter_1_2(serial,
-+                    filter & INDICATION_FILTERS_ALL_V1_2);
-         } else {
--            mRadioProxy.setIndicationFilter_1_2(serial, filter & INDICATION_FILTERS_ALL_V1_2);
-+            mRadioProxy.setIndicationFilter(serial, filter & INDICATION_FILTERS_ALL_V1_0);
-         }
-     }
- 
-@@ -490,7 +504,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-     public void setLinkCapacityReportingCriteria(int serial, int hysteresisMs, int hysteresisDlKbps,
-             int hysteresisUlKbps, int[] thresholdsDlKbps, int[] thresholdsUlKbps, int ran)
-             throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_2)) return;
-         if (isAidl()) {
-             mNetworkProxy.setLinkCapacityReportingCriteria(serial, hysteresisMs, hysteresisDlKbps,
-                     hysteresisUlKbps, thresholdsDlKbps, thresholdsUlKbps,
-@@ -505,7 +519,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             if (ran == AccessNetworkConstants.AccessNetworkType.NGRAN) {
-                 throw new RuntimeException("NGRAN unsupported on IRadio version: " + mHalVersion);
-             }
--            mRadioProxy.setLinkCapacityReportingCriteria(
-+            ((android.hardware.radio.V1_2.IRadio) mRadioProxy).setLinkCapacityReportingCriteria(
-                     serial, hysteresisMs, hysteresisDlKbps, hysteresisUlKbps,
-                     RILUtils.primitiveArrayToArrayList(thresholdsDlKbps),
-                     RILUtils.primitiveArrayToArrayList(thresholdsUlKbps),
-@@ -589,7 +603,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      */
-     public void setSignalStrengthReportingCriteria(int serial,
-             @NonNull List<SignalThresholdInfo> signalThresholdInfos) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_2)) return;
-         if (isAidl()) {
-             android.hardware.radio.network.SignalThresholdInfo[] halSignalThresholdsInfos =
-             new android.hardware.radio.network.SignalThresholdInfo[signalThresholdInfos.size()];
-@@ -608,12 +622,14 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             }
-         } else {
-             for (SignalThresholdInfo signalThresholdInfo : signalThresholdInfos) {
--                mRadioProxy.setSignalStrengthReportingCriteria(serial,
--                        signalThresholdInfo.getHysteresisMs(),
--                        signalThresholdInfo.getHysteresisDb(),
--                        RILUtils.primitiveArrayToArrayList(signalThresholdInfo.getThresholds()),
--                        RILUtils.convertToHalAccessNetwork(
--                                signalThresholdInfo.getRadioAccessNetworkType()));
-+                ((android.hardware.radio.V1_2.IRadio) mRadioProxy)
-+                        .setSignalStrengthReportingCriteria(serial,
-+                                signalThresholdInfo.getHysteresisMs(),
-+                                signalThresholdInfo.getHysteresisDb(),
-+                                RILUtils.primitiveArrayToArrayList(
-+                                        signalThresholdInfo.getThresholds()),
-+                                RILUtils.convertToHalAccessNetwork(
-+                                        signalThresholdInfo.getRadioAccessNetworkType()));
-             }
-         }
-     }
-@@ -641,7 +657,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      */
-     public void setSystemSelectionChannels(int serial, List<RadioAccessSpecifier> specifiers)
-             throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_3)) return;
-         if (isAidl()) {
-             mNetworkProxy.setSystemSelectionChannels(serial, !specifiers.isEmpty(),
-                     specifiers.stream().map(RILUtils::convertToHalRadioAccessSpecifierAidl)
-@@ -652,8 +668,8 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-                             .map(RILUtils::convertToHalRadioAccessSpecifier15)
-                             .collect(Collectors.toCollection(ArrayList::new)));
-         } else {
--            mRadioProxy.setSystemSelectionChannels(serial, !specifiers.isEmpty(),
--                    specifiers.stream()
-+            ((android.hardware.radio.V1_3.IRadio) mRadioProxy).setSystemSelectionChannels(
-+                    serial, !specifiers.isEmpty(), specifiers.stream()
-                             .map(RILUtils::convertToHalRadioAccessSpecifier11)
-                             .collect(Collectors.toCollection(ArrayList::new)));
-         }
-@@ -668,7 +684,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      */
-     public void startNetworkScan(int serial, NetworkScanRequest request,
-             HalVersion overrideHalVersion, Message result) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_1)) return;
-         if (isAidl()) {
-             android.hardware.radio.network.NetworkScanRequest halRequest =
-                     new android.hardware.radio.network.NetworkScanRequest();
-@@ -718,7 +734,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             }
-             ((android.hardware.radio.V1_5.IRadio) mRadioProxy).startNetworkScan_1_5(
-                     serial, halRequest);
--        } else {
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_2)) {
-             android.hardware.radio.V1_2.NetworkScanRequest halRequest =
-                     new android.hardware.radio.V1_2.NetworkScanRequest();
-             halRequest.type = request.getScanType();
-@@ -739,7 +755,31 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-                 }
-                 halRequest.specifiers.add(rasInHalFormat);
-             }
--            mRadioProxy.startNetworkScan_1_4(serial, halRequest);
-+
-+            if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+                ((android.hardware.radio.V1_4.IRadio) mRadioProxy).startNetworkScan_1_4(
-+                        serial, halRequest);
-+            } else {
-+                ((android.hardware.radio.V1_2.IRadio) mRadioProxy).startNetworkScan_1_2(
-+                        serial, halRequest);
-+            }
-+        } else {
-+            android.hardware.radio.V1_1.NetworkScanRequest halRequest =
-+                    new android.hardware.radio.V1_1.NetworkScanRequest();
-+            halRequest.type = request.getScanType();
-+            halRequest.interval = request.getSearchPeriodicity();
-+            for (RadioAccessSpecifier ras : request.getSpecifiers()) {
-+                android.hardware.radio.V1_1.RadioAccessSpecifier rasInHalFormat =
-+                        RILUtils.convertToHalRadioAccessSpecifier11(ras);
-+                if (rasInHalFormat == null) {
-+                    AsyncResult.forMessage(result, null,
-+                            CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                    result.sendToTarget();
-+                    return;
-+                }
-+                halRequest.specifiers.add(rasInHalFormat);
-+            }
-+            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).startNetworkScan(serial, halRequest);
-         }
-     }
- 
-@@ -749,11 +789,11 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      * @throws RemoteException
-      */
-     public void stopNetworkScan(int serial) throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_1)) return;
-         if (isAidl()) {
-             mNetworkProxy.stopNetworkScan(serial);
-         } else {
--            mRadioProxy.stopNetworkScan(serial);
-+            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).stopNetworkScan(serial);
-         }
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioResponse.java b/src/java/com/android/internal/telephony/RadioResponse.java
-index ada45ec0f7..0bc29583fb 100644
---- a/src/java/com/android/internal/telephony/RadioResponse.java
-+++ b/src/java/com/android/internal/telephony/RadioResponse.java
-@@ -43,9 +43,11 @@ import android.telephony.AnomalyReporter;
- import android.telephony.BarringInfo;
- import android.telephony.CarrierRestrictionRules;
- import android.telephony.CellInfo;
-+import android.telephony.LinkCapacityEstimate;
- import android.telephony.ModemActivityInfo;
- import android.telephony.NeighboringCellInfo;
- import android.telephony.NetworkScanRequest;
-+import android.telephony.RadioAccessFamily;
- import android.telephony.RadioAccessSpecifier;
- import android.telephony.SignalStrength;
- import android.telephony.SubscriptionManager;
-@@ -101,7 +103,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param cardStatus ICC card status as defined by CardStatus in types.hal
-      */
-     public void getIccCardStatusResponse(RadioResponseInfo responseInfo, CardStatus cardStatus) {
--        responseNotSupported(responseInfo);
-+        responseIccCardStatus(responseInfo, cardStatus);
-     }
- 
-     /**
-@@ -110,7 +112,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getIccCardStatusResponse_1_2(RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_2.CardStatus cardStatus) {
--        responseNotSupported(responseInfo);
-+        responseIccCardStatus_1_2(responseInfo, cardStatus);
-     }
- 
-     /**
-@@ -119,7 +121,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getIccCardStatusResponse_1_4(RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_4.CardStatus cardStatus) {
--        responseIccCardStatus(responseInfo, cardStatus);
-+        responseIccCardStatus_1_4(responseInfo, cardStatus);
-     }
- 
-     /**
-@@ -206,7 +208,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getCurrentCallsResponse(RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_0.Call> calls) {
--        responseNotSupported(responseInfo);
-+        responseCurrentCalls(responseInfo, calls);
-     }
- 
-     /**
-@@ -215,7 +217,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getCurrentCallsResponse_1_2(RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_2.Call> calls) {
--        responseCurrentCalls(responseInfo, calls);
-+        responseCurrentCalls_1_2(responseInfo, calls);
-     }
- 
-     /**
-@@ -299,25 +301,27 @@ public class RadioResponse extends IRadioResponse.Stub {
- 
-     public void getSignalStrengthResponse(RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_0.SignalStrength sigStrength) {
--        responseNotSupported(responseInfo);
-+        responseSignalStrength(responseInfo, sigStrength);
-     }
- 
-     /**
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      * @param signalStrength Current signal strength of camped/connected cells
-      */
--    public void getSignalStrengthResponse_1_2(RadioResponseInfo responseInfo,
-+    public void getSignalStrengthResponse_1_2(
-+            RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_2.SignalStrength signalStrength) {
--        responseNotSupported(responseInfo);
-+        responseSignalStrength_1_2(responseInfo, signalStrength);
-     }
- 
-     /**
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      * @param signalStrength Current signal strength of camped/connected cells
-      */
--    public void getSignalStrengthResponse_1_4(RadioResponseInfo responseInfo,
-+    public void getSignalStrengthResponse_1_4(
-+            RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_4.SignalStrength signalStrength) {
--        responseSignalStrength(responseInfo, signalStrength);
-+        responseSignalStrength_1_4(responseInfo, signalStrength);
-     }
- 
-     /**
-@@ -337,7 +341,14 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getVoiceRegistrationStateResponse(RadioResponseInfo responseInfo,
-             VoiceRegStateResult voiceRegResponse) {
--        responseNotSupported(responseInfo);
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, voiceRegResponse);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, voiceRegResponse);
-+        }
-     }
- 
-     /**
-@@ -411,7 +422,14 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getDataRegistrationStateResponse(RadioResponseInfo responseInfo,
-             DataRegStateResult dataRegResponse) {
--        responseNotSupported(responseInfo);
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, dataRegResponse);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, dataRegResponse);
-+        }
-     }
- 
-     /**
-@@ -421,7 +439,14 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getDataRegistrationStateResponse_1_2(RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_2.DataRegStateResult dataRegResponse) {
--        responseNotSupported(responseInfo);
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, dataRegResponse);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, dataRegResponse);
-+        }
-     }
- 
-     /**
-@@ -559,7 +584,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void setupDataCallResponse(RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_0.SetupDataCallResult setupDataCallResult) {
--        responseNotSupported(responseInfo);
-+        responseSetupDataCall(responseInfo, setupDataCallResult);
-     }
- 
-     /**
-@@ -787,7 +812,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      */
-     public void startNetworkScanResponse(RadioResponseInfo responseInfo) {
--        responseNotSupported(responseInfo);
-+        responseScanStatus(responseInfo, null /*fallbackHalVersion*/);
-     }
- 
-     /**
-@@ -875,7 +900,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getDataCallListResponse(RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_0.SetupDataCallResult> dataCallResultList) {
--        responseNotSupported(responseInfo);
-+        responseDataCallList(responseInfo, dataCallResultList);
-     }
- 
-     /**
-@@ -898,6 +923,9 @@ public class RadioResponse extends IRadioResponse.Stub {
-         responseDataCallList(responseInfo, dataCallResultList);
-     }
- 
-+    public void sendOemRilRequestRawResponse(RadioResponseInfo responseInfo,
-+            ArrayList<Byte> var2) {}
-+
-     /**
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      */
-@@ -970,7 +998,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      */
-     public void setPreferredNetworkTypeResponse(RadioResponseInfo responseInfo) {
--        responseNotSupported(responseInfo);
-+        responseVoid(responseInfo);
-     }
- 
-     /**
-@@ -986,7 +1014,8 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param nwType RadioPreferredNetworkType defined in types.hal
-      */
-     public void getPreferredNetworkTypeResponse(RadioResponseInfo responseInfo, int nwType) {
--        responseNotSupported(responseInfo);
-+        mRil.mAllowedNetworkTypesBitmask = RadioAccessFamily.getRafFromNetworkType(nwType);
-+        responseInts(responseInfo, RadioAccessFamily.getRafFromNetworkType(nwType));
-     }
- 
-     /**
-@@ -997,6 +1026,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getPreferredNetworkTypeBitmapResponse(
-             RadioResponseInfo responseInfo, int halRadioAccessFamilyBitmap) {
-+
-         int networkTypeBitmask = RILUtils.convertHalNetworkTypeBitMask(halRadioAccessFamilyBitmap);
-         mRil.mAllowedNetworkTypesBitmask = networkTypeBitmask;
-         responseInts(responseInfo, networkTypeBitmask);
-@@ -1305,7 +1335,7 @@ public class RadioResponse extends IRadioResponse.Stub {
- 
-     public void getCellInfoListResponse(RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_0.CellInfo> cellInfo) {
--        responseNotSupported(responseInfo);
-+        responseCellInfoList(responseInfo, cellInfo);
-     }
- 
-     /**
-@@ -1314,7 +1344,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getCellInfoListResponse_1_2(RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_2.CellInfo> cellInfo) {
--        responseNotSupported(responseInfo);
-+        responseCellInfoList(responseInfo, cellInfo);
-     }
- 
-     /**
-@@ -1423,7 +1453,8 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      * @param result IccIoResult as defined in types.hal
-      */
--    public void iccTransmitApduLogicalChannelResponse(RadioResponseInfo responseInfo,
-+    public void iccTransmitApduLogicalChannelResponse(
-+            RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_0.IccIoResult result) {
-         responseIccIo(responseInfo, result);
-     }
-@@ -1471,10 +1502,8 @@ public class RadioResponse extends IRadioResponse.Stub {
-         responseVoid(responseInfo);
-     }
- 
--    /**
--     * @param responseInfo Response info struct containing response type, serial no. and error
--     */
--    public void getHardwareConfigResponse(RadioResponseInfo responseInfo,
-+    public void getHardwareConfigResponse(
-+            RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_0.HardwareConfig> config) {
-         responseHardwareConfig(responseInfo, config);
-     }
-@@ -1548,7 +1577,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param statusInfo LceStatusInfo indicating LCE status
-      */
-     public void startLceServiceResponse(RadioResponseInfo responseInfo, LceStatusInfo statusInfo) {
--        responseNotSupported(responseInfo);
-+        responseLceStatus(responseInfo, statusInfo);
-     }
- 
-     /**
-@@ -1556,11 +1585,11 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param statusInfo LceStatusInfo indicating LCE status
-      */
-     public void stopLceServiceResponse(RadioResponseInfo responseInfo, LceStatusInfo statusInfo) {
--        responseNotSupported(responseInfo);
-+        responseLceStatus(responseInfo, statusInfo);
-     }
- 
-     public void pullLceDataResponse(RadioResponseInfo responseInfo, LceDataInfo lceInfo) {
--        responseNotSupported(responseInfo);
-+        responseLceData(responseInfo, lceInfo);
-     }
- 
-     /**
-@@ -1605,7 +1634,26 @@ public class RadioResponse extends IRadioResponse.Stub {
-      *        if Length of allowed carriers list is 0, numAllowed = 0.
-      */
-     public void setAllowedCarriersResponse(RadioResponseInfo responseInfo, int numAllowed) {
--        responseNotSupported(responseInfo);
-+        // The number of allowed carriers set correctly is not really useful. Even if one is
-+        // missing, the operation has failed, as the list should be treated as a single
-+        // configuration item. So, ignoring the value of numAllowed and considering only the
-+        // value of the responseInfo.error.
-+        int ret = TelephonyManager.SET_CARRIER_RESTRICTION_ERROR;
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+        if (rr != null) {
-+            mRil.riljLog("setAllowedCarriersResponse - error = " + responseInfo.error);
-+
-+            if (responseInfo.error == RadioError.NONE) {
-+                ret = TelephonyManager.SET_CARRIER_RESTRICTION_SUCCESS;
-+                sendMessageResponse(rr.mResult, ret);
-+            } else if (responseInfo.error == RadioError.REQUEST_NOT_SUPPORTED) {
-+                // Handle the case REQUEST_NOT_SUPPORTED as a valid response
-+                responseInfo.error = RadioError.NONE;
-+                ret = TelephonyManager.SET_CARRIER_RESTRICTION_NOT_SUPPORTED;
-+                sendMessageResponse(rr.mResult, ret);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, ret);
-+        }
-     }
- 
-     /**
-@@ -1633,7 +1681,13 @@ public class RadioResponse extends IRadioResponse.Stub {
-      */
-     public void getAllowedCarriersResponse(RadioResponseInfo responseInfo, boolean allAllowed,
-             CarrierRestrictions carriers) {
--        responseNotSupported(responseInfo);
-+        CarrierRestrictionsWithPriority carrierRestrictions = new CarrierRestrictionsWithPriority();
-+        carrierRestrictions.allowedCarriers = carriers.allowedCarriers;
-+        carrierRestrictions.excludedCarriers = carriers.excludedCarriers;
-+        carrierRestrictions.allowedCarriersPrioritized = true;
-+
-+        responseCarrierRestrictions(responseInfo, allAllowed, carrierRestrictions,
-+                SimLockMultiSimPolicy.NO_MULTISIM_POLICY);
-     }
- 
-     /**
-@@ -1642,36 +1696,11 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param multiSimPolicy Policy for multi-sim devices.
-      */
-     public void getAllowedCarriersResponse_1_4(RadioResponseInfo responseInfo,
--            CarrierRestrictionsWithPriority carrierRestrictions, int multiSimPolicy) {
--        RILRequest rr = mRil.processResponse(responseInfo);
--        if (rr == null) {
--            return;
--        }
--
--        int policy = CarrierRestrictionRules.MULTISIM_POLICY_NONE;
--        if (multiSimPolicy == SimLockMultiSimPolicy.ONE_VALID_SIM_MUST_BE_PRESENT) {
--            policy = CarrierRestrictionRules.MULTISIM_POLICY_ONE_VALID_SIM_MUST_BE_PRESENT;
--        }
--
--        int carrierRestrictionDefault =
--                CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED;
--        if (!carrierRestrictions.allowedCarriersPrioritized) {
--            carrierRestrictionDefault = CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_ALLOWED;
--        }
--
--        CarrierRestrictionRules ret = CarrierRestrictionRules.newBuilder()
--                .setAllowedCarriers(RILUtils.convertHalCarrierList(
--                        carrierRestrictions.allowedCarriers))
--                .setExcludedCarriers(RILUtils.convertHalCarrierList(
--                        carrierRestrictions.excludedCarriers))
--                .setDefaultCarrierRestriction(carrierRestrictionDefault)
--                .setMultiSimPolicy(policy)
--                .build();
--
--        if (responseInfo.error == RadioError.NONE) {
--            sendMessageResponse(rr.mResult, ret);
--        }
--        mRil.processResponseDone(rr, responseInfo, ret);
-+            CarrierRestrictionsWithPriority carrierRestrictions,
-+            int multiSimPolicy) {
-+        // The API in IRadio 1.4 does not support the flag allAllowed, so setting it to false, so
-+        // that values in carrierRestrictions are used.
-+        responseCarrierRestrictions(responseInfo, false, carrierRestrictions, multiSimPolicy);
-     }
- 
-     /**
-@@ -1706,7 +1735,7 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param responseInfo Response info struct containing response type, serial no. and error
-      */
-     public void setSimCardPowerResponse(RadioResponseInfo responseInfo) {
--        responseNotSupported(responseInfo);
-+        responseVoid(responseInfo);
-     }
- 
-     /**
-@@ -1845,7 +1874,39 @@ public class RadioResponse extends IRadioResponse.Stub {
-         }
-     }
- 
--    private void responseIccCardStatus(RadioResponseInfo responseInfo,
-+    private void responseIccCardStatus(RadioResponseInfo responseInfo, CardStatus cardStatus) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            IccCardStatus iccCardStatus = RILUtils.convertHalCardStatus(cardStatus);
-+            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, iccCardStatus);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, iccCardStatus);
-+        }
-+    }
-+
-+    private void responseIccCardStatus_1_2(RadioResponseInfo responseInfo,
-+            android.hardware.radio.V1_2.CardStatus cardStatus) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            IccCardStatus iccCardStatus = RILUtils.convertHalCardStatus(cardStatus.base);
-+            IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();
-+            slotPortMapping.mPhysicalSlotIndex = cardStatus.physicalSlotId;
-+            iccCardStatus.mSlotPortMapping = slotPortMapping;
-+            iccCardStatus.atr = cardStatus.atr;
-+            iccCardStatus.iccid = cardStatus.iccid;
-+            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, iccCardStatus);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, iccCardStatus);
-+        }
-+    }
-+
-+    private void responseIccCardStatus_1_4(RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_4.CardStatus cardStatus) {
-         RILRequest rr = mRil.processResponse(responseInfo);
- 
-@@ -1974,12 +2035,52 @@ public class RadioResponse extends IRadioResponse.Stub {
-     }
- 
-     private void responseCurrentCalls(RadioResponseInfo responseInfo,
-+            ArrayList<android.hardware.radio.V1_0.Call> calls) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            int num = calls.size();
-+            ArrayList<DriverCall> dcCalls = new ArrayList<DriverCall>(num);
-+            DriverCall dc;
-+
-+            for (int i = 0; i < num; i++) {
-+                dc = RILUtils.convertToDriverCall(calls.get(i));
-+
-+                dcCalls.add(dc);
-+
-+                if (dc.isVoicePrivacy) {
-+                    mRil.mVoicePrivacyOnRegistrants.notifyRegistrants();
-+                    mRil.riljLog("InCall VoicePrivacy is enabled");
-+                } else {
-+                    mRil.mVoicePrivacyOffRegistrants.notifyRegistrants();
-+                    mRil.riljLog("InCall VoicePrivacy is disabled");
-+                }
-+            }
-+
-+            Collections.sort(dcCalls);
-+
-+            if ((num == 0) && mRil.mTestingEmergencyCall.getAndSet(false)) {
-+                if (mRil.mEmergencyCallbackModeRegistrant != null) {
-+                    mRil.riljLog("responseCurrentCalls: call ended, testing emergency call,"
-+                            + " notify ECM Registrants");
-+                    mRil.mEmergencyCallbackModeRegistrant.notifyRegistrant();
-+                }
-+            }
-+
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, dcCalls);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, dcCalls);
-+        }
-+    }
-+
-+    private void responseCurrentCalls_1_2(RadioResponseInfo responseInfo,
-             ArrayList<android.hardware.radio.V1_2.Call> calls) {
-         RILRequest rr = mRil.processResponse(responseInfo);
- 
-         if (rr != null) {
-             int num = calls.size();
--            ArrayList<DriverCall> dcCalls = new ArrayList<>(num);
-+            ArrayList<DriverCall> dcCalls = new ArrayList<DriverCall>(num);
-             DriverCall dc;
- 
-             for (int i = 0; i < num; i++) {
-@@ -2054,15 +2155,6 @@ public class RadioResponse extends IRadioResponse.Stub {
-         }
-     }
- 
--    private void responseNotSupported(RadioResponseInfo responseInfo) {
--        RILRequest rr = mRil.processResponse(responseInfo);
--        if (rr != null) {
--            mRil.riljLog(RILUtils.requestToString(rr.mRequest) + "not supported on IRadio < 1.4");
--            responseInfo.error = RadioError.REQUEST_NOT_SUPPORTED;
--            mRil.processResponseDone(rr, responseInfo, null);
--        }
--    }
--
-     private void responseVoid(RadioResponseInfo responseInfo) {
-         RILRequest rr = mRil.processResponse(responseInfo);
- 
-@@ -2208,6 +2300,34 @@ public class RadioResponse extends IRadioResponse.Stub {
-     }
- 
-     private void responseSignalStrength(
-+            RadioResponseInfo responseInfo,
-+            android.hardware.radio.V1_0.SignalStrength signalStrength) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            SignalStrength ret = RILUtils.convertHalSignalStrength(signalStrength);
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, ret);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, ret);
-+        }
-+    }
-+
-+    private void responseSignalStrength_1_2(
-+            RadioResponseInfo responseInfo,
-+            android.hardware.radio.V1_2.SignalStrength signalStrength) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            SignalStrength ret = RILUtils.convertHalSignalStrength(signalStrength);
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, ret);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, ret);
-+        }
-+    }
-+
-+    private void responseSignalStrength_1_4(
-             RadioResponseInfo responseInfo,
-             android.hardware.radio.V1_4.SignalStrength signalStrength) {
-         RILRequest rr = mRil.processResponse(responseInfo);
-@@ -2576,6 +2696,69 @@ public class RadioResponse extends IRadioResponse.Stub {
-         }
-     }
- 
-+    private void responseLceStatus(RadioResponseInfo responseInfo, LceStatusInfo statusInfo) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            ArrayList<Integer> ret = new ArrayList<>();
-+            ret.add(statusInfo.lceStatus);
-+            ret.add(Byte.toUnsignedInt(statusInfo.actualIntervalMs));
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, ret);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, ret);
-+        }
-+    }
-+
-+    private void responseLceData(RadioResponseInfo responseInfo, LceDataInfo lceInfo) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+
-+        if (rr != null) {
-+            List<LinkCapacityEstimate> ret = RILUtils.convertHalLceData(lceInfo);
-+            if (responseInfo.error == RadioError.NONE) {
-+                sendMessageResponse(rr.mResult, ret);
-+            }
-+            mRil.processResponseDone(rr, responseInfo, ret);
-+        }
-+    }
-+
-+    private void responseCarrierRestrictions(RadioResponseInfo responseInfo, boolean allAllowed,
-+            CarrierRestrictionsWithPriority carriers, int multiSimPolicy) {
-+        RILRequest rr = mRil.processResponse(responseInfo);
-+        if (rr == null) {
-+            return;
-+        }
-+        CarrierRestrictionRules ret;
-+
-+        if (allAllowed) {
-+            ret = CarrierRestrictionRules.newBuilder().setAllCarriersAllowed().build();
-+        } else {
-+            int policy = CarrierRestrictionRules.MULTISIM_POLICY_NONE;
-+            if (multiSimPolicy == SimLockMultiSimPolicy.ONE_VALID_SIM_MUST_BE_PRESENT) {
-+                policy = CarrierRestrictionRules.MULTISIM_POLICY_ONE_VALID_SIM_MUST_BE_PRESENT;
-+            }
-+
-+            int carrierRestrictionDefault =
-+                    CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED;
-+            if (!carriers.allowedCarriersPrioritized) {
-+                carrierRestrictionDefault =
-+                        CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_ALLOWED;
-+            }
-+
-+            ret = CarrierRestrictionRules.newBuilder()
-+                    .setAllowedCarriers(RILUtils.convertHalCarrierList(carriers.allowedCarriers))
-+                    .setExcludedCarriers(RILUtils.convertHalCarrierList(carriers.excludedCarriers))
-+                    .setDefaultCarrierRestriction(carrierRestrictionDefault)
-+                    .setMultiSimPolicy(policy)
-+                    .build();
-+        }
-+
-+        if (responseInfo.error == RadioError.NONE) {
-+            sendMessageResponse(rr.mResult, ret);
-+        }
-+        mRil.processResponseDone(rr, responseInfo, ret);
-+    }
-+
-     /**
-      * @param responseInfo Response info struct containing response type, serial number and error.
-      */
-diff --git a/src/java/com/android/internal/telephony/RadioServiceProxy.java b/src/java/com/android/internal/telephony/RadioServiceProxy.java
-index 02fc751484..4257327330 100644
---- a/src/java/com/android/internal/telephony/RadioServiceProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioServiceProxy.java
-@@ -19,13 +19,13 @@ package com.android.internal.telephony;
- import android.os.RemoteException;
- 
- /**
-- * A holder for IRadio services.
-- * Use getHidl to get the HIDL IRadio service or getAidl to get the corresponding AIDL service.
-+ * A holder for IRadio services. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get the AIDL service and call the AIDL implementations of the HAL APIs.
-  */
- public abstract class RadioServiceProxy {
-     boolean mIsAidl;
-     HalVersion mHalVersion = RIL.RADIO_HAL_VERSION_UNKNOWN;
--    volatile android.hardware.radio.V1_4.IRadio mRadioProxy = null;
-+    volatile android.hardware.radio.V1_0.IRadio mRadioProxy = null;
- 
-     /**
-      * Whether RadioServiceProxy is an AIDL or HIDL implementation
-@@ -40,7 +40,7 @@ public abstract class RadioServiceProxy {
-      * @param halVersion Radio HAL version
-      * @param radio      IRadio implementation
-      */
--    public void setHidl(HalVersion halVersion, android.hardware.radio.V1_4.IRadio radio) {
-+    public void setHidl(HalVersion halVersion, android.hardware.radio.V1_0.IRadio radio) {
-         mHalVersion = halVersion;
-         mRadioProxy = radio;
-         mIsAidl = false;
-@@ -50,7 +50,7 @@ public abstract class RadioServiceProxy {
-      * Get the HIDL implementation of RadioServiceProxy
-      * @return IRadio implementation
-      */
--    public android.hardware.radio.V1_4.IRadio getHidl() {
-+    public android.hardware.radio.V1_0.IRadio getHidl() {
-         return mRadioProxy;
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioSimProxy.java b/src/java/com/android/internal/telephony/RadioSimProxy.java
-index 5265692167..7c8ee7b6ea 100644
---- a/src/java/com/android/internal/telephony/RadioSimProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioSimProxy.java
-@@ -16,17 +16,22 @@
- 
- package com.android.internal.telephony;
- 
-+import static com.android.internal.telephony.RILConstants.REQUEST_NOT_SUPPORTED;
-+
-+import android.os.AsyncResult;
-+import android.os.Message;
- import android.os.RemoteException;
- import android.telephony.CarrierRestrictionRules;
- import android.telephony.ImsiEncryptionInfo;
- import android.telephony.Rlog;
-+import android.telephony.TelephonyManager;
- 
- import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState;
- import com.android.internal.telephony.uicc.SimPhonebookRecord;
- 
- /**
-- * A holder for IRadioSim.
-- * Use getAidl to get IRadioSim and call the AIDL implementations of the HAL APIs.
-+ * A holder for IRadioSim. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get IRadioSim and call the AIDL implementations of the HAL APIs.
-  */
- public class RadioSimProxy extends RadioServiceProxy {
-     private static final String TAG = "RadioSimProxy";
-@@ -155,8 +160,10 @@ public class RadioSimProxy extends RadioServiceProxy {
-         if (isEmpty()) return;
-         if (isAidl()) {
-             mSimProxy.getAllowedCarriers(serial);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).getAllowedCarriers_1_4(serial);
-         } else {
--            mRadioProxy.getAllowedCarriers_1_4(serial);
-+            mRadioProxy.getAllowedCarriers(serial);
-         }
-     }
- 
-@@ -514,10 +521,11 @@ public class RadioSimProxy extends RadioServiceProxy {
-      * Call IRadioSim#setAllowedCarriers
-      * @param serial Serial number of request
-      * @param carrierRestrictionRules Allowed carriers
-+     * @param result Result to return in case of error
-      * @throws RemoteException
-      */
--    public void setAllowedCarriers(int serial, CarrierRestrictionRules carrierRestrictionRules)
--            throws RemoteException {
-+    public void setAllowedCarriers(int serial, CarrierRestrictionRules carrierRestrictionRules,
-+            Message result) throws RemoteException {
-         if (isEmpty()) return;
-         if (isAidl()) {
-             // Prepare structure with allowed list, excluded list and priority
-@@ -533,7 +541,7 @@ public class RadioSimProxy extends RadioServiceProxy {
-             mSimProxy.setAllowedCarriers(serial, carrierRestrictions,
-                     RILUtils.convertToHalSimLockMultiSimPolicyAidl(
-                             carrierRestrictionRules.getMultiSimPolicy()));
--        } else {
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-             // Prepare structure with allowed list, excluded list and priority
-             android.hardware.radio.V1_4.CarrierRestrictionsWithPriority carrierRestrictions =
-                     new android.hardware.radio.V1_4.CarrierRestrictionsWithPriority();
-@@ -544,9 +552,35 @@ public class RadioSimProxy extends RadioServiceProxy {
-             carrierRestrictions.allowedCarriersPrioritized =
-                     (carrierRestrictionRules.getDefaultCarrierRestriction()
-                             == CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED);
--            mRadioProxy.setAllowedCarriers_1_4(serial, carrierRestrictions,
--                    RILUtils.convertToHalSimLockMultiSimPolicy(
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setAllowedCarriers_1_4(
-+                    serial, carrierRestrictions, RILUtils.convertToHalSimLockMultiSimPolicy(
-                             carrierRestrictionRules.getMultiSimPolicy()));
-+        } else {
-+            boolean isAllCarriersAllowed = carrierRestrictionRules.isAllCarriersAllowed();
-+            boolean supported = (isAllCarriersAllowed
-+                    || (carrierRestrictionRules.getExcludedCarriers().isEmpty()
-+                    && (carrierRestrictionRules.getDefaultCarrierRestriction()
-+                    == CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED)))
-+                    && (RILUtils.convertToHalSimLockMultiSimPolicy(
-+                    carrierRestrictionRules.getMultiSimPolicy())
-+                    == android.hardware.radio.V1_4.SimLockMultiSimPolicy.NO_MULTISIM_POLICY);
-+
-+            if (!supported) {
-+                // Feature is not supported by IRadio interface
-+                if (result != null) {
-+                    AsyncResult.forMessage(result, null,
-+                            CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                    result.sendToTarget();
-+                }
-+                return;
-+            }
-+
-+            // Prepare structure with allowed list
-+            android.hardware.radio.V1_0.CarrierRestrictions carrierRestrictions =
-+                    new android.hardware.radio.V1_0.CarrierRestrictions();
-+            carrierRestrictions.allowedCarriers = RILUtils.convertToHalCarrierRestrictionList(
-+                    carrierRestrictionRules.getAllowedCarriers());
-+            mRadioProxy.setAllowedCarriers(serial, isAllCarriersAllowed, carrierRestrictions);
-         }
-     }
- 
-@@ -558,7 +592,7 @@ public class RadioSimProxy extends RadioServiceProxy {
-      */
-     public void setCarrierInfoForImsiEncryption(int serial, ImsiEncryptionInfo imsiEncryptionInfo)
-             throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_1)) return;
-         if (isAidl()) {
-             android.hardware.radio.sim.ImsiEncryptionInfo halImsiInfo =
-                     new android.hardware.radio.sim.ImsiEncryptionInfo();
-@@ -601,7 +635,8 @@ public class RadioSimProxy extends RadioServiceProxy {
-                 halImsiInfo.carrierKey.add(Byte.valueOf(b));
-             }
- 
--            mRadioProxy.setCarrierInfoForImsiEncryption(serial, halImsiInfo);
-+            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).setCarrierInfoForImsiEncryption(
-+                    serial, halImsiInfo);
-         }
-     }
- 
-@@ -646,16 +681,35 @@ public class RadioSimProxy extends RadioServiceProxy {
-      * Call IRadioSim#setSimCardPower
-      * @param serial Serial number of request
-      * @param state SIM state (power down, power up, pass through)
-+     * @param result Result to return in case of error
-      * @throws RemoteException
-      */
--    public void setSimCardPower(int serial, int state) throws RemoteException {
-+    public void setSimCardPower(int serial, int state, Message result) throws RemoteException {
-         if (isEmpty()) return;
-         if (isAidl()) {
-             mSimProxy.setSimCardPower(serial, state);
-         } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) {
-             ((android.hardware.radio.V1_6.IRadio) mRadioProxy).setSimCardPower_1_6(serial, state);
--        } else {
--            mRadioProxy.setSimCardPower_1_1(serial, state);
-+        } else if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_1)) {
-+            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).setSimCardPower_1_1(serial, state);
-+        } else {
-+            switch (state) {
-+                case TelephonyManager.CARD_POWER_DOWN: {
-+                    mRadioProxy.setSimCardPower(serial, false);
-+                    break;
-+                }
-+                case TelephonyManager.CARD_POWER_UP: {
-+                    mRadioProxy.setSimCardPower(serial, true);
-+                    break;
-+                }
-+                default: {
-+                    if (result != null) {
-+                        AsyncResult.forMessage(result, null,
-+                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
-+                        result.sendToTarget();
-+                    }
-+                }
-+            }
-         }
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioVoiceProxy.java b/src/java/com/android/internal/telephony/RadioVoiceProxy.java
-index e57a61d81c..7f46424485 100644
---- a/src/java/com/android/internal/telephony/RadioVoiceProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioVoiceProxy.java
-@@ -24,8 +24,8 @@ import android.telephony.emergency.EmergencyNumber;
- import java.util.ArrayList;
- 
- /**
-- * A holder for IRadioVoice.
-- * Use getAidl to get IRadioVoice and call the AIDL implementations of the HAL APIs.
-+ * A holder for IRadioVoice. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-+ * getAidl to get IRadioVoice and call the AIDL implementations of the HAL APIs.
-  */
- public class RadioVoiceProxy extends RadioServiceProxy {
-     private static final String TAG = "RadioVoiceProxy";
-@@ -153,7 +153,7 @@ public class RadioVoiceProxy extends RadioServiceProxy {
-     public void emergencyDial(int serial, String address, EmergencyNumber emergencyNumberInfo,
-             boolean hasKnownUserIntentEmergency, int clirMode, UUSInfo uusInfo)
-             throws RemoteException {
--        if (isEmpty()) return;
-+        if (isEmpty() || mHalVersion.less(RIL.RADIO_HAL_VERSION_1_4)) return;
-         if (isAidl()) {
-             mVoiceProxy.emergencyDial(serial,
-                     RILUtils.convertToHalDialAidl(address, clirMode, uusInfo),
-@@ -177,7 +177,7 @@ public class RadioVoiceProxy extends RadioServiceProxy {
-                     emergencyNumberInfo.getEmergencyNumberSourceBitmask()
-                             == EmergencyNumber.EMERGENCY_NUMBER_SOURCE_TEST);
-         } else {
--            mRadioProxy.emergencyDial(serial,
-+            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).emergencyDial(serial,
-                     RILUtils.convertToHalDial(address, clirMode, uusInfo),
-                     emergencyNumberInfo.getEmergencyServiceCategoryBitmaskInternalDial(),
-                     emergencyNumberInfo.getEmergencyUrns() != null
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/RILTest.java b/tests/telephonytests/src/com/android/internal/telephony/RILTest.java
-index b285f0f8d2..c0e5d67a0d 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/RILTest.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/RILTest.java
-@@ -142,7 +142,6 @@ import android.os.RemoteException;
- import android.os.WorkSource;
- import android.service.carrier.CarrierIdentifier;
- import android.telephony.AccessNetworkConstants;
--import android.telephony.CellConfigLte;
- import android.telephony.CellIdentityCdma;
- import android.telephony.CellIdentityGsm;
- import android.telephony.CellIdentityLte;
-@@ -162,10 +161,11 @@ import android.telephony.CellSignalStrengthLte;
- import android.telephony.CellSignalStrengthNr;
- import android.telephony.CellSignalStrengthTdscdma;
- import android.telephony.CellSignalStrengthWcdma;
--import android.telephony.ClosedSubscriberGroupInfo;
- import android.telephony.NetworkScanRequest;
- import android.telephony.RadioAccessFamily;
- import android.telephony.RadioAccessSpecifier;
-+import android.telephony.ServiceState;
-+import android.telephony.SignalStrength;
- import android.telephony.SmsManager;
- import android.telephony.TelephonyManager;
- import android.telephony.data.ApnSetting;
-@@ -225,10 +225,13 @@ public class RILTest extends TelephonyTest {
-     private RadioSimProxy mSimProxy;
-     private RadioModemProxy mRadioModemProxy;
- 
-+    private Map<Integer, HalVersion> mHalVersionV10 = new HashMap<>();
-+    private Map<Integer, HalVersion> mHalVersionV11 = new HashMap<>();
-+    private Map<Integer, HalVersion> mHalVersionV12 = new HashMap<>();
-+    private Map<Integer, HalVersion> mHalVersionV13 = new HashMap<>();
-     private Map<Integer, HalVersion> mHalVersionV14 = new HashMap<>();
-     private Map<Integer, HalVersion> mHalVersionV15 = new HashMap<>();
-     private Map<Integer, HalVersion> mHalVersionV16 = new HashMap<>();
--    private Map<Integer, HalVersion> mHalVersionV20 = new HashMap<>();
-     private Map<Integer, HalVersion> mHalVersionV21 = new HashMap<>();
- 
-     private RIL mRILInstance;
-@@ -245,21 +248,25 @@ public class RILTest extends TelephonyTest {
-     private static final int CI = 268435456;
-     private static final int CID = 65535;
-     private static final int CQI = 2147483647;
--    private static final int CQI_TABLE_INDEX = 1;
-     private static final int DBM = -74;
-     private static final int EARFCN = 262140;
--    private static final ArrayList<Integer> BANDS = new ArrayList<>(Arrays.asList(1, 2));
-+    private static final List<Integer> BANDS = Arrays.asList(1, 2);
-     private static final int BANDWIDTH = 5000;
-     private static final int ECIO = -124;
-+    private static final String EMPTY_ALPHA_LONG = "";
-+    private static final String EMPTY_ALPHA_SHORT = "";
-     private static final int LAC = 65535;
-     private static final int LATITUDE = 1292000;
-     private static final int LONGITUDE = 1295000;
-+    private static final int MCC = 120;
-     private static final String MCC_STR = "120";
-+    private static final int MNC = 260;
-     private static final String MNC_STR = "260";
-     private static final int NETWORK_ID = 65534;
-     private static final int NRARFCN = 3279165;
-     private static final int PCI = 503;
-     private static final int PSC = 500;
-+    private static final int RIL_TIMESTAMP_TYPE_OEM_RIL = 3;
-     private static final int RSSNR = CellInfo.UNAVAILABLE;
-     private static final int RSRP = -96;
-     private static final int RSRQ = -10;
-@@ -275,9 +282,11 @@ public class RILTest extends TelephonyTest {
-     private static final int TIMING_ADVANCE = 4;
-     private static final long TIMESTAMP = 215924934;
-     private static final int UARFCN = 690;
--    private static final int CONNECTION_STATUS = CellInfo.CONNECTION_NONE;
--    private static final boolean ENDC_AVAILABLE = true;
--    private static final boolean REGISTERED = true;
-+    private static final int TYPE_CDMA = 2;
-+    private static final int TYPE_GSM = 1;
-+    private static final int TYPE_LTE = 3;
-+    private static final int TYPE_WCDMA = 4;
-+    private static final int TYPE_TD_SCDMA = 5;
- 
-     private static final int PROFILE_ID = 0;
-     private static final String APN = "apn";
-@@ -294,6 +303,7 @@ public class RILTest extends TelephonyTest {
-                     | TelephonyManager.NETWORK_TYPE_BITMASK_LTE);
-     private static final int ROAMING_PROTOCOL = ApnSetting.PROTOCOL_IPV6;
-     private static final int MTU = 1234;
-+    private static final boolean PERSISTENT = true;
- 
-     private static final String[] ADDITIONAL_PLMNS = new String[] {"00101", "001001", "12345"};
- 
-@@ -349,13 +359,16 @@ public class RILTest extends TelephonyTest {
-         doReturn(false).when(mRadioModemProxy).isEmpty();
-         try {
-             for (int service = RIL.MIN_SERVICE_IDX; service <= RIL.MAX_SERVICE_IDX; service++) {
-+                mHalVersionV10.put(service, new HalVersion(1, 0));
-+                mHalVersionV11.put(service, new HalVersion(1, 1));
-+                mHalVersionV12.put(service, new HalVersion(1, 2));
-+                mHalVersionV13.put(service, new HalVersion(1, 3));
-                 mHalVersionV14.put(service, new HalVersion(1, 4));
-                 mHalVersionV15.put(service, new HalVersion(1, 5));
-                 mHalVersionV16.put(service, new HalVersion(1, 6));
--                mHalVersionV20.put(service, new HalVersion(2, 0));
-                 mHalVersionV21.put(service, new HalVersion(2, 1));
-             }
--            replaceInstance(RIL.class, "mHalVersion", mRILUnderTest, mHalVersionV14);
-+            replaceInstance(RIL.class, "mHalVersion", mRILUnderTest, mHalVersionV10);
-         } catch (Exception e) {
-         }
-     }
-@@ -1596,694 +1609,460 @@ public class RILTest extends TelephonyTest {
-         return respInfo;
-     }
- 
--    private android.hardware.radio.V1_2.CellIdentityOperatorNames getCellIdentityOperatorNames() {
--        android.hardware.radio.V1_2.CellIdentityOperatorNames operatorNames =
--                new android.hardware.radio.V1_2.CellIdentityOperatorNames();
--        operatorNames.alphaLong = ALPHA_LONG;
--        operatorNames.alphaShort = ALPHA_SHORT;
--
--        return operatorNames;
--    }
--
--    private android.hardware.radio.V1_2.CellIdentityLte getCellIdentityLte_1_2() {
--        android.hardware.radio.V1_0.CellIdentityLte cellIdentity0 =
--                new android.hardware.radio.V1_0.CellIdentityLte();
--        cellIdentity0.mcc = MCC_STR;
--        cellIdentity0.mnc = MNC_STR;
--        cellIdentity0.ci = CI;
--        cellIdentity0.pci = PCI;
--        cellIdentity0.tac = TAC;
--        cellIdentity0.earfcn = EARFCN;
--
--        android.hardware.radio.V1_2.CellIdentityLte cellIdentity =
--                new android.hardware.radio.V1_2.CellIdentityLte();
--        cellIdentity.base = cellIdentity0;
--        cellIdentity.operatorNames = getCellIdentityOperatorNames();
--        cellIdentity.bandwidth = BANDWIDTH;
--
--        return cellIdentity;
--    }
--
--    private android.hardware.radio.V1_0.LteSignalStrength getLteSignalStrength_1_0() {
--        android.hardware.radio.V1_0.LteSignalStrength signalStrength =
--                new android.hardware.radio.V1_0.LteSignalStrength();
--        signalStrength.signalStrength = RSSI_ASU;
--        signalStrength.rsrp = -RSRP;
--        signalStrength.rsrq = -RSRQ;
--        signalStrength.rssnr = RSSNR;
--        signalStrength.cqi = CQI;
--        signalStrength.timingAdvance = TIMING_ADVANCE;
--
--        return signalStrength;
--    }
--
--    private android.hardware.radio.V1_4.CellInfo getCellInfo_1_4ForLte() {
--        android.hardware.radio.V1_2.CellInfoLte cellInfo2 =
--                new android.hardware.radio.V1_2.CellInfoLte();
--        cellInfo2.cellIdentityLte = getCellIdentityLte_1_2();
--        cellInfo2.signalStrengthLte = getLteSignalStrength_1_0();
--
--        android.hardware.radio.V1_4.CellConfigLte cellConfig =
--                new android.hardware.radio.V1_4.CellConfigLte();
--        cellConfig.isEndcAvailable = ENDC_AVAILABLE;
--
--        android.hardware.radio.V1_4.CellInfoLte cellInfoLte =
--                new android.hardware.radio.V1_4.CellInfoLte();
--        cellInfoLte.base = cellInfo2;
--        cellInfoLte.cellConfig = cellConfig;
--
--        android.hardware.radio.V1_4.CellInfo cellInfo = new android.hardware.radio.V1_4.CellInfo();
--        cellInfo.isRegistered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.info.lte(cellInfoLte);
--
--        return cellInfo;
--    }
--
-     @Test
--    public void testConvertHalCellInfoList_1_4ForLte() {
-+    public void testConvertHalCellInfoListForLTE() {
-+        android.hardware.radio.V1_0.CellInfoLte lte = new android.hardware.radio.V1_0.CellInfoLte();
-+        lte.cellIdentityLte.ci = CI;
-+        lte.cellIdentityLte.pci = PCI;
-+        lte.cellIdentityLte.tac = TAC;
-+        lte.cellIdentityLte.earfcn = EARFCN;
-+        lte.cellIdentityLte.mcc = MCC_STR;
-+        lte.cellIdentityLte.mnc = MNC_STR;
-+        lte.signalStrengthLte.signalStrength = RSSI_ASU;
-+        lte.signalStrengthLte.rsrp = -RSRP;
-+        lte.signalStrengthLte.rsrq = -RSRQ;
-+        lte.signalStrengthLte.rssnr = RSSNR;
-+        lte.signalStrengthLte.cqi = CQI;
-+        lte.signalStrengthLte.timingAdvance = TIMING_ADVANCE;
-+        android.hardware.radio.V1_0.CellInfo record = new android.hardware.radio.V1_0.CellInfo();
-+        record.cellInfoType = TYPE_LTE;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.lte.add(lte);
-         ArrayList<Object> records = new ArrayList<>();
--        records.add(getCellInfo_1_4ForLte());
-+        records.add(record);
- 
-         ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
- 
-         assertEquals(1, ret.size());
-         CellInfoLte cellInfoLte = (CellInfoLte) ret.get(0);
--        cellInfoLte.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityLte cellIdentityLte = new CellIdentityLte(CI, PCI, TAC, EARFCN, new int[] {},
--                BANDWIDTH, MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT, Collections.emptyList(),
--                null);
--        CellSignalStrengthLte cellSignalStrengthLte = new CellSignalStrengthLte(
-+        CellInfoLte expected = new CellInfoLte();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityLte cil = new CellIdentityLte(CI, PCI, TAC, EARFCN, new int[] {},
-+                Integer.MAX_VALUE, MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT,
-+                Collections.emptyList(), null);
-+        CellSignalStrengthLte css = new CellSignalStrengthLte(
-                 RSSI, RSRP, RSRQ, RSSNR, CQI, TIMING_ADVANCE);
--        CellConfigLte cellConfigLte = new CellConfigLte(ENDC_AVAILABLE);
--        CellInfoLte expected = new CellInfoLte(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityLte, cellSignalStrengthLte, cellConfigLte);
-+        expected.setCellIdentity(cil);
-+        expected.setCellSignalStrength(css);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_UNKNOWN);
-+        cellInfoLte.setTimeStamp(TIMESTAMP); // override the timestamp
-         assertEquals(expected, cellInfoLte);
-     }
- 
--    private android.hardware.radio.V1_5.OptionalCsgInfo getOptionalCsgInfo() {
--        android.hardware.radio.V1_5.ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new android.hardware.radio.V1_5.ClosedSubscriberGroupInfo();
--        closedSubscriberGroupInfo.csgIndication = CSG_INDICATION;
--        closedSubscriberGroupInfo.homeNodebName = HOME_NODEB_NAME;
--        closedSubscriberGroupInfo.csgIdentity = CSG_IDENTITY;
--
--        android.hardware.radio.V1_5.OptionalCsgInfo optionalCsgInfo =
--                new android.hardware.radio.V1_5.OptionalCsgInfo();
--        optionalCsgInfo.csgInfo(closedSubscriberGroupInfo);
--
--        return optionalCsgInfo;
--    }
-+    @Test
-+    public void testConvertHalCellInfoListForGSM() {
-+        android.hardware.radio.V1_0.CellInfoGsm cellinfo =
-+                new android.hardware.radio.V1_0.CellInfoGsm();
-+        cellinfo.cellIdentityGsm.lac = LAC;
-+        cellinfo.cellIdentityGsm.cid = CID;
-+        cellinfo.cellIdentityGsm.bsic = BSIC;
-+        cellinfo.cellIdentityGsm.arfcn = ARFCN;
-+        cellinfo.cellIdentityGsm.mcc = MCC_STR;
-+        cellinfo.cellIdentityGsm.mnc = MNC_STR;
-+        cellinfo.signalStrengthGsm.signalStrength = RSSI_ASU;
-+        cellinfo.signalStrengthGsm.bitErrorRate = BIT_ERROR_RATE;
-+        cellinfo.signalStrengthGsm.timingAdvance = TIMING_ADVANCE;
-+        android.hardware.radio.V1_0.CellInfo record = new android.hardware.radio.V1_0.CellInfo();
-+        record.cellInfoType = TYPE_GSM;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.gsm.add(cellinfo);
-+        ArrayList<Object> records = new ArrayList<>();
-+        records.add(record);
- 
--    private android.hardware.radio.V1_5.CellIdentityLte getCellIdentityLte_1_5() {
--        android.hardware.radio.V1_5.CellIdentityLte cellIdentity =
--                new android.hardware.radio.V1_5.CellIdentityLte();
--        cellIdentity.base = getCellIdentityLte_1_2();
--        cellIdentity.additionalPlmns = new ArrayList<>(Arrays.asList(ADDITIONAL_PLMNS));
--        cellIdentity.optionalCsgInfo = getOptionalCsgInfo();
--        cellIdentity.bands = BANDS;
-+        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
- 
--        return cellIdentity;
-+        assertEquals(1, ret.size());
-+        CellInfoGsm cellInfoGsm = (CellInfoGsm) ret.get(0);
-+        CellInfoGsm expected = new CellInfoGsm();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityGsm ci = new CellIdentityGsm(
-+                LAC, CID, ARFCN, BSIC, MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT,
-+                Collections.emptyList());
-+        CellSignalStrengthGsm cs = new CellSignalStrengthGsm(
-+                RSSI, BIT_ERROR_RATE, TIMING_ADVANCE);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_UNKNOWN);
-+        cellInfoGsm.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoGsm);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_5ForLte() {
--        android.hardware.radio.V1_5.CellInfoLte cellInfoLte =
--                new android.hardware.radio.V1_5.CellInfoLte();
--        cellInfoLte.cellIdentityLte = getCellIdentityLte_1_5();
--        cellInfoLte.signalStrengthLte = getLteSignalStrength_1_0();
--
--        android.hardware.radio.V1_5.CellInfo cellInfo = new android.hardware.radio.V1_5.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.lte(cellInfoLte);
--
-+    public void testConvertHalCellInfoListForWcdma() {
-+        android.hardware.radio.V1_0.CellInfoWcdma cellinfo =
-+                new android.hardware.radio.V1_0.CellInfoWcdma();
-+        cellinfo.cellIdentityWcdma.lac = LAC;
-+        cellinfo.cellIdentityWcdma.cid = CID;
-+        cellinfo.cellIdentityWcdma.psc = PSC;
-+        cellinfo.cellIdentityWcdma.uarfcn = UARFCN;
-+        cellinfo.cellIdentityWcdma.mcc = MCC_STR;
-+        cellinfo.cellIdentityWcdma.mnc = MNC_STR;
-+        cellinfo.signalStrengthWcdma.signalStrength = RSSI_ASU;
-+        cellinfo.signalStrengthWcdma.bitErrorRate = BIT_ERROR_RATE;
-+        android.hardware.radio.V1_0.CellInfo record = new android.hardware.radio.V1_0.CellInfo();
-+        record.cellInfoType = TYPE_WCDMA;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.wcdma.add(cellinfo);
-         ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
-+        records.add(record);
- 
-         ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
- 
-         assertEquals(1, ret.size());
--        CellInfoLte cil = (CellInfoLte) ret.get(0);
--        cil.setTimeStamp(TIMESTAMP); // override the timestamp
-+        CellInfoWcdma cellInfoWcdma = (CellInfoWcdma) ret.get(0);
-+        CellInfoWcdma expected = new CellInfoWcdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityWcdma ci = new CellIdentityWcdma(
-+                LAC, CID, PSC, UARFCN, MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT,
-+                Collections.emptyList(), null);
-+        CellSignalStrengthWcdma cs = new CellSignalStrengthWcdma(
-+                RSSI, BIT_ERROR_RATE, Integer.MAX_VALUE, Integer.MAX_VALUE);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_UNKNOWN);
-+        cellInfoWcdma.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoWcdma);
-+    }
- 
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new ClosedSubscriberGroupInfo(CSG_INDICATION, HOME_NODEB_NAME, CSG_IDENTITY);
--        CellIdentityLte cellIdentityLte = new CellIdentityLte(CI, PCI, TAC, EARFCN,
--                BANDS.stream().mapToInt(i -> i).toArray(), BANDWIDTH, MCC_STR, MNC_STR, ALPHA_LONG,
--                ALPHA_SHORT, additionalPlmns, closedSubscriberGroupInfo);
--        CellSignalStrengthLte cellSignalStrengthLte = new CellSignalStrengthLte(
--                RSSI, RSRP, RSRQ, RSSNR, CQI, TIMING_ADVANCE);
--        CellInfoLte expected = new CellInfoLte(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityLte, cellSignalStrengthLte, new CellConfigLte());
--        assertEquals(expected, cil);
-+    private static void initializeCellIdentityTdscdma_1_2(
-+            android.hardware.radio.V1_2.CellIdentityTdscdma cid) {
-+        cid.base.lac = LAC;
-+        cid.base.cid = CID;
-+        cid.base.cpid = PSC;
-+        cid.base.mcc = MCC_STR;
-+        cid.base.mnc = MNC_STR;
-+        cid.uarfcn = UARFCN;
-+        cid.operatorNames.alphaLong = ALPHA_LONG;
-+        cid.operatorNames.alphaShort = ALPHA_SHORT;
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_6ForLte() {
--        android.hardware.radio.V1_6.LteSignalStrength signalStrength =
--                new android.hardware.radio.V1_6.LteSignalStrength();
--        signalStrength.base = getLteSignalStrength_1_0();
--        signalStrength.cqiTableIndex = CQI_TABLE_INDEX;
--
--        android.hardware.radio.V1_6.CellInfoLte cellInfoLte =
--                new android.hardware.radio.V1_6.CellInfoLte();
--        cellInfoLte.cellIdentityLte = getCellIdentityLte_1_5();
--        cellInfoLte.signalStrengthLte = signalStrength;
--
--        android.hardware.radio.V1_6.CellInfo cellInfo = new android.hardware.radio.V1_6.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.lte(cellInfoLte);
--
-+    public void testConvertHalCellInfoListForTdscdma() {
-+        android.hardware.radio.V1_2.CellInfoTdscdma cellinfo =
-+                new android.hardware.radio.V1_2.CellInfoTdscdma();
-+        initializeCellIdentityTdscdma_1_2(cellinfo.cellIdentityTdscdma);
-+
-+        cellinfo.signalStrengthTdscdma.signalStrength = RSSI_ASU;
-+        cellinfo.signalStrengthTdscdma.bitErrorRate = BIT_ERROR_RATE;
-+        cellinfo.signalStrengthTdscdma.rscp = RSCP_ASU;
-+        android.hardware.radio.V1_2.CellInfo record = new android.hardware.radio.V1_2.CellInfo();
-+        record.cellInfoType = TYPE_TD_SCDMA;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.tdscdma.add(cellinfo);
-         ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
-+        records.add(record);
- 
-         ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
- 
-         assertEquals(1, ret.size());
--        CellInfoLte cil = (CellInfoLte) ret.get(0);
--        cil.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new ClosedSubscriberGroupInfo(CSG_INDICATION, HOME_NODEB_NAME, CSG_IDENTITY);
--        CellIdentityLte cellIdentityLte = new CellIdentityLte(CI, PCI, TAC, EARFCN,
--                BANDS.stream().mapToInt(i -> i).toArray(), BANDWIDTH, MCC_STR, MNC_STR, ALPHA_LONG,
--                ALPHA_SHORT, additionalPlmns, closedSubscriberGroupInfo);
--        CellSignalStrengthLte cellSignalStrengthLte = new CellSignalStrengthLte(
--                RSSI, RSRP, RSRQ, RSSNR, CQI_TABLE_INDEX, CQI, TIMING_ADVANCE);
--        CellInfoLte expected = new CellInfoLte(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityLte, cellSignalStrengthLte, new CellConfigLte());
--        assertEquals(expected, cil);
-+        CellInfoTdscdma cellInfoTdscdma = (CellInfoTdscdma) ret.get(0);
-+        CellInfoTdscdma expected = new CellInfoTdscdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        CellIdentityTdscdma ci = new CellIdentityTdscdma(
-+                MCC_STR, MNC_STR, LAC, CID, PSC, UARFCN, ALPHA_LONG, ALPHA_SHORT,
-+                Collections.emptyList(), null);
-+        CellSignalStrengthTdscdma cs = new CellSignalStrengthTdscdma(
-+                RSSI, BIT_ERROR_RATE, RSCP);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        cellInfoTdscdma.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoTdscdma);
-     }
- 
--    private android.hardware.radio.V1_2.CellIdentityGsm getCellIdentityGsm_1_2() {
--        android.hardware.radio.V1_0.CellIdentityGsm cellIdentity0 =
--                new android.hardware.radio.V1_0.CellIdentityGsm();
--        cellIdentity0.mcc = MCC_STR;
--        cellIdentity0.mnc = MNC_STR;
--        cellIdentity0.lac = LAC;
--        cellIdentity0.cid = CID;
--        cellIdentity0.arfcn = ARFCN;
--        cellIdentity0.bsic = BSIC;
-+    @Test
-+    public void testConvertHalCellInfoListForCdma() {
-+        android.hardware.radio.V1_0.CellInfoCdma cellinfo =
-+                new android.hardware.radio.V1_0.CellInfoCdma();
-+        cellinfo.cellIdentityCdma.networkId = NETWORK_ID;
-+        cellinfo.cellIdentityCdma.systemId = SYSTEM_ID;
-+        cellinfo.cellIdentityCdma.baseStationId = BASESTATION_ID;
-+        cellinfo.cellIdentityCdma.longitude = LONGITUDE;
-+        cellinfo.cellIdentityCdma.latitude = LATITUDE;
-+        cellinfo.signalStrengthCdma.dbm = -DBM;
-+        cellinfo.signalStrengthCdma.ecio = -ECIO;
-+        cellinfo.signalStrengthEvdo.dbm = -DBM;
-+        cellinfo.signalStrengthEvdo.ecio = -ECIO;
-+        cellinfo.signalStrengthEvdo.signalNoiseRatio = SIGNAL_NOISE_RATIO;
-+        android.hardware.radio.V1_0.CellInfo record = new android.hardware.radio.V1_0.CellInfo();
-+        record.cellInfoType = TYPE_CDMA;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.cdma.add(cellinfo);
-+        ArrayList<Object> records = new ArrayList<>();
-+        records.add(record);
- 
--        android.hardware.radio.V1_2.CellIdentityGsm cellIdentity =
--                new android.hardware.radio.V1_2.CellIdentityGsm();
--        cellIdentity.base = cellIdentity0;
--        cellIdentity.operatorNames = getCellIdentityOperatorNames();
-+        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
- 
--        return cellIdentity;
-+        assertEquals(1, ret.size());
-+        CellInfoCdma cellInfoCdma = (CellInfoCdma) ret.get(0);
-+        CellInfoCdma expected = new CellInfoCdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityCdma ci = new CellIdentityCdma(
-+                NETWORK_ID, SYSTEM_ID, BASESTATION_ID, LONGITUDE, LATITUDE,
-+                EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT);
-+        CellSignalStrengthCdma cs = new CellSignalStrengthCdma(
-+                DBM, ECIO, DBM, ECIO, SIGNAL_NOISE_RATIO);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_UNKNOWN);
-+        cellInfoCdma.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoCdma);
-     }
- 
--    private android.hardware.radio.V1_0.GsmSignalStrength getGsmSignalStrength_1_0() {
--        android.hardware.radio.V1_0.GsmSignalStrength signalStrength =
--                new android.hardware.radio.V1_0.GsmSignalStrength();
--        signalStrength.signalStrength = RSSI_ASU;
--        signalStrength.bitErrorRate = BIT_ERROR_RATE;
--        signalStrength.timingAdvance = TIMING_ADVANCE;
-+    @Test
-+    public void testConvertHalCellInfoList_1_2ForLTE() {
-+        ArrayList<CellInfo> ret = getCellInfoListForLTE(MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT);
- 
--        return signalStrength;
-+        assertEquals(1, ret.size());
-+        CellInfoLte cellInfoLte = (CellInfoLte) ret.get(0);
-+        CellInfoLte expected = new CellInfoLte();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityLte cil = new CellIdentityLte(
-+                CI, PCI, TAC, EARFCN, new int[] {}, BANDWIDTH, MCC_STR, MNC_STR,
-+                ALPHA_LONG, ALPHA_SHORT, Collections.emptyList(), null);
-+        CellSignalStrengthLte css = new CellSignalStrengthLte(
-+                RSSI, RSRP, RSRQ, RSSNR, CQI, TIMING_ADVANCE);
-+        expected.setCellIdentity(cil);
-+        expected.setCellSignalStrength(css);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoLte.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoLte);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_4ForGsm() {
--        android.hardware.radio.V1_2.CellInfoGsm cellInfoGsm =
--                new android.hardware.radio.V1_2.CellInfoGsm();
--        cellInfoGsm.cellIdentityGsm = getCellIdentityGsm_1_2();
--        cellInfoGsm.signalStrengthGsm = getGsmSignalStrength_1_0();
--
--        android.hardware.radio.V1_4.CellInfo cellInfo = new android.hardware.radio.V1_4.CellInfo();
--        cellInfo.isRegistered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.info.gsm(cellInfoGsm);
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2_ForLTEWithEmptyOperatorInfo() {
-+        ArrayList<CellInfo> ret = getCellInfoListForLTE(
-+                MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
--        CellInfoGsm cig = (CellInfoGsm) ret.get(0);
--        cig.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityGsm cellIdentityGsm = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, MCC_STR,
--                MNC_STR, ALPHA_LONG, ALPHA_SHORT, Collections.emptyList());
--        CellSignalStrengthGsm cellSignalStrengthGsm = new CellSignalStrengthGsm(
--                RSSI, BIT_ERROR_RATE, TIMING_ADVANCE);
--        CellInfoGsm expected = new CellInfoGsm(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityGsm, cellSignalStrengthGsm);
--        assertEquals(expected, cig);
-+        CellInfoLte cellInfoLte = (CellInfoLte) ret.get(0);
-+        CellInfoLte expected = new CellInfoLte();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityLte cil = new CellIdentityLte(CI, PCI, TAC, EARFCN, new int[] {},
-+                BANDWIDTH, MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT,
-+                Collections.emptyList(), null);
-+        CellSignalStrengthLte css = new CellSignalStrengthLte(
-+                RSSI, RSRP, RSRQ, RSSNR, CQI, TIMING_ADVANCE);
-+        expected.setCellIdentity(cil);
-+        expected.setCellSignalStrength(css);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoLte.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoLte);
-     }
- 
--    private android.hardware.radio.V1_5.CellInfoGsm getCellInfoGsm_1_5() {
--        android.hardware.radio.V1_5.CellIdentityGsm cellIdentity =
--                new android.hardware.radio.V1_5.CellIdentityGsm();
--        cellIdentity.base = getCellIdentityGsm_1_2();
--        cellIdentity.additionalPlmns = new ArrayList<>(Arrays.asList(ADDITIONAL_PLMNS));
--
--        android.hardware.radio.V1_5.CellInfoGsm cellInfo =
--                new android.hardware.radio.V1_5.CellInfoGsm();
--        cellInfo.cellIdentityGsm = cellIdentity;
--        cellInfo.signalStrengthGsm = getGsmSignalStrength_1_0();
-+    @Test
-+    public void testConvertHalCellInfoList_1_2ForLTEWithEmptyMccMnc() {
-+        // MCC/MNC will be set as INT_MAX if unknown
-+        ArrayList<CellInfo> ret = getCellInfoListForLTE(
-+                String.valueOf(Integer.MAX_VALUE), String.valueOf(Integer.MAX_VALUE),
-+                ALPHA_LONG, ALPHA_SHORT);
- 
--        return cellInfo;
-+        assertEquals(1, ret.size());
-+        CellInfoLte cellInfoLte = (CellInfoLte) ret.get(0);
-+        CellInfoLte expected = new CellInfoLte();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityLte cil = new CellIdentityLte(
-+                CI, PCI, TAC, EARFCN, new int[] {}, BANDWIDTH, null, null, ALPHA_LONG,
-+                ALPHA_SHORT, Collections.emptyList(), null);
-+        CellSignalStrengthLte css = new CellSignalStrengthLte(
-+                RSSI, RSRP, RSRQ, RSSNR, CQI, TIMING_ADVANCE);
-+        expected.setCellIdentity(cil);
-+        expected.setCellSignalStrength(css);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoLte.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoLte);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_5ForGsm() {
--        android.hardware.radio.V1_5.CellInfo cellInfo = new android.hardware.radio.V1_5.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.gsm(getCellInfoGsm_1_5());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForGSM() {
-+        ArrayList<CellInfo> ret = getCellInfoListForGSM(MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
-         CellInfoGsm cellInfoGsm = (CellInfoGsm) ret.get(0);
--        cellInfoGsm.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        CellIdentityGsm cellIdentityGsm = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, MCC_STR,
--                MNC_STR, ALPHA_LONG, ALPHA_SHORT, additionalPlmns);
--        CellSignalStrengthGsm cellSignalStrengthGsm = new CellSignalStrengthGsm(
-+        CellInfoGsm expected = new CellInfoGsm();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityGsm ci = new CellIdentityGsm(
-+                LAC, CID, ARFCN, BSIC, MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT,
-+                Collections.emptyList());
-+        CellSignalStrengthGsm cs = new CellSignalStrengthGsm(
-                 RSSI, BIT_ERROR_RATE, TIMING_ADVANCE);
--        CellInfoGsm expected = new CellInfoGsm(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityGsm, cellSignalStrengthGsm);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoGsm.setTimeStamp(TIMESTAMP); // override the timestamp
-         assertEquals(expected, cellInfoGsm);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_6ForGsm() {
--        android.hardware.radio.V1_6.CellInfo cellInfo = new android.hardware.radio.V1_6.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.gsm(getCellInfoGsm_1_5());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForGSMWithEmptyOperatorInfo() {
-+        ArrayList<CellInfo> ret = getCellInfoListForGSM(
-+                MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
-         CellInfoGsm cellInfoGsm = (CellInfoGsm) ret.get(0);
--        cellInfoGsm.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        CellIdentityGsm cellIdentityGsm = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, MCC_STR,
--                MNC_STR, ALPHA_LONG, ALPHA_SHORT, additionalPlmns);
--        CellSignalStrengthGsm cellSignalStrengthGsm = new CellSignalStrengthGsm(
-+        CellInfoGsm expected = new CellInfoGsm();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityGsm ci = new CellIdentityGsm(
-+                LAC, CID, ARFCN, BSIC, MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT,
-+                Collections.emptyList());
-+        CellSignalStrengthGsm cs = new CellSignalStrengthGsm(
-                 RSSI, BIT_ERROR_RATE, TIMING_ADVANCE);
--        CellInfoGsm expected = new CellInfoGsm(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityGsm, cellSignalStrengthGsm);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoGsm.setTimeStamp(TIMESTAMP); // override the timestamp
-         assertEquals(expected, cellInfoGsm);
-     }
- 
--    private android.hardware.radio.V1_2.CellIdentityWcdma getCellIdentityWcdma_1_2() {
--        android.hardware.radio.V1_0.CellIdentityWcdma cellIdentity0 =
--                new android.hardware.radio.V1_0.CellIdentityWcdma();
--        cellIdentity0.mcc = MCC_STR;
--        cellIdentity0.mnc = MNC_STR;
--        cellIdentity0.lac = LAC;
--        cellIdentity0.cid = CID;
--        cellIdentity0.psc = PSC;
--        cellIdentity0.uarfcn = UARFCN;
--
--        android.hardware.radio.V1_2.CellIdentityWcdma cellIdentity =
--                new android.hardware.radio.V1_2.CellIdentityWcdma();
--        cellIdentity.base = cellIdentity0;
--        cellIdentity.operatorNames = getCellIdentityOperatorNames();
--
--        return cellIdentity;
--    }
--
--    private android.hardware.radio.V1_2.WcdmaSignalStrength getWcdmaSignalStrength_1_2() {
--        android.hardware.radio.V1_0.WcdmaSignalStrength signalStrength0 =
--                new android.hardware.radio.V1_0.WcdmaSignalStrength();
--        signalStrength0.signalStrength = RSSI_ASU;
--        signalStrength0.bitErrorRate = BIT_ERROR_RATE;
--
--        android.hardware.radio.V1_2.WcdmaSignalStrength signalStrength =
--                new android.hardware.radio.V1_2.WcdmaSignalStrength();
--        signalStrength.base = signalStrength0;
--        signalStrength.rscp = RSCP_ASU;
--        signalStrength.ecno = ECNO_ASU;
--
--        return signalStrength;
--    }
--
-     @Test
--    public void testConvertHalCellInfoList_1_4ForWcdma() {
--        android.hardware.radio.V1_2.CellInfoWcdma cellInfoWcdma =
--                new android.hardware.radio.V1_2.CellInfoWcdma();
--        cellInfoWcdma.cellIdentityWcdma = getCellIdentityWcdma_1_2();
--        cellInfoWcdma.signalStrengthWcdma = getWcdmaSignalStrength_1_2();
--
--        android.hardware.radio.V1_4.CellInfo cellInfo = new android.hardware.radio.V1_4.CellInfo();
--        cellInfo.isRegistered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.info.wcdma(cellInfoWcdma);
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForGSMWithEmptyMccMnc() {
-+        // MCC/MNC will be set as INT_MAX if unknown
-+        ArrayList<CellInfo> ret = getCellInfoListForGSM(
-+                String.valueOf(Integer.MAX_VALUE), String.valueOf(Integer.MAX_VALUE),
-+                ALPHA_LONG, ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
--        CellInfoWcdma ciw = (CellInfoWcdma) ret.get(0);
--        ciw.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityWcdma cellIdentityWcdma = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, MCC_STR,
--                MNC_STR, ALPHA_LONG, ALPHA_SHORT, Collections.emptyList(), null);
--        CellSignalStrengthWcdma cellSignalStrengthWcdma = new CellSignalStrengthWcdma(
--                RSSI, BIT_ERROR_RATE, RSCP, ECNO);
--        CellInfoWcdma expected = new CellInfoWcdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityWcdma, cellSignalStrengthWcdma);
--        assertEquals(expected, ciw);
--    }
--
--    private android.hardware.radio.V1_5.CellInfoWcdma getCellInfoWcdma_1_5() {
--        android.hardware.radio.V1_5.CellIdentityWcdma cellIdentity =
--                new android.hardware.radio.V1_5.CellIdentityWcdma();
--        cellIdentity.base = getCellIdentityWcdma_1_2();
--        cellIdentity.additionalPlmns = new ArrayList<>(Arrays.asList(ADDITIONAL_PLMNS));
--        cellIdentity.optionalCsgInfo = getOptionalCsgInfo();
--
--        android.hardware.radio.V1_5.CellInfoWcdma cellInfo =
--                new android.hardware.radio.V1_5.CellInfoWcdma();
--        cellInfo.cellIdentityWcdma = cellIdentity;
--        cellInfo.signalStrengthWcdma = getWcdmaSignalStrength_1_2();
--
--        return cellInfo;
-+        CellInfoGsm cellInfoGsm = (CellInfoGsm) ret.get(0);
-+        CellInfoGsm expected = new CellInfoGsm();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityGsm ci = new CellIdentityGsm(
-+                LAC, CID, ARFCN, BSIC, null, null, ALPHA_LONG, ALPHA_SHORT,
-+                Collections.emptyList());
-+        CellSignalStrengthGsm cs = new CellSignalStrengthGsm(
-+                RSSI, BIT_ERROR_RATE, TIMING_ADVANCE);
-+        expected.setCellIdentity(ci);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        expected.setCellSignalStrength(cs);
-+        cellInfoGsm.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoGsm);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_5ForWcdma() {
--        android.hardware.radio.V1_5.CellInfo cellInfo = new android.hardware.radio.V1_5.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.wcdma(getCellInfoWcdma_1_5());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForWcdma() {
-+        ArrayList<CellInfo> ret = getCellInfoListForWcdma(
-+                MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
-         CellInfoWcdma cellInfoWcdma = (CellInfoWcdma) ret.get(0);
-+        CellInfoWcdma expected = new CellInfoWcdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityWcdma ci = new CellIdentityWcdma(
-+                LAC, CID, PSC, UARFCN, MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT,
-+                Collections.emptyList(), null);
-+        CellSignalStrengthWcdma cs =
-+                new CellSignalStrengthWcdma(RSSI, BIT_ERROR_RATE, RSCP, ECNO);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-         cellInfoWcdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new ClosedSubscriberGroupInfo(CSG_INDICATION, HOME_NODEB_NAME, CSG_IDENTITY);
--        CellIdentityWcdma cellIdentityWcdma = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, MCC_STR,
--                MNC_STR, ALPHA_LONG, ALPHA_SHORT, additionalPlmns, closedSubscriberGroupInfo);
--        CellSignalStrengthWcdma cellSignalStrengthWcdma = new CellSignalStrengthWcdma(
--                RSSI, BIT_ERROR_RATE, RSCP, ECNO);
--        CellInfoWcdma expected = new CellInfoWcdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityWcdma, cellSignalStrengthWcdma);
-         assertEquals(expected, cellInfoWcdma);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_6ForWcdma() {
--        android.hardware.radio.V1_6.CellInfo cellInfo = new android.hardware.radio.V1_6.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.wcdma(getCellInfoWcdma_1_5());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForWcdmaWithEmptyOperatorInfo() {
-+        ArrayList<CellInfo> ret = getCellInfoListForWcdma(
-+                MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
-         CellInfoWcdma cellInfoWcdma = (CellInfoWcdma) ret.get(0);
--        cellInfoWcdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new ClosedSubscriberGroupInfo(CSG_INDICATION, HOME_NODEB_NAME, CSG_IDENTITY);
--        CellIdentityWcdma cellIdentityWcdma = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, MCC_STR,
--                MNC_STR, ALPHA_LONG, ALPHA_SHORT, additionalPlmns, closedSubscriberGroupInfo);
--        CellSignalStrengthWcdma cellSignalStrengthWcdma = new CellSignalStrengthWcdma(
-+        CellInfoWcdma expected = new CellInfoWcdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityWcdma ci = new CellIdentityWcdma(
-+                LAC, CID, PSC, UARFCN, MCC_STR, MNC_STR, EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT,
-+                Collections.emptyList(), null);
-+        CellSignalStrengthWcdma cs = new CellSignalStrengthWcdma(
-                 RSSI, BIT_ERROR_RATE, RSCP, ECNO);
--        CellInfoWcdma expected = new CellInfoWcdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityWcdma, cellSignalStrengthWcdma);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoWcdma.setTimeStamp(TIMESTAMP); // override the timestamp
-         assertEquals(expected, cellInfoWcdma);
-     }
- 
--    private android.hardware.radio.V1_2.CellIdentityTdscdma getCellIdentityTdscdma_1_2() {
--        android.hardware.radio.V1_0.CellIdentityTdscdma cellIdentity0 =
--                new android.hardware.radio.V1_0.CellIdentityTdscdma();
--        cellIdentity0.mcc = MCC_STR;
--        cellIdentity0.mnc = MNC_STR;
--        cellIdentity0.lac = LAC;
--        cellIdentity0.cid = CID;
--        cellIdentity0.cpid = PSC;
--
--        android.hardware.radio.V1_2.CellIdentityTdscdma cellIdentity =
--                new android.hardware.radio.V1_2.CellIdentityTdscdma();
--        cellIdentity.base = cellIdentity0;
--        cellIdentity.uarfcn = UARFCN;
--        cellIdentity.operatorNames = getCellIdentityOperatorNames();
--
--        return cellIdentity;
--    }
--
--    private android.hardware.radio.V1_2.TdscdmaSignalStrength getTdscdmaSignalStrength_1_2() {
--        android.hardware.radio.V1_2.TdscdmaSignalStrength signalStrength =
--                new android.hardware.radio.V1_2.TdscdmaSignalStrength();
--        signalStrength.signalStrength = RSSI_ASU;
--        signalStrength.bitErrorRate = BIT_ERROR_RATE;
--        signalStrength.rscp = RSCP_ASU;
--
--        return signalStrength;
--    }
--
-     @Test
--    public void testConvertHalCellInfoList_1_4ForTdscdma() {
--        android.hardware.radio.V1_2.CellInfoTdscdma cellInfoTdscdma =
--                new android.hardware.radio.V1_2.CellInfoTdscdma();
--        cellInfoTdscdma.cellIdentityTdscdma = getCellIdentityTdscdma_1_2();
--        cellInfoTdscdma.signalStrengthTdscdma = getTdscdmaSignalStrength_1_2();
--
--        android.hardware.radio.V1_4.CellInfo cellInfo = new android.hardware.radio.V1_4.CellInfo();
--        cellInfo.isRegistered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.info.tdscdma(cellInfoTdscdma);
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForWcdmaWithEmptyMccMnc() {
-+        // MCC/MNC will be set as INT_MAX if unknown
-+        ArrayList<CellInfo> ret = getCellInfoListForWcdma(null, null, ALPHA_LONG, ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
--        CellInfoTdscdma cit = (CellInfoTdscdma) ret.get(0);
--        cit.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityTdscdma cellIdentityTdscdma = new CellIdentityTdscdma(
--                MCC_STR, MNC_STR, LAC, CID, PSC, UARFCN, ALPHA_LONG, ALPHA_SHORT,
-+        CellInfoWcdma cellInfoWcdma = (CellInfoWcdma) ret.get(0);
-+        CellInfoWcdma expected = new CellInfoWcdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityWcdma ci = new CellIdentityWcdma(
-+                LAC, CID, PSC, UARFCN, null, null, ALPHA_LONG, ALPHA_SHORT,
-                 Collections.emptyList(), null);
--        CellSignalStrengthTdscdma cellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(
--                RSSI, BIT_ERROR_RATE, RSCP);
--        CellInfoTdscdma expected = new CellInfoTdscdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityTdscdma, cellSignalStrengthTdscdma);
--        assertEquals(expected, cit);
--    }
--
--    private android.hardware.radio.V1_5.CellInfoTdscdma getCellInfoTdscdma_1_5() {
--        android.hardware.radio.V1_5.CellIdentityTdscdma cellIdentity =
--                new android.hardware.radio.V1_5.CellIdentityTdscdma();
--        cellIdentity.base = getCellIdentityTdscdma_1_2();
--        cellIdentity.additionalPlmns = new ArrayList<>(Arrays.asList(ADDITIONAL_PLMNS));
--        cellIdentity.optionalCsgInfo = getOptionalCsgInfo();
--
--        android.hardware.radio.V1_5.CellInfoTdscdma cellInfo =
--                new android.hardware.radio.V1_5.CellInfoTdscdma();
--        cellInfo.cellIdentityTdscdma = cellIdentity;
--        cellInfo.signalStrengthTdscdma = getTdscdmaSignalStrength_1_2();
--
--        return cellInfo;
--    }
--
--    @Test
--    public void testConvertHalCellInfoList_1_5ForTdscdma() {
--        android.hardware.radio.V1_5.CellInfo cellInfo = new android.hardware.radio.V1_5.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.tdscdma(getCellInfoTdscdma_1_5());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
--
--        assertEquals(1, ret.size());
--        CellInfoTdscdma cellInfoTdscdma = (CellInfoTdscdma) ret.get(0);
--        cellInfoTdscdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new ClosedSubscriberGroupInfo(CSG_INDICATION, HOME_NODEB_NAME, CSG_IDENTITY);
--        CellIdentityTdscdma cellIdentityTdscdma = new CellIdentityTdscdma(
--                MCC_STR, MNC_STR, LAC, CID, PSC, UARFCN, ALPHA_LONG, ALPHA_SHORT,
--                additionalPlmns, closedSubscriberGroupInfo);
--        CellSignalStrengthTdscdma cellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(
--                RSSI, BIT_ERROR_RATE, RSCP);
--        CellInfoTdscdma expected = new CellInfoTdscdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityTdscdma, cellSignalStrengthTdscdma);
--        assertEquals(expected, cellInfoTdscdma);
--    }
--
--    @Test
--    public void testConvertHalCellInfoList_1_6ForTdscdma() {
--        android.hardware.radio.V1_6.CellInfo cellInfo = new android.hardware.radio.V1_6.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.tdscdma(getCellInfoTdscdma_1_5());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
--
--        assertEquals(1, ret.size());
--        CellInfoTdscdma cellInfoTdscdma = (CellInfoTdscdma) ret.get(0);
--        cellInfoTdscdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        Set<String> additionalPlmns = new HashSet<>();
--        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
--        ClosedSubscriberGroupInfo closedSubscriberGroupInfo =
--                new ClosedSubscriberGroupInfo(CSG_INDICATION, HOME_NODEB_NAME, CSG_IDENTITY);
--        CellIdentityTdscdma cellIdentityTdscdma = new CellIdentityTdscdma(
--                MCC_STR, MNC_STR, LAC, CID, PSC, UARFCN, ALPHA_LONG, ALPHA_SHORT,
--                additionalPlmns, closedSubscriberGroupInfo);
--        CellSignalStrengthTdscdma cellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(
--                RSSI, BIT_ERROR_RATE, RSCP);
--        CellInfoTdscdma expected = new CellInfoTdscdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityTdscdma, cellSignalStrengthTdscdma);
--        assertEquals(expected, cellInfoTdscdma);
--    }
--
--    private android.hardware.radio.V1_2.CellInfoCdma getCellInfoCdma_1_2() {
--        android.hardware.radio.V1_0.CellIdentityCdma cellIdentity0 =
--                new android.hardware.radio.V1_0.CellIdentityCdma();
--        cellIdentity0.networkId = NETWORK_ID;
--        cellIdentity0.systemId = SYSTEM_ID;
--        cellIdentity0.baseStationId = BASESTATION_ID;
--        cellIdentity0.longitude = LONGITUDE;
--        cellIdentity0.latitude = LATITUDE;
--
--        android.hardware.radio.V1_2.CellIdentityCdma cellIdentity =
--                new android.hardware.radio.V1_2.CellIdentityCdma();
--        cellIdentity.base = cellIdentity0;
--        cellIdentity.operatorNames = getCellIdentityOperatorNames();
--
--        android.hardware.radio.V1_0.CdmaSignalStrength cdmaSignalStrength =
--                new android.hardware.radio.V1_0.CdmaSignalStrength();
--        cdmaSignalStrength.dbm = -DBM;
--        cdmaSignalStrength.ecio = -ECIO;
--
--        android.hardware.radio.V1_0.EvdoSignalStrength evdoSignalStrength =
--                new android.hardware.radio.V1_0.EvdoSignalStrength();
--        evdoSignalStrength.dbm = -DBM;
--        evdoSignalStrength.ecio = -ECIO;
--        evdoSignalStrength.signalNoiseRatio = SIGNAL_NOISE_RATIO;
--
--        android.hardware.radio.V1_2.CellInfoCdma cellInfo =
--                new android.hardware.radio.V1_2.CellInfoCdma();
--        cellInfo.cellIdentityCdma = cellIdentity;
--        cellInfo.signalStrengthCdma = cdmaSignalStrength;
--        cellInfo.signalStrengthEvdo = evdoSignalStrength;
--
--        return cellInfo;
-+        CellSignalStrengthWcdma cs = new CellSignalStrengthWcdma(
-+                RSSI, BIT_ERROR_RATE, RSCP, ECNO);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoWcdma.setTimeStamp(TIMESTAMP); // override the timestamp
-+        assertEquals(expected, cellInfoWcdma);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_4ForCdma() {
--        android.hardware.radio.V1_4.CellInfo cellInfo = new android.hardware.radio.V1_4.CellInfo();
--        cellInfo.isRegistered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.info.cdma(getCellInfoCdma_1_2());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForCdma() {
-+        ArrayList<CellInfo> ret = getCellInfoListForCdma(ALPHA_LONG, ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
-         CellInfoCdma cellInfoCdma = (CellInfoCdma) ret.get(0);
--        cellInfoCdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityCdma cellIdentityCdma = new CellIdentityCdma(NETWORK_ID, SYSTEM_ID,
--                BASESTATION_ID, LONGITUDE, LATITUDE, ALPHA_LONG, ALPHA_SHORT);
--        CellSignalStrengthCdma cellSignalStrengthCdma = new CellSignalStrengthCdma(
-+        CellInfoCdma expected = new CellInfoCdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityCdma ci = new CellIdentityCdma(
-+                NETWORK_ID, SYSTEM_ID, BASESTATION_ID, LONGITUDE, LATITUDE,
-+                ALPHA_LONG, ALPHA_SHORT);
-+        CellSignalStrengthCdma cs = new CellSignalStrengthCdma(
-                 DBM, ECIO, DBM, ECIO, SIGNAL_NOISE_RATIO);
--        CellInfoCdma expected = new CellInfoCdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityCdma, cellSignalStrengthCdma);
--        assertEquals(expected, cellInfoCdma);
--    }
--
--    @Test
--    public void testConvertHalCellInfoList_1_5ForCdma() {
--        android.hardware.radio.V1_5.CellInfo cellInfo = new android.hardware.radio.V1_5.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.cdma(getCellInfoCdma_1_2());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
--
--        assertEquals(1, ret.size());
--        CellInfoCdma cellInfoCdma = (CellInfoCdma) ret.get(0);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-         cellInfoCdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityCdma cellIdentityCdma = new CellIdentityCdma(NETWORK_ID, SYSTEM_ID,
--                BASESTATION_ID, LONGITUDE, LATITUDE, ALPHA_LONG, ALPHA_SHORT);
--        CellSignalStrengthCdma cellSignalStrengthCdma = new CellSignalStrengthCdma(
--                DBM, ECIO, DBM, ECIO, SIGNAL_NOISE_RATIO);
--        CellInfoCdma expected = new CellInfoCdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityCdma, cellSignalStrengthCdma);
-         assertEquals(expected, cellInfoCdma);
-     }
- 
-     @Test
--    public void testConvertHalCellInfoList_1_6ForCdma() {
--        android.hardware.radio.V1_6.CellInfo cellInfo = new android.hardware.radio.V1_6.CellInfo();
--        cellInfo.registered = REGISTERED;
--        cellInfo.connectionStatus = CONNECTION_STATUS;
--        cellInfo.ratSpecificInfo.cdma(getCellInfoCdma_1_2());
--
--        ArrayList<Object> records = new ArrayList<>();
--        records.add(cellInfo);
--
--        ArrayList<CellInfo> ret = RILUtils.convertHalCellInfoList(records);
-+    public void testConvertHalCellInfoList_1_2ForCdmaWithEmptyOperatorInfo() {
-+        ArrayList<CellInfo> ret = getCellInfoListForCdma(EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT);
- 
-         assertEquals(1, ret.size());
-         CellInfoCdma cellInfoCdma = (CellInfoCdma) ret.get(0);
--        cellInfoCdma.setTimeStamp(TIMESTAMP); // override the timestamp
--
--        CellIdentityCdma cellIdentityCdma = new CellIdentityCdma(NETWORK_ID, SYSTEM_ID,
--                BASESTATION_ID, LONGITUDE, LATITUDE, ALPHA_LONG, ALPHA_SHORT);
--        CellSignalStrengthCdma cellSignalStrengthCdma = new CellSignalStrengthCdma(
-+        CellInfoCdma expected = new CellInfoCdma();
-+        expected.setRegistered(false);
-+        expected.setTimeStamp(TIMESTAMP);
-+        CellIdentityCdma ci = new CellIdentityCdma(
-+                NETWORK_ID, SYSTEM_ID, BASESTATION_ID, LONGITUDE, LATITUDE,
-+                EMPTY_ALPHA_LONG, EMPTY_ALPHA_SHORT);
-+        CellSignalStrengthCdma cs = new CellSignalStrengthCdma(
-                 DBM, ECIO, DBM, ECIO, SIGNAL_NOISE_RATIO);
--        CellInfoCdma expected = new CellInfoCdma(CONNECTION_STATUS, REGISTERED, TIMESTAMP,
--                cellIdentityCdma, cellSignalStrengthCdma);
-+        expected.setCellIdentity(ci);
-+        expected.setCellSignalStrength(cs);
-+        expected.setCellConnectionStatus(CellInfo.CONNECTION_NONE);
-+        cellInfoCdma.setTimeStamp(TIMESTAMP); // override the timestamp
-         assertEquals(expected, cellInfoCdma);
-     }
- 
-@@ -2329,8 +2108,170 @@ public class RILTest extends TelephonyTest {
-         assertEquals(expectedSignalStrength, signalStrengthNr);
-     }
- 
-+    private static android.hardware.radio.V1_5.ClosedSubscriberGroupInfo getHalCsgInfo() {
-+        android.hardware.radio.V1_5.ClosedSubscriberGroupInfo csgInfo =
-+                new android.hardware.radio.V1_5.ClosedSubscriberGroupInfo();
-+
-+        csgInfo.csgIndication = CSG_INDICATION;
-+        csgInfo.homeNodebName = HOME_NODEB_NAME;
-+        csgInfo.csgIdentity = CSG_IDENTITY;
-+
-+        return csgInfo;
-+    }
-+
-+    private static void initializeCellIdentityLte_1_5(
-+            android.hardware.radio.V1_5.CellIdentityLte id,
-+            boolean addAdditionalPlmns, boolean addCsgInfo) {
-+
-+        initializeCellIdentityLte_1_2(id.base);
-+
-+        if (addAdditionalPlmns) {
-+            id.additionalPlmns = new ArrayList<>(
-+                    Arrays.asList(ADDITIONAL_PLMNS));
-+        }
-+
-+        if (addCsgInfo) {
-+            id.optionalCsgInfo.csgInfo(getHalCsgInfo());
-+        }
-+    }
-+
-+    @Test
-+    public void testCellIdentityLte_1_5_CsgInfo() {
-+        android.hardware.radio.V1_5.CellIdentityLte halCellIdentity =
-+                new android.hardware.radio.V1_5.CellIdentityLte();
-+        initializeCellIdentityLte_1_5(halCellIdentity, false, true);
-+
-+        CellIdentityLte cellIdentity = RILUtils.convertHalCellIdentityLte(halCellIdentity);
-+
-+        assertEquals(CSG_INDICATION,
-+                cellIdentity.getClosedSubscriberGroupInfo().getCsgIndicator());
-+        assertEquals(HOME_NODEB_NAME,
-+                cellIdentity.getClosedSubscriberGroupInfo().getHomeNodebName());
-+        assertEquals(CSG_IDENTITY,
-+                cellIdentity.getClosedSubscriberGroupInfo().getCsgIdentity());
-+    }
-+
-+    @Test
-+    public void testCellIdentityLte_1_5_MultiPlmn() {
-+        android.hardware.radio.V1_5.CellIdentityLte halCellIdentity =
-+                new android.hardware.radio.V1_5.CellIdentityLte();
-+        initializeCellIdentityLte_1_5(halCellIdentity, true, false);
-+
-+        CellIdentityLte cellIdentity = RILUtils.convertHalCellIdentityLte(halCellIdentity);
-+
-+        Set<String> additionalPlmns = new HashSet<>();
-+        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
-+
-+        assertEquals(cellIdentity.getAdditionalPlmns(), additionalPlmns);
-+    }
-+
-+    private static void initializeCellIdentityWcdma_1_5(
-+            android.hardware.radio.V1_5.CellIdentityWcdma id,
-+            boolean addAdditionalPlmns, boolean addCsgInfo) {
-+
-+        initializeCellIdentityWcdma_1_2(id.base);
-+
-+        if (addAdditionalPlmns) {
-+            id.additionalPlmns = new ArrayList<>(Arrays.asList(ADDITIONAL_PLMNS));
-+        }
-+
-+        if (addCsgInfo) {
-+            id.optionalCsgInfo.csgInfo(getHalCsgInfo());
-+        }
-+    }
-+
-+    @Test
-+    public void testCellIdentityWcdma_1_5_CsgInfo() {
-+        android.hardware.radio.V1_5.CellIdentityWcdma halCellIdentity =
-+                new android.hardware.radio.V1_5.CellIdentityWcdma();
-+        initializeCellIdentityWcdma_1_5(halCellIdentity, false, true);
-+
-+        CellIdentityWcdma cellIdentity = RILUtils.convertHalCellIdentityWcdma(halCellIdentity);
-+
-+        assertEquals(CSG_INDICATION,
-+                cellIdentity.getClosedSubscriberGroupInfo().getCsgIndicator());
-+        assertEquals(HOME_NODEB_NAME,
-+                cellIdentity.getClosedSubscriberGroupInfo().getHomeNodebName());
-+        assertEquals(CSG_IDENTITY,
-+                cellIdentity.getClosedSubscriberGroupInfo().getCsgIdentity());
-+    }
-+
-+    @Test
-+    public void testCellIdentityWcdma_1_5_MultiPlmn() {
-+        android.hardware.radio.V1_5.CellIdentityWcdma halCellIdentity =
-+                new android.hardware.radio.V1_5.CellIdentityWcdma();
-+        initializeCellIdentityWcdma_1_5(halCellIdentity, true, false);
-+
-+        CellIdentityWcdma cellIdentity = RILUtils.convertHalCellIdentityWcdma(halCellIdentity);
-+
-+        Set<String> additionalPlmns = new HashSet<>();
-+        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
-+
-+        assertEquals(cellIdentity.getAdditionalPlmns(), additionalPlmns);
-+    }
-+
-+    private static void initializeCellIdentityTdscdma_1_5(
-+            android.hardware.radio.V1_5.CellIdentityTdscdma id,
-+            boolean addAdditionalPlmns, boolean addCsgInfo) {
-+
-+        initializeCellIdentityTdscdma_1_2(id.base);
-+
-+        if (addAdditionalPlmns) {
-+            id.additionalPlmns = new ArrayList<>(Arrays.asList(ADDITIONAL_PLMNS));
-+        }
-+
-+        if (addCsgInfo) {
-+            id.optionalCsgInfo.csgInfo(getHalCsgInfo());
-+        }
-+    }
-+
-+    @Test
-+    public void testCellIdentityTdscdma_1_5_CsgInfo() {
-+        android.hardware.radio.V1_5.CellIdentityTdscdma halCellIdentity =
-+                new android.hardware.radio.V1_5.CellIdentityTdscdma();
-+        initializeCellIdentityTdscdma_1_5(halCellIdentity, false, true);
-+
-+        CellIdentityTdscdma cellIdentity = RILUtils.convertHalCellIdentityTdscdma(halCellIdentity);
-+
-+        assertEquals(CSG_INDICATION,
-+                cellIdentity.getClosedSubscriberGroupInfo().getCsgIndicator());
-+        assertEquals(HOME_NODEB_NAME,
-+                cellIdentity.getClosedSubscriberGroupInfo().getHomeNodebName());
-+        assertEquals(CSG_IDENTITY,
-+                cellIdentity.getClosedSubscriberGroupInfo().getCsgIdentity());
-+    }
-+
-+    @Test
-+    public void testCellIdentityTdscdma_1_5_MultiPlmn() {
-+        android.hardware.radio.V1_5.CellIdentityTdscdma halCellIdentity =
-+                new android.hardware.radio.V1_5.CellIdentityTdscdma();
-+        initializeCellIdentityTdscdma_1_5(halCellIdentity, true, false);
-+
-+        CellIdentityTdscdma cellIdentity = RILUtils.convertHalCellIdentityTdscdma(halCellIdentity);
-+
-+        Set<String> additionalPlmns = new HashSet<>();
-+        Collections.addAll(additionalPlmns, ADDITIONAL_PLMNS);
-+
-+        assertEquals(cellIdentity.getAdditionalPlmns(), additionalPlmns);
-+    }
-+
-     @Test
-     public void testConvertDataCallResult() {
-+        // Test V1.0 SetupDataCallResult
-+        android.hardware.radio.V1_0.SetupDataCallResult result10 =
-+                new android.hardware.radio.V1_0.SetupDataCallResult();
-+        result10.status = android.hardware.radio.V1_0.DataCallFailCause.NONE;
-+        result10.suggestedRetryTime = -1;
-+        result10.cid = 0;
-+        result10.active = 2;
-+        result10.type = "IPV4V6";
-+        result10.ifname = "ifname";
-+        result10.addresses = "10.0.2.15 2607:fb90:a620:651d:eabe:f8da:c107:44be/64";
-+        result10.dnses = "10.0.2.3 fd00:976a::9";
-+        result10.gateways = "10.0.2.15 fe80::2";
-+        result10.pcscf = "fd00:976a:c206:20::6   fd00:976a:c206:20::9    fd00:976a:c202:1d::9";
-+        result10.mtu = 1500;
-+
-         DataCallResponse response = new DataCallResponse.Builder()
-                 .setCause(0)
-                 .setRetryDurationMillis(-1L)
-@@ -2356,6 +2297,8 @@ public class RILTest extends TelephonyTest {
-                 .setTrafficDescriptors(new ArrayList<>())
-                 .build();
- 
-+        assertEquals(response, RILUtils.convertHalDataCallResult(result10));
-+
-         // Test V1.4 SetupDataCallResult
-         android.hardware.radio.V1_4.SetupDataCallResult result14 =
-                 new android.hardware.radio.V1_4.SetupDataCallResult();
-@@ -2592,7 +2535,11 @@ public class RILTest extends TelephonyTest {
-         ArrayList<Object> records = new ArrayList<>();
- 
-         for (int i = 0; i < 5 /* arbitrary */; i++) {
--            android.hardware.radio.V1_4.CellInfo record = getCellInfo_1_4ForLte();
-+            android.hardware.radio.V1_4.CellInfo record =
-+                    new android.hardware.radio.V1_4.CellInfo();
-+            record.info = new android.hardware.radio.V1_4.CellInfo.Info();
-+            record.info.lte(new android.hardware.radio.V1_4.CellInfoLte());
-+            initializeCellInfoLte_1_2(record.info.lte().base);
-             record.info.lte().base.cellIdentityLte.base.ci += i; // make them marginally unique
- 
-             records.add(record);
-@@ -2607,6 +2554,181 @@ public class RILTest extends TelephonyTest {
-         }
-     }
- 
-+    @Test
-+    public void testCellInfoTimestamp_1_2() {
-+        ArrayList<Object> records = new ArrayList<>();
-+
-+        for (int i = 0; i < 5 /* arbitrary */; i++) {
-+            android.hardware.radio.V1_2.CellInfo record =
-+                    new android.hardware.radio.V1_2.CellInfo();
-+            record.cellInfoType = TYPE_LTE;
-+            record.timeStamp = Long.MAX_VALUE;
-+            record.registered = false;
-+            record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+            record.lte.add(new android.hardware.radio.V1_2.CellInfoLte());
-+            initializeCellInfoLte_1_2(record.lte.get(0));
-+            record.lte.get(0).cellIdentityLte.base.ci += i; // make them marginally unique
-+
-+            records.add(record);
-+        }
-+        List<CellInfo> cil = RILUtils.convertHalCellInfoList(records);
-+
-+        // Check that all timestamps are set to a valid number and are equal
-+        final long ts = cil.get(0).getTimeStamp();
-+        for (CellInfo ci : cil) {
-+            assertTrue(ci.getTimeStamp() > 0 && ci.getTimeStamp() != Long.MAX_VALUE);
-+            assertEquals(ci.getTimeStamp(), ts);
-+        }
-+    }
-+
-+    private static void initializeCellIdentityLte_1_2(
-+            android.hardware.radio.V1_2.CellIdentityLte id) {
-+        // 1.0 fields
-+        id.base.mcc = MCC_STR;
-+        id.base.mnc = MNC_STR;
-+        id.base.ci = CI;
-+        id.base.pci = PCI;
-+        id.base.tac = TAC;
-+        id.base.earfcn = EARFCN;
-+
-+        // 1.2 fields
-+        id.bandwidth = BANDWIDTH;
-+        id.operatorNames.alphaLong = ALPHA_LONG;
-+        id.operatorNames.alphaShort = ALPHA_SHORT;
-+    }
-+
-+    private static void initializeCellInfoLte_1_2(android.hardware.radio.V1_2.CellInfoLte lte) {
-+        initializeCellIdentityLte_1_2(lte.cellIdentityLte);
-+
-+        lte.signalStrengthLte.signalStrength = RSSI_ASU;
-+        lte.signalStrengthLte.rsrp = -RSRP;
-+        lte.signalStrengthLte.rsrq = -RSRQ;
-+        lte.signalStrengthLte.rssnr = RSSNR;
-+        lte.signalStrengthLte.cqi = CQI;
-+        lte.signalStrengthLte.timingAdvance = TIMING_ADVANCE;
-+    }
-+
-+    private ArrayList<CellInfo> getCellInfoListForLTE(
-+            String mcc, String mnc, String alphaLong, String alphaShort) {
-+        android.hardware.radio.V1_2.CellInfoLte lte = new android.hardware.radio.V1_2.CellInfoLte();
-+
-+        initializeCellInfoLte_1_2(lte);
-+        // Override the defaults for test-specific purposes
-+        lte.cellIdentityLte.operatorNames.alphaLong = alphaLong;
-+        lte.cellIdentityLte.operatorNames.alphaShort = alphaShort;
-+        lte.cellIdentityLte.base.mcc = mcc;
-+        lte.cellIdentityLte.base.mnc = mnc;
-+
-+        android.hardware.radio.V1_2.CellInfo record = new android.hardware.radio.V1_2.CellInfo();
-+        record.cellInfoType = TYPE_LTE;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.lte.add(lte);
-+        record.connectionStatus = 0;
-+        ArrayList<Object> records = new ArrayList<>();
-+        records.add(record);
-+        return RILUtils.convertHalCellInfoList(records);
-+    }
-+
-+    private ArrayList<CellInfo> getCellInfoListForGSM(
-+            String mcc, String mnc, String alphaLong, String alphaShort) {
-+        android.hardware.radio.V1_2.CellInfoGsm cellinfo =
-+                new android.hardware.radio.V1_2.CellInfoGsm();
-+        cellinfo.cellIdentityGsm.base.lac = LAC;
-+        cellinfo.cellIdentityGsm.base.cid = CID;
-+        cellinfo.cellIdentityGsm.base.bsic = BSIC;
-+        cellinfo.cellIdentityGsm.base.arfcn = ARFCN;
-+        cellinfo.cellIdentityGsm.base.mcc = mcc;
-+        cellinfo.cellIdentityGsm.base.mnc = mnc;
-+        cellinfo.cellIdentityGsm.operatorNames.alphaLong = alphaLong;
-+        cellinfo.cellIdentityGsm.operatorNames.alphaShort = alphaShort;
-+        cellinfo.signalStrengthGsm.signalStrength = RSSI_ASU;
-+        cellinfo.signalStrengthGsm.bitErrorRate = BIT_ERROR_RATE;
-+        cellinfo.signalStrengthGsm.timingAdvance = TIMING_ADVANCE;
-+        android.hardware.radio.V1_2.CellInfo record = new android.hardware.radio.V1_2.CellInfo();
-+        record.cellInfoType = TYPE_GSM;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.gsm.add(cellinfo);
-+        record.connectionStatus = 0;
-+        ArrayList<Object> records = new ArrayList<>();
-+        records.add(record);
-+
-+        return RILUtils.convertHalCellInfoList(records);
-+    }
-+
-+    private static void initializeCellIdentityWcdma_1_2(
-+            android.hardware.radio.V1_2.CellIdentityWcdma cid) {
-+        initializeCellIdentityWcdma_1_2(cid, MCC_STR, MNC_STR, ALPHA_LONG, ALPHA_SHORT);
-+    }
-+
-+    private static void initializeCellIdentityWcdma_1_2(
-+            android.hardware.radio.V1_2.CellIdentityWcdma cid,
-+                String mcc, String mnc, String alphaLong, String alphaShort) {
-+        cid.base.lac = LAC;
-+        cid.base.cid = CID;
-+        cid.base.psc = PSC;
-+        cid.base.uarfcn = UARFCN;
-+        cid.base.mcc = mcc;
-+        cid.base.mnc = mnc;
-+        cid.operatorNames.alphaLong = alphaLong;
-+        cid.operatorNames.alphaShort = alphaShort;
-+    }
-+
-+    private ArrayList<CellInfo> getCellInfoListForWcdma(
-+            String mcc, String mnc, String alphaLong, String alphaShort) {
-+        android.hardware.radio.V1_2.CellInfoWcdma cellinfo =
-+                new android.hardware.radio.V1_2.CellInfoWcdma();
-+        initializeCellIdentityWcdma_1_2(
-+                cellinfo.cellIdentityWcdma, mcc, mnc, alphaLong, alphaShort);
-+
-+        cellinfo.signalStrengthWcdma.base.signalStrength = RSSI_ASU;
-+        cellinfo.signalStrengthWcdma.base.bitErrorRate = BIT_ERROR_RATE;
-+        cellinfo.signalStrengthWcdma.rscp = RSCP_ASU;
-+        cellinfo.signalStrengthWcdma.ecno = ECNO_ASU;
-+        android.hardware.radio.V1_2.CellInfo record = new android.hardware.radio.V1_2.CellInfo();
-+        record.cellInfoType = TYPE_WCDMA;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.wcdma.add(cellinfo);
-+        record.connectionStatus = 0;
-+        ArrayList<Object> records = new ArrayList<>();
-+        records.add(record);
-+
-+        return RILUtils.convertHalCellInfoList(records);
-+    }
-+
-+    private ArrayList<CellInfo> getCellInfoListForCdma(String alphaLong, String alphaShort) {
-+        android.hardware.radio.V1_2.CellInfoCdma cellinfo =
-+                new android.hardware.radio.V1_2.CellInfoCdma();
-+        cellinfo.cellIdentityCdma.base.networkId = NETWORK_ID;
-+        cellinfo.cellIdentityCdma.base.systemId = SYSTEM_ID;
-+        cellinfo.cellIdentityCdma.base.baseStationId = BASESTATION_ID;
-+        cellinfo.cellIdentityCdma.base.longitude = LONGITUDE;
-+        cellinfo.cellIdentityCdma.base.latitude = LATITUDE;
-+        cellinfo.cellIdentityCdma.operatorNames.alphaLong = alphaLong;
-+        cellinfo.cellIdentityCdma.operatorNames.alphaShort = alphaShort;
-+        cellinfo.signalStrengthCdma.dbm = -DBM;
-+        cellinfo.signalStrengthCdma.ecio = -ECIO;
-+        cellinfo.signalStrengthEvdo.dbm = -DBM;
-+        cellinfo.signalStrengthEvdo.ecio = -ECIO;
-+        cellinfo.signalStrengthEvdo.signalNoiseRatio = SIGNAL_NOISE_RATIO;
-+        android.hardware.radio.V1_2.CellInfo record = new android.hardware.radio.V1_2.CellInfo();
-+        record.cellInfoType = TYPE_CDMA;
-+        record.registered = false;
-+        record.timeStampType = RIL_TIMESTAMP_TYPE_OEM_RIL;
-+        record.timeStamp = TIMESTAMP;
-+        record.cdma.add(cellinfo);
-+        record.connectionStatus = 0;
-+        ArrayList<Object> records = new ArrayList<>();
-+        records.add(record);
-+
-+        return RILUtils.convertHalCellInfoList(records);
-+    }
-+
-     @Test
-     public void testSetupDataCall() throws Exception {
-         ApnSetting apn = new ApnSetting.Builder()
-@@ -2636,8 +2758,8 @@ public class RILTest extends TelephonyTest {
-                 obtainMessage());
-         ArgumentCaptor<DataProfile> dpiCaptor = ArgumentCaptor.forClass(DataProfile.class);
-         verify(mDataProxy).setupDataCall(mSerialNumberCaptor.capture(),
--                eq(AccessNetworkConstants.AccessNetworkType.EUTRAN), dpiCaptor.capture(),
--                eq(false), anyInt(), any(), anyInt(), any(), any(), eq(true));
-+                anyInt(), eq(AccessNetworkConstants.AccessNetworkType.EUTRAN), dpiCaptor.capture(),
-+                eq(false), eq(false), anyInt(), any(), anyInt(), any(), any(), eq(true));
-         verifyRILResponse(
-                 mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_SETUP_DATA_CALL);
-         DataProfile dpi = dpiCaptor.getValue();
-@@ -2655,6 +2777,46 @@ public class RILTest extends TelephonyTest {
-         assertEquals(MTU, dpi.getMtu());
-     }
- 
-+    @Test
-+    public void testFixupSignalStrength10() {
-+        final int gsmWcdmaRssiDbm = -65;
-+
-+        // Test the positive case where rat=UMTS and SignalStrength=GSM
-+        doReturn(ServiceState.RIL_RADIO_TECHNOLOGY_UMTS)
-+                .when(mServiceState).getRilVoiceRadioTechnology();
-+
-+        SignalStrength gsmSignalStrength = new SignalStrength(
-+                new CellSignalStrengthCdma(),
-+                new CellSignalStrengthGsm(gsmWcdmaRssiDbm, 1, CellInfo.UNAVAILABLE),
-+                new CellSignalStrengthWcdma(), new CellSignalStrengthTdscdma(),
-+                new CellSignalStrengthLte(), new CellSignalStrengthNr());
-+        SignalStrength result = mRILUnderTest.fixupSignalStrength10(gsmSignalStrength);
-+
-+        assertTrue(result.getCellSignalStrengths(CellSignalStrengthGsm.class).isEmpty());
-+        assertFalse(result.getCellSignalStrengths(CellSignalStrengthWcdma.class).isEmpty());
-+
-+        // Even though the dBm values are equal, the above checks ensure that the value has
-+        // been migrated to WCDMA (with no change in the top-level getDbm() result).
-+        assertEquals(result.getDbm(), gsmSignalStrength.getDbm());
-+
-+        // Test the no-op case where rat=GSM and SignalStrength=GSM
-+        doReturn(ServiceState.RIL_RADIO_TECHNOLOGY_GSM)
-+                .when(mServiceState).getRilVoiceRadioTechnology();
-+        result = mRILUnderTest.fixupSignalStrength10(gsmSignalStrength);
-+        assertEquals(result, gsmSignalStrength);
-+
-+        // Check that non-GSM non-WCDMA signal strengths are also passed through.
-+        SignalStrength lteSignalStrength = new SignalStrength(
-+                new CellSignalStrengthCdma(), new CellSignalStrengthGsm(),
-+                new CellSignalStrengthWcdma(), new CellSignalStrengthTdscdma(),
-+                new CellSignalStrengthLte(CellInfo.UNAVAILABLE,
-+                        -120, -10, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,
-+                        CellInfo.UNAVAILABLE), new CellSignalStrengthNr());
-+        SignalStrength lteResult = mRILUnderTest.fixupSignalStrength10(lteSignalStrength);
-+
-+        assertEquals(lteResult, lteSignalStrength);
-+    }
-+
-     @Test
-     public void testCreateCarrierRestrictionList() {
-         ArrayList<CarrierIdentifier> carriers = new ArrayList<>();
-@@ -2698,7 +2860,7 @@ public class RILTest extends TelephonyTest {
- 
-         ArrayList<Carrier> result = RILUtils.convertToHalCarrierRestrictionList(carriers);
- 
--        assertEquals(result, expected);
-+        assertTrue(result.equals(expected));
-     }
- 
-     @Test
-@@ -2745,27 +2907,27 @@ public class RILTest extends TelephonyTest {
-         verify(mSimProxy, never()).areUiccApplicationsEnabled(mSerialNumberCaptor.capture());
-         // Sending message is handled by getRadioProxy when proxy is null.
-         // areUiccApplicationsEnabled shouldn't explicitly send another callback.
--        assertNull(message.obj);
-+        assertEquals(null, message.obj);
-     }
- 
-     @Test
--    public void testSetGetCompatVersion() {
-+    public void testSetGetCompatVersion() throws Exception {
-         final int testRequest = RIL_REQUEST_GET_UICC_APPLICATIONS_ENABLEMENT;
- 
-         // getCompactVersion should return null before first setting
-         assertNull(mRILUnderTest.getCompatVersion(testRequest));
- 
-         // first time setting any valid HalVersion will success
--        mRILUnderTest.setCompatVersion(testRequest, RIL.RADIO_HAL_VERSION_1_5);
--        assertEquals(RIL.RADIO_HAL_VERSION_1_5, mRILUnderTest.getCompatVersion(testRequest));
--
--        // try to set a lower HalVersion will success
-         mRILUnderTest.setCompatVersion(testRequest, RIL.RADIO_HAL_VERSION_1_4);
-         assertEquals(RIL.RADIO_HAL_VERSION_1_4, mRILUnderTest.getCompatVersion(testRequest));
- 
-+        // try to set a lower HalVersion will success
-+        mRILUnderTest.setCompatVersion(testRequest, RIL.RADIO_HAL_VERSION_1_3);
-+        assertEquals(RIL.RADIO_HAL_VERSION_1_3, mRILUnderTest.getCompatVersion(testRequest));
-+
-         // try to set a greater HalVersion will not success
--        mRILUnderTest.setCompatVersion(testRequest, RIL.RADIO_HAL_VERSION_1_6);
--        assertEquals(RIL.RADIO_HAL_VERSION_1_4, mRILUnderTest.getCompatVersion(testRequest));
-+        mRILUnderTest.setCompatVersion(testRequest, RIL.RADIO_HAL_VERSION_1_5);
-+        assertEquals(RIL.RADIO_HAL_VERSION_1_3, mRILUnderTest.getCompatVersion(testRequest));
-     }
- 
-     @FlakyTest
-@@ -2804,7 +2966,7 @@ public class RILTest extends TelephonyTest {
-         Message message = obtainMessage();
-         mRILUnderTest.getImei(message);
-         AsyncResult ar = (AsyncResult) message.obj;
--        Assert.assertNull(ar.result);
-+        Assert.assertEquals(null, ar.result);
-         Assert.assertNotNull(ar.exception.getMessage());
-         Assert.assertEquals("REQUEST_NOT_SUPPORTED", ar.exception.getMessage());
-     }
-@@ -2817,7 +2979,8 @@ public class RILTest extends TelephonyTest {
-         Handler handler = new Handler(handlerThread.getLooper()) {
-             public void handleMessage(Message msg) {
-                 AsyncResult ar = (AsyncResult) msg.obj;
--                if (ar != null && ar.exception instanceof CommandException) {
-+                if (ar != null && ar.exception != null
-+                        && ar.exception instanceof CommandException) {
-                     CommandException.Error err =
-                             ((CommandException) (ar.exception)).getCommandError();
-                     if (err == CommandException.Error.SYSTEM_ERR) {
-@@ -2847,7 +3010,8 @@ public class RILTest extends TelephonyTest {
-         Handler handler = new Handler(handlerThread.getLooper()) {
-             public void handleMessage(Message msg) {
-                 AsyncResult ar = (AsyncResult) msg.obj;
--                if (ar != null && ar.exception instanceof CommandException) {
-+                if (ar != null && ar.exception != null
-+                        && ar.exception instanceof CommandException) {
-                     CommandException.Error err =
-                             ((CommandException) (ar.exception)).getCommandError();
-                     if (err == CommandException.Error.RADIO_NOT_AVAILABLE) {
-diff --git a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java
-index e56b0a80a1..9f3483550e 100644
---- a/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java
-+++ b/tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java
-@@ -18,10 +18,9 @@ package com.android.internal.telephony.test;
- 
- import android.compat.annotation.UnsupportedAppUsage;
- import android.hardware.radio.RadioError;
--import android.hardware.radio.V1_2.VoiceRegStateResult;
--import android.hardware.radio.V1_4.DataRegStateResult;
--import android.hardware.radio.V1_4.PdpProtocolType;
--import android.hardware.radio.V1_4.SetupDataCallResult;
-+import android.hardware.radio.V1_0.DataRegStateResult;
-+import android.hardware.radio.V1_0.SetupDataCallResult;
-+import android.hardware.radio.V1_0.VoiceRegStateResult;
- import android.hardware.radio.modem.ImeiInfo;
- import android.net.KeepalivePacketData;
- import android.net.LinkProperties;
-@@ -593,7 +592,7 @@ public class SimulatedCommands extends BaseCommands
-      */
-     @Override
-     public void getDataCallList(Message result) {
--        ArrayList<SetupDataCallResult> dcCallList = new ArrayList<>(0);
-+        ArrayList<SetupDataCallResult> dcCallList = new ArrayList<SetupDataCallResult>(0);
-         SimulatedCommandsVerifier.getInstance().getDataCallList(result);
-         if (mSetupDataCallResult != null) {
-             dcCallList.add(mSetupDataCallResult);
-@@ -1060,10 +1059,10 @@ public class SimulatedCommands extends BaseCommands
-         Object ret = mDataRegStateResult;
-         if (ret == null) {
-             ret = new DataRegStateResult();
--            ((DataRegStateResult) ret).base.regState = mDataRegState;
--            ((DataRegStateResult) ret).base.rat = mDataRadioTech;
--            ((DataRegStateResult) ret).base.maxDataCalls = mMaxDataCalls;
--            ((DataRegStateResult) ret).base.reasonDataDenied = mReasonForDenial;
-+            ((DataRegStateResult) ret).regState = mDataRegState;
-+            ((DataRegStateResult) ret).rat = mDataRadioTech;
-+            ((DataRegStateResult) ret).maxDataCalls = mMaxDataCalls;
-+            ((DataRegStateResult) ret).reasonDataDenied = mReasonForDenial;
-         }
- 
-         resultSuccess(result, ret);
-@@ -1224,17 +1223,17 @@ public class SimulatedCommands extends BaseCommands
-         if (mSetupDataCallResult == null) {
-             try {
-                 mSetupDataCallResult = new SetupDataCallResult();
--                mSetupDataCallResult.cause = 0;
-+                mSetupDataCallResult.status = 0;
-                 mSetupDataCallResult.suggestedRetryTime = -1;
-                 mSetupDataCallResult.cid = 1;
-                 mSetupDataCallResult.active = 2;
--                mSetupDataCallResult.type = PdpProtocolType.IP;
-+                mSetupDataCallResult.type = "IP";
-                 mSetupDataCallResult.ifname = "rmnet_data7";
--                mSetupDataCallResult.addresses = new ArrayList<>(List.of("12.34.56.78"));
--                mSetupDataCallResult.dnses = new ArrayList<>(List.of("98.76.54.32"));
--                mSetupDataCallResult.gateways = new ArrayList<>(List.of("11.22.33.44"));
--                mSetupDataCallResult.pcscf = new ArrayList<>(List.of(
--                        "fd00:976a:c305:1d::8 fd00:976a:c202:1d::7 fd00:976a:c305:1d::5"));
-+                mSetupDataCallResult.addresses = "12.34.56.78";
-+                mSetupDataCallResult.dnses = "98.76.54.32";
-+                mSetupDataCallResult.gateways = "11.22.33.44";
-+                mSetupDataCallResult.pcscf =
-+                        "fd00:976a:c305:1d::8 fd00:976a:c202:1d::7 fd00:976a:c305:1d::5";
-                 mSetupDataCallResult.mtu = 1440;
-             } catch (Exception e) {
-                 Rlog.e(LOG_TAG, "setupDataCall: e=" + e);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0007-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0007-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
deleted file mode 100644
index fa6df71b..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0007-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From cd5fa549f82d7387810a465e248211fabe6f02f1 Mon Sep 17 00:00:00 2001
-From: Raphael Mounier <mounierr07@gmail.com>
-Date: Thu, 6 Oct 2022 08:35:38 +0200
-Subject: [PATCH 07/16] Fix signalstrength for huawei kirin (hi6250, hi3670)
-
-The RILUtils.convertHalSignalStrength function does not work correctly under Huawei hi6250 and hi3660 platform. We have therefore replaced this function with a new one specifically for this Kirin platform.
-
- 23/11/2021 :
-  Initial release for Android 11
-
- 06/10/2022 :
-  Android 13 release
-
- xx/xx/2023 :
-  @AndyCGYan: Fixup for Android 14
-
-Change-Id: I4409683dc7cd9b870237a2939188b71ce94a9fc7
----
- .../com/android/internal/telephony/RIL.java   | 123 ++++++++++++++++++
- .../internal/telephony/RadioIndication.java   |  20 ++-
- 2 files changed, 139 insertions(+), 4 deletions(-)
-
-diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index b44fb0f119..42de7882a3 100644
---- a/src/java/com/android/internal/telephony/RIL.java
-+++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -6992,6 +6992,129 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 new CellSignalStrengthNr());
-     }
- 
-+    /**
-+     * Fixup for SignalStrength for Huawei device
-+     * @param signalStrength the initial signal strength
-+     * @return a new SignalStrength
-+     */
-+    public SignalStrength fixupSignalStrengthHuawei(android.hardware.radio.V1_0.SignalStrength signalStrength) {
-+        int gsmSignalStrength = signalStrength.gw.signalStrength;
-+        int gsmBitErrorRate = signalStrength.gw.bitErrorRate;
-+        int gsmTimingAdvance = signalStrength.gw.timingAdvance;
-+        int mWcdmaRscp = CellInfo.UNAVAILABLE;
-+        int mWcdmaEcio = CellInfo.UNAVAILABLE;
-+        int mWcdmaRssi = CellInfo.UNAVAILABLE;
-+        int mWcdmabErrorRate = CellInfo.UNAVAILABLE;
-+        int cdmaDbm = signalStrength.cdma.dbm;
-+        int cdmaEcio = signalStrength.cdma.ecio;
-+        int evdoDbm = signalStrength.evdo.dbm;
-+        int evdoEcio = signalStrength.evdo.ecio;
-+        int evdoSnr = signalStrength.evdo.signalNoiseRatio;
-+        int lteSignalStrength = signalStrength.lte.signalStrength;
-+        int lteRsrp = signalStrength.lte.rsrp; //4G signal
-+        int lteRsrq = signalStrength.lte.rsrq;
-+        int lteRssnr = signalStrength.lte.rssnr;
-+        int lteCqi = signalStrength.lte.cqi;
-+        int lteTimingAdvance = signalStrength.lte.timingAdvance;
-+        int mGsm = 0;
-+        int mRat = 0;
-+        //int tdScdmaDbm = signalStrength.tdScdma.dbm; // TD-SCDMA is the 3G standard developed for and used by China Mobile
-+
-+
-+
-+        // 3G (UMTS) have a lot of protocol (WCDMA, TDSCDMA, CDMA, EVDO, CDMA-EVDO) - only WCDMA, TDSCDMA, CDMA on Android
-+        // [UNSL]< UNSOL_SIGNAL_STRENGTH {
-+        //.gw = {.signalStrength = -100, .bitErrorRate = -1, .timingAdvance = 0},
-+        //.cdma = {.dbm = 0, .ecio = 0},
-+        //.evdo = {.dbm = 32767, .ecio = -1, .signalNoiseRatio = 32767},
-+        //.lte = {.signalStrength = 99, .rsrp = 2147483647, .rsrq = 0, .rssnr = 0, .cqi = 2147483647, .timingAdvance = -1},
-+        //.tdScdma = {.rscp = 2147483647}} [PHONE0]
-+        //public CellSignalStrengthWcdma(int rssi, int ber, int rscp, int ecno) {
-+
-+        CellSignalStrengthWcdma wcdmaStrength=null;         // Europe use WCDMA norme
-+        if ((lteSignalStrength!=SignalStrength.INVALID) && (lteRsrq==0) && (gsmSignalStrength!=0))
-+        {
-+           // 3G UMTS found - wcdma
-+           mWcdmaRscp = CellInfo.UNAVAILABLE;
-+           mWcdmaEcio = CellInfo.UNAVAILABLE;
-+           mWcdmaRssi = gsmSignalStrength; // Just copy level gw to CDMA
-+           mWcdmabErrorRate=gsmBitErrorRate;
-+
-+           // use rssi calcul method
-+           wcdmaStrength = new CellSignalStrengthWcdma(mWcdmaRssi, mWcdmabErrorRate, mWcdmaRscp, mWcdmaEcio);
-+        }
-+        else
-+        {
-+           // 3G not present
-+           wcdmaStrength = new CellSignalStrengthWcdma();
-+        }
-+
-+
-+        // 4G - LTE
-+        // [UNSL]< UNSOL_SIGNAL_STRENGTH {
-+        //.gw = {.signalStrength = 0, .bitErrorRate = -1, .timingAdvance = 0}, .cdma = {.dbm = 0, .ecio = 0},
-+        //.evdo = {.dbm = 32767, .ecio = -1, .signalNoiseRatio = 32767},
-+        //.lte = {.signalStrength = 99, .rsrp = -105, .rsrq = -12, .rssnr = -10, .cqi = 2147483647, .timingAdvance = -1},
-+        //.tdScdma = {.rscp = 2147483647}} [PHONE0]
-+        // public CellSignalStrengthLte(int rssi, int rsrp, int rsrq, int rssnr, int cqi, int timingAdvance) {
-+
-+        CellSignalStrengthLte lteStrength=null;
-+        if ((lteSignalStrength!=SignalStrength.INVALID) && ( lteRsrp!=0) && (lteRsrq!=0) && (lteRssnr!=0))
-+        {
-+           lteStrength = new CellSignalStrengthLte(SignalStrength.INVALID,
-+                                      lteRsrp,
-+                                      lteRsrq,
-+                                      lteRssnr,
-+                                      lteCqi,
-+                                      lteTimingAdvance);
-+        }
-+        else
-+        {
-+           // 4G-LTE not present
-+           lteStrength = new CellSignalStrengthLte();
-+        }
-+
-+
-+        // GSM
-+        // .gw = {.signalStrength = -91, .bitErrorRate = -1, .timingAdvance = 0}
-+        // public CellSignalStrengthGsm(int rssi, int ber, int ta) {
-+        // rssi in dBm [-113, -51] or UNAVAILABLE
-+        // bit error rate (0-7, 99) TS 27.007 8.5 or UNAVAILABLE
-+        CellSignalStrengthGsm gsmStrength = new CellSignalStrengthGsm(gsmSignalStrength,
-+                                                    gsmBitErrorRate,
-+                                                    gsmTimingAdvance);
-+
-+
-+        if (RILJ_LOGD) {
-+           riljLog("Huawei signal : LTE dbm : " + String.valueOf(lteStrength.getDbm()) +
-+                               ", level : " + String.valueOf(lteStrength.getLevel()) +
-+                               ", rsrp  : " + String.valueOf(lteStrength.getRsrp()) +
-+                               ", rsrq  : " + String.valueOf(lteStrength.getRsrq()) +
-+                               ", rssi  : " + String.valueOf(lteStrength.getRssi()) +
-+                               ", rssnr  : " + String.valueOf(lteStrength.getRssnr()));
-+
-+           riljLog("Huawei signal : WCDMA dbm : " + String.valueOf(wcdmaStrength.getDbm()) +
-+                               ", asulevel : " + String.valueOf(wcdmaStrength.getAsuLevel()) +
-+                               ", rssi  : " + String.valueOf(wcdmaStrength.getRssi()) +
-+                               ", errorrate  : " + String.valueOf(wcdmaStrength.getBitErrorRate()) +
-+                               ", rscp  : " + String.valueOf(wcdmaStrength.getRscp()) +
-+                               ", ecno  : " + String.valueOf(wcdmaStrength.getEcNo()));
-+
-+           riljLog("Huawei signal : GSM dbm : " + String.valueOf(gsmStrength.getDbm()) +
-+                               ", errorrate : " + String.valueOf(gsmStrength.getBitErrorRate()) +
-+                               ", timingadvance  : " + String.valueOf(gsmStrength.getTimingAdvance()));
-+        }
-+
-+        // Perhaps add also gsm signalStrength
-+        return new SignalStrength(
-+                       new CellSignalStrengthCdma(),
-+                       gsmStrength,
-+                       wcdmaStrength,
-+                       new CellSignalStrengthTdscdma(),
-+                       lteStrength,
-+                       new CellSignalStrengthNr());
-+    }
-+
-     void notifyBarringInfoChanged(@NonNull BarringInfo barringInfo) {
-         mLastBarringInfo = barringInfo;
-         mBarringInfoChangedRegistrants.notifyRegistrants(new AsyncResult(null, barringInfo, null));
-diff --git a/src/java/com/android/internal/telephony/RadioIndication.java b/src/java/com/android/internal/telephony/RadioIndication.java
-index b29a7bf434..f62425d22a 100644
---- a/src/java/com/android/internal/telephony/RadioIndication.java
-+++ b/src/java/com/android/internal/telephony/RadioIndication.java
-@@ -241,13 +241,25 @@ public class RadioIndication extends IRadioIndication.Stub {
- 
-     public void currentSignalStrength(int indicationType,
-                                       android.hardware.radio.V1_0.SignalStrength signalStrength) {
--        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
-+        SignalStrength ss = null;
- 
--        SignalStrength ssInitial = RILUtils.convertHalSignalStrength(signalStrength);
-+        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);
- 
--        SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);
-         // Note this is set to "verbose" because it happens frequently
--        if (mRil.isLogvOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);
-+        if (mRil.isLogvOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, signalStrength);
-+
-+        // Fix signalStrength for Huawei
-+        String hardware = android.os.SystemProperties.get("ro.hardware", "");
-+        if(hardware.contains("hi3660") || hardware.contains("hi6250") || hardware.contains("hi3670") || hardware.contains("kirin"))
-+        {
-+            if (RIL.RILJ_LOGV) mRil.riljLog("currentSignalStrength Found Huawei device");
-+            ss = mRil.fixupSignalStrengthHuawei(signalStrength);
-+        }
-+        else
-+        {
-+            SignalStrength ssInitial = RILUtils.convertHalSignalStrength(signalStrength);
-+            ss = mRil.fixupSignalStrength10(ssInitial);
-+        }
- 
-         if (mRil.mSignalStrengthRegistrant != null) {
-             mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult (null, ss, null));
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0008-telephony-forward-port-support-for-forceCognitive.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0008-telephony-forward-port-support-for-forceCognitive.patch
deleted file mode 100644
index bb1b09ef..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0008-telephony-forward-port-support-for-forceCognitive.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6b03579b2dea0a7d80e6505e8cb49fc380e7505e Mon Sep 17 00:00:00 2001
-From: corneranchu <corneranchu@gmail.com>
-Date: Sat, 1 Oct 2022 01:49:58 +0000
-Subject: [PATCH 08/16] telephony: forward-port support for forceCognitive
-
-* This is needed on some MTK devices. Android 10 refactored some code,
-  so now the "non-persistent/cognitive" filter is relocated to RIL and
-  also in DcTracker.setupData().
-
-Change-Id: I7dd387a9f064a969ca5774e53b05388de12aa308
----
- src/java/com/android/internal/telephony/RadioDataProxy.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/java/com/android/internal/telephony/RadioDataProxy.java b/src/java/com/android/internal/telephony/RadioDataProxy.java
-index 9671077b0f..561fceaa7d 100644
---- a/src/java/com/android/internal/telephony/RadioDataProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioDataProxy.java
-@@ -21,6 +21,7 @@ import android.net.LinkProperties;
- import android.os.AsyncResult;
- import android.os.Message;
- import android.os.RemoteException;
-+import android.os.SystemProperties;
- import android.telephony.Rlog;
- import android.telephony.ServiceState;
- import android.telephony.data.DataProfile;
-@@ -244,7 +245,8 @@ public class RadioDataProxy extends RadioServiceProxy {
-         } else {
-             ArrayList<android.hardware.radio.V1_0.DataProfileInfo> dpis = new ArrayList<>();
-             for (DataProfile dp : profiles) {
--                if (dp.isPersistent()) {
-+                boolean forceCognitive = SystemProperties.getBoolean("persist.sys.phh.radio.force_cognitive", false);
-+                        if (dp.isPersistent() || forceCognitive) {
-                     dpis.add(RILUtils.convertToHalDataProfile10(dp));
-                 }
-             }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0009-Pass-correct-value-to-setPreferredNetworkType-for-RI.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0009-Pass-correct-value-to-setPreferredNetworkType-for-RI.patch
deleted file mode 100644
index 50aee4f9..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0009-Pass-correct-value-to-setPreferredNetworkType-for-RI.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 16817ce6a8d7b1240b3212aa6e03b732f3aab642 Mon Sep 17 00:00:00 2001
-From: LuK1337 <priv.luk@gmail.com>
-Date: Fri, 21 Oct 2022 20:55:05 +0200
-Subject: [PATCH 09/16] Pass correct value to setPreferredNetworkType() for RIL
- version < 1.4
-
-Change-Id: Id14be66a2ea4e85b6504bc03fd7d2f038185c17d
----
- src/java/com/android/internal/telephony/RIL.java             | 3 ++-
- .../com/android/internal/telephony/RadioNetworkProxy.java    | 5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 42de7882a3..9eceae2810 100644
---- a/src/java/com/android/internal/telephony/RIL.java
-+++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -3169,7 +3169,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
-         mMetrics.writeSetPreferredNetworkType(mPhoneId, networkType);
- 
-         radioServiceInvokeHelper(HAL_SERVICE_NETWORK, rr, "setPreferredNetworkType", () -> {
--            networkProxy.setPreferredNetworkTypeBitmap(rr.mSerial, mAllowedNetworkTypesBitmask);
-+            networkProxy.setPreferredNetworkTypeBitmap(
-+                        rr.mSerial, mAllowedNetworkTypesBitmask, networkType);
-         });
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioNetworkProxy.java b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-index 069e0667df..708b1850c9 100644
---- a/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-@@ -389,16 +389,17 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      * Call IRadioNetwork#setPreferredNetworkTypeBitmap
-      * @param serial Serial number of request
-      * @param networkTypesBitmask Preferred network types bitmask to set
-+     * @param networkType Preferred network type to set for RIL version < 1.4
-      * @throws RemoteException
-      */
--    public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask)
-+    public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask, int networkType)
-             throws RemoteException {
-         if (isEmpty() || mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) return;
-         if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {
-             ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setPreferredNetworkTypeBitmap(serial,
-                     RILUtils.convertToHalRadioAccessFamily(networkTypesBitmask));
-         } else {
--            mRadioProxy.setPreferredNetworkType(serial, networkTypesBitmask);
-+            mRadioProxy.setPreferredNetworkType(serial, networkType);
-         }
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0010-Fix-NPE-with-1.0-and-1.1-CardStatus.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0010-Fix-NPE-with-1.0-and-1.1-CardStatus.patch
deleted file mode 100644
index 1b40b198..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0010-Fix-NPE-with-1.0-and-1.1-CardStatus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b1e5546cc4cb05a791b0fbe76126c0926b257511 Mon Sep 17 00:00:00 2001
-From: Christian Hoffmann <chrmhoffmann@gmail.com>
-Date: Fri, 21 Oct 2022 12:58:04 +0200
-Subject: [PATCH 10/16] Fix NPE with 1.0 and 1.1 CardStatus
-
-Change-Id: I965f6ef419b7aef828da02f5d4745bd33d09fe3a
----
- src/java/com/android/internal/telephony/RadioResponse.java | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/java/com/android/internal/telephony/RadioResponse.java b/src/java/com/android/internal/telephony/RadioResponse.java
-index 0bc29583fb..71bb2e5b75 100644
---- a/src/java/com/android/internal/telephony/RadioResponse.java
-+++ b/src/java/com/android/internal/telephony/RadioResponse.java
-@@ -1879,6 +1879,8 @@ public class RadioResponse extends IRadioResponse.Stub {
- 
-         if (rr != null) {
-             IccCardStatus iccCardStatus = RILUtils.convertHalCardStatus(cardStatus);
-+            IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();
-+            iccCardStatus.mSlotPortMapping = slotPortMapping;
-             mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);
-             if (responseInfo.error == RadioError.NONE) {
-                 sendMessageResponse(rr.mResult, iccCardStatus);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0011-Conditionally-revert-Block-Binder-thread-until-incom.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0011-Conditionally-revert-Block-Binder-thread-until-incom.patch
deleted file mode 100644
index 7f5595c5..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0011-Conditionally-revert-Block-Binder-thread-until-incom.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 784380fdc01f9dddf0ac222f9b7fbfceee6cee1a Mon Sep 17 00:00:00 2001
-From: ExactExampl <exactxmpl@pixelexperience.org>
-Date: Tue, 11 Oct 2022 12:38:00 +0300
-Subject: [PATCH 11/16] Conditionally revert "Block Binder thread until
- incoming call process completes"
-
-* Legacy IMS packages handling incoming calls in such a way that
-  a blocked binder thread won`t allow to complete call setup,
-  thus we have half dead incoming calls with unattached call session
-  (caller can hear dialing tone whereas recipient got nothing)
-
-This conditionally reverts commit 75c3dc9ba272b43971f519caba0382f9871c7d9d.
-
-Change-Id: I55a8f3bbca4a2b9a6bc7511e9fe2d0884a8818e5
----
- .../telephony/imsphone/ImsPhoneCallTracker.java   | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
-index dcb3b207af..5d234e29ae 100644
---- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
-+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
-@@ -70,6 +70,7 @@ import android.os.Registrant;
- import android.os.RegistrantList;
- import android.os.RemoteException;
- import android.os.SystemClock;
-+import android.os.SystemProperties;
- import android.preference.PreferenceManager;
- import android.provider.Settings;
- import android.sysprop.TelephonyProperties;
-@@ -389,7 +390,19 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
-         @Nullable
-         public IImsCallSessionListener onIncomingCall(
-                 @NonNull IImsCallSession c, @Nullable String callId, @Nullable Bundle extras) {
--            return executeAndWaitForReturn(()-> processIncomingCall(c, callId, extras));
-+            final boolean shouldBlockBinderThreadOnIncomingCalls = SystemProperties.getBoolean(
-+                    "ro.telephony.block_binder_thread_on_incoming_calls", true);
-+            if (shouldBlockBinderThreadOnIncomingCalls) {
-+                // we want to ensure we block this binder thread until incoming call setup completes
-+                // as to avoid race conditions where the ImsService tries to update the state of the
-+                // call before the listeners have been attached.
-+                return executeAndWaitForReturn(()-> processIncomingCall(c, callId, extras));
-+            } else {
-+                // for legacy IMS we want to avoid blocking the binder thread, otherwise
-+                // we end up with half dead incoming calls with unattached call session
-+                return TelephonyUtils.runWithCleanCallingIdentity(()-> processIncomingCall(c, callId, extras),
-+                        mExecutor);
-+            }
-         }
- 
-         @Override
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0012-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0012-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch
deleted file mode 100644
index e18ed712..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0012-When-logging-UiccSlot-ignore-error-if-we-cant-print-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e0832343864d4745a012c99121782080e3a408e0 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 17 Oct 2023 11:08:06 -0400
-Subject: [PATCH 12/16] When logging UiccSlot, ignore error if we cant print
- IccIds
-
----
- .../com/android/internal/telephony/uicc/UiccSlot.java     | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/java/com/android/internal/telephony/uicc/UiccSlot.java b/src/java/com/android/internal/telephony/uicc/UiccSlot.java
-index db10271a2f..00c8acb0db 100644
---- a/src/java/com/android/internal/telephony/uicc/UiccSlot.java
-+++ b/src/java/com/android/internal/telephony/uicc/UiccSlot.java
-@@ -687,7 +687,13 @@ public class UiccSlot extends Handler {
-     @NonNull
-     @Override
-     public String toString() {
--        return "[UiccSlot: mActive=" + mActive + ", mIccId=" + getPrintableIccIds() + ", mIsEuicc="
-+        Map<Integer,String> printableIccIds = null;
-+        try {
-+            printableIccIds = getPrintableIccIds();
-+        } catch(Throwable t) {
-+            android.util.Log.e("PHH", "getPrintableIccIds failed", t);
-+        }
-+        return "[UiccSlot: mActive=" + mActive + ", mIccId=" + printableIccIds + ", mIsEuicc="
-                 + mIsEuicc + ", MEP=" + isMultipleEnabledProfileSupported() + ", mPortIdxToPhoneId="
-                 + mPortIdxToPhoneId + ", mEid=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mEid)
-                 + ", mCardState=" + mCardState + " mSupportedMepMode=" + mSupportedMepMode + "]";
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0013-Revert-Removed-IWLAN-legacy-mode-support.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0013-Revert-Removed-IWLAN-legacy-mode-support.patch
deleted file mode 100644
index aa1a9763..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0013-Revert-Removed-IWLAN-legacy-mode-support.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-From f607208304a5c3b096f8502c5c7f8b036ba485a6 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Fri, 20 Oct 2023 09:11:55 +0000
-Subject: [PATCH 13/16] Revert "Removed IWLAN legacy mode support"
-
-This reverts commit d8d3ed41243ba1fc4b5a5a2a6e30be3f6a404a9d.
-
-Change-Id: I1fd5a803ea3b01f902ff14e1ee6225312b2d3206
----
- .../telephony/ServiceStateTracker.java        |  63 ++++++++--
- .../telephony/data/AccessNetworksManager.java | 110 +++++++++++++++---
- .../telephony/data/DataNetworkController.java |  10 +-
- .../internal/telephony/imsphone/ImsPhone.java |  42 ++++++-
- 4 files changed, 189 insertions(+), 36 deletions(-)
-
-diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
-index ba6479ed03..05f28a90e1 100644
---- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
-+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
-@@ -671,7 +671,7 @@ public class ServiceStateTracker extends Handler {
- 
-         mAccessNetworksManager = mPhone.getAccessNetworksManager();
-         mOutOfServiceSS = new ServiceState();
--        mOutOfServiceSS.setOutOfService(false);
-+        mOutOfServiceSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
- 
-         for (int transportType : mAccessNetworksManager.getAvailableTransports()) {
-             mRegStateManagers.append(transportType, new NetworkRegistrationManager(
-@@ -793,9 +793,9 @@ public class ServiceStateTracker extends Handler {
-         }
- 
-         mSS = new ServiceState();
--        mSS.setOutOfService(false);
-+        mSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
-         mNewSS = new ServiceState();
--        mNewSS.setOutOfService(false);
-+        mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
-         mLastCellInfoReqTime = 0;
-         mLastCellInfoList = null;
-         mStartedGprsRegCheck = false;
-@@ -3374,7 +3374,7 @@ public class ServiceStateTracker extends Handler {
-         NetworkRegistrationInfo nri = mNewSS.getNetworkRegistrationInfo(
-                 NetworkRegistrationInfo.DOMAIN_PS,
-                 AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
--        mNewSS.setOutOfService(radioOff);
-+        mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(),radioOff);
-         // Add the IWLAN registration info back to service state.
-         if (nri != null) {
-             mNewSS.addNetworkRegistrationInfo(nri);
-@@ -3461,10 +3461,14 @@ public class ServiceStateTracker extends Handler {
-                 mSS.getState() == ServiceState.STATE_POWER_OFF
-                         && mNewSS.getState() != ServiceState.STATE_POWER_OFF;
- 
--        SparseBooleanArray hasDataAttached = new SparseBooleanArray();
--        SparseBooleanArray hasDataDetached = new SparseBooleanArray();
--        SparseBooleanArray hasRilDataRadioTechnologyChanged = new SparseBooleanArray();
--        SparseBooleanArray hasDataRegStateChanged = new SparseBooleanArray();
-+        SparseBooleanArray hasDataAttached = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-+        SparseBooleanArray hasDataDetached = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-+        SparseBooleanArray hasRilDataRadioTechnologyChanged = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-+        SparseBooleanArray hasDataRegStateChanged = new SparseBooleanArray(
-+                mAccessNetworksManager.getAvailableTransports().length);
-         boolean anyDataRegChanged = false;
-         boolean anyDataRatChanged = false;
-         boolean hasAlphaRawChanged =
-@@ -3650,7 +3654,7 @@ public class ServiceStateTracker extends Handler {
-         ServiceState oldMergedSS = new ServiceState(mPhone.getServiceState());
-         mSS = new ServiceState(mNewSS);
- 
--        mNewSS.setOutOfService(false);
-+        mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), false);
- 
-         mCellIdentity = primaryCellIdentity;
-         if (mSS.getState() == ServiceState.STATE_IN_SERVICE && primaryCellIdentity != null) {
-@@ -5522,7 +5526,8 @@ public class ServiceStateTracker extends Handler {
-     }
- 
-     /**
--     * This method makes some adjustments when the device camps on IWLAN in airplane mode.
-+     * This method adds IWLAN registration info for legacy mode devices camped on IWLAN. It also
-+     * makes some adjustments when the device camps on IWLAN in airplane mode.
-      */
-     private void processIwlanRegistrationInfo() {
-         if (mCi.getRadioState() == TelephonyManager.RADIO_POWER_OFF) {
-@@ -5536,7 +5541,7 @@ public class ServiceStateTracker extends Handler {
-             }
-             // operator info should be kept in SS
-             String operator = mNewSS.getOperatorAlphaLong();
--            mNewSS.setOutOfService(true);
-+            mNewSS.setOutOfService(mAccessNetworksManager.isInLegacyMode(), true);
-             if (resetIwlanRatVal) {
-                 mNewSS.setDataRegState(ServiceState.STATE_IN_SERVICE);
-                 NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
-@@ -5546,6 +5551,17 @@ public class ServiceStateTracker extends Handler {
-                         .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
-                         .build();
-                 mNewSS.addNetworkRegistrationInfo(nri);
-+                if (mAccessNetworksManager.isInLegacyMode()) {
-+                    // If in legacy mode, simulate the behavior that IWLAN registration info
-+                    // is reported through WWAN transport.
-+                    nri = new NetworkRegistrationInfo.Builder()
-+                            .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
-+                            .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
-+                            .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_IWLAN)
-+                            .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
-+                            .build();
-+                    mNewSS.addNetworkRegistrationInfo(nri);
-+                }
-                 mNewSS.setOperatorAlphaLong(operator);
-                 // Since it's in airplane mode, cellular must be out of service. The only possible
-                 // transport for data to go through is the IWLAN transport. Setting this to true
-@@ -5555,6 +5571,31 @@ public class ServiceStateTracker extends Handler {
-             }
-             return;
-         }
-+
-+        // If the device operates in legacy mode and camps on IWLAN, modem reports IWLAN as a RAT
-+        // through WWAN registration info. To be consistent with the behavior with AP-assisted mode,
-+        // we manually make a WLAN registration info for clients to consume. In this scenario,
-+        // both WWAN and WLAN registration info are the IWLAN registration info and that's the
-+        // unfortunate limitation we have when the device operates in legacy mode. In AP-assisted
-+        // mode, the WWAN registration will correctly report the actual cellular registration info
-+        // when the device camps on IWLAN.
-+        if (mAccessNetworksManager.isInLegacyMode()) {
-+            NetworkRegistrationInfo wwanNri = mNewSS.getNetworkRegistrationInfo(
-+                    NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
-+            if (wwanNri != null && wwanNri.getAccessNetworkTechnology()
-+                    == TelephonyManager.NETWORK_TYPE_IWLAN) {
-+                NetworkRegistrationInfo wlanNri = new NetworkRegistrationInfo.Builder()
-+                        .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
-+                        .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
-+                        .setRegistrationState(wwanNri.getNetworkRegistrationState())
-+                        .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_IWLAN)
-+                        .setRejectCause(wwanNri.getRejectCause())
-+                        .setEmergencyOnly(wwanNri.isEmergencyEnabled())
-+                        .setAvailableServices(wwanNri.getAvailableServices())
-+                        .build();
-+                mNewSS.addNetworkRegistrationInfo(wlanNri);
-+            }
-+        }
-     }
- 
-     private void updateNtnCapability() {
-diff --git a/src/java/com/android/internal/telephony/data/AccessNetworksManager.java b/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
-index 3d3fbe959c..8ba5581bf6 100644
---- a/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
-+++ b/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
-@@ -16,9 +16,12 @@
- 
- package com.android.internal.telephony.data;
- 
-+import static android.telephony.TelephonyManager.HAL_SERVICE_DATA;
-+
- import android.annotation.CallbackExecutor;
- import android.annotation.NonNull;
- import android.annotation.Nullable;
-+import android.annotation.StringDef;
- import android.content.ComponentName;
- import android.content.Context;
- import android.content.Intent;
-@@ -32,6 +35,7 @@ import android.os.PersistableBundle;
- import android.os.Registrant;
- import android.os.RegistrantList;
- import android.os.RemoteException;
-+import android.os.SystemProperties;
- import android.telephony.AccessNetworkConstants;
- import android.telephony.AccessNetworkConstants.AccessNetworkType;
- import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;
-@@ -54,6 +58,7 @@ import android.util.SparseArray;
- 
- import com.android.internal.telephony.IIntegerConsumer;
- import com.android.internal.telephony.Phone;
-+import com.android.internal.telephony.RIL;
- import com.android.internal.telephony.SlidingWindowEventCounter;
- import com.android.internal.telephony.flags.FeatureFlags;
- import com.android.internal.util.FunctionalUtils;
-@@ -61,6 +66,8 @@ import com.android.telephony.Rlog;
- 
- import java.io.FileDescriptor;
- import java.io.PrintWriter;
-+import java.lang.annotation.Retention;
-+import java.lang.annotation.RetentionPolicy;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.List;
-@@ -79,6 +86,35 @@ import java.util.stream.Collectors;
-  */
- public class AccessNetworksManager extends Handler {
-     private static final boolean DBG = false;
-+    public static final String SYSTEM_PROPERTIES_IWLAN_OPERATION_MODE =
-+            "ro.telephony.iwlan_operation_mode";
-+
-+    @Retention(RetentionPolicy.SOURCE)
-+    @StringDef(prefix = {"IWLAN_OPERATION_MODE_"},
-+            value = {
-+                    IWLAN_OPERATION_MODE_DEFAULT,
-+                    IWLAN_OPERATION_MODE_LEGACY,
-+                    IWLAN_OPERATION_MODE_AP_ASSISTED})
-+    public @interface IwlanOperationMode {}
-+
-+    /**
-+     * IWLAN default mode. On device that has IRadio 1.4 or above, it means
-+     * {@link #IWLAN_OPERATION_MODE_AP_ASSISTED}. On device that has IRadio 1.3 or below, it means
-+     * {@link #IWLAN_OPERATION_MODE_LEGACY}.
-+     */
-+    public static final String IWLAN_OPERATION_MODE_DEFAULT = "default";
-+
-+    /**
-+     * IWLAN legacy mode. IWLAN is completely handled by the modem, and when the device is on
-+     * IWLAN, modem reports IWLAN as a RAT.
-+     */
-+    public static final String IWLAN_OPERATION_MODE_LEGACY = "legacy";
-+
-+    /**
-+     * IWLAN application processor assisted mode. IWLAN is handled by the bound IWLAN data service
-+     * and network service separately.
-+     */
-+    public static final String IWLAN_OPERATION_MODE_AP_ASSISTED = "AP-assisted";
- 
-     /** Event to guide a transport type for initial data connection of emergency data network. */
-     private static final int EVENT_GUIDE_TRANSPORT_TYPE_FOR_EMERGENCY = 1;
-@@ -408,22 +444,30 @@ public class AccessNetworksManager extends Handler {
-                 Context.CARRIER_CONFIG_SERVICE);
-         mLogTag = "ANM-" + mPhone.getPhoneId();
-         mApnTypeToQnsChangeNetworkCounter = new SparseArray<>();
--        mAvailableTransports = new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
--                AccessNetworkConstants.TRANSPORT_TYPE_WLAN};
-         mFeatureFlags = featureFlags;
--
--        // bindQualifiedNetworksService posts real work to handler thread. So here we can
--        // let the callback execute in binder thread to avoid post twice.
--        mCarrierConfigManager.registerCarrierConfigChangeListener(Runnable::run,
--                (slotIndex, subId, carrierId, specificCarrierId) -> {
--                    if (slotIndex != mPhone.getPhoneId()) return;
--                    // We should wait for carrier config changed event because the target binding
--                    // package name can come from the carrier config. Note that we still get this
--                    // event even when SIM is absent.
--                    if (DBG) log("Carrier config changed. Try to bind qualified network service.");
--                    bindQualifiedNetworksService();
--                });
--        bindQualifiedNetworksService();
-+        if (isInLegacyMode()) {
-+            log("operates in legacy mode.");
-+            // For legacy mode, WWAN is the only transport to handle all data connections, even
-+            // the IWLAN ones.
-+            mAvailableTransports = new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN};
-+        } else {
-+            log("operates in AP-assisted mode.");
-+            mAvailableTransports = new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
-+                    AccessNetworkConstants.TRANSPORT_TYPE_WLAN};
-+
-+            // bindQualifiedNetworksService posts real work to handler thread. So here we can
-+            // let the callback execute in binder thread to avoid post twice.
-+            mCarrierConfigManager.registerCarrierConfigChangeListener(Runnable::run,
-+                    (slotIndex, subId, carrierId, specificCarrierId) -> {
-+                        if (slotIndex != mPhone.getPhoneId()) return;
-+                        // We should wait for carrier config changed event because the target binding
-+                        // package name can come from the carrier config. Note that we still get this
-+                        // event even when SIM is absent.
-+                        if (DBG) log("Carrier config changed. Try to bind qualified network service.");
-+                        bindQualifiedNetworksService();
-+                    });
-+            bindQualifiedNetworksService();
-+        }
- 
-         // Using post to delay the registering because data retry manager and data config
-         // manager instances are created later than access networks manager.
-@@ -528,7 +572,8 @@ public class AccessNetworksManager extends Handler {
-     /**
-      * Get the qualified network service package.
-      *
--     * @return package name of the qualified networks service package.
-+     * @return package name of the qualified networks service package. Return empty string when in
-+     * legacy mode (i.e. Dedicated IWLAN data/network service is not supported).
-      */
-     private String getQualifiedNetworksServicePackageName() {
-         // Read package name from the resource
-@@ -617,9 +662,30 @@ public class AccessNetworksManager extends Handler {
-     }
- 
-     /**
--     * @return The available transports.
-+     * @return {@code true} if the device operates in legacy mode, otherwise {@code false}.
-      */
--    public @NonNull int[] getAvailableTransports() {
-+    public boolean isInLegacyMode() {
-+        // Get IWLAN operation mode from the system property. If the system property is configured
-+        // to default or not configured, the mode is tied to IRadio version. For 1.4 or above, it's
-+        // AP-assisted mode, for 1.3 or below, it's legacy mode.
-+        String mode = SystemProperties.get(SYSTEM_PROPERTIES_IWLAN_OPERATION_MODE);
-+
-+        if (mode.equals(IWLAN_OPERATION_MODE_AP_ASSISTED)) {
-+            return false;
-+        } else if (mode.equals(IWLAN_OPERATION_MODE_LEGACY)) {
-+            return true;
-+        }
-+
-+        return mPhone.getHalVersion(HAL_SERVICE_DATA).less(RIL.RADIO_HAL_VERSION_1_4);
-+    }
-+
-+    /**
-+     * @return The available transports. Note that on legacy devices, the only available transport
-+     * would be WWAN only. If the device is configured as AP-assisted mode, the available transport
-+     * will always be WWAN and WLAN (even if the device is not camped on IWLAN).
-+     * See {@link #isInLegacyMode()} for mode details.
-+     */
-+    public synchronized @NonNull int[] getAvailableTransports() {
-         return mAvailableTransports;
-     }
- 
-@@ -657,6 +723,11 @@ public class AccessNetworksManager extends Handler {
-      * @return The preferred transport.
-      */
-     public @TransportType int getPreferredTransport(@ApnType int apnType) {
-+        // In legacy mode, always preferred on cellular.
-+        if (isInLegacyMode()) {
-+            return AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
-+        }
-+
-         return mPreferredTransports.get(apnType) == null
-                 ? AccessNetworkConstants.TRANSPORT_TYPE_WWAN : mPreferredTransports.get(apnType);
-     }
-@@ -759,6 +830,9 @@ public class AccessNetworksManager extends Handler {
-         }
- 
-         pw.decreaseIndent();
-+        pw.println("isInLegacy=" + isInLegacyMode());
-+        pw.println("IWLAN operation mode="
-+                + SystemProperties.get(SYSTEM_PROPERTIES_IWLAN_OPERATION_MODE));
-         pw.println("Local logs=");
-         pw.increaseIndent();
-         mLocalLog.dump(fd, pw, args);
-diff --git a/src/java/com/android/internal/telephony/data/DataNetworkController.java b/src/java/com/android/internal/telephony/data/DataNetworkController.java
-index 70d3b23142..fa67c0daf5 100644
---- a/src/java/com/android/internal/telephony/data/DataNetworkController.java
-+++ b/src/java/com/android/internal/telephony/data/DataNetworkController.java
-@@ -1039,10 +1039,12 @@ public class DataNetworkController extends Handler {
-         mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
-                 .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
- 
--        mPhone.getServiceStateTracker().registerForServiceStateChanged(this,
--                EVENT_SERVICE_STATE_CHANGED, null);
--        mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
--                .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
-+        if (!mAccessNetworksManager.isInLegacyMode()) {
-+            mPhone.getServiceStateTracker().registerForServiceStateChanged(this,
-+                    EVENT_SERVICE_STATE_CHANGED, null);
-+            mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
-+                    .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
-+        }
- 
-         mPhone.getContext().getSystemService(TelephonyRegistryManager.class)
-                 .addOnSubscriptionsChangedListener(new OnSubscriptionsChangedListener() {
-diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
-index a6bb1d66f0..2ebaca52ad 100644
---- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
-+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
-@@ -492,7 +492,11 @@ public class ImsPhone extends ImsPhoneBase {
-         mCT.registerPhoneStateListener(mExternalCallTracker);
-         mExternalCallTracker.setCallPuller(mCT);
- 
--        mSS.setOutOfService(false);
-+        boolean legacyMode = true;
-+        if (mDefaultPhone.getAccessNetworksManager() != null) {
-+            legacyMode = mDefaultPhone.getAccessNetworksManager().isInLegacyMode();
-+        }
-+        mSS.setOutOfService(legacyMode, false);
- 
-         mPhoneId = mDefaultPhone.getPhoneId();
- 
-@@ -2422,7 +2426,7 @@ public class ImsPhone extends ImsPhoneBase {
-     /**
-      * Update roaming state and WFC mode in the following situations:
-      *     1) voice is in service.
--     *     2) data is in service.
-+     *     2) data is in service and it is not IWLAN (if in legacy mode).
-      * @param ss non-null ServiceState
-      */
-     private void updateRoamingState(ServiceState ss) {
-@@ -2443,7 +2447,15 @@ public class ImsPhone extends ImsPhoneBase {
-             logi("updateRoamingState: we are not IN_SERVICE, ignoring roaming change.");
-             return;
-         }
--
-+        // We ignore roaming changes when moving to IWLAN because it always sets the roaming
-+        // mode to home and masks the actual cellular roaming status if voice is not registered. If
-+        // we just moved to IWLAN because WFC roaming mode is IWLAN preferred and WFC home mode is
-+        // cell preferred, we can get into a condition where the modem keeps bouncing between
-+        // IWLAN->cell->IWLAN->cell...
-+        if (isCsNotInServiceAndPsWwanReportingWlan(ss)) {
-+            logi("updateRoamingState: IWLAN masking roaming, ignore roaming change.");
-+            return;
-+        }
-         if (mCT.getState() == PhoneConstants.State.IDLE) {
-             if (DBG) logd("updateRoamingState now: " + newRoamingState);
-             if (!mFeatureFlags.updateRoamingStateToSetWfcMode()) {
-@@ -2467,6 +2479,30 @@ public class ImsPhone extends ImsPhoneBase {
-         }
-     }
- 
-+    /**
-+     * In legacy mode, data registration will report IWLAN when we are using WLAN for data,
-+     * effectively masking the true roaming state of the device if voice is not registered.
-+     *
-+     * @return true if we are reporting not in service for CS domain over WWAN transport and WLAN
-+     * for PS domain over WWAN transport.
-+     */
-+    private boolean isCsNotInServiceAndPsWwanReportingWlan(ServiceState ss) {
-+        // We can not get into this condition if we are in AP-Assisted mode.
-+        if (mDefaultPhone.getAccessNetworksManager() == null
-+                || !mDefaultPhone.getAccessNetworksManager().isInLegacyMode()) {
-+            return false;
-+        }
-+        NetworkRegistrationInfo csInfo = ss.getNetworkRegistrationInfo(
-+                NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
-+        NetworkRegistrationInfo psInfo = ss.getNetworkRegistrationInfo(
-+                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
-+        // We will return roaming state correctly if the CS domain is in service because
-+        // ss.getRoaming() returns isVoiceRoaming||isDataRoaming result and isDataRoaming==false
-+        // when the modem reports IWLAN RAT.
-+        return psInfo != null && csInfo != null && !csInfo.isInService()
-+                && psInfo.getAccessNetworkTechnology() == TelephonyManager.NETWORK_TYPE_IWLAN;
-+    }
-+
-     public RegistrationManager.RegistrationCallback getImsMmTelRegistrationCallback() {
-         return mImsMmTelRegistrationHelper.getCallback();
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0014-Initialize-Samsung-AIDL-ISehRadioNetwork.-Fixes-5G-o.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0014-Initialize-Samsung-AIDL-ISehRadioNetwork.-Fixes-5G-o.patch
deleted file mode 100644
index 3181a1c6..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0014-Initialize-Samsung-AIDL-ISehRadioNetwork.-Fixes-5G-o.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 43dfd8506111bcc7ba25aba8ca064e8a55f4e4b5 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 21 Feb 2024 12:50:28 -0500
-Subject: [PATCH 14/16] Initialize Samsung AIDL ISehRadioNetwork. Fixes 5G on
- S24
-
----
- Android.bp                                    |   1 +
- .../com/android/internal/telephony/RIL.java   |   2 +-
- .../internal/telephony/RadioNetworkProxy.java | 143 +++++++++++++++++-
- 3 files changed, 144 insertions(+), 2 deletions(-)
-
-diff --git a/Android.bp b/Android.bp
-index 331b722ace..6e2c045bd1 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -90,6 +90,7 @@ java_library {
-         "android.hardware.radio.network-V3-java",
-         "android.hardware.radio.sim-V3-java",
-         "android.hardware.radio.voice-V3-java",
-+        "vendor.samsung.hardware.radio.network-V1-java",
-         "voip-common",
-         "ims-common",
-         "unsupportedappusage",
-diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 9eceae2810..6f5f89d22d 100644
---- a/src/java/com/android/internal/telephony/RIL.java
-+++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -866,7 +866,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                             mHalVersion.put(service, ((RadioNetworkProxy) serviceProxy).setAidl(
-                                     mHalVersion.get(service),
-                                     android.hardware.radio.network.IRadioNetwork.Stub
--                                            .asInterface(binder)));
-+                                            .asInterface(binder), HIDL_SERVICE_NAME[mPhoneId]));
-                         }
-                         break;
-                     case HAL_SERVICE_SIM:
-diff --git a/src/java/com/android/internal/telephony/RadioNetworkProxy.java b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-index 708b1850c9..6acc90ed63 100644
---- a/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-@@ -32,6 +32,20 @@ import java.util.ArrayList;
- import java.util.List;
- import java.util.stream.Collectors;
- 
-+import vendor.samsung.hardware.radio.network.ISehRadioNetworkIndication;
-+import vendor.samsung.hardware.radio.network.ISehRadioNetworkResponse;
-+import vendor.samsung.hardware.radio.network.ISehRadioNetwork;
-+import vendor.samsung.hardware.radio.network.SehCallDetails;
-+import vendor.samsung.hardware.radio.network.SehCsgInfo;
-+import vendor.samsung.hardware.radio.network.SehEriInfo;
-+import vendor.samsung.hardware.radio.network.SehExtendedRegStateResult;
-+import vendor.samsung.hardware.radio.network.SehOperatorInfo;
-+import vendor.samsung.hardware.radio.network.SehPreferredNetworkInfo;
-+import vendor.samsung.hardware.radio.network.SehRadioResponseInfo;
-+import vendor.samsung.hardware.radio.network.SehRoamingNetworkInfo;
-+import vendor.samsung.hardware.radio.network.SehSignalBar;
-+import vendor.samsung.hardware.radio.network.SehVendorConfiguration;
-+
- /**
-  * A holder for IRadioNetwork. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-  * getAidl to get IRadioNetwork and call the AIDL implementations of the HAL APIs.
-@@ -69,7 +83,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      * @return updated HAL version
-      */
-     public HalVersion setAidl(HalVersion halVersion,
--            android.hardware.radio.network.IRadioNetwork network) {
-+            android.hardware.radio.network.IRadioNetwork network, String serviceName) {
-         HalVersion version = halVersion;
-         try {
-             version = RIL.getServiceHalVersion(network.getInterfaceVersion());
-@@ -80,6 +94,133 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-         mNetworkProxy = network;
-         mIsAidl = true;
- 
-+        try {
-+            var samsungIndication = new ISehRadioNetworkIndication.Stub() {
-+                void l(String v) {
-+                    android.util.Log.e("PHH-Radio", v);
-+                }
-+                public void acbInfo(int type, int[] acbInfo) {
-+                    l("acbInfo");
-+                }
-+                public void callDetailsChanged(int type, SehCallDetails[] callDetails) {
-+                    l("callDetailsChanged");
-+                }
-+                public void csFallback(int type, int state) {
-+                    l("csFallback");
-+                }
-+                public void currentNetworkScanIsrequested(int type, byte mode) {
-+                    l("currentNetworkScanIsrequested");
-+                }
-+                public void eriInfoReceived(int type, SehEriInfo eriInfo) {
-+                    l("eriInfoReceived");
-+                }
-+                public void execute(int type, String cmd) {
-+                    l("execute " + cmd);
-+                }
-+                public void extendedRegistrationState(int type, SehExtendedRegStateResult state) {
-+                    l("extendedRegistrationState " + state);
-+                    l("dataRegState = " + state.unprocessedDataRegState +
-+                            ", voiceRegState = " + state.unprocessedVoiceRegState +
-+                            ", isValid = " + state.isValid +
-+                            ", snapshotStatus = " + state.snapshotStatus +
-+                            ", dataRat = " + state.unprocessedDataRat +
-+                            ", mobileOptionRat = " + state.mobileOptionalRat +
-+                            ", imsEmergencyCallBarring = " + state.imsEmergencyCallBarring +
-+                            ", isPsOnlyReg = " + state.isPsOnlyReg);
-+                }
-+                public void imsPreferenceChanged(int type, int[] imsPref) {
-+                    l("imsPreferenceChanged");
-+                }
-+                public void needTurnOnRadioIndication(int type) {
-+                    l("needTurnOnRadioIndication");
-+                }
-+                public void nrBearerAllocationChanged(int type, int status) {
-+                    l("nrBearerAllocationChanged " + status);
-+                }
-+                public void nrIconTypeChanged(int type, int nrIconType) {
-+                    l("nrIconTypeChanged " + nrIconType);
-+                }
-+                public void nrNetworkTypeAdded(int type, int nrNetworkType) {
-+                    l("nrNetworkTypeAdded " + nrNetworkType);
-+                }
-+                public void roamingNetworkScanIsRequested(int type, byte[] scanData) {
-+                    l("roamingNetworkScanIsRequested");
-+                }
-+                public void signalLevelInfoChanged(int type, SehSignalBar signalBarInfo) {
-+                    l("signalLevelInfoChanged " + signalBarInfo);
-+                }
-+                public void vendorConfigurationChanged(int type, SehVendorConfiguration[] configurations) {
-+                    l("vendorConfigurationChanged:");
-+                    for(var c: configurations) {
-+                        l(" - " + c.name + "=" + c.value);
-+                    }
-+                }
-+                @Override
-+                public String getInterfaceHash() {
-+                    return ISehRadioNetworkIndication.HASH;
-+                }
-+
-+                @Override
-+                public int getInterfaceVersion() {
-+                    return ISehRadioNetworkIndication.VERSION;
-+                }
-+            };
-+
-+            var samsungResponse = new ISehRadioNetworkResponse.Stub() {
-+                void l(String v) {
-+                    android.util.Log.e("PHH-Radio", v);
-+                }
-+                public void emergencyControlResponse(SehRadioResponseInfo info) {}
-+                public void emergencySearchResponse(SehRadioResponseInfo info, int respEmergenySearch) {}
-+                public void getAvailableNetworksResponse(SehRadioResponseInfo info, SehOperatorInfo[] networksInfo) {}
-+                public void getCnapResponse(SehRadioResponseInfo info, int m) {}
-+                public void getCsgListResponse(SehRadioResponseInfo info, SehCsgInfo[] csgInfos) {}
-+                public void getDisable2gResponse(SehRadioResponseInfo info, int isDisable) {}
-+                public void getNrIconTypeResponse(SehRadioResponseInfo info, int nrIconType) {}
-+                public void getNrModeResponse(SehRadioResponseInfo info, int nrMode) {}
-+                public void getPreferredNetworkListResponse(SehRadioResponseInfo info, SehPreferredNetworkInfo[] infos) {}
-+                public void getRoamingNetworkInfoViaBLEResponse(SehRadioResponseInfo info, SehRoamingNetworkInfo[] networkInfo) {}
-+                public void getVendorSpecificConfigurationResponse(SehRadioResponseInfo info, SehVendorConfiguration configurations) {}
-+                public void selectCsgManualResponse(SehRadioResponseInfo info) {}
-+                public void sendEncodedUssdResponse(SehRadioResponseInfo info) {}
-+                public void sendRequestRawResponse(SehRadioResponseInfo info, byte[] data) {}
-+                public void sendRequestStringsResponse(SehRadioResponseInfo info, String[] data) {}
-+                public void setCurrentNetworkInfoViaBLEResponse(SehRadioResponseInfo info) {}
-+                public void setDisable2gResponse(SehRadioResponseInfo info) {}
-+                public void setImsCallListResponse(SehRadioResponseInfo info) {}
-+                public void setNrModeResponse(SehRadioResponseInfo info) {}
-+                public void setPreferredNetworkListResponse(SehRadioResponseInfo info) {}
-+                public void setRoamingNetworkInfoViaBLEResponse(SehRadioResponseInfo info) {}
-+                public void setScanResultViaBLEResponse(SehRadioResponseInfo info) {}
-+                public void setVendorSpecificConfigurationResponse(SehRadioResponseInfo info) {
-+                    l("vendor-specific configuration response " + info);
-+                }
-+
-+                @Override
-+                public String getInterfaceHash() {
-+                    return ISehRadioNetworkResponse.HASH;
-+                }
-+
-+                @Override
-+                public int getInterfaceVersion() {
-+                    return ISehRadioNetworkResponse.VERSION;
-+                }
-+            };
-+            var samsungHal =
-+                ISehRadioNetwork.Stub.asInterface(
-+                        android.os.ServiceManager.waitForDeclaredService(
-+                            ISehRadioNetwork.DESCRIPTOR + "/" + serviceName));
-+            samsungHal.setResponseFunctions(samsungResponse, samsungIndication);
-+            var conf = new SehVendorConfiguration[1];
-+            conf[0] = new SehVendorConfiguration();
-+            conf[0].name = "FW_READY";
-+            conf[0].value = "1";
-+            samsungHal.setVendorSpecificConfiguration(0x4242, conf);
-+            android.util.Log.e("PHH", "Successfully got ISehRadioNetwork");
-+        } catch(Throwable t) {
-+            android.util.Log.e("PHH", "Failed getting ISehRadioNetwork", t);
-+        }
-+
-         Rlog.d(TAG, "AIDL initialized mHalVersion=" + mHalVersion);
-         return mHalVersion;
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0015-Initialize-Samsung-HIDL-ISehRadio.-Fixes-5G-on-S20-U.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0015-Initialize-Samsung-HIDL-ISehRadio.-Fixes-5G-on-S20-U.patch
deleted file mode 100644
index 9385b7c6..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0015-Initialize-Samsung-HIDL-ISehRadio.-Fixes-5G-on-S20-U.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From 84c693bde13e019311f1de79fa62d82bc0daa4ce Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 21 Feb 2024 16:21:51 -0500
-Subject: [PATCH 15/16] Initialize Samsung HIDL ISehRadio. Fixes 5G on S20
- Ultra
-
----
- Android.bp                                    |   1 +
- .../com/android/internal/telephony/RIL.java   |   3 +-
- .../internal/telephony/RadioNetworkProxy.java | 122 +++++++++++++++++-
- .../internal/telephony/RadioServiceProxy.java |   5 +
- 4 files changed, 127 insertions(+), 4 deletions(-)
-
-diff --git a/Android.bp b/Android.bp
-index 6e2c045bd1..2370555150 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -82,6 +82,7 @@ java_library {
-         "android.hardware.radio-V1.4-java",
-         "android.hardware.radio-V1.5-java",
-         "android.hardware.radio-V1.6-java",
-+        "vendor.samsung.hardware.radio-V2.2-java",
-         "android.hardware.radio.config-V3-java",
-         "android.hardware.radio.data-V3-java",
-         "android.hardware.radio.ims-V2-java",
-diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
-index 6f5f89d22d..0d379739ef 100644
---- a/src/java/com/android/internal/telephony/RIL.java
-+++ b/src/java/com/android/internal/telephony/RIL.java
-@@ -808,6 +808,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                 return null;
-             } else {
-                 IBinder binder;
-+                serviceProxy.setServiceName(HIDL_SERVICE_NAME[mPhoneId]);
-                 switch (service) {
-                     case HAL_SERVICE_DATA:
-                         if (mMockModem == null) {
-@@ -866,7 +867,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
-                             mHalVersion.put(service, ((RadioNetworkProxy) serviceProxy).setAidl(
-                                     mHalVersion.get(service),
-                                     android.hardware.radio.network.IRadioNetwork.Stub
--                                            .asInterface(binder), HIDL_SERVICE_NAME[mPhoneId]));
-+                                            .asInterface(binder)));
-                         }
-                         break;
-                     case HAL_SERVICE_SIM:
-diff --git a/src/java/com/android/internal/telephony/RadioNetworkProxy.java b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-index 6acc90ed63..ed623744ad 100644
---- a/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
-@@ -32,6 +32,7 @@ import java.util.ArrayList;
- import java.util.List;
- import java.util.stream.Collectors;
- 
-+// AIDL
- import vendor.samsung.hardware.radio.network.ISehRadioNetworkIndication;
- import vendor.samsung.hardware.radio.network.ISehRadioNetworkResponse;
- import vendor.samsung.hardware.radio.network.ISehRadioNetwork;
-@@ -46,6 +47,10 @@ import vendor.samsung.hardware.radio.network.SehRoamingNetworkInfo;
- import vendor.samsung.hardware.radio.network.SehSignalBar;
- import vendor.samsung.hardware.radio.network.SehVendorConfiguration;
- 
-+// HIDL
-+import android.hardware.radio.V1_0.RadioResponseInfo;
-+import vendor.samsung.hardware.radio.V2_2.ISehRadio;
-+
- /**
-  * A holder for IRadioNetwork. Use getHidl to get IRadio 1.0 and call the HIDL implementations or
-  * getAidl to get IRadioNetwork and call the AIDL implementations of the HAL APIs.
-@@ -83,7 +88,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-      * @return updated HAL version
-      */
-     public HalVersion setAidl(HalVersion halVersion,
--            android.hardware.radio.network.IRadioNetwork network, String serviceName) {
-+            android.hardware.radio.network.IRadioNetwork network) {
-         HalVersion version = halVersion;
-         try {
-             version = RIL.getServiceHalVersion(network.getInterfaceVersion());
-@@ -167,7 +172,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             };
- 
-             var samsungResponse = new ISehRadioNetworkResponse.Stub() {
--                void l(String v) {
-+                private void l(String v) {
-                     android.util.Log.e("PHH-Radio", v);
-                 }
-                 public void emergencyControlResponse(SehRadioResponseInfo info) {}
-@@ -209,7 +214,7 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-             var samsungHal =
-                 ISehRadioNetwork.Stub.asInterface(
-                         android.os.ServiceManager.waitForDeclaredService(
--                            ISehRadioNetwork.DESCRIPTOR + "/" + serviceName));
-+                            ISehRadioNetwork.DESCRIPTOR + "/" + mServiceName));
-             samsungHal.setResponseFunctions(samsungResponse, samsungIndication);
-             var conf = new SehVendorConfiguration[1];
-             conf[0] = new SehVendorConfiguration();
-@@ -817,6 +822,117 @@ public class RadioNetworkProxy extends RadioServiceProxy {
-         }
-     }
- 
-+    @Override
-+    public void setHidl(HalVersion halVersion, android.hardware.radio.V1_0.IRadio radio) {
-+        super.setHidl(halVersion, radio);
-+        try {
-+            var samsungResponse = new vendor.samsung.hardware.radio.V2_2.ISehRadioResponse.Stub() {
-+public void getIccCardStatusResponse() {}
-+public void supplyNetworkDepersonalizationResponse(RadioResponseInfo info) {}
-+public void dialResponse(RadioResponseInfo info) {}
-+public void getCurrentCallsResponse() {}
-+public void getImsRegistrationStateResponse() {}
-+public void setImsCallListResponse(RadioResponseInfo info) {}
-+public void getPreferredNetworkListResponse() {}
-+public void setPreferredNetworkListResponse(RadioResponseInfo info) {}
-+public void sendEncodedUssdResponse(RadioResponseInfo info) {}
-+public void getDisable2gResponse(RadioResponseInfo info, int isDisable) {}
-+public void setDisable2gResponse(RadioResponseInfo info) {}
-+public void getCnapResponse(RadioResponseInfo info, int m) {}
-+public void getPhonebookStorageInfoResponse() {}
-+public void getUsimPhonebookCapabilityResponse(RadioResponseInfo info, ArrayList<Integer> phonebookCapability) {}
-+public void setSimOnOffResponse(RadioResponseInfo info) {}
-+public void setSimInitEventResponse(RadioResponseInfo info) {}
-+public void getSimLockInfoResponse() {}
-+public void supplyIccPersonalizationResponse(RadioResponseInfo info) {}
-+public void changeIccPersonalizationResponse(RadioResponseInfo info) {}
-+public void getPhonebookEntryResponse() {}
-+public void accessPhonebookEntryResponse(RadioResponseInfo info, int SimPhonmebookAccessResp) {}
-+public void getCellBroadcastConfigResponse() {}
-+public void emergencySearchResponse(RadioResponseInfo info, int respEmergencySearch) {}
-+public void emergencyControlResponse(RadioResponseInfo info) {}
-+public void getAtrResponse(RadioResponseInfo info, String atr) {}
-+public void sendCdmaSmsExpectMoreResponse() {}
-+public void sendSmsResponse() {}
-+public void sendSMSExpectMoreResponse() {}
-+public void sendCdmaSmsResponse( ){}
-+public void sendImsSmsResponse() {}
-+public void getStoredMsgCountFromSimResponse() {}
-+public void readSmsFromSimResponse() {}
-+public void writeSmsToSimResponse(RadioResponseInfo info, int index) {}
-+public void setDataAllowedResponse(RadioResponseInfo info) {}
-+public void getCsgListResponse() {}
-+public void selectCsgManualResponse(RadioResponseInfo info) {}
-+public void setMobileDataSettingResponse(RadioResponseInfo info) {}
-+public void sendRequestRawResponse(RadioResponseInfo info, ArrayList<Byte> data) {}
-+public void sendRequestStringsResponse(RadioResponseInfo info, ArrayList<String> data) {}
-+public void setNrModeResponse(RadioResponseInfo info) {}
-+public void getNrModeResponse(RadioResponseInfo info, int nrMode) {}
-+public void getNrIconResponse(RadioResponseInfo info, int nrIconType) {}
-+public void getIccCardStatusResponse_2_1(RadioResponseInfo info, vendor.samsung.hardware.radio.V2_1.SehCardStatus cardStatus) {}
-+public void setNrModeResponse_2_2(RadioResponseInfo info) {}
-+public void getVendorSpecificConfigurationResponse(RadioResponseInfo info, ArrayList<vendor.samsung.hardware.radio.V2_2.SehVendorConfiguration> configurations) {}
-+public void setVendorSpecificConfigurationResponse(RadioResponseInfo info) {}
-+            };
-+            var samsungIndication = new vendor.samsung.hardware.radio.V2_2.ISehRadioIndication.Stub() {
-+                private void l(String v) {
-+                    android.util.Log.e("PHH-Radio", "Indication: " + v);
-+                }
-+                public void acbInfoChanged(int type, ArrayList<Integer> acbInfo) { l("acbInfoChanged"); }
-+                public void csFallback(int type, int state) { l("csFallback"); }
-+                public void imsPreferenceChanged(int type, ArrayList<Integer> imsPref) { l("imsPreferenceChanged"); }
-+                public void voiceRadioBearerHandoverStatusChanged(int type, int state) { l("voiceRadioBearerHandoverStatusChanged"); }
-+                public void timerStatusChangedInd(int type, ArrayList<Integer> eventNoti) { l("timerStatusChangedInd"); }
-+                public void modemCapabilityIndication(int type, ArrayList<Byte> data) { l("modemCapabilityIndication"); }
-+                public void needTurnOnRadioIndication(int type) { l("needTurnOnRadioIndication"); }
-+                public void simPhonebookReadyIndication(int type) { l("simPhonebookReadyIndication"); }
-+                public void phonebookInitCompleteIndication(int type) { l("phonebookInitCompleteIndication"); }
-+                public void deviceReadyNoti(int type) { l("deviceReadyNoti"); }
-+                public void stkSmsSendResultIndication(int type, int result) { l("stkSmsSendResultIndication"); }
-+                public void stkCallControlResultIndication(int type, String cmd) { l("stkCallControlResultIndication"); }
-+                public void simSwapStateChangedIndication(int type, int state) { l("simSwapStateChangedIndication"); }
-+                public void simCountMismatchedIndication(int type, int state) { l("simCountMismatchedIndication"); }
-+                public void simOnOffStateChangedNotify(int type, int mode) { l("simOnOffStateChangedNotify"); }
-+                public void releaseCompleteMessageIndication(int type, vendor.samsung.hardware.radio.V2_0.SehSsReleaseComplete result) { l("releaseCompleteMessageIndication"); }
-+                public void sapNotify(int type, ArrayList<Byte> data) { l("sapNotify"); }
-+                public void nrBearerAllocationChanged(int type, int status) { l("nrBearerAllocationChanged"); }
-+                public void nrNetworkTypeAdded(int type, int status) { l("nrNetworkTypeAdded"); }
-+                public void rrcStateChanged(int type, vendor.samsung.hardware.radio.V2_0.SehRrcStateInfo state) { l("rrcStateChanged"); }
-+                public void configModemCapabilityChangeNoti(int type, vendor.samsung.hardware.radio.V2_0.SehConfigModemCapability configModemCapa) { l("configModemCapabilityChangeNoti"); }
-+                public void needApnProfileIndication(String select) { l("needApnProfileIndication");};
-+                public int needSettingValueIndication(String key, String table) {
-+                    l("needSettingValueIndication");
-+                    return -1;
-+                }
-+                public void execute(int type, String cmd) { l("execute " + cmd); }
-+                public void signalLevelInfoChanged(int type, vendor.samsung.hardware.radio.V2_0.SehSignalBar signalBarInfo) { l("signalLevelInfoChanged"); }
-+                public void extendedRegistrationState(int type, vendor.samsung.hardware.radio.V2_0.SehExtendedRegStateResult state) { l("extendedRegistrationState"); }
-+                public void needPacketUsage(String iface, needPacketUsageCallback hidl_cb) {
-+                    hidl_cb.onValues(0, new vendor.samsung.hardware.radio.V2_0.SehPacketUsage());
-+                }
-+                public void nrIconTypeChanged(int type, int nrIconType) { l("nrIconTypeChanged " + nrIconType); }
-+                public void callDetailsChanged(int type, ArrayList<vendor.samsung.hardware.radio.V2_0.SehCallDetails> callDetails) { l("callDetailsChanged"); }
-+                public void vendorConfigurationChanged(int type, ArrayList<vendor.samsung.hardware.radio.V2_2.SehVendorConfiguration> configurations) { l("vendorConfigurationChanged"); }
-+                public void eriInfoReceived(int type, vendor.samsung.hardware.radio.V2_2.SehEriInfo eriInfo) { l("eriInfoReceived"); }
-+
-+            };
-+
-+            var svc = ISehRadio.getService(mServiceName);
-+            svc.setResponseFunction(samsungResponse, samsungIndication);
-+
-+            var args = new ArrayList<vendor.samsung.hardware.radio.V2_2.SehVendorConfiguration>();
-+            var arg = new vendor.samsung.hardware.radio.V2_2.SehVendorConfiguration();
-+            arg.name = "FW_READY";
-+            arg.value = "1";
-+            args.add(arg);
-+
-+            svc.setVendorSpecificConfiguration(0x3232, args);
-+            android.util.Log.e("PHH-Radio", "HIDL FW_READY done");
-+        } catch(Throwable t) {
-+            android.util.Log.e("PHH-Radio", "Getting HIDL ISehRadio", t);
-+        }
-+    }
-+
-     /**
-      * Call IRadioNetwork#startNetworkScan
-      * @param serial Serial number of request
-diff --git a/src/java/com/android/internal/telephony/RadioServiceProxy.java b/src/java/com/android/internal/telephony/RadioServiceProxy.java
-index 4257327330..b3d43ea635 100644
---- a/src/java/com/android/internal/telephony/RadioServiceProxy.java
-+++ b/src/java/com/android/internal/telephony/RadioServiceProxy.java
-@@ -83,4 +83,9 @@ public abstract class RadioServiceProxy {
-     public String toString() {
-         return getClass().getSimpleName() + "[mHalVersion=" + mHalVersion + ']';
-     }
-+
-+    protected String mServiceName = null;
-+    public void setServiceName(String serviceName) {
-+        mServiceName = serviceName;
-+    }
- }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_frameworks_opt_telephony/0016-When-reading-SMSC-ignore-invalid-SMSC.patch b/patches/trebledroid/platform_frameworks_opt_telephony/0016-When-reading-SMSC-ignore-invalid-SMSC.patch
deleted file mode 100644
index 993e4a51..00000000
--- a/patches/trebledroid/platform_frameworks_opt_telephony/0016-When-reading-SMSC-ignore-invalid-SMSC.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e37f6b8fa5406d08115a558ceaba783c638d31ef Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 25 Feb 2024 10:23:29 -0500
-Subject: [PATCH 16/16] When reading SMSC, ignore invalid SMSC
-
-On Samsung, when reading SMSC we get weird strings like
-"4392084000100",149
-The first number is nowhere close to the SMSC phone number
-This number is used when sending SMS, and since it is invalid, sending
-SMS doesn't work.
-We have no idea what this value means or anything, but let's just ignore
-it. In 2024 we can send SMS just fine without a SMSC
-
-This commit fixes sending SMS on OrangeF on my S24
----
- src/java/com/android/internal/telephony/MessagingResponse.java | 2 ++
- src/java/com/android/internal/telephony/RadioResponse.java     | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/java/com/android/internal/telephony/MessagingResponse.java b/src/java/com/android/internal/telephony/MessagingResponse.java
-index 19211e15f5..3ddf6762dd 100644
---- a/src/java/com/android/internal/telephony/MessagingResponse.java
-+++ b/src/java/com/android/internal/telephony/MessagingResponse.java
-@@ -170,6 +170,8 @@ public class MessagingResponse extends IRadioMessagingResponse.Stub {
-      * @param smsc Short Message Service Center address on the device
-      */
-     public void getSmscAddressResponse(RadioResponseInfo responseInfo, String smsc) {
-+        if(smsc.contains("\"") || smsc.contains(","))
-+            smsc = "";
-         RadioResponse.responseString(HAL_SERVICE_MESSAGING, mRil, responseInfo, smsc);
-     }
- 
-diff --git a/src/java/com/android/internal/telephony/RadioResponse.java b/src/java/com/android/internal/telephony/RadioResponse.java
-index 71bb2e5b75..87cb4ad615 100644
---- a/src/java/com/android/internal/telephony/RadioResponse.java
-+++ b/src/java/com/android/internal/telephony/RadioResponse.java
-@@ -1267,6 +1267,8 @@ public class RadioResponse extends IRadioResponse.Stub {
-      * @param smsc Short Message Service Center address on the device
-      */
-     public void getSmscAddressResponse(RadioResponseInfo responseInfo, String smsc) {
-+        if(smsc.contains("\"") || smsc.contains(","))
-+            smsc = "";
-         responseString(responseInfo, smsc);
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch b/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch
deleted file mode 100644
index beb2bc2a..00000000
--- a/patches/trebledroid/platform_hardware_interfaces/0001-Add-a-vendor800-command-to-be-able-to-call-vendor-sp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7208af40a2968eb1e04017e45e6fe0388daa1bcb Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 19 Dec 2021 17:03:15 -0500
-Subject: [PATCH 1/3] Add a vendor800 command, to be able to call
- vendor-specific hwc functions
-
-Change-Id: Icbef1e9e3a331ae3bd5a05687d545851d94d88a8
----
- .../composer-command-buffer/2.1/ComposerCommandBuffer.h     | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/graphics/composer/2.1/utils/command-buffer/include/composer-command-buffer/2.1/ComposerCommandBuffer.h b/graphics/composer/2.1/utils/command-buffer/include/composer-command-buffer/2.1/ComposerCommandBuffer.h
-index 336d15dc6c..423893f837 100644
---- a/graphics/composer/2.1/utils/command-buffer/include/composer-command-buffer/2.1/ComposerCommandBuffer.h
-+++ b/graphics/composer/2.1/utils/command-buffer/include/composer-command-buffer/2.1/ComposerCommandBuffer.h
-@@ -402,6 +402,12 @@ class CommandWriterBase {
-         endCommand();
-     }
- 
-+    void vendor800_1(uint32_t val) {
-+        beginCommand(0x800 << 16, 1);
-+        write(val);
-+        endCommand();
-+    }
-+
-    protected:
-      template <typename T>
-      void beginCommand(T command, uint16_t length) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch b/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch
deleted file mode 100644
index b4c82c6b..00000000
--- a/patches/trebledroid/platform_hardware_interfaces/0002-Fix-light-sensor-crash-on-Xiaomi-13.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 85f11fd68459dade2683da86b5aebaacaefe5cc5 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Tue, 18 Apr 2023 23:48:15 +0000
-Subject: [PATCH 2/3] Fix light sensor crash on Xiaomi 13
-
-SensorService expects a scalar, but Xiaomi HAL returns a pose6DOF vector encapsulation
-Thanks @phhusson for the analysis
-
-Change-Id: Ie358321d5328d01541f455d6af86944ff413c9c9
----
- sensors/aidl/convert/convert.cpp | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/sensors/aidl/convert/convert.cpp b/sensors/aidl/convert/convert.cpp
-index 2dc7a177a0..be3833dfa7 100644
---- a/sensors/aidl/convert/convert.cpp
-+++ b/sensors/aidl/convert/convert.cpp
-@@ -162,7 +162,14 @@ void convertToSensorEvent(const Event& src, sensors_event_t* dst) {
-         case SensorType::MOTION_DETECT:
-         case SensorType::HEART_BEAT:
-         case SensorType::LOW_LATENCY_OFFBODY_DETECT: {
--            dst->data[0] = src.payload.get<Event::EventPayload::scalar>();
-+            if (src.payload.getTag() == Event::EventPayload::pose6DOF) {
-+                auto d = src.payload.get<Event::EventPayload::pose6DOF>();
-+                auto dstr = ::android::internal::ToString(d);
-+                // ALOGE("Received 6DOF for expected scalar %s", dstr.c_str());
-+                dst->data[0] = d.values[0];
-+            } else {
-+                dst->data[0] = src.payload.get<Event::EventPayload::scalar>();
-+            }
-             break;
-         }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch b/patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch
deleted file mode 100644
index df6b0b9b..00000000
--- a/patches/trebledroid/platform_hardware_interfaces/0003-Fix-crash-on-Samsung-S23-using-stock-properties-beca.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dce503981d424772049cf9f7f7066d9da0435dfb Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 24 Oct 2023 04:59:57 -0400
-Subject: [PATCH 3/3] Fix crash on Samsung S23 using stock properties, because
- of sensor reporting vec3 instead of scalar. Likely the device orientation
- sensor
-
----
- sensors/aidl/convert/convert.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sensors/aidl/convert/convert.cpp b/sensors/aidl/convert/convert.cpp
-index be3833dfa7..c56b30475c 100644
---- a/sensors/aidl/convert/convert.cpp
-+++ b/sensors/aidl/convert/convert.cpp
-@@ -167,6 +167,9 @@ void convertToSensorEvent(const Event& src, sensors_event_t* dst) {
-                 auto dstr = ::android::internal::ToString(d);
-                 // ALOGE("Received 6DOF for expected scalar %s", dstr.c_str());
-                 dst->data[0] = d.values[0];
-+            } else if (src.payload.getTag() == Event::EventPayload::vec3) {
-+                auto d = src.payload.get<Event::EventPayload::vec3>();
-+                dst->data[0] = d.x;
-             } else {
-                 dst->data[0] = src.payload.get<Event::EventPayload::scalar>();
-             }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch b/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
deleted file mode 100644
index 47bd1851..00000000
--- a/patches/trebledroid/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dca461b69f7ad858b43c3f06ba6624756413e7d6 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 14 Aug 2018 21:48:19 +0200
-Subject: [PATCH 1/4] Act as usb device when there is no hal, but we believe we
- are a device
-
-Change-Id: I036090738525fd8cc63534d52d02ab1852950a7d
----
- .../usb/UsbConnectionBroadcastReceiver.java                | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
-index 16ea602bc4f..262afbcbb31 100644
---- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
-+++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
-@@ -93,6 +93,13 @@ public class UsbConnectionBroadcastReceiver extends BroadcastReceiver implements
-             mFunctions = functions;
-             mDataRole = mUsbBackend.getDataRole();
-             mPowerRole = mUsbBackend.getPowerRole();
-+                //If we have no USB HAL, mDataRole is invalid
-+                //But we can't be connected AND have none data_role, so it's safe.
-+		//It would be better to fix UsbManager when no HAL is available, but that's more work
-+                if(mDataRole == UsbPortStatus.DATA_ROLE_NONE &&
-+                        intent.getExtras().getBoolean(UsbManager.USB_CONNECTED) &&
-+                        !intent.getExtras().getBoolean(UsbManager.USB_HOST_CONNECTED))
-+                    mDataRole = UsbPortStatus.DATA_ROLE_DEVICE;
-         } else if (UsbManager.ACTION_USB_PORT_CHANGED.equals(intent.getAction())) {
-             UsbPortStatus portStatus = intent.getExtras()
-                     .getParcelable(UsbManager.EXTRA_PORT_STATUS);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch b/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
deleted file mode 100644
index aaf5b53f..00000000
--- a/patches/trebledroid/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 93c61ef0fa473e8ea0bd42676ef917e88bac91f1 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 2 May 2022 17:44:28 -0400
-Subject: [PATCH 2/4] Ignore cancelled fingerprint events, they are expected,
- plus add more fingerprint enroll logs
-
----
- .../biometrics/fingerprint/FingerprintEnrollEnrolling.java     | 3 +++
- .../biometrics/fingerprint/FingerprintEnrollFindSensor.java    | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
-index 90b93461b9c..f84cb4d10c5 100644
---- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
-+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
-@@ -794,6 +794,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
- 
-     @Override
-     public void onEnrollmentError(int errMsgId, CharSequence errString) {
-+        android.util.Log.e("PHH-Enroll", "heyo " + errMsgId + ", " + errString , new Exception());
-+        if (errMsgId == 5) return;
-+
-         onCancelEnrollment(errMsgId);
-         dismissTouchDialogIfSfps();
-     }
-diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
-index 6b7538ae220..366cace6a0a 100644
---- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
-+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
-@@ -371,6 +371,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
- 
-     @Override
-     public void onEnrollmentError(int errMsgId, CharSequence errString) {
-+	android.util.Log.e("PHH-Enroll", "heyo " + errMsgId + ", " + errString + ", " + mNextClicked, new Exception());
-         if (mNextClicked && errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
-             proceedToEnrolling(false /* cancelEnrollment */);
-         } else {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0003-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch b/patches/trebledroid/platform_packages_apps_Settings/0003-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch
deleted file mode 100644
index 19d141c5..00000000
--- a/patches/trebledroid/platform_packages_apps_Settings/0003-Revert-Wi-Fi-Remove-Do-not-validate-option-in-CA-cer.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 4ca52c15a44fa6fa2e9f5f60c6f47449fd1fc546 Mon Sep 17 00:00:00 2001
-From: TogoFire <italomellopereira@gmail.com>
-Date: Fri, 6 Aug 2021 08:54:07 -0300
-Subject: [PATCH 3/4] Revert "[Wi-Fi] Remove 'Do not validate' option in CA
- certificate spinner"
-
-This is not a definitive fix, so revert it. WPA2-Enterprise (802.1X) or
-WPA2-PSK.
-
-[xawlw]:
-- Sometimes we can't connect to some Enterprise WiFi networks because we
-  don't know its domain so let's revert this 'Security' feature
-- Read more about it here:
-  https://www.xda-developers.com/android-11-break-enterprise-wifi-connection/
-
-This reverts commit 33cde5dbeee934269f16d72e26e651d56a13733e.
-This reverts commit 94b8579607c6f1201cea9d6601e88cec897b2ff6.
-
-Signed-off-by: TogoFire <italomellopereira@gmail.com>
-Signed-off-by: xawlw <abdulazizawlw@gmail.com>
-Change-Id: I3cec92b74a419b5463c5e5db496863e66d034703
----
- res/layout/wifi_network_config.xml            | 12 +++++++
- res/values/strings.xml                        |  4 +++
- .../settings/wifi/WifiConfigController.java   | 33 +++++++++++++------
- .../settings/wifi/WifiConfigController2.java  | 33 +++++++++++++------
- 4 files changed, 62 insertions(+), 20 deletions(-)
-
-diff --git a/res/layout/wifi_network_config.xml b/res/layout/wifi_network_config.xml
-index 3de1a38c3ea..5e179d1fc60 100644
---- a/res/layout/wifi_network_config.xml
-+++ b/res/layout/wifi_network_config.xml
-@@ -237,6 +237,18 @@
-                          android:entries="@array/eap_ocsp_type"/>
-             </LinearLayout>
- 
-+            <LinearLayout android:id="@+id/no_ca_cert_warning"
-+                    android:layout_width="match_parent"
-+                    android:layout_height="wrap_content"
-+                    android:visibility="gone"
-+                    style="@style/wifi_item" >
-+                <TextView
-+                        android:layout_width="wrap_content"
-+                        android:layout_height="wrap_content"
-+                        style="@style/wifi_item_warning"
-+                        android:text="@string/wifi_do_not_validate_eap_server_warning" />
-+            </LinearLayout>
-+
-             <LinearLayout android:id="@+id/l_domain"
-                           android:layout_width="match_parent"
-                           android:layout_height="wrap_content"
-diff --git a/res/values/strings.xml b/res/values/strings.xml
-index ef93ba71132..0622daa859c 100644
---- a/res/values/strings.xml
-+++ b/res/values/strings.xml
-@@ -2231,6 +2231,10 @@
-     <string name="wifi_use_system_certs">Use system certificates</string>
-     <!-- Menu option for not providing an EAP user certificate -->
-     <string name="wifi_do_not_provide_eap_user_cert">Do not provide</string>
-+    <!-- Menu option for not validating the EAP server -->
-+    <string name="wifi_do_not_validate_eap_server">Do not validate</string>
-+    <!-- Warning message displayed if user choses not to validate the EAP server -->
-+    <string name="wifi_do_not_validate_eap_server_warning">No certificate specified. Your connection will not be private.</string>
-     <!-- Menu option for Trust On First Use[CHAR_LIMIT=64] -->
-     <string name="wifi_trust_on_first_use">Trust on First Use</string>
-     <!-- Warning message displayed if network name (ssid) is too long -->
-diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
-index 5d45cb235b8..dc49850e7fa 100644
---- a/src/com/android/settings/wifi/WifiConfigController.java
-+++ b/src/com/android/settings/wifi/WifiConfigController.java
-@@ -169,6 +169,7 @@ public class WifiConfigController implements TextWatcher,
-     private String mMultipleCertSetString;
-     private String mUseSystemCertsString;
-     private String mDoNotProvideEapUserCertString;
-+    private String mDoNotValidateEapServerString;
- 
-     private Spinner mSecuritySpinner;
-     @VisibleForTesting Spinner mEapMethodSpinner;
-@@ -275,6 +276,8 @@ public class WifiConfigController implements TextWatcher,
-         mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
-         mDoNotProvideEapUserCertString =
-             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-+        mDoNotValidateEapServerString =
-+            mContext.getString(R.string.wifi_do_not_validate_eap_server);
- 
-         if (Flags.androidVWifiApi() && mAccessPointSecurity == WifiEntry.SECURITY_WEP) {
-             LinearLayout wepWarningLayout =
-@@ -553,7 +556,8 @@ public class WifiConfigController implements TextWatcher,
-                 // Disallow submit if the user has not selected a CA certificate for an EAP network
-                 // configuration.
-                 enabled = false;
--            } else if (mEapDomainView != null
-+            } else if (!caCertSelection.equals(mDoNotValidateEapServerString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Disallow submit if the user chooses to use a certificate for EAP server
-@@ -575,6 +579,7 @@ public class WifiConfigController implements TextWatcher,
-     }
- 
-     void showWarningMessagesIfAppropriate() {
-+        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
-@@ -587,7 +592,13 @@ public class WifiConfigController implements TextWatcher,
-         }
-         if (mEapCaCertSpinner != null
-                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
--            if (mEapDomainView != null
-+            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-+            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-+                // Display warning if user chooses not to validate the EAP server with a
-+                // user-supplied CA certificate in an EAP network configuration.
-+                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-+            } else if (!caCertSelection.equals(mUnspecifiedCertString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Display warning if user chooses to use a certificate without restricting the
-@@ -731,7 +742,8 @@ public class WifiConfigController implements TextWatcher,
-                 config.enterpriseConfig.setCaCertificateAliases(null);
-                 config.enterpriseConfig.setCaPath(null);
-                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     // ca_cert already set to null, so do nothing.
-                 } else if (caCert.equals(mUseSystemCertsString)) {
-                     config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
-@@ -765,7 +777,8 @@ public class WifiConfigController implements TextWatcher,
-                 }
- 
-                 // Only set OCSP option if there is a valid CA certificate.
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
-                 } else {
-                     config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
-@@ -1070,7 +1083,7 @@ public class WifiConfigController implements TextWatcher,
-             loadCertificates(
-                     mEapCaCertSpinner,
-                     androidKeystoreAliasLoader.getCaCertAliases(),
--                    null /* noCertificateString */,
-+                    mDoNotValidateEapServerString /* noCertificateString */,
-                     false /* showMultipleCerts */,
-                     true /* showUsePreinstalledCertOption */);
-             loadCertificates(
-@@ -1154,7 +1167,7 @@ public class WifiConfigController implements TextWatcher,
-             } else {
-                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
-                 if (caCerts == null) {
--                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
-+                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
-                 } else if (caCerts.length == 1) {
-                     setSelection(mEapCaCertSpinner, caCerts[0]);
-                 } else {
-@@ -1165,7 +1178,7 @@ public class WifiConfigController implements TextWatcher,
-                     loadCertificates(
-                             mEapCaCertSpinner,
-                             androidKeystoreAliasLoader.getCaCertAliases(),
--                            null /* noCertificateString */,
-+                            mDoNotValidateEapServerString /* noCertificateString */,
-                             true /* showMultipleCerts */,
-                             true /* showUsePreinstalledCertOption */);
-                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
-@@ -1298,7 +1311,8 @@ public class WifiConfigController implements TextWatcher,
- 
-         if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
-             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
--            if (eapCertSelection.equals(mUnspecifiedCertString)) {
-+            if (eapCertSelection.equals(mDoNotValidateEapServerString)
-+                    || eapCertSelection.equals(mUnspecifiedCertString)) {
-                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
-                 // certificate yet, or chooses not to validate the EAP server.
-                 setDomainInvisible();
-@@ -1559,8 +1573,7 @@ public class WifiConfigController implements TextWatcher,
-                     }).collect(Collectors.toList()));
-         }
- 
--        if (!TextUtils.isEmpty(noCertificateString)
--                && mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
-+        if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
-             certs.add(noCertificateString);
-         }
- 
-diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
-index 7c9b1d1b471..3114941e8d6 100644
---- a/src/com/android/settings/wifi/WifiConfigController2.java
-+++ b/src/com/android/settings/wifi/WifiConfigController2.java
-@@ -177,6 +177,7 @@ public class WifiConfigController2 implements TextWatcher,
-     private String mUseSystemCertsString;
-     private String mTrustOnFirstUse;
-     private String mDoNotProvideEapUserCertString;
-+    private String mDoNotValidateEapServerString;
-     @VisibleForTesting String mInstallCertsString;
- 
-     private Spinner mSecuritySpinner;
-@@ -287,6 +288,8 @@ public class WifiConfigController2 implements TextWatcher,
-         mTrustOnFirstUse = mContext.getString(R.string.wifi_trust_on_first_use);
-         mDoNotProvideEapUserCertString =
-             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-+        mDoNotValidateEapServerString =
-+            mContext.getString(R.string.wifi_do_not_validate_eap_server);
-         mInstallCertsString = mContext.getString(R.string.wifi_install_credentials);
- 
-         if (Flags.androidVWifiApi() && mWifiEntrySecurity == WifiEntry.SECURITY_WEP) {
-@@ -552,7 +555,8 @@ public class WifiConfigController2 implements TextWatcher,
-                 // Disallow submit if the user has not selected a CA certificate for an EAP network
-                 // configuration.
-                 enabled = false;
--            } else if (mEapDomainView != null
-+            } else if (!caCertSelection.equals(mDoNotValidateEapServerString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Disallow submit if the user chooses to use a certificate for EAP server
-@@ -574,6 +578,7 @@ public class WifiConfigController2 implements TextWatcher,
-     }
- 
-     void showWarningMessagesIfAppropriate() {
-+        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
-         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
-@@ -586,7 +591,13 @@ public class WifiConfigController2 implements TextWatcher,
-         }
-         if (mEapCaCertSpinner != null
-                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
--            if (mEapDomainView != null
-+            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-+            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-+                // Display warning if user chooses not to validate the EAP server with a
-+                // user-supplied CA certificate in an EAP network configuration.
-+                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-+            } else if (!caCertSelection.equals(mUnspecifiedCertString)
-+                    && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                 // Display warning if user chooses to use a certificate without restricting the
-@@ -743,7 +754,8 @@ public class WifiConfigController2 implements TextWatcher,
-                 config.enterpriseConfig.setCaCertificateAliases(null);
-                 config.enterpriseConfig.setCaPath(null);
-                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     // ca_cert already set to null, so do nothing.
-                 } else if (mIsTrustOnFirstUseSupported && caCert.equals(mTrustOnFirstUse)) {
-                     config.enterpriseConfig.enableTrustOnFirstUse(true);
-@@ -778,7 +790,8 @@ public class WifiConfigController2 implements TextWatcher,
-                 }
- 
-                 // Only set certificate option if there is a valid CA certificate.
--                if (caCert.equals(mUnspecifiedCertString)) {
-+                if (caCert.equals(mUnspecifiedCertString)
-+                        || caCert.equals(mDoNotValidateEapServerString)) {
-                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
-                     config.enterpriseConfig.setMinimumTlsVersion(WifiEnterpriseConfig.TLS_V1_0);
-                 } else {
-@@ -1086,7 +1099,7 @@ public class WifiConfigController2 implements TextWatcher,
-             loadCertificates(
-                     mEapCaCertSpinner,
-                     mAndroidKeystoreAliasLoader.getCaCertAliases(),
--                    null /* noCertificateString */,
-+                    mDoNotValidateEapServerString /* noCertificateString */,
-                     false /* showMultipleCerts */,
-                     true /* showUsePreinstalledCertOption */);
-             loadCertificates(
-@@ -1170,7 +1183,7 @@ public class WifiConfigController2 implements TextWatcher,
-                             && enterpriseConfig.isTrustOnFirstUseEnabled()) {
-                         setSelection(mEapCaCertSpinner, mTrustOnFirstUse);
-                     } else {
--                        setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
-+                        setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
-                     }
-                 } else if (caCerts.length == 1) {
-                     setSelection(mEapCaCertSpinner, caCerts[0]);
-@@ -1179,7 +1192,7 @@ public class WifiConfigController2 implements TextWatcher,
-                     loadCertificates(
-                             mEapCaCertSpinner,
-                             mAndroidKeystoreAliasLoader.getCaCertAliases(),
--                            null /* noCertificateString */,
-+                            mDoNotValidateEapServerString /* noCertificateString */,
-                             true /* showMultipleCerts */,
-                             true /* showUsePreinstalledCertOption */);
-                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
-@@ -1321,7 +1334,8 @@ public class WifiConfigController2 implements TextWatcher,
-             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-             if (eapCertSelection.equals(mUnspecifiedCertString)
-                     || (mIsTrustOnFirstUseSupported
--                            && eapCertSelection.equals(mTrustOnFirstUse))) {
-+                            && eapCertSelection.equals(mTrustOnFirstUse))
-+                    || eapCertSelection.equals(mUnspecifiedCertString)) {
-                 setMinTlsVerInvisible();
-                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
-                 // certificate yet, or chooses not to validate the EAP server.
-@@ -1595,8 +1609,7 @@ public class WifiConfigController2 implements TextWatcher,
-                     }).collect(Collectors.toList()));
-         }
- 
--        if (!TextUtils.isEmpty(noCertificateString)
--                && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
-+        if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
-             certs.add(noCertificateString);
-         }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Check-if-domain-field-is-not-empty-when.patch b/patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Check-if-domain-field-is-not-empty-when.patch
deleted file mode 100644
index 56ab60f6..00000000
--- a/patches/trebledroid/platform_packages_apps_Settings/0004-Revert-Wi-Fi-Check-if-domain-field-is-not-empty-when.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 9172607accb1b91db9aca5a9a042c22455c38599 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Thu, 2 Nov 2023 10:23:56 +0000
-Subject: [PATCH 4/4] Revert "[Wi-Fi] Check if domain field is not empty when
- users choose a ca certificate"
-
-Change-Id: I52ede9eb6b5164e147578e2dc2756cc722fe36ef
----
- .../android/settings/wifi/WifiConfigController.java   | 11 ++++++-----
- .../android/settings/wifi/WifiConfigController2.java  | 11 ++++++-----
- 2 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
-index dc49850e7fa..4d03f9e3d81 100644
---- a/src/com/android/settings/wifi/WifiConfigController.java
-+++ b/src/com/android/settings/wifi/WifiConfigController.java
-@@ -556,11 +556,11 @@ public class WifiConfigController implements TextWatcher,
-                 // Disallow submit if the user has not selected a CA certificate for an EAP network
-                 // configuration.
-                 enabled = false;
--            } else if (!caCertSelection.equals(mDoNotValidateEapServerString)
-+            } else if (caCertSelection.equals(mUseSystemCertsString)
-                     && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
--                // Disallow submit if the user chooses to use a certificate for EAP server
-+                // Disallow submit if the user chooses to use a system certificate for EAP server
-                 // validation, but does not provide a domain.
-                 enabled = false;
-             }
-@@ -597,12 +597,13 @@ public class WifiConfigController implements TextWatcher,
-                 // Display warning if user chooses not to validate the EAP server with a
-                 // user-supplied CA certificate in an EAP network configuration.
-                 mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
--            } else if (!caCertSelection.equals(mUnspecifiedCertString)
-+            } else if (caCertSelection.equals(mUseSystemCertsString)
-                     && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
--                // Display warning if user chooses to use a certificate without restricting the
--                // server domain that these certificates can be used to validate.
-+                // Display warning if user chooses to use pre-installed public CA certificates
-+                // without restricting the server domain that these certificates can be used to
-+                // validate.
-                 mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
-             }
-         }
-diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
-index 3114941e8d6..9a3892c8722 100644
---- a/src/com/android/settings/wifi/WifiConfigController2.java
-+++ b/src/com/android/settings/wifi/WifiConfigController2.java
-@@ -555,11 +555,11 @@ public class WifiConfigController2 implements TextWatcher,
-                 // Disallow submit if the user has not selected a CA certificate for an EAP network
-                 // configuration.
-                 enabled = false;
--            } else if (!caCertSelection.equals(mDoNotValidateEapServerString)
-+            } else if (caCertSelection.equals(mUseSystemCertsString)
-                     && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
--                // Disallow submit if the user chooses to use a certificate for EAP server
-+                // Disallow submit if the user chooses to use a system certificate for EAP server
-                 // validation, but does not provide a domain.
-                 enabled = false;
-             }
-@@ -596,12 +596,13 @@ public class WifiConfigController2 implements TextWatcher,
-                 // Display warning if user chooses not to validate the EAP server with a
-                 // user-supplied CA certificate in an EAP network configuration.
-                 mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
--            } else if (!caCertSelection.equals(mUnspecifiedCertString)
-+            } else if (caCertSelection.equals(mUseSystemCertsString)
-                     && mEapDomainView != null
-                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
-                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
--                // Display warning if user chooses to use a certificate without restricting the
--                // server domain that these certificates can be used to validate.
-+                // Display warning if user chooses to use pre-installed public CA certificates
-+                // without restricting the server domain that these certificates can be used to
-+                // validate.
-                 mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
-             }
-         }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0001-gd-hci-Ignore-unexpected-status-events.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0001-gd-hci-Ignore-unexpected-status-events.patch
deleted file mode 100644
index b9b44d10..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0001-gd-hci-Ignore-unexpected-status-events.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bd071cdb22667a1b720a85eeda29d75b4bfb59af Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 24 Aug 2022 10:41:29 -0400
-Subject: [PATCH 1/8] gd: hci: Ignore unexpected status events
-
-For some reason, on some old devices, the controller will report a
-remote to support SNIFF_SUBRATING even when it does not. Just ignore the
-error here (the status event comes from the failure response).
-
-Change-Id: Ifb9a65fd77f21d15a8dc1ced9240194d38218ef6
----
- system/gd/hci/hci_layer.cc | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/system/gd/hci/hci_layer.cc b/system/gd/hci/hci_layer.cc
-index 5ae661cb75..d91bb1480d 100644
---- a/system/gd/hci/hci_layer.cc
-+++ b/system/gd/hci/hci_layer.cc
-@@ -218,14 +218,13 @@ struct HciLayer::impl {
-       command_queue_.front().GetCallback<CommandCompleteView>()->Invoke(
-           std::move(command_complete_view));
-     } else {
--      ASSERT_LOG(
--          command_queue_.front().waiting_for_status_ == is_status,
--          "0x%02hx (%s) was not expecting %s event",
--          op_code,
--          OpCodeText(op_code).c_str(),
--          logging_id.c_str());
--
--      command_queue_.front().GetCallback<TResponse>()->Invoke(std::move(response_view));
-+      if (command_queue_.front().waiting_for_status_ == is_status) {
-+        command_queue_.front().GetCallback<TResponse>()->Invoke(std::move(response_view));
-+      } else {
-+        CommandCompleteView command_complete_view = CommandCompleteView::Create(
-+            EventView::Create(PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>(std::vector<uint8_t>()))));
-+        command_queue_.front().GetCallback<CommandCompleteView>()->Invoke(std::move(command_complete_view));
-+      }
-     }
- 
- #ifdef TARGET_FLOSS
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch
deleted file mode 100644
index c0d06c71..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From f9de685ffab6ea2ee0ed9cb9c6f6f8d96d2eba9c Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Wed, 24 Aug 2022 15:45:18 -0400
-Subject: [PATCH 2/8] audio_hal_interface: Optionally use sysbta HAL
-
-Required to support sysbta, our system-side bt audio implementation.
-
-Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860
----
- .../audio_hal_interface/aidl/client_interface_aidl.cc |  6 +++---
- .../audio_hal_interface/aidl/client_interface_aidl.h  |  7 +++++++
- system/audio_hal_interface/hal_version_manager.cc     | 11 +++++++++--
- 3 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc
-index 76e8788d02..bde4c4529c 100644
---- a/system/audio_hal_interface/aidl/client_interface_aidl.cc
-+++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
-@@ -63,7 +63,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface(
- 
- bool BluetoothAudioClientInterface::is_aidl_available() {
-   return AServiceManager_isDeclared(
--      kDefaultAudioProviderFactoryInterface.c_str());
-+      audioProviderFactoryInterface().c_str());
- }
- 
- std::vector<AudioCapabilities>
-@@ -79,7 +79,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) {
-   }
-   auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
-       ::ndk::SpAIBinder(AServiceManager_waitForService(
--          kDefaultAudioProviderFactoryInterface.c_str())));
-+          audioProviderFactoryInterface().c_str())));
- 
-   if (provider_factory == nullptr) {
-     LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
-@@ -192,7 +192,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() {
-   }
-   auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
-       ::ndk::SpAIBinder(AServiceManager_waitForService(
--          kDefaultAudioProviderFactoryInterface.c_str())));
-+          audioProviderFactoryInterface().c_str())));
- 
-   if (provider_factory == nullptr) {
-     LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
-diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.h b/system/audio_hal_interface/aidl/client_interface_aidl.h
-index c191e4054e..99d5192376 100644
---- a/system/audio_hal_interface/aidl/client_interface_aidl.h
-+++ b/system/audio_hal_interface/aidl/client_interface_aidl.h
-@@ -27,6 +27,7 @@
- #include "audio_ctrl_ack.h"
- #include "bluetooth_audio_port_impl.h"
- #include "transport_instance.h"
-+#include "osi/include/properties.h"
- 
- #define BLUETOOTH_AUDIO_HAL_PROP_DISABLED \
-   "persist.bluetooth.bluetooth_audio_hal.disabled"
-@@ -175,6 +176,12 @@ class BluetoothAudioClientInterface {
-   //     "android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory/default";
-   static inline const std::string kDefaultAudioProviderFactoryInterface =
-       std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";
-+  static inline const std::string kSystemAudioProviderFactoryInterface =
-+      std::string() + IBluetoothAudioProviderFactory::descriptor + "/sysbta";
-+  static inline const std::string audioProviderFactoryInterface() {
-+   return osi_property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)
-+    ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface;
-+  }
- 
-  private:
-   IBluetoothTransportInstance* transport_;
-diff --git a/system/audio_hal_interface/hal_version_manager.cc b/system/audio_hal_interface/hal_version_manager.cc
-index 36672cb32c..98f1cdecac 100644
---- a/system/audio_hal_interface/hal_version_manager.cc
-+++ b/system/audio_hal_interface/hal_version_manager.cc
-@@ -26,6 +26,7 @@
- #include "aidl/audio_aidl_interfaces.h"
- #include "include/check.h"
- #include "os/log.h"
-+#include "osi/include/properties.h"
- 
- namespace bluetooth {
- namespace audio {
-@@ -35,6 +36,12 @@ using ::aidl::android::hardware::bluetooth::audio::
- 
- static const std::string kDefaultAudioProviderFactoryInterface =
-     std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";
-+static const std::string kSystemAudioProviderFactoryInterface =
-+    std::string() + IBluetoothAudioProviderFactory::descriptor + "/sysbta";
-+static inline const std::string& audioProviderFactoryInterface() {
-+  return osi_property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)
-+    ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface;
-+}
- 
- std::string toString(BluetoothAudioHalTransport transport) {
-   switch (transport) {
-@@ -76,7 +83,7 @@ BluetoothAudioHalVersion GetAidlInterfaceVersion() {
-     int version = 0;
-     auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
-         ::ndk::SpAIBinder(AServiceManager_waitForService(
--            kDefaultAudioProviderFactoryInterface.c_str())));
-+            audioProviderFactoryInterface().c_str())));
- 
-     if (provider_factory == nullptr) {
-       LOG_ERROR(
-@@ -146,7 +153,7 @@ HalVersionManager::GetProvidersFactory_2_0() {
- HalVersionManager::HalVersionManager() {
-   hal_transport_ = BluetoothAudioHalTransport::UNKNOWN;
-   if (AServiceManager_checkService(
--          kDefaultAudioProviderFactoryInterface.c_str()) != nullptr) {
-+          audioProviderFactoryInterface().c_str()) != nullptr) {
-     hal_version_ = GetAidlInterfaceVersion();
-     hal_transport_ = BluetoothAudioHalTransport::AIDL;
-     return;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
deleted file mode 100644
index fad458bb..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f67a732465c863d7767cb9bfd8d71403806a14c8 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Thu, 17 Jun 2021 15:48:53 +0100
-Subject: [PATCH 3/8] Add option to change eSCO Transport Unit Size
-
-Fixes Bluetooth calls on some Samsung devices if set to 16.
-
-It's still unknown if other Treble devices need other values so it's preferred to leave this able to be configured with another integer.
-
-This applies to mSBC T2, T1 and CVSD codecs
-
-Change-Id: I3e5897c2ce983042b9a4bef9def6744ba4253bcb
----
- system/device/src/esco_parameters.cc | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/system/device/src/esco_parameters.cc b/system/device/src/esco_parameters.cc
-index 15f1397087..21590782a6 100644
---- a/system/device/src/esco_parameters.cc
-+++ b/system/device/src/esco_parameters.cc
-@@ -25,7 +25,8 @@
- #include "hci/controller_interface.h"
- #include "main/shim/entry.h"
- 
--static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = {
-+#include <cutils/properties.h>
-+static enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = {
-     // CVSD D1
-     {
-         .transmit_bandwidth = TXRX_64KBITS_RATE,
-@@ -352,6 +353,11 @@ enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool offload) {
-     }
-   }
- 
-+  int escoTransportUnitSize = property_get_int32("persist.sys.bt.esco_transport_unit_size", 0);
-+  if(escoTransportUnitSize) {
-+    default_esco_parameters[codec].input_transport_unit_size = escoTransportUnitSize;
-+    default_esco_parameters[codec].output_transport_unit_size = escoTransportUnitSize;
-+  }
-   if (offload) {
-     if (codec == ESCO_CODEC_SWB_Q0 || codec == ESCO_CODEC_SWB_Q1 ||
-         codec == ESCO_CODEC_SWB_Q2 || codec == ESCO_CODEC_SWB_Q3) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
deleted file mode 100644
index 6795943d..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 5cd9f407cd0bde7e119eb182ab973c99d595cb9c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 17 Oct 2021 17:17:13 -0400
-Subject: [PATCH 4/8] Don't abort when failing to get real-time priority
-
-On some devices (like OP6), for unknown reason, trying to go to realtime
-fails with EPERM.
-There is no good reason to actually require real-time, so don't fail
-when we don't get it
-This fixes gabeldorsche on OP6
-Not yet legacy bluetooth stack
-
-Change-Id: Id25dac186628e933185bdfd640498004459b375a
----
- system/btif/src/btif_a2dp_sink.cc   |  2 +-
- system/btif/src/btif_a2dp_source.cc |  2 +-
- system/osi/src/alarm.cc             | 12 +++++++++++-
- system/stack/btu/main_thread.cc     |  2 +-
- 4 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/system/btif/src/btif_a2dp_sink.cc b/system/btif/src/btif_a2dp_sink.cc
-index 8e0083b014..0f6369e205 100644
---- a/system/btif/src/btif_a2dp_sink.cc
-+++ b/system/btif/src/btif_a2dp_sink.cc
-@@ -197,7 +197,7 @@ bool btif_a2dp_sink_init() {
-   /* Schedule the rest of the operations */
-   if (!btif_a2dp_sink_cb.worker_thread.EnableRealTimeScheduling()) {
- #if defined(__ANDROID__)
--    log::fatal("Failed to increase A2DP decoder thread priority");
-+    log::error("Failed to increase A2DP decoder thread priority");
- #endif
-   }
-   btif_a2dp_sink_cb.worker_thread.DoInThread(
-diff --git a/system/btif/src/btif_a2dp_source.cc b/system/btif/src/btif_a2dp_source.cc
-index 6b6555ec88..2dcf06dd3e 100644
---- a/system/btif/src/btif_a2dp_source.cc
-+++ b/system/btif/src/btif_a2dp_source.cc
-@@ -374,7 +374,7 @@ static void btif_a2dp_source_startup_delayed() {
-   log::info("state={}", btif_a2dp_source_cb.StateStr());
-   if (!btif_a2dp_source_thread.EnableRealTimeScheduling()) {
- #if defined(__ANDROID__)
--    log::fatal("unable to enable real time scheduling");
-+    log::error("unable to enable real time scheduling");
- #endif
-   }
-   if (!bluetooth::audio::a2dp::init(&btif_a2dp_source_thread)) {
-diff --git a/system/osi/src/alarm.cc b/system/osi/src/alarm.cc
-index 408f4f3bee..4b48be24c7 100644
---- a/system/osi/src/alarm.cc
-+++ b/system/osi/src/alarm.cc
-@@ -673,7 +673,17 @@ static bool timer_create_internal(const clockid_t clock_id, timer_t* timer) {
-   sigevent.sigev_notify = SIGEV_THREAD;
-   sigevent.sigev_notify_function = (void (*)(union sigval))timer_callback;
-   sigevent.sigev_notify_attributes = &thread_attr;
--  if (timer_create(clock_id, &sigevent, timer) == -1) {
-+
-+  int ret = timer_create(clock_id, &sigevent, timer);
-+  if (ret == -1) {
-+       LOG_ERROR("%s failed to create timer with RT err %s... Try again without RT", __func__, strerror(errno));
-+      // Recreate timer without RT priority
-+      memset(&sigevent, 0, sizeof(sigevent));
-+      sigevent.sigev_notify = SIGEV_THREAD;
-+      sigevent.sigev_notify_function = (void (*)(union sigval))timer_callback;
-+      ret = timer_create(clock_id, &sigevent, timer);
-+  }
-+  if (ret == -1) {
-     LOG_ERROR("%s unable to create timer with clock %d: %s", __func__, clock_id,
-               strerror(errno));
-     if (clock_id == CLOCK_BOOTTIME_ALARM) {
-diff --git a/system/stack/btu/main_thread.cc b/system/stack/btu/main_thread.cc
-index a2cdd7bac6..045cbc3cbd 100644
---- a/system/stack/btu/main_thread.cc
-+++ b/system/stack/btu/main_thread.cc
-@@ -71,7 +71,7 @@ void main_thread_start_up() {
-   }
-   if (!main_thread.EnableRealTimeScheduling()) {
- #if defined(__ANDROID__)
--    log::fatal("unable to enable real time scheduling");
-+    log::error("unable to enable real time scheduling");
- #else
-     log::error("unable to enable real time scheduling");
- #endif
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
deleted file mode 100644
index 6cfcbf0b..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 2a3b6faebd0bef5228786f6306460063da9066e1 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Sat, 12 Nov 2022 00:35:46 +0000
-Subject: [PATCH 5/8] On Samsung devices, we need to tell Audio HAL if we're
- running narrow band or wide band
-
-Ported to Android 13.
-
-Change-Id: I7802b7a29c017a2cd7018e82772183df1dfa0b89
----
- .../com/android/bluetooth/hfp/HeadsetStateMachine.java    | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
-index 38db4dc656..f764f6aa9d 100644
---- a/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
-+++ b/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
-@@ -158,6 +158,7 @@ public class HeadsetStateMachine extends StateMachine {
-     private boolean mHasWbsEnabled = false;
-     private boolean mHasSwbLc3Enabled = false;
-     private boolean mHasSwbAptXEnabled = false;
-+    private int mReportScoSampleRate = 0;
-     // AT Phone book keeps a group of states used by AT+CPBR commands
-     @VisibleForTesting
-     final AtPhonebook mPhonebook;
-@@ -277,6 +278,7 @@ public class HeadsetStateMachine extends StateMachine {
-         mHasNrecEnabled = false;
-         mHasSwbLc3Enabled = false;
-         mHasSwbAptXEnabled = false;
-+        mReportScoSampleRate = 0;
-     }
- 
-     public void dump(StringBuilder sb) {
-@@ -518,6 +520,7 @@ public class HeadsetStateMachine extends StateMachine {
-             mHasSwbLc3Enabled = false;
-             mHasNrecEnabled = false;
-             mHasSwbAptXEnabled = false;
-+            mReportScoSampleRate = 0;
- 
-             broadcastStateTransitions();
-             logFailureIfNeeded();
-@@ -1704,6 +1707,9 @@ public class HeadsetStateMachine extends StateMachine {
-             am.setParameters("bt_swb=" + (mHasSwbAptXEnabled ? "0" : "65535"));
-         }
-         am.setBluetoothHeadsetProperties(getCurrentDeviceName(), mHasNrecEnabled, mHasWbsEnabled);
-+        if (mReportScoSampleRate > 0) {
-+            am.setParameters("g_sco_samplerate=" + mReportScoSampleRate);
-+        }
-     }
- 
-     @VisibleForTesting
-@@ -1847,10 +1853,12 @@ public class HeadsetStateMachine extends StateMachine {
-         switch (wbsConfig) {
-             case HeadsetHalConstants.BTHF_WBS_YES:
-                 mHasWbsEnabled = true;
-+                mReportScoSampleRate = 16000;
-                 break;
-             case HeadsetHalConstants.BTHF_WBS_NO:
-             case HeadsetHalConstants.BTHF_WBS_NONE:
-                 mHasWbsEnabled = false;
-+                mReportScoSampleRate = 8000;
-                 break;
-             default:
-                 Log.e(TAG, "processWBSEvent: unknown wbsConfig " + wbsConfig);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0006-Add-properties-to-disable-some-features-commands-sta.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0006-Add-properties-to-disable-some-features-commands-sta.patch
deleted file mode 100644
index 527c66ad..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0006-Add-properties-to-disable-some-features-commands-sta.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 8a315f66383f91115ba8e3a28afa63ab7bea7834 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 27 May 2023 06:41:32 -0400
-Subject: [PATCH 6/8] Add properties to disable some features/commands/states
- that the ble chip declared but doesnt actually support
-
----
- system/gd/hci/controller.cc | 72 ++++++++++++++++++++++++++++++++++---
- 1 file changed, 68 insertions(+), 4 deletions(-)
-
-diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
-index a6c16a9061..237dbe6b93 100644
---- a/system/gd/hci/controller.cc
-+++ b/system/gd/hci/controller.cc
-@@ -18,6 +18,7 @@
- 
- #include <android_bluetooth_flags.h>
- 
-+#include <base/strings/string_split.h>
- #include <future>
- #include <memory>
- #include <string>
-@@ -33,6 +34,7 @@
- #include "os/metrics.h"
- #include "os/system_properties.h"
- #include "sysprops/sysprops_module.h"
-+using bluetooth::os::GetSystemProperty;
- 
- namespace bluetooth {
- namespace hci {
-@@ -313,7 +315,23 @@ struct Controller::impl {
-     ASSERT(complete_view.IsValid());
-     ErrorCode status = complete_view.GetStatus();
-     ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());
--    local_supported_commands_ = complete_view.GetSupportedCommands();
-+    //local_supported_commands_ = complete_view.GetSupportedCommands();
-+
-+    auto local_commands = complete_view.GetSupportedCommands();
-+    std::string ignored_commands = GetSystemProperty("persist.sys.bt.unsupported.commands").value_or("");
-+
-+    if (ignored_commands != "") {
-+        auto s = base::SplitString(ignored_commands, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-+        for(auto command: s) {
-+            int index = std::stoi(command);
-+            LOG_WARN("Ignoring local supported command %d", index);
-+            uint16_t byte_index = index / 10;
-+            uint16_t bit_index = index % 10;
-+            local_commands[byte_index] &= ~(1 << bit_index);
-+        }
-+    }
-+
-+    local_supported_commands_ = local_commands;
-   }
- 
-   void read_local_extended_features_complete_handler(std::promise<void> promise, CommandCompleteView view) {
-@@ -322,7 +340,25 @@ struct Controller::impl {
-     ErrorCode status = complete_view.GetStatus();
-     ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());
-     uint8_t page_number = complete_view.GetPageNumber();
--    extended_lmp_features_array_.push_back(complete_view.GetExtendedLmpFeatures());
-+
-+    //extended_lmp_features_array_.push_back(complete_view.GetExtendedLmpFeatures());
-+    auto lmp_features = complete_view.GetExtendedLmpFeatures();
-+
-+    std::string ignored_features = GetSystemProperty("persist.sys.bt.unsupported.ogfeatures").value_or("");
-+
-+    if (ignored_features != "") {
-+        auto s = base::SplitString(ignored_features, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-+        int offset = page_number * 64;
-+        for(auto feature: s) {
-+            int index = std::stoi(feature) - offset;
-+            if(index >= 0 && index < 64) {
-+                LOG_WARN("Ignoring local supported feature %d", index);
-+                lmp_features &= ~(1ULL << index);
-+            }
-+        }
-+    }
-+    extended_lmp_features_array_.push_back(lmp_features);
-+
-     bluetooth::os::LogMetricBluetoothLocalSupportedFeatures(page_number, complete_view.GetExtendedLmpFeatures());
-     // Query all extended features
-     if (page_number < complete_view.GetMaximumPageNumber()) {
-@@ -475,7 +511,21 @@ struct Controller::impl {
-     ASSERT(complete_view.IsValid());
-     ErrorCode status = complete_view.GetStatus();
-     ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());
--    le_local_supported_features_ = complete_view.GetLeFeatures();
-+
-+    //le_local_supported_features_ = complete_view.GetLeFeatures();
-+    auto local_features = complete_view.GetLeFeatures();
-+    std::string ignored_features = GetSystemProperty("persist.sys.bt.unsupported.lefeatures").value_or("");
-+
-+    if (ignored_features != "") {
-+        auto s = base::SplitString(ignored_features, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-+        for(auto feature: s) {
-+            int index = std::stoi(feature);
-+            LOG_WARN("Ignoring local supported feature %d", index);
-+            local_features &= ~(1ULL << index);
-+        }
-+    }
-+
-+    le_local_supported_features_ = local_features;
-   }
- 
-   void le_read_supported_states_handler(CommandCompleteView view) {
-@@ -483,7 +533,21 @@ struct Controller::impl {
-     ASSERT(complete_view.IsValid());
-     ErrorCode status = complete_view.GetStatus();
-     ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());
--    le_supported_states_ = complete_view.GetLeStates();
-+    //le_supported_states_ = complete_view.GetLeStates();
-+
-+    auto local_states = complete_view.GetLeStates();
-+    std::string ignored_states = GetSystemProperty("persist.sys.bt.unsupported.states").value_or("");
-+
-+    if (ignored_states != "") {
-+        auto s = base::SplitString(ignored_states, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-+        for(auto state: s) {
-+            int index = std::stoi(state);
-+            LOG_WARN("Ignoring local supported state %d", index);
-+            local_states &= ~(1ULL << index);
-+        }
-+    }
-+
-+    le_supported_states_ = local_states;
-   }
- 
-   void le_read_accept_list_size_handler(CommandCompleteView view) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
deleted file mode 100644
index 37d91ff4..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5022ea9658ae9e88a5dd8d04338f979191392961 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 30 May 2023 17:34:03 -0400
-Subject: [PATCH 7/8] Add a property to cap declared le vendor version. Found
- needed on unisoc
-
----
- system/gd/hci/controller.cc | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
-index 237dbe6b93..ce1b46c3bb 100644
---- a/system/gd/hci/controller.cc
-+++ b/system/gd/hci/controller.cc
-@@ -634,6 +634,13 @@ struct Controller::impl {
-     }
-     vendor_capabilities_.is_supported_ = 0x01;
- 
-+    int vendor_cap_max = 0xffff;
-+    std::string vendor_cap_max_prop = GetSystemProperty("persist.sys.bt.max_vendor_cap").value_or("");
-+    if (vendor_cap_max_prop != "") {
-+        vendor_cap_max = std::stoi(vendor_cap_max_prop);
-+    }
-+    if (vendor_cap_max < 55) return;
-+
-     // v0.55
-     BaseVendorCapabilities base_vendor_capabilities = complete_view.GetBaseVendorCapabilities();
-     vendor_capabilities_.max_advt_instances_ = base_vendor_capabilities.max_advt_instances_;
-@@ -653,6 +660,8 @@ struct Controller::impl {
-       return;
-     }
- 
-+    if (vendor_cap_max < 95) return;
-+
-     // v0.95
-     auto v95 = LeGetVendorCapabilitiesComplete095View::Create(complete_view);
-     if (!v95.IsValid()) {
-@@ -669,6 +678,8 @@ struct Controller::impl {
-       return;
-     }
- 
-+    if (vendor_cap_max < 96) return;
-+
-     // v0.96
-     auto v96 = LeGetVendorCapabilitiesComplete096View::Create(v95);
-     if (!v96.IsValid()) {
-@@ -683,6 +694,8 @@ struct Controller::impl {
-       return;
-     }
- 
-+    if (vendor_cap_max < 98) return;
-+
-     // v0.98
-     auto v98 = LeGetVendorCapabilitiesComplete098View::Create(v96);
-     if (!v98.IsValid()) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Bluetooth/0008-gd-hci-Ignore-command-READ_REMOTE_VERSION_INFORMATIO.patch b/patches/trebledroid/platform_packages_modules_Bluetooth/0008-gd-hci-Ignore-command-READ_REMOTE_VERSION_INFORMATIO.patch
deleted file mode 100644
index 43c05ded..00000000
--- a/patches/trebledroid/platform_packages_modules_Bluetooth/0008-gd-hci-Ignore-command-READ_REMOTE_VERSION_INFORMATIO.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 03eb55b2a72fc63f335f520603f09ccf1e4e79fc Mon Sep 17 00:00:00 2001
-From: wbs306 <wbs306@gmail.com>
-Date: Fri, 20 Jan 2023 17:07:41 +0800
-Subject: [PATCH 8/8] gd: hci: Ignore command READ_REMOTE_VERSION_INFORMATION
- result if it doesn't in command_queue_
-
-In MTK Dimensity 8100 devices, com.android.bluetooth will gets crash if try to connect a new device.
-
-F DEBUG   : Abort message: 'assertion 'op_code == OpCode::NONE' failed - Received COMMAND_STATUS event with OpCode 0x41d (READ_REMOTE_VERSION_INFORMATION) without a waiting command(is the HAL sending commands, but not handling the events?)'
-
-It means this command isn't in the command_queue_, we can just ignore it.
----
- system/gd/hci/hci_layer.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/system/gd/hci/hci_layer.cc b/system/gd/hci/hci_layer.cc
-index d91bb1480d..b1b72b5d9e 100644
---- a/system/gd/hci/hci_layer.cc
-+++ b/system/gd/hci/hci_layer.cc
-@@ -390,6 +390,10 @@ struct HciLayer::impl {
-         auto view = CommandStatusView::Create(event);
-         ASSERT(view.IsValid());
-         auto op_code = view.GetCommandOpCode();
-+        if (op_code == OpCode::READ_REMOTE_VERSION_INFORMATION) {
-+            LOG_WARN("OpCode 0x%02hx (%s) is not in the command queue, skipped.", op_code, OpCodeText(op_code).c_str());
-+            return;
-+        }
-         ASSERT_LOG(
-             op_code == OpCode::NONE,
-             "Received %s event with OpCode 0x%02hx (%s) without a waiting command"
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch
deleted file mode 100644
index 02de955a..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0001-Allow-failing-to-load-bpf-programs-for-BPF-less-devi.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0c62748ef5781c19f566a18fad343f262a6c28a0 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 26 Oct 2022 18:10:04 -0400
-Subject: [PATCH 1/9] Allow failing to load bpf programs, for BPF-less devices
-
-Change-Id: I68ba3be2e15c188e56e32a6ecf844e1ca64d560f
----
- netd/BpfHandler.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
-index a00c363254..aaaa41c6d7 100644
---- a/netd/BpfHandler.cpp
-+++ b/netd/BpfHandler.cpp
-@@ -125,8 +125,14 @@ static Status initPrograms(const char* cg2_path) {
-     RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_DENYLIST_PROG_PATH));
-     RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_EGRESS_PROG_PATH));
-     RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_INGRESS_PROG_PATH));
--    RETURN_IF_NOT_OK(attachProgramToCgroup(BPF_EGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_EGRESS));
--    RETURN_IF_NOT_OK(attachProgramToCgroup(BPF_INGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_INGRESS));
-+    auto ret = attachProgramToCgroup(BPF_EGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_EGRESS);
-+    if (!isOk(ret)) {
-+        ALOGE("Failed loading egress program");
-+    }
-+    auto ret2 = attachProgramToCgroup(BPF_INGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_INGRESS);
-+    if (!isOk(ret)) {
-+        ALOGE("Failed loading ingress program");
-+    }
- 
-     // For the devices that support cgroup socket filter, the socket filter
-     // should be loaded successfully by bpfloader. So we attach the filter to
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0002-Support-non-working-BPF-maps-on-old-BPF-less-kernel.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0002-Support-non-working-BPF-maps-on-old-BPF-less-kernel.patch
deleted file mode 100644
index 62800538..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0002-Support-non-working-BPF-maps-on-old-BPF-less-kernel.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-From 4b95e8567c81493ded4ed9cd779b18e9846e9b5e Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 26 Oct 2022 18:11:10 -0400
-Subject: [PATCH 2/9] Support non-working BPF maps on old BPF-less kernel
-
----
- .../src/android/net/BpfNetMapsReader.java     | 13 +++++--
- netbpfload/NetBpfLoad.cpp                     | 34 +++++++---------
- .../libs/libnetworkstats/BpfNetworkStats.cpp  |  1 +
- .../server/net/NetworkStatsService.java       | 29 ++++++++------
- .../src/com/android/server/BpfNetMaps.java    | 39 ++++++++++++++++++-
- .../native/bpf_headers/include/bpf/BpfMap.h   | 21 +++++-----
- 6 files changed, 91 insertions(+), 46 deletions(-)
-
-diff --git a/framework/src/android/net/BpfNetMapsReader.java b/framework/src/android/net/BpfNetMapsReader.java
-index ee422abd9c..d31024c686 100644
---- a/framework/src/android/net/BpfNetMapsReader.java
-+++ b/framework/src/android/net/BpfNetMapsReader.java
-@@ -124,7 +124,7 @@ public class BpfNetMapsReader {
-                 return new BpfMap<>(CONFIGURATION_MAP_PATH, BpfMap.BPF_F_RDONLY,
-                         S32.class, U32.class);
-             } catch (ErrnoException e) {
--                throw new IllegalStateException("Cannot open configuration map", e);
-+                return null;
-             }
-         }
- 
-@@ -134,7 +134,7 @@ public class BpfNetMapsReader {
-                 return new BpfMap<>(UID_OWNER_MAP_PATH, BpfMap.BPF_F_RDONLY,
-                         S32.class, UidOwnerValue.class);
-             } catch (ErrnoException e) {
--                throw new IllegalStateException("Cannot open uid owner map", e);
-+                return null;
-             }
-         }
- 
-@@ -144,7 +144,7 @@ public class BpfNetMapsReader {
-                 return new BpfMap<>(DATA_SAVER_ENABLED_MAP_PATH, BpfMap.BPF_F_RDONLY, S32.class,
-                         U8.class);
-             } catch (ErrnoException e) {
--                throw new IllegalStateException("Cannot open data saver enabled map", e);
-+                return null;
-             }
-         }
-     }
-@@ -191,6 +191,8 @@ public class BpfNetMapsReader {
-             final IBpfMap<S32, U32> configurationMap, final int chain) {
-         throwIfPreT("isChainEnabled is not available on pre-T devices");
- 
-+        if (configurationMap == null) return false;
-+
-         final long match = getMatchByFirewallChain(chain);
-         try {
-             final U32 config = configurationMap.getValue(UID_RULES_CONFIGURATION_KEY);
-@@ -216,6 +218,8 @@ public class BpfNetMapsReader {
-             final int chain, final int uid) {
-         throwIfPreT("getUidRule is not available on pre-T devices");
- 
-+        if (uidOwnerMap == null) return FIREWALL_RULE_ALLOW;
-+
-         final long match = getMatchByFirewallChain(chain);
-         final boolean isAllowList = isFirewallAllowList(chain);
-         try {
-@@ -244,6 +248,8 @@ public class BpfNetMapsReader {
-             boolean isDataSaverEnabled) {
-         throwIfPreT("isUidBlockedByFirewallChains is not available on pre-T devices");
- 
-+        if (mConfigurationMap == null) return false;
-+
-         final long uidRuleConfig;
-         final long uidMatch;
-         try {
-@@ -277,6 +283,7 @@ public class BpfNetMapsReader {
-     public boolean getDataSaverEnabled() {
-         throwIfPreT("getDataSaverEnabled is not available on pre-T devices");
- 
-+        if (mDataSaverEnabledMap == null) return false;
-         try {
-             return mDataSaverEnabledMap.getValue(DATA_SAVER_ENABLED_KEY).val == DATA_SAVER_ENABLED;
-         } catch (ErrnoException e) {
-diff --git a/netbpfload/NetBpfLoad.cpp b/netbpfload/NetBpfLoad.cpp
-index ed7d048279..6b9b8c5729 100644
---- a/netbpfload/NetBpfLoad.cpp
-+++ b/netbpfload/NetBpfLoad.cpp
-@@ -242,6 +242,7 @@ int main(int argc, char** argv, char * const envp[]) {
-     const bool isAtLeastT = (device_api_level >= __ANDROID_API_T__);
-     const bool isAtLeastU = (device_api_level >= __ANDROID_API_U__);
-     const bool isAtLeastV = (device_api_level >= __ANDROID_API_V__);
-+    bool failed = false;
- 
-     // last in U QPR2 beta1
-     const bool has_platform_bpfloader_rc = exists("/system/etc/init/bpfloader.rc");
-@@ -290,17 +291,17 @@ int main(int argc, char** argv, char * const envp[]) {
- 
-     if (isAtLeastT && !android::bpf::isAtLeastKernelVersion(4, 9, 0)) {
-         ALOGE("Android T requires kernel 4.9.");
--        return 1;
-+        failed = true;
-     }
- 
-     if (isAtLeastU && !android::bpf::isAtLeastKernelVersion(4, 14, 0)) {
-         ALOGE("Android U requires kernel 4.14.");
--        return 1;
-+        failed = true;
-     }
- 
-     if (isAtLeastV && !android::bpf::isAtLeastKernelVersion(4, 19, 0)) {
-         ALOGE("Android V requires kernel 4.19.");
--        return 1;
-+        failed = true;
-     }
- 
-     if (isAtLeastV && android::bpf::isX86() && !android::bpf::isKernel64Bit()) {
-@@ -329,14 +330,14 @@ int main(int argc, char** argv, char * const envp[]) {
-          * and 32-bit userspace on 64-bit kernel bpf ringbuffer compatibility is broken.
-          */
-         ALOGE("64-bit userspace required on 6.2+ kernels.");
--        return 1;
-+        failed = true;
-     }
- 
-     // Ensure we can determine the Android build type.
-     if (!android::bpf::isEng() && !android::bpf::isUser() && !android::bpf::isUserdebug()) {
-         ALOGE("Failed to determine the build type: got %s, want 'eng', 'user', or 'userdebug'",
-               android::bpf::getBuildType().c_str());
--        return 1;
-+        failed = true;
-     }
- 
-     if (isAtLeastU) {
-@@ -379,24 +380,17 @@ int main(int argc, char** argv, char * const envp[]) {
-     // Load all ELF objects, create programs and maps, and pin them
-     for (const auto& location : locations) {
-         if (loadAllElfObjects(location) != 0) {
--            ALOGE("=== CRITICAL FAILURE LOADING BPF PROGRAMS FROM %s ===", location.dir);
--            ALOGE("If this triggers reliably, you're probably missing kernel options or patches.");
--            ALOGE("If this triggers randomly, you might be hitting some memory allocation "
--                  "problems or startup script race.");
--            ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
--            sleep(20);
--            return 2;
-+            failed = true;
-         }
-     }
- 
--    int key = 1;
--    int value = 123;
--    android::base::unique_fd map(
--            android::bpf::createMap(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value), 2, 0));
--    if (android::bpf::writeToMapEntry(map, &key, &value, BPF_ANY)) {
--        ALOGE("Critical kernel bug - failure to write into index 1 of 2 element bpf map array.");
--        return 1;
--    }
-+    if (failed) {
-+        ALOGE("=== CRITICAL FAILURE LOADING BPF PROGRAMS ===");
-+        ALOGE("If this triggers reliably, you're probably missing kernel options or patches.");
-+        ALOGE("If this triggers randomly, you might be hitting some memory allocation "
-+                "problems or startup script race.");
-+        ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
-+     }
- 
-     ALOGI("done, transferring control to platform bpfloader.");
- 
-diff --git a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
-index d3e331ec81..541b8c8f01 100644
---- a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
-+++ b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
-@@ -195,6 +195,7 @@ int parseBpfNetworkStatsDetail(std::vector<stats_line>* lines) {
-     static BpfMapRO<uint32_t, uint32_t> configurationMap(CONFIGURATION_MAP_PATH);
-     static BpfMap<StatsKey, StatsValue> statsMapA(STATS_MAP_A_PATH);
-     static BpfMap<StatsKey, StatsValue> statsMapB(STATS_MAP_B_PATH);
-+    if (!configurationMap.isOk()) return -1;
-     auto configuration = configurationMap.readValue(CURRENT_STATS_MAP_CONFIGURATION_KEY);
-     if (!configuration.ok()) {
-         ALOGE("Cannot read the old configuration from map: %s",
-diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java
-index f7f133c5a1..90cc39040a 100644
---- a/service-t/src/com/android/server/net/NetworkStatsService.java
-+++ b/service-t/src/com/android/server/net/NetworkStatsService.java
-@@ -433,12 +433,12 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
-      * mActiveUidCounterSet to avoid accessing kernel too frequently.
-      */
-     private SparseIntArray mActiveUidCounterSet = new SparseIntArray();
--    private final IBpfMap<S32, U8> mUidCounterSetMap;
--    private final IBpfMap<CookieTagMapKey, CookieTagMapValue> mCookieTagMap;
--    private final IBpfMap<StatsMapKey, StatsMapValue> mStatsMapA;
--    private final IBpfMap<StatsMapKey, StatsMapValue> mStatsMapB;
--    private final IBpfMap<UidStatsMapKey, StatsMapValue> mAppUidStatsMap;
--    private final IBpfMap<S32, StatsMapValue> mIfaceStatsMap;
-+    private IBpfMap<S32, U8> mUidCounterSetMap = null;
-+    private IBpfMap<CookieTagMapKey, CookieTagMapValue> mCookieTagMap = null;
-+    private IBpfMap<StatsMapKey, StatsMapValue> mStatsMapA = null;
-+    private IBpfMap<StatsMapKey, StatsMapValue> mStatsMapB = null;
-+    private IBpfMap<UidStatsMapKey, StatsMapValue> mAppUidStatsMap = null;
-+    private IBpfMap<S32, StatsMapValue> mIfaceStatsMap = null;
- 
-     /** Data layer operation counters for splicing into other structures. */
-     private NetworkStats mUidOperations = new NetworkStats(0L, 10);
-@@ -629,12 +629,16 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
-                 mNetworkStatsSubscriptionsMonitor);
-         mLocationPermissionChecker = mDeps.makeLocationPermissionChecker(mContext);
-         mInterfaceMapHelper = mDeps.makeBpfInterfaceMapHelper();
--        mUidCounterSetMap = mDeps.getUidCounterSetMap();
--        mCookieTagMap = mDeps.getCookieTagMap();
--        mStatsMapA = mDeps.getStatsMapA();
--        mStatsMapB = mDeps.getStatsMapB();
--        mAppUidStatsMap = mDeps.getAppUidStatsMap();
--        mIfaceStatsMap = mDeps.getIfaceStatsMap();
-+        try {
-+            mUidCounterSetMap = mDeps.getUidCounterSetMap();
-+            mCookieTagMap = mDeps.getCookieTagMap();
-+            mStatsMapA = mDeps.getStatsMapA();
-+            mStatsMapB = mDeps.getStatsMapB();
-+            mAppUidStatsMap = mDeps.getAppUidStatsMap();
-+            mIfaceStatsMap = mDeps.getIfaceStatsMap();
-+        } catch(Throwable t) {
-+            android.util.Log.e("PHH", "Failed creating bpf maps", t);
-+        }
-         // To prevent any possible races, the flag is not allowed to change until rebooting.
-         mSupportEventLogger = mDeps.supportEventLogger(mContext);
-         if (mSupportEventLogger) {
-@@ -2584,6 +2588,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
-      * @param uid
-      */
-     private void deleteKernelTagData(int uid) {
-+        if(mCookieTagMap == null) return;
-         try {
-             mCookieTagMap.forEach((key, value) -> {
-                 // If SkDestroyListener deletes the socket tag while this code is running,
-diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
-index a7fddd08f0..833a6a9a5a 100644
---- a/service/src/com/android/server/BpfNetMaps.java
-+++ b/service/src/com/android/server/BpfNetMaps.java
-@@ -366,7 +366,11 @@ public class BpfNetMaps {
-     @VisibleForTesting
-     public BpfNetMaps(final Context context, final INetd netd, final Dependencies deps) {
-         if (SdkLevel.isAtLeastT()) {
--            ensureInitialized(context);
-+            try {
-+                ensureInitialized(context);
-+            } catch(Throwable t) {
-+                android.util.Log.e("PHH", "Failed initialization BpfMaps, doing without it", t);
-+            }
-         }
-         mNetd = netd;
-         mDeps = deps;
-@@ -385,6 +389,8 @@ public class BpfNetMaps {
-     }
- 
-     private void removeRule(final int uid, final long match, final String caller) {
-+        if (sUidOwnerMap == null) return;
-+
-         try {
-             synchronized (sUidOwnerMap) {
-                 final UidOwnerValue oldMatch = sUidOwnerMap.getValue(new S32(uid));
-@@ -412,6 +418,8 @@ public class BpfNetMaps {
-     }
- 
-     private void addRule(final int uid, final long match, final int iif, final String caller) {
-+        if (sUidOwnerMap == null) return;
-+
-         if (match != IIF_MATCH && iif != 0) {
-             throw new ServiceSpecificException(EINVAL,
-                     "Non-interface match must have zero interface index");
-@@ -514,6 +522,8 @@ public class BpfNetMaps {
-     public void setChildChain(final int childChain, final boolean enable) {
-         throwIfPreT("setChildChain is not available on pre-T devices");
- 
-+        if (sConfigurationMap == null) return;
-+
-         final long match = getMatchByFirewallChain(childChain);
-         try {
-             synchronized (sUidRulesConfigBpfMapLock) {
-@@ -566,6 +576,8 @@ public class BpfNetMaps {
-     public void replaceUidChain(final int chain, final int[] uids) {
-         throwIfPreT("replaceUidChain is not available on pre-T devices");
- 
-+        if (sUidOwnerMap == null) return;
-+
-         final long match;
-         try {
-             match = getMatchByFirewallChain(chain);
-@@ -646,6 +658,9 @@ public class BpfNetMaps {
-     private Set<Integer> getUidsMatchEnabled(final int childChain) throws ErrnoException {
-         final long match = getMatchByFirewallChain(childChain);
-         Set<Integer> uids = new ArraySet<>();
-+
-+        if (sUidOwnerMap == null) return uids;
-+
-         synchronized (sUidOwnerMap) {
-             sUidOwnerMap.forEach((uid, val) -> {
-                 if (val == null) {
-@@ -802,6 +817,8 @@ public class BpfNetMaps {
-     public void swapActiveStatsMap() {
-         throwIfPreT("swapActiveStatsMap is not available on pre-T devices");
- 
-+        if (sConfigurationMap == null) return;
-+
-         try {
-             synchronized (sCurrentStatsMapConfigLock) {
-                 final long config = sConfigurationMap.getValue(
-@@ -842,6 +859,8 @@ public class BpfNetMaps {
-             return;
-         }
- 
-+        if (sUidPermissionMap == null) return;
-+
-         // Remove the entry if package is uninstalled or uid has only INTERNET permission.
-         if (permissions == PERMISSION_UNINSTALLED || permissions == PERMISSION_INTERNET) {
-             for (final int uid : uids) {
-@@ -876,6 +895,8 @@ public class BpfNetMaps {
-     public void setDataSaverEnabled(boolean enable) {
-         throwIfPreT("setDataSaverEnabled is not available on pre-T devices");
- 
-+        if (sDataSaverEnabledMap == null) return;
-+
-         try {
-             final short config = enable ? DATA_SAVER_ENABLED : DATA_SAVER_DISABLED;
-             sDataSaverEnabledMap.updateEntry(DATA_SAVER_ENABLED_KEY, new U8(config));
-@@ -894,6 +915,9 @@ public class BpfNetMaps {
-     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-     public void setIngressDiscardRule(final InetAddress address, final String iface) {
-         throwIfPreT("setIngressDiscardRule is not available on pre-T devices");
-+
-+        if (sIngressDiscardMap == null) return;
-+
-         final int ifIndex = mDeps.getIfIndex(iface);
-         if (ifIndex == 0) {
-             Log.e(TAG, "Failed to get if index, skip setting ingress discard rule for " + address
-@@ -917,6 +941,9 @@ public class BpfNetMaps {
-     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-     public void removeIngressDiscardRule(final InetAddress address) {
-         throwIfPreT("removeIngressDiscardRule is not available on pre-T devices");
-+
-+        if (sIngressDiscardMap == null) return;
-+
-         try {
-             sIngressDiscardMap.deleteEntry(new IngressDiscardKey(address));
-         } catch (ErrnoException e) {
-@@ -940,7 +967,9 @@ public class BpfNetMaps {
-         // deletion. netd and skDestroyListener could delete CookieTagMap entry concurrently.
-         // So using Set to count the number of entry in the map.
-         Set<K> keySet = new ArraySet<>();
--        map.forEach((k, v) -> keySet.add(k));
-+        if (map != null) {
-+            map.forEach((k, v) -> keySet.add(k));
-+        }
-         return keySet.size();
-     }
- 
-@@ -987,6 +1016,8 @@ public class BpfNetMaps {
-     }
- 
-     private void dumpOwnerMatchConfig(final IndentingPrintWriter pw) {
-+        if (sConfigurationMap == null) return;
-+
-         try {
-             final long match = sConfigurationMap.getValue(UID_RULES_CONFIGURATION_KEY).val;
-             pw.println("current ownerMatch configuration: " + match + " " + matchToString(match));
-@@ -996,6 +1027,8 @@ public class BpfNetMaps {
-     }
- 
-     private void dumpCurrentStatsMapConfig(final IndentingPrintWriter pw) {
-+        if (sConfigurationMap == null) return;
-+
-         try {
-             final long config = sConfigurationMap.getValue(CURRENT_STATS_MAP_CONFIGURATION_KEY).val;
-             final String currentStatsMap =
-@@ -1007,6 +1040,8 @@ public class BpfNetMaps {
-     }
- 
-     private void dumpDataSaverConfig(final IndentingPrintWriter pw) {
-+        if (sDataSaverEnabledMap == null) return;
-+
-         try {
-             final short config = sDataSaverEnabledMap.getValue(DATA_SAVER_ENABLED_KEY).val;
-             // Any non-zero value converted from short to boolean is true by convention.
-diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
-index 1037bebf29..b8e8991c57 100644
---- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
-+++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
-@@ -60,21 +60,24 @@ class BpfMapRO {
- 
-   protected:
-     void abortOnMismatch(bool writable) const {
--        if (!mMapFd.ok()) abort();
-+        (void) writable;
-+    }
-+
-+  public:
-+    bool isOk(bool writable = false) const {
-+        if (!mMapFd.ok()) return false;
-         if (isAtLeastKernelVersion(4, 14, 0)) {
-             int flags = bpfGetFdMapFlags(mMapFd);
--            if (flags < 0) abort();
--            if (flags & BPF_F_WRONLY) abort();
--            if (writable && (flags & BPF_F_RDONLY)) abort();
--            if (bpfGetFdKeySize(mMapFd) != sizeof(Key)) abort();
--            if (bpfGetFdValueSize(mMapFd) != sizeof(Value)) abort();
-+            if (flags < 0) return false;
-+            if (flags & BPF_F_WRONLY) return false;
-+            if (writable && (flags & BPF_F_RDONLY)) return false;
-+            if (bpfGetFdKeySize(mMapFd) != sizeof(Key)) return false;
-+            if (bpfGetFdValueSize(mMapFd) != sizeof(Value)) return false;
-         }
-+        return true;
-     }
--
--  public:
-     explicit BpfMapRO<Key, Value>(const char* pathname) {
-         mMapFd.reset(mapRetrieveRO(pathname));
--        abortOnMismatch(/* writable */ false);
-     }
- 
-     Result<Key> getFirstKey() const {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0003-Bring-back-traffic-indicators-for-legacy-devices.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0003-Bring-back-traffic-indicators-for-legacy-devices.patch
deleted file mode 100644
index 97c47f74..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0003-Bring-back-traffic-indicators-for-legacy-devices.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 852e5615e27b645ff5c1f98599da328771652cf0 Mon Sep 17 00:00:00 2001
-From: koron393 <koron393@gmail.com>
-Date: Fri, 20 Jan 2023 05:41:13 +0900
-Subject: [PATCH 3/9] Bring back traffic indicators for legacy devices
-
-Revert: "remove qtaguid parsing"
-(commit 0b99c46bcde8e607d9233c474035da95ab68a6fe.)
-and re-enable legacy qtguid parsing.
-
-This fixes traffic indicator on BPF-less kernel.
-
-Change-Id: I65c626c1c5832d81805c45c53b021236fe09030b
-Signed-off-by: koron393 <koron393@gmail.com>
----
- ...android_server_net_NetworkStatsService.cpp | 84 ++++++++++++++++++-
- 1 file changed, 81 insertions(+), 3 deletions(-)
-
-diff --git a/service-t/jni/com_android_server_net_NetworkStatsService.cpp b/service-t/jni/com_android_server_net_NetworkStatsService.cpp
-index c99939864d..741f13c7ed 100644
---- a/service-t/jni/com_android_server_net_NetworkStatsService.cpp
-+++ b/service-t/jni/com_android_server_net_NetworkStatsService.cpp
-@@ -39,6 +39,9 @@ using android::bpf::NetworkTraceHandler;
- 
- namespace android {
- 
-+static const char* QTAGUID_IFACE_STATS = "/proc/net/xt_qtaguid/iface_stat_fmt";
-+static const char* QTAGUID_UID_STATS = "/proc/net/xt_qtaguid/stats";
-+
- static void nativeRegisterIface(JNIEnv* env, jclass clazz, jstring iface) {
-     ScopedUtfChars iface8(env, iface);
-     if (iface8.c_str() == nullptr) return;
-@@ -73,13 +76,80 @@ static jobject statsValueToEntry(JNIEnv* env, StatsValue* stats) {
-     return result;
- }
- 
-+static int parseIfaceStats(const char* iface, StatsValue* stats) {
-+    FILE *fp = fopen(QTAGUID_IFACE_STATS, "r");
-+    if (fp == NULL) {
-+        return -1;
-+    }
-+
-+    char buffer[384];
-+    char cur_iface[32];
-+    uint64_t rxBytes, rxPackets, txBytes, txPackets, tcpRxPackets, tcpTxPackets;
-+
-+    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
-+        int matched = sscanf(buffer, "%31s %" SCNu64 " %" SCNu64 " %" SCNu64
-+                " %" SCNu64 " " "%*u %" SCNu64 " %*u %*u %*u %*u "
-+                "%*u %" SCNu64 " %*u %*u %*u %*u", cur_iface, &rxBytes,
-+                &rxPackets, &txBytes, &txPackets, &tcpRxPackets, &tcpTxPackets);
-+        if (matched >= 5) {
-+            if (!iface || !strcmp(iface, cur_iface)) {
-+                stats->rxBytes += rxBytes;
-+                stats->rxPackets += rxPackets;
-+                stats->txBytes += txBytes;
-+                stats->txPackets += txPackets;
-+            }
-+        }
-+    }
-+
-+    if (fclose(fp) != 0) {
-+        return -1;
-+    }
-+    return 0;
-+}
-+
-+static int parseUidStats(const uint32_t uid, StatsValue* stats) {
-+    FILE *fp = fopen(QTAGUID_UID_STATS, "r");
-+    if (fp == NULL) {
-+        return -1;
-+    }
-+
-+    char buffer[384];
-+    char iface[32];
-+    uint32_t idx, cur_uid, set;
-+    uint64_t tag, rxBytes, rxPackets, txBytes, txPackets;
-+
-+    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
-+        if (sscanf(buffer,
-+                "%" SCNu32 " %31s 0x%" SCNx64 " %u %u %" SCNu64 " %" SCNu64
-+                " %" SCNu64 " %" SCNu64 "",
-+                &idx, iface, &tag, &cur_uid, &set, &rxBytes, &rxPackets,
-+                &txBytes, &txPackets) == 9) {
-+            if (uid == cur_uid && tag == 0L) {
-+                stats->rxBytes += rxBytes;
-+                stats->rxPackets += rxPackets;
-+                stats->txBytes += txBytes;
-+                stats->txPackets += txPackets;
-+            }
-+        }
-+    }
-+
-+    if (fclose(fp) != 0) {
-+        return -1;
-+    }
-+    return 0;
-+}
-+
- static jobject nativeGetTotalStat(JNIEnv* env, jclass clazz) {
-     StatsValue stats = {};
- 
-     if (bpfGetIfaceStats(nullptr, &stats) == 0) {
-         return statsValueToEntry(env, &stats);
-     } else {
--        return nullptr;
-+        if (parseIfaceStats(nullptr, &stats) == 0) {
-+            return statsValueToEntry(env, &stats);
-+        } else {
-+            return nullptr;
-+        }
-     }
- }
- 
-@@ -94,7 +164,11 @@ static jobject nativeGetIfaceStat(JNIEnv* env, jclass clazz, jstring iface) {
-     if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) {
-         return statsValueToEntry(env, &stats);
-     } else {
--        return nullptr;
-+        if (parseIfaceStats(iface8.c_str(), &stats) == 0) {
-+            return statsValueToEntry(env, &stats);
-+        } else {
-+            return nullptr;
-+        }
-     }
- }
- 
-@@ -104,7 +178,11 @@ static jobject nativeGetUidStat(JNIEnv* env, jclass clazz, jint uid) {
-     if (bpfGetUidStats(uid, &stats) == 0) {
-         return statsValueToEntry(env, &stats);
-     } else {
--        return nullptr;
-+        if (parseUidStats(uid, &stats) == 0) {
-+            return statsValueToEntry(env, &stats);
-+        } else {
-+            return nullptr;
-+        }
-     }
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0004-Revert-drop-support-for-V-gsi-on-pixel-5-R-base-kern.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0004-Revert-drop-support-for-V-gsi-on-pixel-5-R-base-kern.patch
deleted file mode 100644
index 41f117cb..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0004-Revert-drop-support-for-V-gsi-on-pixel-5-R-base-kern.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 74a631969871db241b4f08b74e4b6729fbb70657 Mon Sep 17 00:00:00 2001
-From: Peter Cai <peter@typeblog.net>
-Date: Sat, 16 Mar 2024 15:27:27 -0400
-Subject: [PATCH 4/9] Revert "drop support for V gsi on pixel 5 R base kernel"
-
-This reverts commit bbbd18a71368a80f689b924dcf82062c2ee351b2.
----
- ..._android_server_connectivity_ClatCoordinator.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
-index c125bd6479..787ef8fd69 100644
---- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
-+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
-@@ -90,6 +90,11 @@ static void verifyPerms(const char * const path,
- 
- #undef ALOGF
- 
-+bool isGsiImage() {
-+    // this implementation matches 2 other places in the codebase (same function name too)
-+    return !access("/system/system_ext/etc/init/init.gsi.rc", F_OK);
-+}
-+
- static const char* kClatdDir = "/apex/com.android.tethering/bin/for-system";
- static const char* kClatdBin = "/apex/com.android.tethering/bin/for-system/clatd";
- 
-@@ -130,6 +135,14 @@ static void verifyClatPerms() {
- 
- #undef V2
- 
-+    // HACK: Some old vendor kernels lack ~5.10 backport of 'bpffs selinux genfscon' support.
-+    // This is *NOT* supported, but let's allow, at least for now, U+ GSI to boot on them.
-+    // (without this hack pixel5 R vendor + U gsi breaks)
-+    if (isGsiImage() && !bpf::isAtLeastKernelVersion(5, 10, 0)) {
-+        ALOGE("GSI with *BAD* pre-5.10 kernel lacking bpffs selinux genfscon support.");
-+        return;
-+    }
-+
-     if (fatal) abort();
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0005-netbpfload-add-back-support-for-4.9-T-kernels.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0005-netbpfload-add-back-support-for-4.9-T-kernels.patch
deleted file mode 100644
index d9df7d33..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0005-netbpfload-add-back-support-for-4.9-T-kernels.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From af33e578f83665061401e9a864b94d5df5d996c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
-Date: Mon, 11 Mar 2024 12:40:06 +0000
-Subject: [PATCH 5/9] netbpfload: add back support for 4.9-T kernels
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This effectively reverts aosp/2268766
-
-Test: TreeHugger
-Signed-off-by: Maciej Żenczykowski <maze@google.com>
-Change-Id: I42da5c56fe4b69635b9678ff57ade7788c17f7c8
----
- netbpfload/loader.cpp | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp
-index c534b2cecc..7754a3ef4f 100644
---- a/netbpfload/loader.cpp
-+++ b/netbpfload/loader.cpp
-@@ -574,6 +574,14 @@ static int getSymNameByIdx(ifstream& elfFile, int index, string& name) {
- 
- static bool mapMatchesExpectations(const unique_fd& fd, const string& mapName,
-                                    const struct bpf_map_def& mapDef, const enum bpf_map_type type) {
-+    // bpfGetFd... family of functions require at minimum a 4.14 kernel,
-+    // so on 4.9-T kernels just pretend the map matches our expectations.
-+    // Additionally we'll get almost equivalent test coverage on newer devices/kernels.
-+    // This is because the primary failure mode we're trying to detect here
-+    // is either a source code misconfiguration (which is likely kernel independent)
-+    // or a newly introduced kernel feature/bug (which is unlikely to get backported to 4.9).
-+    if (!isAtLeastKernelVersion(4, 14, 0)) return true;
-+
-     // Assuming fd is a valid Bpf Map file descriptor then
-     // all the following should always succeed on a 4.14+ kernel.
-     // If they somehow do fail, they'll return -1 (and set errno),
-@@ -711,6 +719,16 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
-         }
- 
-         enum bpf_map_type type = md[i].type;
-+        if (type == BPF_MAP_TYPE_DEVMAP && !isAtLeastKernelVersion(4, 14, 0)) {
-+            // On Linux Kernels older than 4.14 this map type doesn't exist, but it can kind
-+            // of be approximated: ARRAY has the same userspace api, though it is not usable
-+            // by the same ebpf programs.  However, that's okay because the bpf_redirect_map()
-+            // helper doesn't exist on 4.9-T anyway (so the bpf program would fail to load,
-+            // and thus needs to be tagged as 4.14+ either way), so there's nothing useful you
-+            // could do with a DEVMAP anyway (that isn't already provided by an ARRAY)...
-+            // Hence using an ARRAY instead of a DEVMAP simply makes life easier for userspace.
-+            type = BPF_MAP_TYPE_ARRAY;
-+        }
-         if (type == BPF_MAP_TYPE_DEVMAP_HASH && !isAtLeastKernelVersion(5, 4, 0)) {
-             // On Linux Kernels older than 5.4 this map type doesn't exist, but it can kind
-             // of be approximated: HASH has the same userspace visible api.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0006-NetBpfLoad-more-4.9-T-support.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0006-NetBpfLoad-more-4.9-T-support.patch
deleted file mode 100644
index fd7b49ff..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0006-NetBpfLoad-more-4.9-T-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f467002fa0316030a1cbaa2513dab689c84040e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
-Date: Fri, 15 Mar 2024 19:03:13 +0000
-Subject: [PATCH 6/9] NetBpfLoad: more 4.9-T support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-(older kernels don't support naming maps/programs)
-
-Test: TreeHugger
-Signed-off-by: Maciej Żenczykowski <maze@google.com>
-Change-Id: If59b8947021394e1ce0a91326fee4272a5bddd38
----
- netbpfload/loader.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp
-index 7754a3ef4f..d9d3b5067c 100644
---- a/netbpfload/loader.cpp
-+++ b/netbpfload/loader.cpp
-@@ -784,7 +784,8 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
-               .max_entries = max_entries,
-               .map_flags = md[i].map_flags,
-             };
--            strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
-+            if (isAtLeastKernelVersion(4, 14, 0))
-+                strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
-             fd.reset(bpf(BPF_MAP_CREATE, req));
-             saved_errno = errno;
-             ALOGD("bpf_create_map name %s, ret: %d", mapNames[i].c_str(), fd.get());
-@@ -1026,7 +1027,8 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
-               .log_size = static_cast<__u32>(log_buf.size()),
-               .expected_attach_type = cs[i].expected_attach_type,
-             };
--            strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
-+            if (isAtLeastKernelVersion(4, 14, 0))
-+                strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
-             fd.reset(bpf(BPF_PROG_LOAD, req));
- 
-             ALOGD("BPF_PROG_LOAD call for %s (%s) returned fd: %d (%s)", elfPath,
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0007-netd-Remove-4.14-kernel-restrictions.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0007-netd-Remove-4.14-kernel-restrictions.patch
deleted file mode 100644
index 78da7742..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0007-netd-Remove-4.14-kernel-restrictions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 04b319ec7da6f356f8710e2b30c1061d7627e180 Mon Sep 17 00:00:00 2001
-From: Michael Bestas <mkbestas@gmail.com>
-Date: Fri, 15 Mar 2024 14:59:21 +0200
-Subject: [PATCH 7/9] netd: Remove <4.14 kernel restrictions
-
-Change-Id: I4d4abbacd6b9589260de06663e2143bc37d8ea0f
----
- netd/BpfHandler.cpp | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
-index aaaa41c6d7..b8333526d8 100644
---- a/netd/BpfHandler.cpp
-+++ b/netd/BpfHandler.cpp
-@@ -75,16 +75,6 @@ static Status initPrograms(const char* cg2_path) {
-     // This code was mainlined in T, so this should be trivially satisfied.
-     if (!modules::sdklevel::IsAtLeastT()) return Status("S- platform is unsupported");
- 
--    // S requires eBPF support which was only added in 4.9, so this should be satisfied.
--    if (!bpf::isAtLeastKernelVersion(4, 9, 0)) {
--        return Status("kernel version < 4.9.0 is unsupported");
--    }
--
--    // U bumps the kernel requirement up to 4.14
--    if (modules::sdklevel::IsAtLeastU() && !bpf::isAtLeastKernelVersion(4, 14, 0)) {
--        return Status("U+ platform with kernel version < 4.14.0 is unsupported");
--    }
--
-     if (modules::sdklevel::IsAtLeastV()) {
-         // V bumps the kernel requirement up to 4.19
-         // see also: //system/netd/tests/kernel_test.cpp TestKernel419
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0008-More-bpf-errors-ignore-there-are-some-4.14-without-t.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0008-More-bpf-errors-ignore-there-are-some-4.14-without-t.patch
deleted file mode 100644
index a28b32c4..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0008-More-bpf-errors-ignore-there-are-some-4.14-without-t.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6bebcc5a2eb42e4d060f19219872beb716e08df8 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 15 May 2024 05:56:59 -0400
-Subject: [PATCH 8/9] More bpf errors ignore -- there are some 4.14 without the
- bpf jit file
-
----
- netbpfload/NetBpfLoad.cpp | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/netbpfload/NetBpfLoad.cpp b/netbpfload/NetBpfLoad.cpp
-index 6b9b8c5729..0484577a49 100644
---- a/netbpfload/NetBpfLoad.cpp
-+++ b/netbpfload/NetBpfLoad.cpp
-@@ -345,8 +345,7 @@ int main(int argc, char** argv, char * const envp[]) {
-         // but we need 0 (enabled)
-         // (this writeFile is known to fail on at least 4.19, but always defaults to 0 on
-         // pre-5.13, on 5.13+ it depends on CONFIG_BPF_UNPRIV_DEFAULT_OFF)
--        if (writeProcSysFile("/proc/sys/kernel/unprivileged_bpf_disabled", "0\n") &&
--            android::bpf::isAtLeastKernelVersion(5, 13, 0)) return 1;
-+        writeProcSysFile("/proc/sys/kernel/unprivileged_bpf_disabled", "0\n");
- 
-         // Enable the eBPF JIT -- but do note that on 64-bit kernels it is likely
-         // already force enabled by the kernel config option BPF_JIT_ALWAYS_ON.
-@@ -354,12 +353,12 @@ int main(int argc, char** argv, char * const envp[]) {
-         //  kernel does not have CONFIG_BPF_JIT=y)
-         // BPF_JIT is required by R VINTF (which means 4.14/4.19/5.4 kernels),
-         // but 4.14/4.19 were released with P & Q, and only 5.4 is new in R+.
--        if (writeProcSysFile("/proc/sys/net/core/bpf_jit_enable", "1\n")) return 1;
-+        writeProcSysFile("/proc/sys/net/core/bpf_jit_enable", "1\n");
- 
-         // Enable JIT kallsyms export for privileged users only
-         // (Note: this (open) will fail with ENOENT 'No such file or directory' if
-         //  kernel does not have CONFIG_HAVE_EBPF_JIT=y)
--        if (writeProcSysFile("/proc/sys/net/core/bpf_jit_kallsyms", "1\n")) return 1;
-+        writeProcSysFile("/proc/sys/net/core/bpf_jit_kallsyms", "1\n");
-     }
- 
-     // Create all the pin subdirectories
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Connectivity/0009-Revert-netdupdatable-add-back-abort-on-init-fail.patch b/patches/trebledroid/platform_packages_modules_Connectivity/0009-Revert-netdupdatable-add-back-abort-on-init-fail.patch
deleted file mode 100644
index f775e47f..00000000
--- a/patches/trebledroid/platform_packages_modules_Connectivity/0009-Revert-netdupdatable-add-back-abort-on-init-fail.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d770a7eeca41db1832b0b0ea4bc218ed89449a77 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Thu, 20 Jun 2024 12:38:58 +0100
-Subject: [PATCH 9/9] Revert "netdupdatable: add back abort() on init() fail"
-
-This reverts commit ff845a642bc988f960c77ac60664560f8cdc7ee3.
----
- netd/NetdUpdatable.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/netd/NetdUpdatable.cpp b/netd/NetdUpdatable.cpp
-index 3b15916398..8b9e5a759c 100644
---- a/netd/NetdUpdatable.cpp
-+++ b/netd/NetdUpdatable.cpp
-@@ -31,8 +31,8 @@ int libnetd_updatable_init(const char* cg2_path) {
- 
-     android::netdutils::Status ret = sBpfHandler.init(cg2_path);
-     if (!android::netdutils::isOk(ret)) {
--        LOG(ERROR) << __func__ << ": Failed: (" << ret.code() << ") " << ret.msg();
--        abort();
-+        LOG(ERROR) << __func__ << ": Failed. " << ret.code() << " " << ret.msg();
-+        return -ret.code();
-     }
-     return 0;
- }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch b/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch
deleted file mode 100644
index 8b5adbe6..00000000
--- a/patches/trebledroid/platform_packages_modules_DeviceLock/0001-Don-t-crash-when-we-get-no-DeviceLockManager.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce509a6a4788e696de672d7d772853cc49c5b38e Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 18 Oct 2023 17:44:59 -0400
-Subject: [PATCH] Don't crash when we get no DeviceLockManager
-
-Change-Id: Iaba659694e706c82a95ec2e99feb26e2bc6314e0
----
- .../devicelockcontroller/SystemDeviceLockManagerImpl.java    | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/DeviceLockController/src/com/android/devicelockcontroller/SystemDeviceLockManagerImpl.java b/DeviceLockController/src/com/android/devicelockcontroller/SystemDeviceLockManagerImpl.java
-index 93540aec..4916c823 100644
---- a/DeviceLockController/src/com/android/devicelockcontroller/SystemDeviceLockManagerImpl.java
-+++ b/DeviceLockController/src/com/android/devicelockcontroller/SystemDeviceLockManagerImpl.java
-@@ -48,7 +48,10 @@ public final class SystemDeviceLockManagerImpl implements SystemDeviceLockManage
-         final DeviceLockManager deviceLockManager = context.getSystemService(
-                 DeviceLockManager.class);
- 
--        mIDeviceLockService = deviceLockManager.getService();
-+        if (deviceLockManager != null)
-+            mIDeviceLockService = deviceLockManager.getService();
-+        else
-+            mIDeviceLockService = null;
-     }
- 
-     private SystemDeviceLockManagerImpl() {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_DnsResolver/0001-Dont-abort-if-the-DnsHelper-failed-to-init-on-BPF-le.patch b/patches/trebledroid/platform_packages_modules_DnsResolver/0001-Dont-abort-if-the-DnsHelper-failed-to-init-on-BPF-le.patch
deleted file mode 100644
index 963e5b53..00000000
--- a/patches/trebledroid/platform_packages_modules_DnsResolver/0001-Dont-abort-if-the-DnsHelper-failed-to-init-on-BPF-le.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dd03c99e311866b3e05c7a18c73183155715986a Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 7 May 2024 22:44:25 +0000
-Subject: [PATCH] Dont abort if the DnsHelper failed to init on BPF-less kernel
-
----
- DnsProxyListener.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/DnsProxyListener.cpp b/DnsProxyListener.cpp
-index 8064aef7..008e1a5d 100644
---- a/DnsProxyListener.cpp
-+++ b/DnsProxyListener.cpp
-@@ -691,7 +691,6 @@ IsUidBlockedFn resolveIsUidNetworkingBlockedFn() {
-     const int ret = (*ADnsHelper_init)();
-     if (ret) {
-         LOG(ERROR) << __func__ << ": ADnsHelper_init failed " << strerror(-ret);
--        abort();
-     }
- 
-     IsUidBlockedFn f =
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_Wifi/0001-Add-persist.sys.phh.wifi_disable_sae-property-to-dis.patch b/patches/trebledroid/platform_packages_modules_Wifi/0001-Add-persist.sys.phh.wifi_disable_sae-property-to-dis.patch
deleted file mode 100644
index af3f6e96..00000000
--- a/patches/trebledroid/platform_packages_modules_Wifi/0001-Add-persist.sys.phh.wifi_disable_sae-property-to-dis.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 69f7824ab0ad50c982a48a3fc21a30d7e715831e Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 21 Feb 2024 17:26:07 -0500
-Subject: [PATCH] Add persist.sys.phh.wifi_disable_sae property to disable
- WPA2=>WPA3 upgrades
-
-Change-Id: I72a0133e986f2c745af3c915ed65d7b540d2119b
----
- service/java/com/android/server/wifi/WifiGlobals.java | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/service/java/com/android/server/wifi/WifiGlobals.java b/service/java/com/android/server/wifi/WifiGlobals.java
-index 454d8c25c7..9601064af8 100644
---- a/service/java/com/android/server/wifi/WifiGlobals.java
-+++ b/service/java/com/android/server/wifi/WifiGlobals.java
-@@ -59,7 +59,7 @@ public class WifiGlobals {
-     private final AtomicInteger mSendDhcpHostnameRestriction = new AtomicInteger();
- 
-     // These are read from the overlay, cache them after boot up.
--    private final boolean mIsWpa3SaeUpgradeEnabled;
-+    private boolean mIsWpa3SaeUpgradeEnabled;
-     private boolean mIsWpa3SaeUpgradeOffloadEnabled;
-     private final boolean mIsOweUpgradeEnabled;
-     private final boolean mFlushAnqpCacheOnWifiToggleOffEvent;
-@@ -108,6 +108,9 @@ public class WifiGlobals {
- 
-         mIsWpa3SaeUpgradeEnabled = mContext.getResources()
-                 .getBoolean(R.bool.config_wifiSaeUpgradeEnabled);
-+        var prop = android.os.SystemProperties.get("persist.sys.phh.wifi_disable_sae", null);
-+        if (prop != null && "true".equals(prop))
-+            mIsWpa3SaeUpgradeEnabled = false;
-         mIsWpa3SaeUpgradeOffloadEnabled = mContext.getResources()
-                 .getBoolean(R.bool.config_wifiSaeUpgradeOffloadEnabled);
-         mIsOweUpgradeEnabled = mContext.getResources()
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch b/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch
deleted file mode 100644
index c617468e..00000000
--- a/patches/trebledroid/platform_packages_modules_vndk/0001-Include-vndk-v28-apex.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d31481328f865b04e778b8a7bad5278f0970a97f Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 05:18:39 -0400
-Subject: [PATCH] Include vndk v28 apex
-
-Change-Id: I5689074542f13e136e5bc1292afec2a8288f9e1c
----
- apex/Android.bp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/apex/Android.bp b/apex/Android.bp
-index 3e20230..4ccf12f 100644
---- a/apex/Android.bp
-+++ b/apex/Android.bp
-@@ -89,3 +89,9 @@ apex_vndk {
-     system_ext_specific: true,
- }
- 
-+apex_vndk {
-+    name: "com.android.vndk.v28",
-+    defaults: ["vndk-apex-defaults"],
-+    vndk_version: "28",
-+    system_ext_specific: true,
-+}
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_packages_services_Telephony/0001-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch b/patches/trebledroid/platform_packages_services_Telephony/0001-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
deleted file mode 100644
index 895e534b..00000000
--- a/patches/trebledroid/platform_packages_services_Telephony/0001-Revert-Remove-deprecated-IRadio-1.4-APIs-and-referen.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 9199bcc009aae59a36572e9df9aca41b516b031f Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Mon, 1 Apr 2024 09:15:33 +0000
-Subject: [PATCH] Revert "Remove deprecated IRadio <1.4 APIs and references"
-
-This reverts commit b4a31f92a15ccf1f74c804ab3706ef8e4b59c8df.
----
- .../android/phone/PhoneInterfaceManager.java  | 48 +++++++++++++++++++
- 1 file changed, 48 insertions(+)
-
-diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
-index e18818c0f..3a6a96725 100644
---- a/src/com/android/phone/PhoneInterfaceManager.java
-+++ b/src/com/android/phone/PhoneInterfaceManager.java
-@@ -312,6 +312,8 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
-     private static final int EVENT_GET_ALLOWED_NETWORK_TYPES_BITMASK_DONE = 22;
-     private static final int CMD_SEND_ENVELOPE = 25;
-     private static final int EVENT_SEND_ENVELOPE_DONE = 26;
-+    private static final int CMD_INVOKE_OEM_RIL_REQUEST_RAW = 27;
-+    private static final int EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE = 28;
-     private static final int CMD_TRANSMIT_APDU_BASIC_CHANNEL = 29;
-     private static final int EVENT_TRANSMIT_APDU_BASIC_CHANNEL_DONE = 30;
-     private static final int CMD_EXCHANGE_SIM_IO = 31;
-@@ -1174,6 +1176,19 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
-                     handleNullReturnEvent(msg, "setAllowedNetworkTypesForReason");
-                     break;
- 
-+                case CMD_INVOKE_OEM_RIL_REQUEST_RAW:
-+                    request = (MainThreadRequest)msg.obj;
-+                    onCompleted = obtainMessage(EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE, request);
-+                    defaultPhone.invokeOemRilRequestRaw((byte[]) request.argument, onCompleted);
-+                    break;
-+
-+                case EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE:
-+                    ar = (AsyncResult)msg.obj;
-+                    request = (MainThreadRequest)ar.userObj;
-+                    request.result = ar;
-+                    notifyRequester(request);
-+                    break;
-+
-                 case CMD_SET_VOICEMAIL_NUMBER:
-                     request = (MainThreadRequest) msg.obj;
-                     onCompleted = obtainMessage(EVENT_SET_VOICEMAIL_NUMBER_DONE, request);
-@@ -8047,6 +8062,39 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
-         }
-     }
- 
-+    @Override
-+    @Deprecated
-+    public int invokeOemRilRequestRaw(byte[] oemReq, byte[] oemResp) {
-+        enforceModifyPermission();
-+
-+        int returnValue = 0;
-+        try {
-+            AsyncResult result = (AsyncResult) sendRequest(CMD_INVOKE_OEM_RIL_REQUEST_RAW, oemReq);
-+            if(result.exception == null) {
-+                if (result.result != null) {
-+                    byte[] responseData = (byte[])(result.result);
-+                    if(responseData.length > oemResp.length) {
-+                        Log.w(LOG_TAG, "Buffer to copy response too small: Response length is " +
-+                                responseData.length +  "bytes. Buffer Size is " +
-+                                oemResp.length + "bytes.");
-+                    }
-+                    System.arraycopy(responseData, 0, oemResp, 0, responseData.length);
-+                    returnValue = responseData.length;
-+                }
-+            } else {
-+                CommandException ex = (CommandException) result.exception;
-+                returnValue = ex.getCommandError().ordinal();
-+                if(returnValue > 0) returnValue *= -1;
-+            }
-+        } catch (RuntimeException e) {
-+            Log.w(LOG_TAG, "sendOemRilRequestRaw: Runtime Exception");
-+            returnValue = (CommandException.Error.GENERIC_FAILURE.ordinal());
-+            if(returnValue > 0) returnValue *= -1;
-+        }
-+
-+        return returnValue;
-+    }
-+
-     @Override
-     public int getRadioAccessFamily(int phoneId, String callingPackage) {
-         int raf = RadioAccessFamily.RAF_UNKNOWN;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_apex/0001-Disable-O_DIRECT-for-old-kernels.patch b/patches/trebledroid/platform_system_apex/0001-Disable-O_DIRECT-for-old-kernels.patch
deleted file mode 100644
index 000d0612..00000000
--- a/patches/trebledroid/platform_system_apex/0001-Disable-O_DIRECT-for-old-kernels.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 5cea503e63b91024670a641c1ff02227113853db Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 7 May 2024 19:28:41 -0400
-Subject: [PATCH] Disable O_DIRECT for old kernels
-
-On old kernels, mounting over O_DIRECT over FBE ext4 leads to corrupted
-reads.
-"Old kernel" is hard to define, some 4.19 and 4.14 got the fix.
-The penalty for not using o_direct is a bit of performance/ram hit, so
-live with it
-
-Co-authored-by: Alberto Ponces <ponces26@gmail.com>
-Change-Id: I710e870bc467000547b00958b0818aaf0ddca072
----
- apexd/apexd_loop.cpp | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/apexd/apexd_loop.cpp b/apexd/apexd_loop.cpp
-index e15a7fa8..464eca0f 100644
---- a/apexd/apexd_loop.cpp
-+++ b/apexd/apexd_loop.cpp
-@@ -35,6 +35,7 @@
- #include <sys/statfs.h>
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-+#include <sys/utsname.h>
- #include <unistd.h>
- #include <utils/Trace.h>
- 
-@@ -351,7 +352,20 @@ Result<void> ConfigureLoopDevice(const int device_fd, const std::string& target,
-    * condition is now met.
-    */
-   bool use_buffered_io = false;
--  unique_fd target_fd(open(target.c_str(), O_RDONLY | O_CLOEXEC | O_DIRECT));
-+  bool enable_odirect = false;
-+  struct utsname uts;
-+  unsigned int major, minor;
-+  if (uname(&uts) == 0 && sscanf(uts.release, "%u.%u", &major, &minor) == 2) {
-+    if(major > 4) enable_odirect = true;
-+    if(major == 4 && minor > 19) enable_odirect = true;
-+  }
-+  unique_fd target_fd;
-+  if (enable_odirect) {
-+    target_fd = unique_fd(open(target.c_str(), O_RDONLY | O_CLOEXEC | O_DIRECT));
-+  } else {
-+    target_fd = unique_fd(open(target.c_str(), O_RDONLY | O_CLOEXEC));
-+  }
-+  //unique_fd target_fd(open(target.c_str(), O_RDONLY | O_CLOEXEC));
-   if (target_fd.get() == -1) {
-     struct statfs stbuf;
-     int saved_errno = errno;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch b/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch
deleted file mode 100644
index 6c988af1..00000000
--- a/patches/trebledroid/platform_system_bpf/0001-Support-no-bpf-usecase.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2f853166adea13064fffb903a95c53ce79695a30 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 13 Oct 2021 10:56:52 -0400
-Subject: [PATCH 1/3] Support no-bpf usecase
-
-Change-Id: I75a427a2a41aa4ab1104ad88a891bef0dc2d9c91
----
- bpfloader/BpfLoader.cpp | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
-index 08fd72d..07bf6f3 100644
---- a/bpfloader/BpfLoader.cpp
-+++ b/bpfloader/BpfLoader.cpp
-@@ -196,19 +196,15 @@ int main(int argc, char** argv) {
-     //  which could otherwise fail with ENOENT during object pinning or renaming,
-     //  due to ordering issues)
-     for (const auto& location : locations) {
--        if (createSysFsBpfSubDir(location.prefix)) return 1;
-+        if (createSysFsBpfSubDir(location.prefix)) {
-+            goto fail;
-+        }
-     }
- 
-     // Load all ELF objects, create programs and maps, and pin them
-     for (const auto& location : locations) {
-         if (loadAllElfObjects(location) != 0) {
--            ALOGE("=== CRITICAL FAILURE LOADING BPF PROGRAMS FROM %s ===", location.dir);
--            ALOGE("If this triggers reliably, you're probably missing kernel options or patches.");
--            ALOGE("If this triggers randomly, you might be hitting some memory allocation "
--                  "problems or startup script race.");
--            ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
--            sleep(20);
--            return 2;
-+            goto fail;
-         }
-     }
- 
-@@ -217,5 +213,13 @@ int main(int argc, char** argv) {
-         return 1;
-     }
- 
-+    return 0;
-+fail:
-+    ALOGE("=== CRITICAL FAILURE LOADING BPF PROGRAMS ===");
-+    ALOGE("If this triggers reliably, you're probably missing kernel options or patches.");
-+    ALOGE("If this triggers randomly, you might be hitting some memory allocation "
-+            "problems or startup script race.");
-+    ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
-+    android::base::SetProperty("bpf.progs_loaded", "1");
-     return 0;
- }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_bpf/0002-bpfloader-add-back-support-for-4.9-T-kernels.patch b/patches/trebledroid/platform_system_bpf/0002-bpfloader-add-back-support-for-4.9-T-kernels.patch
deleted file mode 100644
index d92281c2..00000000
--- a/patches/trebledroid/platform_system_bpf/0002-bpfloader-add-back-support-for-4.9-T-kernels.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0e0575d0cdf7d10042dba79d4894bd94b2a709d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
-Date: Mon, 11 Mar 2024 12:40:06 +0000
-Subject: [PATCH 2/3] bpfloader: add back support for 4.9-T kernels
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This effectively reverts aosp/2268766
-
-Test: TreeHugger
-Signed-off-by: Maciej Żenczykowski <maze@google.com>
-Change-Id: I42da5c56fe4b69635b9678ff57ade7788c17f7c8
----
- libbpf_android/Loader.cpp | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
-index 229dd93..9691c3a 100644
---- a/libbpf_android/Loader.cpp
-+++ b/libbpf_android/Loader.cpp
-@@ -573,6 +573,14 @@ static int getSymNameByIdx(ifstream& elfFile, int index, string& name) {
- 
- static bool mapMatchesExpectations(const unique_fd& fd, const string& mapName,
-                                    const struct bpf_map_def& mapDef, const enum bpf_map_type type) {
-+    // bpfGetFd... family of functions require at minimum a 4.14 kernel,
-+    // so on 4.9-T kernels just pretend the map matches our expectations.
-+    // Additionally we'll get almost equivalent test coverage on newer devices/kernels.
-+    // This is because the primary failure mode we're trying to detect here
-+    // is either a source code misconfiguration (which is likely kernel independent)
-+    // or a newly introduced kernel feature/bug (which is unlikely to get backported to 4.9).
-+    if (!isAtLeastKernelVersion(4, 14, 0)) return true;
-+
-     // Assuming fd is a valid Bpf Map file descriptor then
-     // all the following should always succeed on a 4.14+ kernel.
-     // If they somehow do fail, they'll return -1 (and set errno),
-@@ -711,6 +719,16 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
-         }
- 
-         enum bpf_map_type type = md[i].type;
-+        if (type == BPF_MAP_TYPE_DEVMAP && !isAtLeastKernelVersion(4, 14, 0)) {
-+            // On Linux Kernels older than 4.14 this map type doesn't exist, but it can kind
-+            // of be approximated: ARRAY has the same userspace api, though it is not usable
-+            // by the same ebpf programs.  However, that's okay because the bpf_redirect_map()
-+            // helper doesn't exist on 4.9-T anyway (so the bpf program would fail to load,
-+            // and thus needs to be tagged as 4.14+ either way), so there's nothing useful you
-+            // could do with a DEVMAP anyway (that isn't already provided by an ARRAY)...
-+            // Hence using an ARRAY instead of a DEVMAP simply makes life easier for userspace.
-+            type = BPF_MAP_TYPE_ARRAY;
-+        }
-         if (type == BPF_MAP_TYPE_DEVMAP_HASH && !isAtLeastKernelVersion(5, 4, 0)) {
-             // On Linux Kernels older than 5.4 this map type doesn't exist, but it can kind
-             // of be approximated: HASH has the same userspace visible api.
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_bpf/0003-bpfloader-more-4.9-T-support.patch b/patches/trebledroid/platform_system_bpf/0003-bpfloader-more-4.9-T-support.patch
deleted file mode 100644
index 00b5a6a6..00000000
--- a/patches/trebledroid/platform_system_bpf/0003-bpfloader-more-4.9-T-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 297c325990f1c06834207d2cb28dc9b912b4d763 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
-Date: Fri, 15 Mar 2024 19:03:13 +0000
-Subject: [PATCH 3/3] bpfloader: more 4.9-T support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-(older kernels don't support naming maps/programs)
-
-Test: TreeHugger
-Signed-off-by: Maciej Żenczykowski <maze@google.com>
-Change-Id: If59b8947021394e1ce0a91326fee4272a5bddd38
----
- libbpf_android/Loader.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
-index 9691c3a..008f9a1 100644
---- a/libbpf_android/Loader.cpp
-+++ b/libbpf_android/Loader.cpp
-@@ -794,7 +794,8 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
-               .max_entries = max_entries,
-               .map_flags = md[i].map_flags,
-             };
--            strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
-+            if (isAtLeastKernelVersion(4, 14, 0))
-+                strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
-             fd.reset(bpf(BPF_MAP_CREATE, req));
-             saved_errno = errno;
-             ALOGD("bpf_create_map name %s, ret: %d", mapNames[i].c_str(), fd.get());
-@@ -1046,7 +1047,8 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
-               .log_size = static_cast<__u32>(log_buf.size()),
-               .expected_attach_type = cs[i].expected_attach_type,
-             };
--            strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
-+            if (isAtLeastKernelVersion(4, 14, 0))
-+                strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
-             fd.reset(bpf(BPF_PROG_LOAD, req));
- 
-             ALOGD("BPF_PROG_LOAD call for %s (%s) returned fd: %d (%s)", elfPath,
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch b/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch
deleted file mode 100644
index 980c0d1d..00000000
--- a/patches/trebledroid/platform_system_core/0001-Let-system-override-ro.apex.updatable.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 929cbf22ad8f8ea69b6cb37932d76dc9894fb506 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 23 Feb 2022 17:37:47 -0500
-Subject: [PATCH 01/26] Let system override ro.apex.updatable
-
-APEX are broken because of a kernel bug in Android 10 devices
-So we have system set ro.apex.updatable = false
-However, vendor can override system, which prevents us from setting this
-to false
-So, ignore the override policy for this prop
----
- init/property_service.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 157fc709c..0b2cf3cc6 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -802,8 +802,12 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
-                 } else if (it->second != value) {
-                     LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
-                                  << "' with new value '" << value << "'";
--                    it->second = value;
--                }
-+                    if(strcmp("ro.apex.updatable", key) == 0) {
-+                        LOG(WARNING) << "... Ignored";
-+                    } else {
-+                        it->second = value;
-+                    }
-+		}
-             } else {
-                 LOG(ERROR) << "Do not have permissions to set '" << key << "' to '" << value
-                            << "' in property file '" << filename << "': " << error;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0002-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch b/patches/trebledroid/platform_system_core/0002-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
deleted file mode 100644
index 4ecc3103..00000000
--- a/patches/trebledroid/platform_system_core/0002-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 31d2c3d4ff4f93fe80f7ee56ee04054334037f31 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 18 Oct 2020 18:14:47 +0200
-Subject: [PATCH 02/26] Don't abandon creating property tree if there is a
- conflict, and hope for the best
-
-Change-Id: I194c815fdd58bfb84aaf7db02b8f0d00b4db21e8
----
- .../libpropertyinfoserializer/property_info_serializer.cpp     | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/property_service/libpropertyinfoserializer/property_info_serializer.cpp b/property_service/libpropertyinfoserializer/property_info_serializer.cpp
-index 803657ab8..ecdd0be20 100644
---- a/property_service/libpropertyinfoserializer/property_info_serializer.cpp
-+++ b/property_service/libpropertyinfoserializer/property_info_serializer.cpp
-@@ -19,6 +19,7 @@
- #include "property_info_parser/property_info_parser.h"
- 
- #include <set>
-+#include <iostream>
- 
- #include "trie_builder.h"
- #include "trie_serializer.h"
-@@ -34,7 +35,7 @@ bool BuildTrie(const std::vector<PropertyInfoEntry>& property_info,
- 
-   for (const auto& [name, context, type, is_exact] : property_info) {
-     if (!trie_builder.AddToTrie(name, context, type, is_exact, error)) {
--      return false;
-+      std::cerr << "Failed adding " << name << " to property trie... let's hope for the best" << std::endl;
-     }
-   }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0003-init-Do-not-start-console-service-when-debuggable.patch b/patches/trebledroid/platform_system_core/0003-init-Do-not-start-console-service-when-debuggable.patch
deleted file mode 100644
index 2551a085..00000000
--- a/patches/trebledroid/platform_system_core/0003-init-Do-not-start-console-service-when-debuggable.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 24328f6b9b0cc77c0302c4b6e5a1a47976e9f768 Mon Sep 17 00:00:00 2001
-From: Isaac Chen <tingyi364@gmail.com>
-Date: Wed, 23 Jun 2021 13:07:30 +0800
-Subject: [PATCH 03/26] init: Do not start console service when debuggable
-
-Google added a check for this in R, when it's running it will show a
-notification about that performance is impacted.
-
-Signed-off-by: Isaac Chen <tingyi364@gmail.com>
-Change-Id: I34cfd6b42d3b9aee4b3e63181480cfb8b1255f29
----
- rootdir/init.rc | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/rootdir/init.rc b/rootdir/init.rc
-index 8a2ed9fac..960534805 100644
---- a/rootdir/init.rc
-+++ b/rootdir/init.rc
-@@ -1306,9 +1306,6 @@ on property:ro.debuggable=1
-     # Give reads to anyone for the accessibility trace folder on debug builds.
-     chmod 0775 /data/misc/a11ytrace
- 
--on init && property:ro.debuggable=1
--    start console
--
- on userspace-reboot-requested
-   # TODO(b/135984674): reset all necessary properties here.
-   setprop sys.boot_completed ""
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0004-Panic-into-recovery-rather-than-bootloader.patch b/patches/trebledroid/platform_system_core/0004-Panic-into-recovery-rather-than-bootloader.patch
deleted file mode 100644
index 0342bf48..00000000
--- a/patches/trebledroid/platform_system_core/0004-Panic-into-recovery-rather-than-bootloader.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1a6682f3ce288fd0cfd75e0caf89d6a02ff428ef Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 4 Sep 2019 21:11:48 +0200
-Subject: [PATCH 04/26] Panic into recovery rather than bootloader
-
-Getting last_kmsg/pstore from bootloader isn't possible for other people
-than the OEM, but we have TWRP to access last_kmsg/pstore
-
-Change-Id: If04bb6572dc66677d7b44f7d302b2d69ce526200
----
- init/reboot_utils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init/reboot_utils.cpp b/init/reboot_utils.cpp
-index 547b1869f..dd0fbbfe8 100644
---- a/init/reboot_utils.cpp
-+++ b/init/reboot_utils.cpp
-@@ -37,7 +37,7 @@
- namespace android {
- namespace init {
- 
--static std::string init_fatal_reboot_target = "bootloader";
-+static std::string init_fatal_reboot_target = "recovery";
- static bool init_fatal_panic = false;
- 
- // this needs to read the /proc/* files directly because it is called before
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0005-Detect-allowed-sdcard-options-based-on-vndk.patch b/patches/trebledroid/platform_system_core/0005-Detect-allowed-sdcard-options-based-on-vndk.patch
deleted file mode 100644
index be0b2db9..00000000
--- a/patches/trebledroid/platform_system_core/0005-Detect-allowed-sdcard-options-based-on-vndk.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e0b7c4b77ee65618af47717dddbdb7222b2f3b9f Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 14 Aug 2018 19:33:03 +0200
-Subject: [PATCH 05/26] Detect allowed sdcard options based on vndk
-
-Some kernel crashes when using too recent sdcardfs options
-
-Change-Id: I632e485f9b2a09a46d4a1fde2ea15217f8d92eff
----
- sdcard/sdcard.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
-index 622de5b7a..e580190e9 100644
---- a/sdcard/sdcard.cpp
-+++ b/sdcard/sdcard.cpp
-@@ -32,6 +32,7 @@
- #include <android-base/file.h>
- #include <android-base/logging.h>
- #include <android-base/macros.h>
-+#include <android-base/properties.h>
- #include <android-base/stringprintf.h>
- #include <android-base/strings.h>
- 
-@@ -103,11 +104,12 @@ static bool sdcardfs_setup(const std::string& source_path, const std::string& de
-                            mode_t mask, bool derive_gid, bool default_normal, bool unshared_obb,
-                            bool use_esdfs) {
-     // Add new options at the end of the vector.
-+    int vndk = android::base::GetIntProperty<int>("ro.vndk.version", 29);
-     std::vector<std::string> new_opts_list;
-     if (multi_user) new_opts_list.push_back("multiuser,");
--    if (derive_gid) new_opts_list.push_back("derive_gid,");
--    if (default_normal) new_opts_list.push_back("default_normal,");
--    if (unshared_obb) new_opts_list.push_back("unshared_obb,");
-+    if (derive_gid && vndk >= 27) new_opts_list.push_back("derive_gid,");
-+    if (default_normal && vndk >= 28) new_opts_list.push_back("default_normal,");
-+    if (unshared_obb && vndk >= 29) new_opts_list.push_back("unshared_obb,");
-     // Try several attempts, each time with one less option, to gracefully
-     // handle older kernels that aren't updated yet.
-     for (int i = 0; i <= new_opts_list.size(); ++i) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0006-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch b/patches/trebledroid/platform_system_core/0006-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
deleted file mode 100644
index 1157a1cb..00000000
--- a/patches/trebledroid/platform_system_core/0006-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9532731e39fc4da61d04e79894c7b306c9e020d5 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 1 Nov 2019 18:22:13 +0100
-Subject: [PATCH 06/26] Ugly but secure: Set /dev/uinput as 0666 to fix
- fingerprint sensor on some devices
-
-cf https://github.com/phhusson/device_phh_treble/pull/122/commits/e000d69c286b6686777ea6f1867f379e30273e48
-This is safe because even though it's 0666, its SELinux policy is very
-tight, and only bluetooth HAL, shell (and fingerprint HAL on Xiaomi) can
-access it.
-
-Change-Id: Id374e781957927d5604cb96c7a39b3fb28b3a6c5
----
- rootdir/ueventd.rc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
-index 3927501a4..d0ab3f7bb 100644
---- a/rootdir/ueventd.rc
-+++ b/rootdir/ueventd.rc
-@@ -60,7 +60,7 @@ subsystem vfio
- 
- # these should not be world writable
- /dev/uhid                 0660   uhid       uhid
--/dev/uinput               0660   uhid       uhid
-+/dev/uinput               0666   uhid       uhid
- /dev/rtc0                 0640   system     system
- /dev/tty0                 0660   root       system
- /dev/graphics/*           0660   root       graphics
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0007-Revert-Set-system-xbin-permissions-to-750.patch b/patches/trebledroid/platform_system_core/0007-Revert-Set-system-xbin-permissions-to-750.patch
deleted file mode 100644
index b1601798..00000000
--- a/patches/trebledroid/platform_system_core/0007-Revert-Set-system-xbin-permissions-to-750.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6dd7c07a73c4a80269bd3ef9e9586d6392511f02 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Tue, 1 Feb 2022 13:48:35 +0000
-Subject: [PATCH 07/26] Revert "Set /system/xbin permissions to 750."
-
-This reverts commit 42a1a126e554a8bca31d0afc832848b7b0fa1f4e.
-
-Change-Id: I277def5153616d6f00bc877e6170b7fed7cd799d
----
- libcutils/fs_config.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
-index 919be2ff2..9ab7f4305 100644
---- a/libcutils/fs_config.cpp
-+++ b/libcutils/fs_config.cpp
-@@ -83,7 +83,7 @@ static const struct fs_path_config android_dirs[] = {
-     { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },
-     { 00755, AID_ROOT,         AID_ROOT,         0, "system/etc/ppp" },
-     { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },
--    { 00750, AID_ROOT,         AID_SHELL,        0, "system/xbin" },
-+    { 00751, AID_ROOT,         AID_SHELL,        0, "system/xbin" },
-     { 00751, AID_ROOT,         AID_SHELL,        0, "system/apex/*/bin" },
-     { 00750, AID_ROOT,         AID_SYSTEM,       0, "system_ext/apex/com.android.tethering/bin/for-system" },
-     { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/bin" },
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0008-Add-my-own-OTA-mechanism-going-over-data.patch b/patches/trebledroid/platform_system_core/0008-Add-my-own-OTA-mechanism-going-over-data.patch
deleted file mode 100644
index fabf206b..00000000
--- a/patches/trebledroid/platform_system_core/0008-Add-my-own-OTA-mechanism-going-over-data.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 3ff1ec39c393feec99a10a31bd561881ab86ca15 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 22 Jan 2022 14:34:45 -0500
-Subject: [PATCH 08/26] Add my own OTA mechanism going over /data
-
-Change-Id: I9cacff2d761affa0376b4bb8ca63353a9d95b5de
----
- fs_mgr/libfiemap/image_manager.cpp |  2 +-
- init/selinux.cpp                   | 64 ++++++++++++++++++++++++++++++
- 2 files changed, 65 insertions(+), 1 deletion(-)
-
-diff --git a/fs_mgr/libfiemap/image_manager.cpp b/fs_mgr/libfiemap/image_manager.cpp
-index a5da6e342..85f4ed62d 100644
---- a/fs_mgr/libfiemap/image_manager.cpp
-+++ b/fs_mgr/libfiemap/image_manager.cpp
-@@ -156,7 +156,7 @@ bool ImageManager::MetadataDirIsTest() const {
- }
- 
- bool ImageManager::IsUnreliablePinningAllowed() const {
--    return IsSubdir(data_dir_, "/data/gsi/dsu/") || MetadataDirIsTest();
-+    return IsSubdir(data_dir_, "/data/gsi/dsu/") || MetadataDirIsTest() || IsSubdir(data_dir_, "/data/gsi/phh/");
- }
- 
- FiemapStatus ImageManager::CreateBackingImage(
-diff --git a/init/selinux.cpp b/init/selinux.cpp
-index 1f211ddfa..bd7f02df8 100644
---- a/init/selinux.cpp
-+++ b/init/selinux.cpp
-@@ -58,6 +58,9 @@
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#include <fcntl.h>
-+#include <strings.h>
-+#include <sys/sysmacros.h>
- 
- #include <android-base/chrono_utils.h>
- #include <android-base/file.h>
-@@ -71,12 +74,16 @@
- #include <libgsi/libgsi.h>
- #include <libsnapshot/snapshot.h>
- #include <selinux/android.h>
-+#include <sys/mount.h>
-+#include <libfiemap/image_manager.h>
-+#include <liblp/partition_opener.h>
- 
- #include "block_dev_initializer.h"
- #include "debug_ramdisk.h"
- #include "reboot_utils.h"
- #include "snapuserd_transition.h"
- #include "util.h"
-+#include "switch_root.h"
- 
- using namespace std::string_literals;
- 
-@@ -85,6 +92,7 @@ using android::base::Timer;
- using android::base::unique_fd;
- using android::fs_mgr::AvbHandle;
- using android::snapshot::SnapshotManager;
-+using android::fiemap::IImageManager;
- 
- namespace android {
- namespace init {
-@@ -732,6 +740,60 @@ void LoadSelinuxPolicyMicrodroid() {
-     LoadSelinuxPolicy(policy);
- }
- 
-+static void setupPhhOta() {
-+	setenv("PHH_STEP2", (char*)"1", 1);
-+	if(getenv("PHH_OTA")) return;
-+	setenv("PHH_STEP3", (char*)"1", 1);
-+
-+	std::string phh_ota;
-+	if(!base::ReadFileToString("/metadata/phh/img", &phh_ota)) return;
-+	const char *slot = "a";
-+	if(phh_ota.c_str()[0] == 'b')
-+		slot = "b";
-+	setenv("PHH_OTA_SLOT", (char*)slot, 1);
-+	setenv("PHH_STEP4", (char*)"1", 1);
-+
-+	std::string imageNameStr = "system_otaphh_"s + slot;
-+
-+	BlockDevInitializer block_dev_init;
-+	block_dev_init.InitDeviceMapper();
-+	block_dev_init.InitDevices({"userdata"});
-+
-+	auto images = IImageManager::Open("phh", 0ms);
-+	std::string blockDev;
-+	android::fs_mgr::PartitionOpener opener;
-+	if(!images->MapImageWithDeviceMapper(opener, imageNameStr, &blockDev)) return;
-+
-+	// For some reason, I can't get block_dev_init to find system_otaphh_X, so construct it ourselves
-+	int major = atoi(blockDev.c_str());
-+	const char *minorStr = strstr(blockDev.c_str(), ":")+1;
-+	int minor = atoi(minorStr);
-+	int eee = mknod("/dev/root-otaphh", 0644 | S_IFBLK, makedev(major, minor));
-+
-+	base::WriteStringToFile("phh mknod returned " + std::to_string(eee) + " of " + std::to_string(major) + " " + std::to_string(minor), "/dev/kmsg");
-+	setenv("PHH_STEP5", (char*)"1", 1);
-+
-+	umount2("/debug_ramdisk", 0);
-+	umount2("/debug_ramdisk", MNT_DETACH);
-+	int mountRes = mount("/dev/root-otaphh", "/debug_ramdisk", "ext4", MS_RDONLY, "");
-+	putenv((char*)"PHH_OTA=1");
-+	base::WriteStringToFile("phh_ota setup " + blockDev, "/dev/kmsg");
-+	base::WriteStringToFile("phh mount returned " + std::to_string(mountRes), "/dev/kmsg");
-+	base::WriteStringToFile("errno is " + std::to_string(errno), "/dev/kmsg");
-+
-+	if(mountRes != 0) return;
-+
-+	SwitchRoot("/debug_ramdisk");
-+
-+	const char* path = "/system/bin/init";
-+	const char* args[] = {path, "selinux_setup", nullptr};
-+	auto fd = open("/dev/kmsg", O_WRONLY | O_CLOEXEC);
-+	dup2(fd, STDOUT_FILENO);
-+	dup2(fd, STDERR_FILENO);
-+	close(fd);
-+	execv(path, const_cast<char**>(args));
-+}
-+
- // The SELinux setup process is carefully orchestrated around snapuserd. Policy
- // must be loaded off dynamic partitions, and during an OTA, those partitions
- // cannot be read without snapuserd. But, with kernel-privileged snapuserd
-@@ -748,6 +810,8 @@ void LoadSelinuxPolicyMicrodroid() {
- //
- // After this sequence, it is safe to enable enforcing mode and continue booting.
- void LoadSelinuxPolicyAndroid() {
-+    setenv("PHH_STEP1", (char*)"1", 1);
-+    setupPhhOta();
-     MountMissingSystemPartitions();
- 
-     LOG(INFO) << "Opening SELinux policy";
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0009-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch b/patches/trebledroid/platform_system_core/0009-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch
deleted file mode 100644
index e91cde18..00000000
--- a/patches/trebledroid/platform_system_core/0009-fs_mgr-Keep-allowing-encryptable-fstab-flag.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1941fa397c4dcf4f8bc06ad49f284da0576d2da7 Mon Sep 17 00:00:00 2001
-From: Alberto Ponces <ponces26@gmail.com>
-Date: Mon, 3 Oct 2022 13:50:36 +0100
-Subject: [PATCH 09/26] fs_mgr: Keep allowing encryptable fstab flag
-
-Some users still use "encryptable" flag while being unencrypted. Let them still boot their devices.
-
-Change-Id: Id2554d6563a869bb5bcf39c67b0322484bdab0c9
----
- fs_mgr/libfstab/fstab.cpp | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp
-index 6fa22fee5..0603f25b0 100644
---- a/fs_mgr/libfstab/fstab.cpp
-+++ b/fs_mgr/libfstab/fstab.cpp
-@@ -327,16 +327,6 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
-         }
-     }
- 
--    // FDE is no longer supported, so reject "encryptable" when used without
--    // "vold_managed".  For now skip this check when in recovery mode, since
--    // some recovery fstabs still contain the FDE options since they didn't do
--    // anything in recovery mode anyway (except possibly to cause the
--    // reservation of a crypto footer) and thus never got removed.
--    if (entry->fs_mgr_flags.crypt && !entry->fs_mgr_flags.vold_managed && !InRecovery()) {
--        LERROR << "FDE is no longer supported; 'encryptable' can only be used for adoptable "
--                  "storage";
--        return false;
--    }
-     return true;
- }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0010-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch b/patches/trebledroid/platform_system_core/0010-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch
deleted file mode 100644
index 5fdc9eee..00000000
--- a/patches/trebledroid/platform_system_core/0010-FDE-is-dead.-Fallback-FDE-to-no-encryption-and-FDE-F.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From aa03f2d0bb1dfe17deaa23e2c3300c3b7f8214a3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 10 Nov 2022 13:30:50 -0500
-Subject: [PATCH 10/26] FDE is dead. Fallback FDE to no encryption, and FDE+FBE
- to FBE
-
----
- fs_mgr/libfstab/fstab.cpp | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp
-index 0603f25b0..453010e4e 100644
---- a/fs_mgr/libfstab/fstab.cpp
-+++ b/fs_mgr/libfstab/fstab.cpp
-@@ -187,7 +187,7 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
- #undef CheckFlag
- 
-         // Then handle flags that take an argument.
--        if (StartsWith(flag, "encryptable=")) {
-+        if (StartsWith(flag, "encryptable=") || StartsWith(flag, "forceencrypt=")) {
-             // The "encryptable" flag identifies adoptable storage volumes.  The
-             // argument to this flag is ignored, but it should be "userdata".
-             //
-@@ -197,9 +197,8 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
-             // storage volumes.  Today, FDE is no longer supported, leaving only
-             // the adoptable storage volume meaning for this flag.
-             entry->fs_mgr_flags.crypt = true;
--        } else if (StartsWith(flag, "forceencrypt=") || StartsWith(flag, "forcefdeorfbe=")) {
--            LERROR << "flag no longer supported: " << flag;
--            return false;
-+        } else if (StartsWith(flag, "forcefdeorfbe=")) {
-+            ParseFileEncryption("aes-256-xts:aes-256-cts", entry);
-         } else if (StartsWith(flag, "voldmanaged=")) {
-             // The voldmanaged flag is followed by an = and the label, a colon and the partition
-             // number or the word "auto", e.g. voldmanaged=sdcard:3
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0011-Let-system-override-adb-secure-props-so-we-dont-get-.patch b/patches/trebledroid/platform_system_core/0011-Let-system-override-adb-secure-props-so-we-dont-get-.patch
deleted file mode 100644
index afb957d7..00000000
--- a/patches/trebledroid/platform_system_core/0011-Let-system-override-adb-secure-props-so-we-dont-get-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dbfee5724435578184e805c8cdd437b12260b27f Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 9 Dec 2022 13:57:10 -0500
-Subject: [PATCH 11/26] Let system override adb/secure props, so we dont get
- stuck in ro.adb.secure=1 vendors
-
----
- init/property_service.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 0b2cf3cc6..eedad50f3 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -802,7 +802,7 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
-                 } else if (it->second != value) {
-                     LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
-                                  << "' with new value '" << value << "'";
--                    if(strcmp("ro.apex.updatable", key) == 0) {
-+                    if(strcmp("ro.apex.updatable", key) == 0 || strstr(key, "adb") || strstr(key, "secure")) {
-                         LOG(WARNING) << "... Ignored";
-                     } else {
-                         it->second = value;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0012-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch b/patches/trebledroid/platform_system_core/0012-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch
deleted file mode 100644
index 07f0c1f5..00000000
--- a/patches/trebledroid/platform_system_core/0012-Allow-apex-on-5.0-kernels.-This-is-needed-because-on.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ce712b5cfed6a037d90daef047717e68f0ad1d2f Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 28 Apr 2023 12:29:05 -0400
-Subject: [PATCH 12/26] Allow apex on > 5.0 kernels. This is needed because on
- Pixels, camera HAL are exclusively in vendor apex
-
-Change-Id: I334cde4c5557b0ff70d550205c5bb727d4b5dbf5
----
- init/property_service.cpp | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index eedad50f3..dbd1e61a5 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -64,6 +64,7 @@
- #include <selinux/android.h>
- #include <selinux/label.h>
- #include <selinux/selinux.h>
-+#include <sys/utsname.h>
- #include <vendorsupport/api_level.h>
- 
- #include "debug_ramdisk.h"
-@@ -705,6 +706,16 @@ uint32_t InitPropertySet(const std::string& name, const std::string& value) {
- static Result<void> load_properties_from_file(const char*, const char*,
-                                               std::map<std::string, std::string>*);
- 
-+static bool kernel_supports_capex() {
-+    //Put a threshold at >= 5.0
-+    struct utsname buf;
-+    uname(&buf);
-+    const char *where = buf.release;
-+    int a = atoi(where);
-+    if(a <= 4) return false;
-+    return true;
-+}
-+
- /*
-  * Filter is used to decide which properties to load: NULL loads all keys,
-  * "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.
-@@ -802,7 +813,9 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
-                 } else if (it->second != value) {
-                     LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
-                                  << "' with new value '" << value << "'";
--                    if(strcmp("ro.apex.updatable", key) == 0 || strstr(key, "adb") || strstr(key, "secure")) {
-+                    if(strcmp("ro.apex.updatable", key) == 0 && !kernel_supports_capex()) {
-+                        LOG(WARNING) << "... Ignored apex by kernel version";
-+                    } else if(strstr(key, "adb") || strstr(key, "secure")) {
-                         LOG(WARNING) << "... Ignored";
-                     } else {
-                         it->second = value;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0013-watchdogd-Support-pinging-two-watchdogs.patch b/patches/trebledroid/platform_system_core/0013-watchdogd-Support-pinging-two-watchdogs.patch
deleted file mode 100644
index 45be193c..00000000
--- a/patches/trebledroid/platform_system_core/0013-watchdogd-Support-pinging-two-watchdogs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 72eb1c4510de138231360b819ffcdbf9723daee6 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 27 May 2023 05:36:21 -0400
-Subject: [PATCH 13/26] watchdogd: Support pinging two watchdogs
-
----
- watchdogd/watchdogd.cpp | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/watchdogd/watchdogd.cpp b/watchdogd/watchdogd.cpp
-index 5dc41e6b8..69abb4e2b 100644
---- a/watchdogd/watchdogd.cpp
-+++ b/watchdogd/watchdogd.cpp
-@@ -20,12 +20,15 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/stat.h>
- 
- #include <android-base/logging.h>
- 
- #define DEV_NAME "/dev/watchdog"
-+#define DEV_NAME2 "/dev/watchdog1"
- 
- int main(int argc, char** argv) {
-+    struct stat st_buf;
-     android::base::InitLogging(argv, &android::base::KernelLogger);
- 
-     int interval = 10;
-@@ -42,6 +45,13 @@ int main(int argc, char** argv) {
-         return 1;
-     }
- 
-+    int fd2 = open(DEV_NAME2, O_RDWR | O_CLOEXEC);
-+    fstat(fd2, &st_buf);
-+    if ((st_buf.st_mode & S_IFMT) != S_IFCHR) {
-+        close(fd2);
-+        fd2 = -1;
-+    }
-+
-     int timeout = interval + margin;
-     int ret = ioctl(fd, WDIOC_SETTIMEOUT, &timeout);
-     if (ret) {
-@@ -61,8 +71,31 @@ int main(int argc, char** argv) {
-         }
-     }
- 
-+    if(fd2 >= 0) {
-+        int interval2 = interval;
-+        ret = ioctl(fd2, WDIOC_SETTIMEOUT, &timeout);
-+        if (ret) {
-+            PLOG(ERROR) << "Failed to set2 timeout to " << timeout;
-+            ret = ioctl(fd, WDIOC_GETTIMEOUT, &timeout);
-+            if (ret) {
-+                PLOG(ERROR) << "Failed to get timeout";
-+            } else {
-+                if (timeout > margin) {
-+                    interval2 = timeout - margin;
-+                } else {
-+                    interval2 = 1;
-+                }
-+                LOG(WARNING) << "Adjusted interval to timeout returned by driver: "
-+                             << "timeout " << timeout << ", interval " << interval2 << ", margin "
-+                             << margin;
-+            }
-+        }
-+        if(interval2 < interval) interval = interval2;
-+    }
-+
-     while (true) {
-         write(fd, "", 1);
-+        if (fd2 >= 0) write(fd2, "", 1);
-         sleep(interval);
-     }
- }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0014-healthd-offline-charger-fix-screen-off-3-3.patch b/patches/trebledroid/platform_system_core/0014-healthd-offline-charger-fix-screen-off-3-3.patch
deleted file mode 100644
index 08abe3b6..00000000
--- a/patches/trebledroid/platform_system_core/0014-healthd-offline-charger-fix-screen-off-3-3.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From 5afcea0daf87323423b8794dace5bd3d54199d71 Mon Sep 17 00:00:00 2001
-From: Raphael Mounier <mounierr07@gmail.com>
-Date: Sun, 21 May 2023 16:15:42 +0200
-Subject: [PATCH 14/26] healthd : offline charger fix screen off 3/3
-
-When the phone is charging, the animation never turns off on huawei phones (kernel 4.9). This patch allows you to turn it off by setting the brightness to 0. This problem may also exist on other phone models.
-
-The charge service must be started with the root user to be able to access
-/sys/class/leds/lcd_backlight0 ....
-
-You must also set the following selinux rules:
-
-attribute sysfs_backlight_attr;
-allow load sysfs_backlight_attr:file rw_file_perms;
----
- healthd/healthd_draw.cpp                      | 82 ++++++++++++++++++-
- healthd/healthd_draw.h                        |  6 ++
- healthd/healthd_mode_charger.cpp              | 26 +++++-
- .../charger/healthd_mode_charger.h            |  1 +
- 4 files changed, 108 insertions(+), 7 deletions(-)
-
-diff --git a/healthd/healthd_draw.cpp b/healthd/healthd_draw.cpp
-index 7c7931944..2266233e1 100644
---- a/healthd/healthd_draw.cpp
-+++ b/healthd/healthd_draw.cpp
-@@ -15,18 +15,28 @@
-  */
- 
- #include <android-base/stringprintf.h>
-+#include <android-base/file.h>
- #include <batteryservice/BatteryService.h>
- #include <cutils/klog.h>
-+#include <cutils/properties.h>
-+#include <unistd.h>
- 
- #include "healthd_draw.h"
- 
-+
- #if !defined(__ANDROID_VNDK__)
- #include "charger.sysprop.h"
- #endif
- 
--#define LOGE(x...) KLOG_ERROR("charger", x);
--#define LOGW(x...) KLOG_WARNING("charger", x);
--#define LOGV(x...) KLOG_DEBUG("charger", x);
-+#define HARDWARE_MODEL "ro.hardware"
-+
-+#define LOGE(x...) KLOG_ERROR("charger", x); fprintf(stderr,x);
-+#define LOGW(x...) KLOG_WARNING("charger", x); fprintf(stderr,x);
-+#define LOGV(x...) KLOG_DEBUG("charger", x); fprintf(stderr,x);
-+
-+using ::android::base::ReadFileToString;
-+using ::android::base::WriteStringToFile;
-+
- 
- static bool get_split_screen() {
- #if !defined(__ANDROID_VNDK__)
-@@ -73,10 +83,41 @@ HealthdDraw::HealthdDraw(animation* anim)
-         (res = gr_init_font(anim->text_clock.font_file.c_str(), &anim->text_clock.font)) < 0) {
-         LOGE("Could not load time font (%d)\n", res);
-     }
-+
-     if (!anim->text_percent.font_file.empty() &&
-         (res = gr_init_font(anim->text_percent.font_file.c_str(), &anim->text_percent.font)) < 0) {
-         LOGE("Could not load percent font (%d)\n", res);
-     }
-+
-+    // Try to find kirin/huawei hardware
-+    char prop_hardware[PROPERTY_VALUE_MAX] = {};
-+
-+    is_kirin = false;
-+    if (property_get(HARDWARE_MODEL, prop_hardware, "") > 0) {
-+        if (!strcmp(prop_hardware,"hi3660")
-+            || !strcmp(prop_hardware,"hi3670")
-+            || !strcmp(prop_hardware,"hi6250")
-+            || !strcmp(prop_hardware,"kirin"))
-+        {
-+            LOGV("Kirin Huawei found\n");
-+            is_kirin=true;
-+
-+            mMaxBrightness=4095;
-+            std::string content_str;
-+
-+            if (ReadFileToString("/sys/class/leds/lcd_backlight0/max_brightness", &content_str)) {
-+                mMaxBrightness = std::stoi(content_str);
-+            }
-+            else {
-+                if (ReadFileToString("/sys/class/leds/lcd_backlight/max_brightness", &content_str)) {
-+                    mMaxBrightness = std::stoi(content_str);
-+                }
-+            }
-+
-+            // Set max brightness
-+            set_brightness(mMaxBrightness);
-+        }
-+    }
- }
- 
- HealthdDraw::~HealthdDraw() {}
-@@ -94,9 +135,42 @@ void HealthdDraw::redraw_screen(const animation* batt_anim, GRSurface* surf_unkn
-     gr_flip();
- }
- 
-+void HealthdDraw::set_brightness(uint32_t value) {
-+    LOGV("Kirin - Try to set brightness to %d\n",value)
-+    if (WriteStringToFile(std::to_string(value), "/sys/class/leds/lcd_backlight0/brightness")==false) {
-+        LOGW("Kirin - WriteStringToFile failed lcd_backlight0, unable to set brightness (lcd_backlight0)\n");
-+        if (WriteStringToFile(std::to_string(0), "/sys/class/leds/lcd_backlight/brightness")==false) {
-+            LOGE("Kirin - WriteStringToFile failed lcd_backlight, unable to set brightness (lcd_backlight)\n");
-+        }
-+    }
-+}
-+
-+
- void HealthdDraw::blank_screen(bool blank, int drm) {
-+
-     if (!graphics_available) return;
--    gr_fb_blank(blank, drm);
-+
-+    bool bmulti=gr_has_multiple_connectors();
-+
-+    if (bmulti && (drm==1)) {
-+        KLOG_WARNING("charger", "minui graphic backend don't support multi-connector for blank screen\n");
-+    }
-+
-+    if (is_kirin) {
-+        if (blank==true) {
-+            LOGV("Kirin - clear screen\n")
-+            //clear_screen();
-+            //gr_flip();
-+            set_brightness(0);
-+        }
-+        else {
-+            set_brightness(mMaxBrightness);
-+        }
-+    }
-+    else {
-+        LOGV("Blank screen with minui api)\n");
-+        gr_fb_blank(blank, drm);
-+    }
- }
- 
- // support screen rotation for foldable phone
-diff --git a/healthd/healthd_draw.h b/healthd/healthd_draw.h
-index 016db8e07..e8e51748d 100644
---- a/healthd/healthd_draw.h
-+++ b/healthd/healthd_draw.h
-@@ -84,9 +84,15 @@ class HealthdDraw {
-   // true if minui init'ed OK, false if minui init failed
-   bool graphics_available;
- 
-+  // true if kirin found
-+  bool is_kirin;
-+  uint32_t mMaxBrightness;
-+
-  private:
-   // Configures font using given animation.
-   HealthdDraw(animation* anim);
-+  // Set brightness
-+  void set_brightness(uint32_t value);
- };
- 
- #endif  // HEALTHD_DRAW_H
-diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
-index 26af13b31..0d4ba32ff 100644
---- a/healthd/healthd_mode_charger.cpp
-+++ b/healthd/healthd_mode_charger.cpp
-@@ -93,9 +93,9 @@ char* locale;
- 
- #define LAST_KMSG_MAX_SZ (32 * 1024)
- 
--#define LOGE(x...) KLOG_ERROR("charger", x);
--#define LOGW(x...) KLOG_WARNING("charger", x);
--#define LOGV(x...) KLOG_DEBUG("charger", x);
-+#define LOGE(x...) KLOG_ERROR("charger", x); fprintf(stderr,x);
-+#define LOGW(x...) KLOG_WARNING("charger", x); fprintf(stderr,x);
-+#define LOGV(x...) KLOG_DEBUG("charger", x); fprintf(stderr,x);
- 
- namespace android {
- 
-@@ -301,6 +301,23 @@ void Charger::BlankSecScreen() {
-     }
- }
- 
-+void Charger::UpdateLedState() {
-+
-+    if (!have_battery_state_) return;
-+    if (health_info_.battery_level == 0 && health_info_.battery_status == BatteryStatus::UNKNOWN) return ;
-+
-+    // TODO set led with battery_level in % (0->100%)
-+    LOGV("Battery level = %d\n",health_info_.battery_level);
-+
-+    /*
-+    /sys/class/leds/red/brightness
-+    /sys/class/leds/green/brightness
-+    /sys/class/leds/blue/brightness
-+    */
-+
-+}
-+
-+
- void Charger::UpdateScreenState(int64_t now) {
-     int disp_time;
- 
-@@ -609,6 +626,9 @@ void Charger::OnHeartbeat() {
-      * screen transitions (animations, etc)
-      */
-     UpdateScreenState(now);
-+
-+    // Update Led color
-+    UpdateLedState();
- }
- 
- void Charger::OnHealthInfoChanged(const ChargerHealthInfo& health_info) {
-diff --git a/healthd/include_charger/charger/healthd_mode_charger.h b/healthd/include_charger/charger/healthd_mode_charger.h
-index c463b92aa..50267ffee 100644
---- a/healthd/include_charger/charger/healthd_mode_charger.h
-+++ b/healthd/include_charger/charger/healthd_mode_charger.h
-@@ -103,6 +103,7 @@ class Charger {
-     void ProcessHallSensor(int code);
-     void HandleInputState(int64_t now);
-     void HandlePowerSupplyState(int64_t now);
-+    void UpdateLedState();
-     int InputCallback(int fd, unsigned int epevents);
-     void InitHealthdDraw();
-     void InitAnimation();
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0015-Disable-quotas-on-legacy-devices-with-encryption-dis.patch b/patches/trebledroid/platform_system_core/0015-Disable-quotas-on-legacy-devices-with-encryption-dis.patch
deleted file mode 100644
index e9a1a242..00000000
--- a/patches/trebledroid/platform_system_core/0015-Disable-quotas-on-legacy-devices-with-encryption-dis.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e77a410a93459646c656ce76681b506d1bdb2d72 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 6 Jun 2023 16:17:11 +0100
-Subject: [PATCH 15/26] Disable quotas on legacy devices with encryption
- disabled
-
-Source: https://t.me/phhtreblebuilders/20521 and https://t.me/phhtreblebuilders/20546
----
- fs_mgr/fs_mgr.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
-index 8c0c1efe3..38b9d8ffc 100644
---- a/fs_mgr/fs_mgr.cpp
-+++ b/fs_mgr/fs_mgr.cpp
-@@ -377,6 +377,13 @@ static void tune_quota(const std::string& blk_device, const FstabEntry& entry,
-         return;
-     }
- 
-+    // There is no relation between quotas and encryption disabled, it's just that encryption
-+    // being disabled shows that the device is pretty old, so quotas might be broken on it
-+    if (!entry.fs_mgr_flags.file_encryption) {
-+        LINFO << "Disabling quotas on legacy devices with encryption disabled";
-+        want_quota = false;
-+    }
-+
-     if (!tune2fs_available()) {
-         LERROR << "Unable to " << (want_quota ? "enable" : "disable") << " quotas on " << blk_device
-                << " because " TUNE2FS_BIN " is missing";
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0016-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch b/patches/trebledroid/platform_system_core/0016-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch
deleted file mode 100644
index aa77c004..00000000
--- a/patches/trebledroid/platform_system_core/0016-Add-vendor-firmware_mnt.-Moto-Razr-2019-look-for-fir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6f4b6d9993d93e5efe6476e1e297022d816b14b4 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 11 Jul 2023 14:52:40 -0400
-Subject: [PATCH 16/26] Add /vendor/firmware_mnt. Moto Razr 2019 look for
- firmwares (modem, sensors, ...) there
-
----
- rootdir/ueventd.rc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
-index d0ab3f7bb..39e8fe9eb 100644
---- a/rootdir/ueventd.rc
-+++ b/rootdir/ueventd.rc
-@@ -1,7 +1,7 @@
- import /vendor/etc/ueventd.rc
- import /odm/etc/ueventd.rc
- 
--firmware_directories /etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/
-+firmware_directories /etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/ /vendor/firmware_mnt/image/
- uevent_socket_rcvbuf_size 16M
- 
- subsystem graphics
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0017-Ignore-dm-verity-setup-issues.patch b/patches/trebledroid/platform_system_core/0017-Ignore-dm-verity-setup-issues.patch
deleted file mode 100644
index b5bae413..00000000
--- a/patches/trebledroid/platform_system_core/0017-Ignore-dm-verity-setup-issues.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c62c93b6cc04554462663fb573a0837a666b5a4c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 08:20:48 -0400
-Subject: [PATCH 17/26] Ignore dm-verity setup issues
-
-On Amlogic STB Android 9 vendor, no boot device is setup
-(fstab doesn't use /dev/block/by-name but more direct mappings)
-that means that libavb can't access the partition by-name, thus failing
-to read vbmeta & co, and thus failing setting up dm-verity.
-
-We don't care much about dm-verity so let's just ignore this
----
- init/first_stage_mount.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
-index c0b928139..4f5293771 100644
---- a/init/first_stage_mount.cpp
-+++ b/init/first_stage_mount.cpp
-@@ -427,7 +427,6 @@ bool FirstStageMountVBootV2::MountPartition(const Fstab::iterator& begin, bool e
-     }
-     if (!SetUpDmVerity(&(*begin))) {
-         PLOG(ERROR) << "Failed to setup verity for '" << begin->mount_point << "'";
--        return false;
-     }
- 
-     bool mounted = (fs_mgr_do_mount_one(*begin) == 0);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0018-Fix-support-for-devices-without-cgroupv2-support.patch b/patches/trebledroid/platform_system_core/0018-Fix-support-for-devices-without-cgroupv2-support.patch
deleted file mode 100644
index 5ab2bc9b..00000000
--- a/patches/trebledroid/platform_system_core/0018-Fix-support-for-devices-without-cgroupv2-support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 919a8cd87bb8347867911235929ad47f73beb52e Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 26 Oct 2022 17:59:11 -0400
-Subject: [PATCH 18/26] Fix support for devices without cgroupv2 support
-
-This is technically a revert of 1bd1746447.
-The warning inside the commit doesn't really apply to us, because the
-devices without cgroupv2 simply won't freeze processes at all
-(which is in itself an issue, but a different one)
----
- init/service.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/init/service.cpp b/init/service.cpp
-index eb24dd593..4dfaf3137 100644
---- a/init/service.cpp
-+++ b/init/service.cpp
-@@ -703,12 +703,15 @@ Result<void> Service::Start() {
-                          limit_percent_ != -1 || !limit_property_.empty();
-         errno = -createProcessGroup(uid(), pid_, use_memcg);
-         if (errno != 0) {
-+            PLOG(ERROR) << "createProcessGroup(" << uid() << ", " << pid_ <<  ") failed for service '" << name_ << "'";
-+#if 0
-             Result<void> result = cgroups_activated.Write(kActivatingCgroupsFailed);
-             if (!result.ok()) {
-                 return Error() << "Sending notification failed: " << result.error();
-             }
-             return Error() << "createProcessGroup(" << uid() << ", " << pid_ << ", " << use_memcg
-                            << ") failed for service '" << name_ << "': " << strerror(errno);
-+#endif
-         }
- 
-         // When the blkio controller is mounted in the v1 hierarchy, NormalIoPriority is
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0019-Disable-project_quota-on-old-devices-but-new-enough-.patch b/patches/trebledroid/platform_system_core/0019-Disable-project_quota-on-old-devices-but-new-enough-.patch
deleted file mode 100644
index 03df2aee..00000000
--- a/patches/trebledroid/platform_system_core/0019-Disable-project_quota-on-old-devices-but-new-enough-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7009b38ea686122a2fc04760cc4ce6c34c85d599 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 19:01:27 -0400
-Subject: [PATCH 19/26] Disable project_quota on old devices but new enough to
- have encryption (they do keep quota support)
-
----
- fs_mgr/fs_mgr.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
-index 38b9d8ffc..6a09ec4a8 100644
---- a/fs_mgr/fs_mgr.cpp
-+++ b/fs_mgr/fs_mgr.cpp
-@@ -384,6 +384,14 @@ static void tune_quota(const std::string& blk_device, const FstabEntry& entry,
-         want_quota = false;
-     }
- 
-+    struct utsname uts;
-+    unsigned int major, minor;
-+
-+    if ((uname(&uts) == 0) && (sscanf(uts.release, "%u.%u", &major, &minor) == 2)) {
-+        if(major < 4) want_projid = false;
-+        if(major == 4 && minor < 9) want_projid = false;
-+    }
-+
-     if (!tune2fs_available()) {
-         LERROR << "Unable to " << (want_quota ? "enable" : "disable") << " quotas on " << blk_device
-                << " because " TUNE2FS_BIN " is missing";
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0020-fix-Nubia-6-series-custom-rc-action-prop-validation.patch b/patches/trebledroid/platform_system_core/0020-fix-Nubia-6-series-custom-rc-action-prop-validation.patch
deleted file mode 100644
index d346325a..00000000
--- a/patches/trebledroid/platform_system_core/0020-fix-Nubia-6-series-custom-rc-action-prop-validation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d8b4dc40b41965c41505f21cd76453e38e22f2b5 Mon Sep 17 00:00:00 2001
-From: Huy Hoang <38396158+boydaihungst@users.noreply.github.com>
-Date: Thu, 19 Oct 2023 07:06:55 +0700
-Subject: [PATCH 20/26] fix: Nubia 6 series custom rc action prop validation
-
----
- init/action_parser.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/init/action_parser.cpp b/init/action_parser.cpp
-index 49fe24a43..f683790e9 100644
---- a/init/action_parser.cpp
-+++ b/init/action_parser.cpp
-@@ -47,6 +47,7 @@ bool IsActionableProperty(Subcontext* subcontext, const std::string& prop_name)
-             "init.svc.vendor.", "ro.vendor.",    "persist.vendor.",
-             "vendor.",          "init.svc.odm.", "ro.odm.",
-             "persist.odm.",     "odm.",          "ro.boot.",
-+            "nubia.perf."
-     };
- 
-     for (const auto& prefix : kPartnerPrefixes) {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0021-HACK-Ignore-errors-when-setting-fscrypt-directory.-S.patch b/patches/trebledroid/platform_system_core/0021-HACK-Ignore-errors-when-setting-fscrypt-directory.-S.patch
deleted file mode 100644
index c8d8ef10..00000000
--- a/patches/trebledroid/platform_system_core/0021-HACK-Ignore-errors-when-setting-fscrypt-directory.-S.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1872981cf538cdd76cdb2806d8ec5514a239ac82 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 23 Nov 2023 11:05:20 -0500
-Subject: [PATCH 21/26] HACK: Ignore errors when setting fscrypt directory.
- Some devices fail to set it on first boot, but is happy later (?!?)
-
----
- init/builtins.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/init/builtins.cpp b/init/builtins.cpp
-index 606ea8c0a..3be6c7cb9 100644
---- a/init/builtins.cpp
-+++ b/init/builtins.cpp
-@@ -430,9 +430,13 @@ static Result<void> make_dir_with_options(const MkdirOptions& options) {
-         }
-     }
-     if (IsFbeEnabled()) {
-+        //TODO FIXME
-+//01-01 06:10:54.928   477   477 E vold    : Failed to set encryption policy of /data/data to be0c03668ef1fddc v1 modes 127/4 flags 0x0: Invalid argument
-+//01-01 06:10:55.927     0     0 W         : c2    477 ext4_process_policy: Policy inconsistent with encryption context
-+//01-01 06:10:55.927     0     0 E         : c2    477 vold: Failed to set encryption policy of /data/data to be0c03668ef1fddc v1 modes 127/4 flags 0x0: Invalid argument
-+
-         if (!FscryptSetDirectoryPolicy(ref_basename, options.fscrypt_action, options.target)) {
--            return reboot_into_recovery(
--                    {"--prompt_and_wipe_data", "--reason=set_policy_failed:"s + options.target});
-+            return {};
-         }
-     }
-     return {};
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0022-Keep-our-own-version-of-ro.logd.kernel.-We-do-want-l.patch b/patches/trebledroid/platform_system_core/0022-Keep-our-own-version-of-ro.logd.kernel.-We-do-want-l.patch
deleted file mode 100644
index dcc92d49..00000000
--- a/patches/trebledroid/platform_system_core/0022-Keep-our-own-version-of-ro.logd.kernel.-We-do-want-l.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ba54501631df4d08e45f576cc57d0b45ee4d85a4 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 25 Nov 2023 09:51:14 -0500
-Subject: [PATCH 22/26] Keep our own version of ro.logd.kernel. We do want
- logcat -b kernel, unlike what OEM set from their vendor
-
----
- init/property_service.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index dbd1e61a5..b2fedebd8 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -815,7 +815,7 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
-                                  << "' with new value '" << value << "'";
-                     if(strcmp("ro.apex.updatable", key) == 0 && !kernel_supports_capex()) {
-                         LOG(WARNING) << "... Ignored apex by kernel version";
--                    } else if(strstr(key, "adb") || strstr(key, "secure")) {
-+                    } else if(strstr(key, "adb") || strstr(key, "secure") || strstr(key, "ro.logd.kernel")) {
-                         LOG(WARNING) << "... Ignored";
-                     } else {
-                         it->second = value;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0023-Keep-capex-when-there-are-vendor-apexes.patch b/patches/trebledroid/platform_system_core/0023-Keep-capex-when-there-are-vendor-apexes.patch
deleted file mode 100644
index 1e7f6014..00000000
--- a/patches/trebledroid/platform_system_core/0023-Keep-capex-when-there-are-vendor-apexes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 246d4313bc8f069c7076401c200d38bcddf9edba Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 16 Jan 2024 10:30:57 -0500
-Subject: [PATCH 23/26] Keep capex when there are vendor apexes
-
-When disabling APEX on Linux < 5, we might break some vendor APEXes
-For instance Pixel 4a on Linux 4.14.
-If there is a vendor apex, enable APEX anyway.
----
- init/property_service.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index b2fedebd8..d049df264 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -712,8 +712,18 @@ static bool kernel_supports_capex() {
-     uname(&buf);
-     const char *where = buf.release;
-     int a = atoi(where);
--    if(a <= 4) return false;
--    return true;
-+    if(a >= 5) return true;
-+
-+    // If there are vendor apexes, we most likely actually need them
-+    auto dir = std::unique_ptr<DIR, decltype(&closedir)>{opendir("/vendor/apex"), closedir};
-+    if (!dir) {
-+        return false;
-+    }
-+    for (struct dirent* ent = readdir(dir.get()); ent; ent = readdir(dir.get())) {
-+        if(strstr(ent->d_name, "apex")) return true;
-+    }
-+
-+    return false;
- }
- 
- /*
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0024-When-setting-ro.apex.updatable-actually-set-the-valu.patch b/patches/trebledroid/platform_system_core/0024-When-setting-ro.apex.updatable-actually-set-the-valu.patch
deleted file mode 100644
index 772171ab..00000000
--- a/patches/trebledroid/platform_system_core/0024-When-setting-ro.apex.updatable-actually-set-the-valu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 5dae6081e9ef518d7670c62c431229cc88cbde32 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Thu, 25 Jan 2024 15:20:10 -0500
-Subject: [PATCH 24/26] When setting ro.apex.updatable, actually set the value
-
-Before this change, we were only changing the override, but on newest
-Android 14 vendor, they don't explicitly set ro.apex.updatable=true
-so there is no override.
-But we do want apex for them (notably for vendor apex),
-hence always set based on kernel version.
-
-This fixes boot on Samsung Galaxy S24
----
- init/property_service.cpp | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index d049df264..0c12512e0 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -818,17 +818,22 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
-             std::string error;
-             if (CheckPermissions(key, value, context, cr, &error) == PROP_SUCCESS) {
-                 auto it = properties->find(key);
-+                const char *new_value = value;
-+
-+                if(strcmp("ro.apex.updatable", key) == 0) {
-+                    new_value = kernel_supports_capex() ? "true" : "false";
-+                }
-                 if (it == properties->end()) {
--                    (*properties)[key] = value;
--                } else if (it->second != value) {
-+                    (*properties)[key] = new_value;
-+                } else if (it->second != new_value) {
-                     LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
-                                  << "' with new value '" << value << "'";
--                    if(strcmp("ro.apex.updatable", key) == 0 && !kernel_supports_capex()) {
-+                    if(strcmp("ro.apex.updatable", key) == 0) {
-                         LOG(WARNING) << "... Ignored apex by kernel version";
-                     } else if(strstr(key, "adb") || strstr(key, "secure") || strstr(key, "ro.logd.kernel")) {
-                         LOG(WARNING) << "... Ignored";
-                     } else {
--                        it->second = value;
-+                        it->second = new_value;
-                     }
- 		}
-             } else {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0025-If-AVB-fails-ignore-disable-AVB.patch b/patches/trebledroid/platform_system_core/0025-If-AVB-fails-ignore-disable-AVB.patch
deleted file mode 100644
index cd2ab395..00000000
--- a/patches/trebledroid/platform_system_core/0025-If-AVB-fails-ignore-disable-AVB.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 7bb1ee6a7dda3ae5b7a8545a32fe248001539fb3 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sun, 31 Mar 2024 17:18:05 -0400
-Subject: [PATCH 25/26] If AVB fails, ignore/disable AVB
-
-DO NOT INCLUDE THIS PATCH If you want to run GSIs on a locked bootloader
-
-This is needed on Honor View 10 which declares "avb" in fstab while
-being AVB1.0
----
- init/first_stage_init.cpp  |  6 +++++-
- init/first_stage_mount.cpp | 10 +++++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
-index c4d0f758d..0470444ff 100644
---- a/init/first_stage_init.cpp
-+++ b/init/first_stage_init.cpp
-@@ -520,7 +520,11 @@ int FirstStageMain(int argc, char** argv) {
-         }
- 
-         if (!created_devices && !fsm->DoCreateDevices()) {
--            LOG(FATAL) << "Failed to create devices required for first stage mount";
-+            LOG(ERROR) << "Failed to create devices required for first stage mount, retrying without avb";
-+            fsm = CreateFirstStageMount(cmdline + " no_vbmeta");
-+            if(!fsm->DoCreateDevices()) {
-+                LOG(FATAL) << "Failed to create devices required for first stage mount, retrying without avb";
-+            }
-         }
- 
-         if (!fsm->DoFirstStageMount()) {
-diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
-index 4f5293771..5d58db6f4 100644
---- a/init/first_stage_mount.cpp
-+++ b/init/first_stage_mount.cpp
-@@ -231,6 +231,12 @@ Result<std::unique_ptr<FirstStageMount>> FirstStageMount::Create(const std::stri
-     } else {
-         fstab = ReadFirstStageFstabAndroid();
-     }
-+    if (cmdline.find("no_vbmeta") != std::string::npos) {
-+        for(auto& part: *fstab) {
-+            part.avb_keys = "";
-+            part.fs_mgr_flags.avb = false;
-+        }
-+    }
-     if (!fstab.ok()) {
-         return fstab.error();
-     }
-@@ -267,7 +273,9 @@ bool FirstStageMountVBootV2::DoFirstStageMount() {
-         return true;
-     }
- 
--    if (!MountPartitions()) return false;
-+    if (!MountPartitions()) {
-+        return false;
-+    }
- 
-     return true;
- }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_core/0026-Flattened-apexes-no-longer-exist-we-ll-deal-with-it-.patch b/patches/trebledroid/platform_system_core/0026-Flattened-apexes-no-longer-exist-we-ll-deal-with-it-.patch
deleted file mode 100644
index 757cc02a..00000000
--- a/patches/trebledroid/platform_system_core/0026-Flattened-apexes-no-longer-exist-we-ll-deal-with-it-.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 31c5deb1b46d3a9e746f7f6536191e3ff5f28ddb Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 2 Apr 2024 16:53:08 -0400
-Subject: [PATCH 26/26] Flattened apexes no longer exist, we'll deal with it
- another way
-
----
- init/property_service.cpp | 22 +---------------------
- 1 file changed, 1 insertion(+), 21 deletions(-)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 0c12512e0..be6ccaad3 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -706,26 +706,6 @@ uint32_t InitPropertySet(const std::string& name, const std::string& value) {
- static Result<void> load_properties_from_file(const char*, const char*,
-                                               std::map<std::string, std::string>*);
- 
--static bool kernel_supports_capex() {
--    //Put a threshold at >= 5.0
--    struct utsname buf;
--    uname(&buf);
--    const char *where = buf.release;
--    int a = atoi(where);
--    if(a >= 5) return true;
--
--    // If there are vendor apexes, we most likely actually need them
--    auto dir = std::unique_ptr<DIR, decltype(&closedir)>{opendir("/vendor/apex"), closedir};
--    if (!dir) {
--        return false;
--    }
--    for (struct dirent* ent = readdir(dir.get()); ent; ent = readdir(dir.get())) {
--        if(strstr(ent->d_name, "apex")) return true;
--    }
--
--    return false;
--}
--
- /*
-  * Filter is used to decide which properties to load: NULL loads all keys,
-  * "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.
-@@ -821,7 +801,7 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
-                 const char *new_value = value;
- 
-                 if(strcmp("ro.apex.updatable", key) == 0) {
--                    new_value = kernel_supports_capex() ? "true" : "false";
-+                    new_value = "true";
-                 }
-                 if (it == properties->end()) {
-                     (*properties)[key] = new_value;
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch b/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
deleted file mode 100644
index 5798fe34..00000000
--- a/patches/trebledroid/platform_system_extras/0001-libfscrypt-Bail-out-if-we-can-t-open-directory.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e12cf11ceb1981a28ac2826407ca3c99a92bb01e Mon Sep 17 00:00:00 2001
-From: Luca Stefani <luca.stefani.ge1@gmail.com>
-Date: Wed, 9 Sep 2020 12:43:54 +0200
-Subject: [PATCH] libfscrypt: Bail out if we can't open directory
-
-* On QCOM Q vendor init.qcom.rc has a 'mkdir' entry
-  for /data/system
-* While the encryption policy matches and is applied properly in
-  permissive, vendor_init doesn't have enough perms to open
-  and run ioctl over system_data_file to check its policy
-* Instead of opening the possiblity to vendors, just
-  bail out if we fail to open the directory
-
-Test: m, boot r-gsi on Zenfone 6
-Change-Id: I5ea37019221cd0887b8a5d7454f5a42ac01335c7
----
- libfscrypt/fscrypt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libfscrypt/fscrypt.cpp b/libfscrypt/fscrypt.cpp
-index 4c756b18..f3b106e9 100644
---- a/libfscrypt/fscrypt.cpp
-+++ b/libfscrypt/fscrypt.cpp
-@@ -354,7 +354,7 @@ bool EnsurePolicy(const EncryptionPolicy& policy, const std::string& directory)
-     android::base::unique_fd fd(open(directory.c_str(), O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC));
-     if (fd == -1) {
-         PLOG(ERROR) << "Failed to open directory " << directory;
--        return false;
-+        return true;
-     }
- 
-     bool already_encrypted = fscrypt_is_encrypted(fd);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch b/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
deleted file mode 100644
index 02e053e6..00000000
--- a/patches/trebledroid/platform_system_linkerconfig/0001-Disable-vndklite-handling.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1aab47c48e3c3d4b1c12a25f9cd5b8d169683ffc Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 27 Oct 2021 14:40:26 -0400
-Subject: [PATCH] Disable vndklite handling
-
-Change-Id: I4a132512471a68891f2efb59539267c35a3c3e56
----
- modules/environment.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/environment.cc b/modules/environment.cc
-index 01e520e..e4991c2 100644
---- a/modules/environment.cc
-+++ b/modules/environment.cc
-@@ -28,7 +28,7 @@ bool IsTreblelizedDevice() {
- }
- 
- bool IsVndkLiteDevice() {
--  return Variables::GetValue("ro.vndk.lite").value_or("") == "true";
-+  return false;
- }
- 
- bool IsVndkInSystemNamespace() {
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch b/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
deleted file mode 100644
index 3ea6268d..00000000
--- a/patches/trebledroid/platform_system_netd/0001-Huawei-Kirin-960-accept-broken-rpfilter-match.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b5397cc4cdb7901887abe737405f6ef2aa652369 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 2 Jul 2018 22:01:43 +0200
-Subject: [PATCH 1/4] Huawei Kirin 960:: accept broken rpfilter match
-
-How bad a security flaw is this?
-People lived with rpfilter on IPv4 for a very long time...
-
-Change-Id: I9aa63d18e54a8254133adf97bf757c03d6b66757
----
- server/TetherController.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/TetherController.cpp b/server/TetherController.cpp
-index 03185e71..a890d60c 100644
---- a/server/TetherController.cpp
-+++ b/server/TetherController.cpp
-@@ -718,7 +718,7 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
-         "*raw\n"
-         "%s %s -i %s -m rpfilter --invert ! -s fe80::/64 -j DROP\n"
-         "COMMIT\n", op, LOCAL_RAW_PREROUTING, intIface);
--    if (iptablesRestoreFunction(V6, rpfilterCmd, nullptr) == -1 && add) {
-+    if (iptablesRestoreFunction(V6, rpfilterCmd, nullptr) == -1 && add && false) {
-         return -EREMOTEIO;
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch b/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
deleted file mode 100644
index be1345b1..00000000
--- a/patches/trebledroid/platform_system_netd/0002-Don-t-fail-on-FTP-conntracking-failing.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6e55ef31fb304703c6a312d66f106d937b1f6151 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 29 Jul 2019 18:09:12 +0200
-Subject: [PATCH 2/4] Don't fail on FTP conntracking failing
-
-The issue has been seen on some Samsung devices.
-See https://github.com/phhusson/treble_experimentations/issues/425
-
-Thanks @zamrih for pin-pointing the issue and validating fix
-
-Change-Id: I3d9c865eb5a4b421f9983210c2ceae62b4906234
----
- server/TetherController.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/server/TetherController.cpp b/server/TetherController.cpp
-index a890d60c..88e7f52b 100644
---- a/server/TetherController.cpp
-+++ b/server/TetherController.cpp
-@@ -722,13 +722,19 @@ int TetherController::setForwardRules(bool add, const char *intIface, const char
-         return -EREMOTEIO;
-     }
- 
--    std::vector<std::string> v4 = {
-+    std::vector<std::string> v4Ftp = {
-             "*raw",
--            StringPrintf("%s %s -p tcp --dport 21 -i %s -j CT --helper ftp", op,
--                         LOCAL_RAW_PREROUTING, intIface),
-+            StringPrintf("%s %s -p tcp --dport 21 -i %s -j CT --helper ftp",
-+                            op, LOCAL_RAW_PREROUTING, intIface),
-             StringPrintf("%s %s -p tcp --dport 1723 -i %s -j CT --helper pptp", op,
-                          LOCAL_RAW_PREROUTING, intIface),
-             "COMMIT",
-+    };
-+    if(iptablesRestoreFunction(V4, Join(v4Ftp, '\n'), nullptr) == -1) {
-+            ALOGE("Failed adding iptables CT target on FTP.");
-+    }
-+
-+    std::vector<std::string> v4 = {
-             "*filter",
-             StringPrintf("%s %s -i %s -o %s -m state --state ESTABLISHED,RELATED -g %s", op,
-                          LOCAL_FORWARD, extIface, intIface, LOCAL_TETHER_COUNTERS_CHAIN),
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch b/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch
deleted file mode 100644
index 9b49bde6..00000000
--- a/patches/trebledroid/platform_system_netd/0003-Support-no-bpf-usecase.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7995aba04c82cf2a8d47b2d3f6c45959470135ec Mon Sep 17 00:00:00 2001
-From: ChonDoit <thphantomblog@gmail.com>
-Date: Fri, 7 Oct 2022 02:43:21 +0000
-Subject: [PATCH 3/4] Support no-bpf usecase
-
-Change-Id: Ic759e2cfaf11705169a4a6b677b0e5aca26907b3
----
- server/Controllers.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/Controllers.cpp b/server/Controllers.cpp
-index 87b2c55d..1a027210 100644
---- a/server/Controllers.cpp
-+++ b/server/Controllers.cpp
-@@ -321,7 +321,7 @@ void Controllers::init() {
-         // As such simply exit netd.  This may crash loop the system, but by failing
-         // to bootup we will trigger rollback and thus this offers us protection against
-         // a mainline update breaking things.
--        exit(1);
-+        // exit(1);
-     }
-     gLog.info("Enabling bandwidth control: %" PRId64 "us", s.getTimeAndResetUs());
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch b/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch
deleted file mode 100644
index 671b43f1..00000000
--- a/patches/trebledroid/platform_system_netd/0004-Don-t-abort-in-case-of-cgroup-bpf-setup-fail-since-s.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 60e8ec91fa93bbd5f190cb70563c0b57f101ad21 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 26 Oct 2022 18:13:56 -0400
-Subject: [PATCH 4/4] Don't abort in case of cgroup/bpf setup fail, since some
- devices dont have BPF
-
----
- server/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/main.cpp b/server/main.cpp
-index b0c5406d..ec15ecc2 100644
---- a/server/main.cpp
-+++ b/server/main.cpp
-@@ -145,7 +145,7 @@ int main() {
- 
-     if (libnetd_updatable_init(cg2_path.c_str())) {
-         ALOGE("libnetd_updatable_init failed");
--        exit(1);
-+        //exit(1);
-     }
-     gLog.info("libnetd_updatable_init success");
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch b/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch
deleted file mode 100644
index 4458185d..00000000
--- a/patches/trebledroid/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 01bbd8b5fec55a315c5cdd9fbed0cf541ae54d88 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 21 Dec 2020 19:36:54 +0100
-Subject: [PATCH] Let vendor have priority over NFC config file, rather than
- GSI
-
-Thanks @mikalovtch
-
-Change-Id: Iaee468f3b8e5c8ec90ca7e856a6526d1cbcaa33e
----
- src/adaptation/nfc_config.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/adaptation/nfc_config.cc b/src/adaptation/nfc_config.cc
-index f635fd50..15d42cab 100644
---- a/src/adaptation/nfc_config.cc
-+++ b/src/adaptation/nfc_config.cc
-@@ -30,7 +30,7 @@ using namespace ::android::base;
- namespace {
- std::string searchConfigPath(std::string file_name) {
-   const std::vector<std::string> search_path = {
--      "/product/etc/", "/odm/etc/", "/vendor/etc/", "/system_ext/etc/", "/etc/",
-+      "/odm/etc/", "/vendor/etc/", "/product/etc/", "/system_ext/etc/", "/etc/",
-   };
-   for (std::string path : search_path) {
-     path.append(file_name);
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch b/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch
deleted file mode 100644
index bc7c65c2..00000000
--- a/patches/trebledroid/platform_system_sepolicy/0001-Revert-Remove-28.0-compat-support.patch
+++ /dev/null
@@ -1,34429 +0,0 @@
-From fecc9c53064d4d3bc9186e9e1ed875fb3d93a517 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Fri, 6 Oct 2023 08:25:11 -0400
-Subject: [PATCH 1/2] Revert "Remove 28.0 compat support"
-
-This reverts commit d16612cd8aed0de2ca889174f1a7033137260ecd.
-
-Change-Id: I2b0c61ced1f9651f74da85d1228d7260cc782c80
----
- compat/Android.bp                             |   62 +
- prebuilts/api/28.0/private/access_vectors     |  726 +++++
- prebuilts/api/28.0/private/adbd.te            |  148 +
- prebuilts/api/28.0/private/app.te             |    7 +
- prebuilts/api/28.0/private/app_neverallows.te |  262 ++
- prebuilts/api/28.0/private/asan_extract.te    |    8 +
- prebuilts/api/28.0/private/atrace.te          |   46 +
- prebuilts/api/28.0/private/audioserver.te     |   88 +
- .../private/binder_in_vendor_violators.te     |    1 +
- .../api/28.0/private/binderservicedomain.te   |   22 +
- prebuilts/api/28.0/private/blank_screen.te    |    6 +
- prebuilts/api/28.0/private/blkid.te           |   22 +
- prebuilts/api/28.0/private/blkid_untrusted.te |   37 +
- prebuilts/api/28.0/private/bluetooth.te       |   80 +
- prebuilts/api/28.0/private/bluetoothdomain.te |    2 +
- prebuilts/api/28.0/private/bootanim.te        |    6 +
- prebuilts/api/28.0/private/bootstat.te        |    3 +
- prebuilts/api/28.0/private/bpfloader.te       |   30 +
- prebuilts/api/28.0/private/bufferhubd.te      |    3 +
- prebuilts/api/28.0/private/bug_map            |   45 +
- prebuilts/api/28.0/private/cameraserver.te    |    3 +
- prebuilts/api/28.0/private/charger.te         |    1 +
- prebuilts/api/28.0/private/clatd.te           |    1 +
- prebuilts/api/28.0/private/coredomain.te      |   15 +
- prebuilts/api/28.0/private/cppreopts.te       |    6 +
- prebuilts/api/28.0/private/crash_dump.te      |   14 +
- prebuilts/api/28.0/private/dex2oat.te         |    1 +
- prebuilts/api/28.0/private/dexoptanalyzer.te  |   30 +
- prebuilts/api/28.0/private/dhcp.te            |    4 +
- prebuilts/api/28.0/private/dnsmasq.te         |    1 +
- prebuilts/api/28.0/private/domain.te          |  118 +
- prebuilts/api/28.0/private/drmserver.te       |    7 +
- prebuilts/api/28.0/private/dumpstate.te       |   47 +
- prebuilts/api/28.0/private/ephemeral_app.te   |   81 +
- prebuilts/api/28.0/private/file.te            |   16 +
- prebuilts/api/28.0/private/file_contexts      |  541 ++++
- prebuilts/api/28.0/private/file_contexts_asan |   11 +
- prebuilts/api/28.0/private/fingerprintd.te    |    3 +
- prebuilts/api/28.0/private/fs_use             |   22 +
- prebuilts/api/28.0/private/fsck.te            |    5 +
- prebuilts/api/28.0/private/fsck_untrusted.te  |    1 +
- prebuilts/api/28.0/private/gatekeeperd.te     |    3 +
- prebuilts/api/28.0/private/genfs_contexts     |  244 ++
- .../api/28.0/private/hal_allocator_default.te |    5 +
- prebuilts/api/28.0/private/halclientdomain.te |   13 +
- prebuilts/api/28.0/private/halserverdomain.te |   12 +
- prebuilts/api/28.0/private/healthd.te         |    6 +
- prebuilts/api/28.0/private/hwservice_contexts |   71 +
- .../api/28.0/private/hwservicemanager.te      |    8 +
- prebuilts/api/28.0/private/idmap.te           |    1 +
- prebuilts/api/28.0/private/incident.te        |   30 +
- prebuilts/api/28.0/private/incident_helper.te |   14 +
- prebuilts/api/28.0/private/incidentd.te       |  165 +
- prebuilts/api/28.0/private/init.te            |   22 +
- .../api/28.0/private/initial_sid_contexts     |   27 +
- prebuilts/api/28.0/private/initial_sids       |   35 +
- prebuilts/api/28.0/private/inputflinger.te    |    3 +
- .../api/28.0/private/install_recovery.te      |    3 +
- prebuilts/api/28.0/private/installd.te        |   22 +
- prebuilts/api/28.0/private/isolated_app.te    |  119 +
- prebuilts/api/28.0/private/kernel.te          |    3 +
- prebuilts/api/28.0/private/keys.conf          |   24 +
- prebuilts/api/28.0/private/keystore.te        |   19 +
- prebuilts/api/28.0/private/lmkd.te            |    3 +
- prebuilts/api/28.0/private/logd.te            |   39 +
- prebuilts/api/28.0/private/logpersist.te      |   24 +
- .../api/28.0/private/mac_permissions.xml      |   59 +
- prebuilts/api/28.0/private/mdnsd.te           |   12 +
- prebuilts/api/28.0/private/mediadrmserver.te  |    7 +
- prebuilts/api/28.0/private/mediaextractor.te  |    3 +
- prebuilts/api/28.0/private/mediametrics.te    |    3 +
- prebuilts/api/28.0/private/mediaprovider.te   |   43 +
- prebuilts/api/28.0/private/mediaserver.te     |   11 +
- prebuilts/api/28.0/private/mls                |  100 +
- prebuilts/api/28.0/private/mls_decl           |   10 +
- prebuilts/api/28.0/private/mls_macros         |   54 +
- prebuilts/api/28.0/private/modprobe.te        |    1 +
- prebuilts/api/28.0/private/mtp.te             |    3 +
- prebuilts/api/28.0/private/net.te             |   24 +
- prebuilts/api/28.0/private/netd.te            |   15 +
- .../api/28.0/private/netutils_wrapper.te      |   41 +
- prebuilts/api/28.0/private/nfc.te             |   34 +
- .../api/28.0/private/otapreopt_chroot.te      |    4 +
- prebuilts/api/28.0/private/otapreopt_slot.te  |    5 +
- prebuilts/api/28.0/private/perfetto.te        |   68 +
- prebuilts/api/28.0/private/performanced.te    |    3 +
- prebuilts/api/28.0/private/perfprofd.te       |    8 +
- prebuilts/api/28.0/private/platform_app.te    |   85 +
- .../api/28.0/private/policy_capabilities      |   12 +
- prebuilts/api/28.0/private/port_contexts      |    2 +
- prebuilts/api/28.0/private/postinstall.te     |    3 +
- .../api/28.0/private/postinstall_dexopt.te    |    5 +
- prebuilts/api/28.0/private/ppp.te             |    3 +
- .../api/28.0/private/preopt2cachename.te      |    1 +
- prebuilts/api/28.0/private/priv_app.te        |  206 ++
- prebuilts/api/28.0/private/profman.te         |    1 +
- prebuilts/api/28.0/private/property_contexts  |  147 +
- prebuilts/api/28.0/private/racoon.te          |    3 +
- prebuilts/api/28.0/private/radio.te           |    5 +
- prebuilts/api/28.0/private/recovery.te        |    1 +
- .../api/28.0/private/recovery_persist.te      |    7 +
- .../api/28.0/private/recovery_refresh.te      |    7 +
- prebuilts/api/28.0/private/roles_decl         |    1 +
- prebuilts/api/28.0/private/runas.te           |    4 +
- prebuilts/api/28.0/private/sdcardd.te         |    3 +
- prebuilts/api/28.0/private/seapp_contexts     |  118 +
- prebuilts/api/28.0/private/secure_element.te  |   14 +
- prebuilts/api/28.0/private/security_classes   |  146 +
- prebuilts/api/28.0/private/service.te         |    2 +
- prebuilts/api/28.0/private/service_contexts   |  188 ++
- prebuilts/api/28.0/private/servicemanager.te  |    5 +
- prebuilts/api/28.0/private/sgdisk.te          |    1 +
- prebuilts/api/28.0/private/shared_relro.te    |    5 +
- prebuilts/api/28.0/private/shell.te           |   53 +
- prebuilts/api/28.0/private/slideshow.te       |    1 +
- prebuilts/api/28.0/private/stats.te           |   24 +
- prebuilts/api/28.0/private/statsd.te          |  116 +
- prebuilts/api/28.0/private/storaged.te        |   61 +
- prebuilts/api/28.0/private/su.te              |   23 +
- prebuilts/api/28.0/private/surfaceflinger.te  |  121 +
- prebuilts/api/28.0/private/system_app.te      |  129 +
- prebuilts/api/28.0/private/system_server.te   |  868 ++++++
- prebuilts/api/28.0/private/technical_debt.cil |   38 +
- prebuilts/api/28.0/private/thermalserviced.te |    3 +
- prebuilts/api/28.0/private/tombstoned.te      |    3 +
- prebuilts/api/28.0/private/toolbox.te         |    3 +
- prebuilts/api/28.0/private/traced.te          |   60 +
- prebuilts/api/28.0/private/traced_probes.te   |   99 +
- prebuilts/api/28.0/private/traceur_app.te     |   15 +
- prebuilts/api/28.0/private/tzdatacheck.te     |    3 +
- prebuilts/api/28.0/private/ueventd.te         |    3 +
- prebuilts/api/28.0/private/uncrypt.te         |    3 +
- prebuilts/api/28.0/private/untrusted_app.te   |   25 +
- .../api/28.0/private/untrusted_app_25.te      |   42 +
- .../api/28.0/private/untrusted_app_27.te      |   28 +
- .../api/28.0/private/untrusted_app_all.te     |  140 +
- .../api/28.0/private/untrusted_v2_app.te      |   47 +
- prebuilts/api/28.0/private/update_engine.te   |    3 +
- .../api/28.0/private/update_engine_common.te  |    5 +
- prebuilts/api/28.0/private/update_verifier.te |    3 +
- prebuilts/api/28.0/private/usbd.te            |   12 +
- prebuilts/api/28.0/private/users              |    1 +
- prebuilts/api/28.0/private/vdc.te             |    3 +
- prebuilts/api/28.0/private/vendor_init.te     |    4 +
- .../api/28.0/private/virtual_touchpad.te      |    3 +
- prebuilts/api/28.0/private/vold.te            |   19 +
- .../api/28.0/private/vold_prepare_subdirs.te  |   26 +
- prebuilts/api/28.0/private/vr_hwc.te          |    6 +
- .../api/28.0/private/wait_for_keymaster.te    |    9 +
- prebuilts/api/28.0/private/watchdogd.te       |    1 +
- prebuilts/api/28.0/private/webview_zygote.te  |  140 +
- prebuilts/api/28.0/private/wificond.te        |    4 +
- prebuilts/api/28.0/private/wpantund.te        |    3 +
- prebuilts/api/28.0/private/zygote.te          |  140 +
- prebuilts/api/28.0/public/adbd.te             |    4 +
- prebuilts/api/28.0/public/app.te              |  572 ++++
- prebuilts/api/28.0/public/asan_extract.te     |   36 +
- prebuilts/api/28.0/public/attributes          |  311 ++
- prebuilts/api/28.0/public/audioserver.te      |    2 +
- prebuilts/api/28.0/public/blkid.te            |    2 +
- prebuilts/api/28.0/public/blkid_untrusted.te  |    2 +
- prebuilts/api/28.0/public/bluetooth.te        |    2 +
- prebuilts/api/28.0/public/bootanim.te         |   41 +
- prebuilts/api/28.0/public/bootstat.te         |   57 +
- prebuilts/api/28.0/public/bufferhubd.te       |   20 +
- prebuilts/api/28.0/public/cameraserver.te     |   65 +
- prebuilts/api/28.0/public/charger.te          |   45 +
- prebuilts/api/28.0/public/clatd.te            |   33 +
- prebuilts/api/28.0/public/cppreopts.te        |   22 +
- prebuilts/api/28.0/public/crash_dump.te       |   65 +
- prebuilts/api/28.0/public/device.te           |  106 +
- prebuilts/api/28.0/public/dex2oat.te          |   66 +
- prebuilts/api/28.0/public/dhcp.te             |   30 +
- .../api/28.0/public/display_service_server.te |    1 +
- prebuilts/api/28.0/public/dnsmasq.te          |   25 +
- prebuilts/api/28.0/public/domain.te           | 1399 +++++++++
- prebuilts/api/28.0/public/drmserver.te        |   58 +
- prebuilts/api/28.0/public/dumpstate.te        |  289 ++
- prebuilts/api/28.0/public/e2fs.te             |   22 +
- prebuilts/api/28.0/public/ephemeral_app.te    |   14 +
- prebuilts/api/28.0/public/file.te             |  411 +++
- prebuilts/api/28.0/public/fingerprintd.te     |   26 +
- prebuilts/api/28.0/public/fsck.te             |   57 +
- prebuilts/api/28.0/public/fsck_untrusted.te   |   49 +
- prebuilts/api/28.0/public/gatekeeperd.te      |   39 +
- prebuilts/api/28.0/public/global_macros       |   50 +
- prebuilts/api/28.0/public/hal_allocator.te    |    6 +
- prebuilts/api/28.0/public/hal_audio.te        |   38 +
- prebuilts/api/28.0/public/hal_audiocontrol.te |    7 +
- prebuilts/api/28.0/public/hal_authsecret.te   |    5 +
- prebuilts/api/28.0/public/hal_bluetooth.te    |   32 +
- prebuilts/api/28.0/public/hal_bootctl.te      |    8 +
- .../api/28.0/public/hal_broadcastradio.te     |    4 +
- prebuilts/api/28.0/public/hal_camera.te       |   33 +
- prebuilts/api/28.0/public/hal_cas.te          |   35 +
- prebuilts/api/28.0/public/hal_configstore.te  |   71 +
- .../api/28.0/public/hal_confirmationui.te     |    5 +
- prebuilts/api/28.0/public/hal_contexthub.te   |    6 +
- prebuilts/api/28.0/public/hal_drm.te          |   53 +
- prebuilts/api/28.0/public/hal_dumpstate.te    |   11 +
- prebuilts/api/28.0/public/hal_evs.te          |    4 +
- prebuilts/api/28.0/public/hal_fingerprint.te  |   15 +
- prebuilts/api/28.0/public/hal_gatekeeper.te   |    8 +
- prebuilts/api/28.0/public/hal_gnss.te         |    6 +
- .../api/28.0/public/hal_graphics_allocator.te |   13 +
- .../api/28.0/public/hal_graphics_composer.te  |   26 +
- prebuilts/api/28.0/public/hal_health.te       |   30 +
- prebuilts/api/28.0/public/hal_ir.te           |    6 +
- prebuilts/api/28.0/public/hal_keymaster.te    |    8 +
- prebuilts/api/28.0/public/hal_light.te        |   10 +
- prebuilts/api/28.0/public/hal_lowpan.te       |   21 +
- prebuilts/api/28.0/public/hal_memtrack.te     |    5 +
- .../api/28.0/public/hal_neuralnetworks.te     |    8 +
- prebuilts/api/28.0/public/hal_neverallows.te  |   59 +
- prebuilts/api/28.0/public/hal_nfc.te          |   12 +
- prebuilts/api/28.0/public/hal_oemlock.te      |    5 +
- prebuilts/api/28.0/public/hal_power.te        |    6 +
- .../api/28.0/public/hal_secure_element.te     |    6 +
- prebuilts/api/28.0/public/hal_sensors.te      |   15 +
- prebuilts/api/28.0/public/hal_telephony.te    |   46 +
- .../api/28.0/public/hal_tetheroffload.te      |    8 +
- prebuilts/api/28.0/public/hal_thermal.te      |    6 +
- prebuilts/api/28.0/public/hal_tv_cec.te       |    6 +
- prebuilts/api/28.0/public/hal_tv_input.te     |    6 +
- prebuilts/api/28.0/public/hal_usb.te          |   17 +
- prebuilts/api/28.0/public/hal_usb_gadget.te   |   13 +
- prebuilts/api/28.0/public/hal_vehicle.te      |    7 +
- prebuilts/api/28.0/public/hal_vibrator.te     |    9 +
- prebuilts/api/28.0/public/hal_vr.te           |    6 +
- prebuilts/api/28.0/public/hal_weaver.te       |    5 +
- prebuilts/api/28.0/public/hal_wifi.te         |   32 +
- prebuilts/api/28.0/public/hal_wifi_hostapd.te |   28 +
- prebuilts/api/28.0/public/hal_wifi_offload.te |    9 +
- .../api/28.0/public/hal_wifi_supplicant.te    |   29 +
- prebuilts/api/28.0/public/healthd.te          |   58 +
- prebuilts/api/28.0/public/hwservice.te        |   62 +
- prebuilts/api/28.0/public/hwservicemanager.te |   22 +
- prebuilts/api/28.0/public/idmap.te            |   20 +
- prebuilts/api/28.0/public/incident.te         |    7 +
- prebuilts/api/28.0/public/incident_helper.te  |    5 +
- prebuilts/api/28.0/public/incidentd.te        |    2 +
- prebuilts/api/28.0/public/init.te             |  509 ++++
- prebuilts/api/28.0/public/inputflinger.te     |   16 +
- prebuilts/api/28.0/public/install_recovery.te |   27 +
- prebuilts/api/28.0/public/installd.te         |  160 +
- prebuilts/api/28.0/public/ioctl_defines       | 2694 +++++++++++++++++
- prebuilts/api/28.0/public/ioctl_macros        |   68 +
- prebuilts/api/28.0/public/isolated_app.te     |    9 +
- prebuilts/api/28.0/public/kernel.te           |  105 +
- prebuilts/api/28.0/public/keystore.te         |   35 +
- prebuilts/api/28.0/public/lmkd.te             |   52 +
- prebuilts/api/28.0/public/logd.te             |   73 +
- prebuilts/api/28.0/public/logpersist.te       |   26 +
- prebuilts/api/28.0/public/mdnsd.te            |    2 +
- prebuilts/api/28.0/public/mediacodec.te       |   70 +
- prebuilts/api/28.0/public/mediadrmserver.te   |   31 +
- prebuilts/api/28.0/public/mediaextractor.te   |   74 +
- prebuilts/api/28.0/public/mediametrics.te     |   41 +
- prebuilts/api/28.0/public/mediaprovider.te    |    6 +
- prebuilts/api/28.0/public/mediaserver.te      |  147 +
- prebuilts/api/28.0/public/modprobe.te         |    9 +
- prebuilts/api/28.0/public/mtp.te              |   11 +
- prebuilts/api/28.0/public/net.te              |    4 +
- prebuilts/api/28.0/public/netd.te             |  148 +
- prebuilts/api/28.0/public/netutils_wrapper.te |    4 +
- prebuilts/api/28.0/public/neverallow_macros   |   15 +
- prebuilts/api/28.0/public/nfc.te              |    2 +
- prebuilts/api/28.0/public/otapreopt_chroot.te |   20 +
- prebuilts/api/28.0/public/otapreopt_slot.te   |   27 +
- prebuilts/api/28.0/public/performanced.te     |   30 +
- prebuilts/api/28.0/public/perfprofd.te        |  119 +
- prebuilts/api/28.0/public/platform_app.te     |    5 +
- prebuilts/api/28.0/public/postinstall.te      |   36 +
- .../api/28.0/public/postinstall_dexopt.te     |   59 +
- prebuilts/api/28.0/public/ppp.te              |   23 +
- prebuilts/api/28.0/public/preopt2cachename.te |   13 +
- prebuilts/api/28.0/public/priv_app.te         |    5 +
- prebuilts/api/28.0/public/profman.te          |   29 +
- prebuilts/api/28.0/public/property.te         |  414 +++
- prebuilts/api/28.0/public/property_contexts   |  310 ++
- prebuilts/api/28.0/public/racoon.te           |   33 +
- prebuilts/api/28.0/public/radio.te            |   41 +
- prebuilts/api/28.0/public/recovery.te         |  161 +
- prebuilts/api/28.0/public/recovery_persist.te |   26 +
- prebuilts/api/28.0/public/recovery_refresh.te |   24 +
- prebuilts/api/28.0/public/roles               |    1 +
- prebuilts/api/28.0/public/runas.te            |   42 +
- prebuilts/api/28.0/public/sdcardd.te          |   43 +
- prebuilts/api/28.0/public/secure_element.te   |    2 +
- prebuilts/api/28.0/public/service.te          |  161 +
- prebuilts/api/28.0/public/servicemanager.te   |   25 +
- prebuilts/api/28.0/public/sgdisk.te           |   22 +
- prebuilts/api/28.0/public/shared_relro.te     |   10 +
- prebuilts/api/28.0/public/shell.te            |  226 ++
- prebuilts/api/28.0/public/slideshow.te        |   13 +
- prebuilts/api/28.0/public/su.te               |  100 +
- prebuilts/api/28.0/public/surfaceflinger.te   |    2 +
- prebuilts/api/28.0/public/system_app.te       |    7 +
- prebuilts/api/28.0/public/system_server.te    |    5 +
- prebuilts/api/28.0/public/te_macros           |  597 ++++
- prebuilts/api/28.0/public/tee.te              |   10 +
- prebuilts/api/28.0/public/thermalserviced.te  |   13 +
- prebuilts/api/28.0/public/tombstoned.te       |   22 +
- prebuilts/api/28.0/public/toolbox.te          |   24 +
- prebuilts/api/28.0/public/traced_probes.te    |    1 +
- prebuilts/api/28.0/public/traceur_app.te      |   21 +
- prebuilts/api/28.0/public/tzdatacheck.te      |   18 +
- prebuilts/api/28.0/public/ueventd.te          |   57 +
- prebuilts/api/28.0/public/uncrypt.te          |   45 +
- prebuilts/api/28.0/public/untrusted_app.te    |   21 +
- prebuilts/api/28.0/public/untrusted_v2_app.te |    5 +
- prebuilts/api/28.0/public/update_engine.te    |   58 +
- .../api/28.0/public/update_engine_common.te   |   45 +
- prebuilts/api/28.0/public/update_verifier.te  |   31 +
- prebuilts/api/28.0/public/usbd.te             |    2 +
- prebuilts/api/28.0/public/vdc.te              |   20 +
- prebuilts/api/28.0/public/vendor_init.te      |  198 ++
- prebuilts/api/28.0/public/vendor_shell.te     |   19 +
- prebuilts/api/28.0/public/vendor_toolbox.te   |   16 +
- prebuilts/api/28.0/public/virtual_touchpad.te |   16 +
- prebuilts/api/28.0/public/vndservice.te       |    1 +
- .../api/28.0/public/vndservicemanager.te      |    2 +
- prebuilts/api/28.0/public/vold.te             |  269 ++
- .../api/28.0/public/vold_prepare_subdirs.te   |    6 +
- prebuilts/api/28.0/public/vr_hwc.te           |   31 +
- prebuilts/api/28.0/public/watchdogd.te        |    4 +
- prebuilts/api/28.0/public/webview_zygote.te   |    5 +
- prebuilts/api/28.0/public/wificond.te         |   31 +
- prebuilts/api/28.0/public/wpantund.te         |   29 +
- prebuilts/api/28.0/public/zygote.te           |    3 +
- .../api/29.0/private/compat/28.0/28.0.cil     | 1742 +++++++++++
- .../29.0/private/compat/28.0/28.0.ignore.cil  |  151 +
- .../api/30.0/private/compat/28.0/28.0.cil     | 1744 +++++++++++
- .../30.0/private/compat/28.0/28.0.compat.cil  |    5 +
- .../30.0/private/compat/28.0/28.0.ignore.cil  |  159 +
- .../api/31.0/private/compat/28.0/28.0.cil     | 1744 +++++++++++
- .../31.0/private/compat/28.0/28.0.compat.cil  |   11 +
- .../31.0/private/compat/28.0/28.0.ignore.cil  |  160 +
- .../api/32.0/private/compat/28.0/28.0.cil     | 1744 +++++++++++
- .../32.0/private/compat/28.0/28.0.compat.cil  |   11 +
- .../32.0/private/compat/28.0/28.0.ignore.cil  |  160 +
- .../api/33.0/private/compat/28.0/28.0.cil     | 1744 +++++++++++
- .../33.0/private/compat/28.0/28.0.compat.cil  |   11 +
- .../33.0/private/compat/28.0/28.0.ignore.cil  |  160 +
- private/compat/28.0/28.0.cil                  | 1745 +++++++++++
- private/compat/28.0/28.0.compat.cil           |   15 +
- private/compat/28.0/28.0.ignore.cil           |  160 +
- 347 files changed, 31579 insertions(+)
- create mode 100644 prebuilts/api/28.0/private/access_vectors
- create mode 100644 prebuilts/api/28.0/private/adbd.te
- create mode 100644 prebuilts/api/28.0/private/app.te
- create mode 100644 prebuilts/api/28.0/private/app_neverallows.te
- create mode 100644 prebuilts/api/28.0/private/asan_extract.te
- create mode 100644 prebuilts/api/28.0/private/atrace.te
- create mode 100644 prebuilts/api/28.0/private/audioserver.te
- create mode 100644 prebuilts/api/28.0/private/binder_in_vendor_violators.te
- create mode 100644 prebuilts/api/28.0/private/binderservicedomain.te
- create mode 100644 prebuilts/api/28.0/private/blank_screen.te
- create mode 100644 prebuilts/api/28.0/private/blkid.te
- create mode 100644 prebuilts/api/28.0/private/blkid_untrusted.te
- create mode 100644 prebuilts/api/28.0/private/bluetooth.te
- create mode 100644 prebuilts/api/28.0/private/bluetoothdomain.te
- create mode 100644 prebuilts/api/28.0/private/bootanim.te
- create mode 100644 prebuilts/api/28.0/private/bootstat.te
- create mode 100644 prebuilts/api/28.0/private/bpfloader.te
- create mode 100644 prebuilts/api/28.0/private/bufferhubd.te
- create mode 100644 prebuilts/api/28.0/private/bug_map
- create mode 100644 prebuilts/api/28.0/private/cameraserver.te
- create mode 100644 prebuilts/api/28.0/private/charger.te
- create mode 100644 prebuilts/api/28.0/private/clatd.te
- create mode 100644 prebuilts/api/28.0/private/coredomain.te
- create mode 100644 prebuilts/api/28.0/private/cppreopts.te
- create mode 100644 prebuilts/api/28.0/private/crash_dump.te
- create mode 100644 prebuilts/api/28.0/private/dex2oat.te
- create mode 100644 prebuilts/api/28.0/private/dexoptanalyzer.te
- create mode 100644 prebuilts/api/28.0/private/dhcp.te
- create mode 100644 prebuilts/api/28.0/private/dnsmasq.te
- create mode 100644 prebuilts/api/28.0/private/domain.te
- create mode 100644 prebuilts/api/28.0/private/drmserver.te
- create mode 100644 prebuilts/api/28.0/private/dumpstate.te
- create mode 100644 prebuilts/api/28.0/private/ephemeral_app.te
- create mode 100644 prebuilts/api/28.0/private/file.te
- create mode 100644 prebuilts/api/28.0/private/file_contexts
- create mode 100644 prebuilts/api/28.0/private/file_contexts_asan
- create mode 100644 prebuilts/api/28.0/private/fingerprintd.te
- create mode 100644 prebuilts/api/28.0/private/fs_use
- create mode 100644 prebuilts/api/28.0/private/fsck.te
- create mode 100644 prebuilts/api/28.0/private/fsck_untrusted.te
- create mode 100644 prebuilts/api/28.0/private/gatekeeperd.te
- create mode 100644 prebuilts/api/28.0/private/genfs_contexts
- create mode 100644 prebuilts/api/28.0/private/hal_allocator_default.te
- create mode 100644 prebuilts/api/28.0/private/halclientdomain.te
- create mode 100644 prebuilts/api/28.0/private/halserverdomain.te
- create mode 100644 prebuilts/api/28.0/private/healthd.te
- create mode 100644 prebuilts/api/28.0/private/hwservice_contexts
- create mode 100644 prebuilts/api/28.0/private/hwservicemanager.te
- create mode 100644 prebuilts/api/28.0/private/idmap.te
- create mode 100644 prebuilts/api/28.0/private/incident.te
- create mode 100644 prebuilts/api/28.0/private/incident_helper.te
- create mode 100644 prebuilts/api/28.0/private/incidentd.te
- create mode 100644 prebuilts/api/28.0/private/init.te
- create mode 100644 prebuilts/api/28.0/private/initial_sid_contexts
- create mode 100644 prebuilts/api/28.0/private/initial_sids
- create mode 100644 prebuilts/api/28.0/private/inputflinger.te
- create mode 100644 prebuilts/api/28.0/private/install_recovery.te
- create mode 100644 prebuilts/api/28.0/private/installd.te
- create mode 100644 prebuilts/api/28.0/private/isolated_app.te
- create mode 100644 prebuilts/api/28.0/private/kernel.te
- create mode 100644 prebuilts/api/28.0/private/keys.conf
- create mode 100644 prebuilts/api/28.0/private/keystore.te
- create mode 100644 prebuilts/api/28.0/private/lmkd.te
- create mode 100644 prebuilts/api/28.0/private/logd.te
- create mode 100644 prebuilts/api/28.0/private/logpersist.te
- create mode 100644 prebuilts/api/28.0/private/mac_permissions.xml
- create mode 100644 prebuilts/api/28.0/private/mdnsd.te
- create mode 100644 prebuilts/api/28.0/private/mediadrmserver.te
- create mode 100644 prebuilts/api/28.0/private/mediaextractor.te
- create mode 100644 prebuilts/api/28.0/private/mediametrics.te
- create mode 100644 prebuilts/api/28.0/private/mediaprovider.te
- create mode 100644 prebuilts/api/28.0/private/mediaserver.te
- create mode 100644 prebuilts/api/28.0/private/mls
- create mode 100644 prebuilts/api/28.0/private/mls_decl
- create mode 100644 prebuilts/api/28.0/private/mls_macros
- create mode 100644 prebuilts/api/28.0/private/modprobe.te
- create mode 100644 prebuilts/api/28.0/private/mtp.te
- create mode 100644 prebuilts/api/28.0/private/net.te
- create mode 100644 prebuilts/api/28.0/private/netd.te
- create mode 100644 prebuilts/api/28.0/private/netutils_wrapper.te
- create mode 100644 prebuilts/api/28.0/private/nfc.te
- create mode 100644 prebuilts/api/28.0/private/otapreopt_chroot.te
- create mode 100644 prebuilts/api/28.0/private/otapreopt_slot.te
- create mode 100644 prebuilts/api/28.0/private/perfetto.te
- create mode 100644 prebuilts/api/28.0/private/performanced.te
- create mode 100644 prebuilts/api/28.0/private/perfprofd.te
- create mode 100644 prebuilts/api/28.0/private/platform_app.te
- create mode 100644 prebuilts/api/28.0/private/policy_capabilities
- create mode 100644 prebuilts/api/28.0/private/port_contexts
- create mode 100644 prebuilts/api/28.0/private/postinstall.te
- create mode 100644 prebuilts/api/28.0/private/postinstall_dexopt.te
- create mode 100644 prebuilts/api/28.0/private/ppp.te
- create mode 100644 prebuilts/api/28.0/private/preopt2cachename.te
- create mode 100644 prebuilts/api/28.0/private/priv_app.te
- create mode 100644 prebuilts/api/28.0/private/profman.te
- create mode 100644 prebuilts/api/28.0/private/property_contexts
- create mode 100644 prebuilts/api/28.0/private/racoon.te
- create mode 100644 prebuilts/api/28.0/private/radio.te
- create mode 100644 prebuilts/api/28.0/private/recovery.te
- create mode 100644 prebuilts/api/28.0/private/recovery_persist.te
- create mode 100644 prebuilts/api/28.0/private/recovery_refresh.te
- create mode 100644 prebuilts/api/28.0/private/roles_decl
- create mode 100644 prebuilts/api/28.0/private/runas.te
- create mode 100644 prebuilts/api/28.0/private/sdcardd.te
- create mode 100644 prebuilts/api/28.0/private/seapp_contexts
- create mode 100644 prebuilts/api/28.0/private/secure_element.te
- create mode 100644 prebuilts/api/28.0/private/security_classes
- create mode 100644 prebuilts/api/28.0/private/service.te
- create mode 100644 prebuilts/api/28.0/private/service_contexts
- create mode 100644 prebuilts/api/28.0/private/servicemanager.te
- create mode 100644 prebuilts/api/28.0/private/sgdisk.te
- create mode 100644 prebuilts/api/28.0/private/shared_relro.te
- create mode 100644 prebuilts/api/28.0/private/shell.te
- create mode 100644 prebuilts/api/28.0/private/slideshow.te
- create mode 100644 prebuilts/api/28.0/private/stats.te
- create mode 100644 prebuilts/api/28.0/private/statsd.te
- create mode 100644 prebuilts/api/28.0/private/storaged.te
- create mode 100644 prebuilts/api/28.0/private/su.te
- create mode 100644 prebuilts/api/28.0/private/surfaceflinger.te
- create mode 100644 prebuilts/api/28.0/private/system_app.te
- create mode 100644 prebuilts/api/28.0/private/system_server.te
- create mode 100644 prebuilts/api/28.0/private/technical_debt.cil
- create mode 100644 prebuilts/api/28.0/private/thermalserviced.te
- create mode 100644 prebuilts/api/28.0/private/tombstoned.te
- create mode 100644 prebuilts/api/28.0/private/toolbox.te
- create mode 100644 prebuilts/api/28.0/private/traced.te
- create mode 100644 prebuilts/api/28.0/private/traced_probes.te
- create mode 100644 prebuilts/api/28.0/private/traceur_app.te
- create mode 100644 prebuilts/api/28.0/private/tzdatacheck.te
- create mode 100644 prebuilts/api/28.0/private/ueventd.te
- create mode 100644 prebuilts/api/28.0/private/uncrypt.te
- create mode 100644 prebuilts/api/28.0/private/untrusted_app.te
- create mode 100644 prebuilts/api/28.0/private/untrusted_app_25.te
- create mode 100644 prebuilts/api/28.0/private/untrusted_app_27.te
- create mode 100644 prebuilts/api/28.0/private/untrusted_app_all.te
- create mode 100644 prebuilts/api/28.0/private/untrusted_v2_app.te
- create mode 100644 prebuilts/api/28.0/private/update_engine.te
- create mode 100644 prebuilts/api/28.0/private/update_engine_common.te
- create mode 100644 prebuilts/api/28.0/private/update_verifier.te
- create mode 100644 prebuilts/api/28.0/private/usbd.te
- create mode 100644 prebuilts/api/28.0/private/users
- create mode 100644 prebuilts/api/28.0/private/vdc.te
- create mode 100644 prebuilts/api/28.0/private/vendor_init.te
- create mode 100644 prebuilts/api/28.0/private/virtual_touchpad.te
- create mode 100644 prebuilts/api/28.0/private/vold.te
- create mode 100644 prebuilts/api/28.0/private/vold_prepare_subdirs.te
- create mode 100644 prebuilts/api/28.0/private/vr_hwc.te
- create mode 100644 prebuilts/api/28.0/private/wait_for_keymaster.te
- create mode 100644 prebuilts/api/28.0/private/watchdogd.te
- create mode 100644 prebuilts/api/28.0/private/webview_zygote.te
- create mode 100644 prebuilts/api/28.0/private/wificond.te
- create mode 100644 prebuilts/api/28.0/private/wpantund.te
- create mode 100644 prebuilts/api/28.0/private/zygote.te
- create mode 100644 prebuilts/api/28.0/public/adbd.te
- create mode 100644 prebuilts/api/28.0/public/app.te
- create mode 100644 prebuilts/api/28.0/public/asan_extract.te
- create mode 100644 prebuilts/api/28.0/public/attributes
- create mode 100644 prebuilts/api/28.0/public/audioserver.te
- create mode 100644 prebuilts/api/28.0/public/blkid.te
- create mode 100644 prebuilts/api/28.0/public/blkid_untrusted.te
- create mode 100644 prebuilts/api/28.0/public/bluetooth.te
- create mode 100644 prebuilts/api/28.0/public/bootanim.te
- create mode 100644 prebuilts/api/28.0/public/bootstat.te
- create mode 100644 prebuilts/api/28.0/public/bufferhubd.te
- create mode 100644 prebuilts/api/28.0/public/cameraserver.te
- create mode 100644 prebuilts/api/28.0/public/charger.te
- create mode 100644 prebuilts/api/28.0/public/clatd.te
- create mode 100644 prebuilts/api/28.0/public/cppreopts.te
- create mode 100644 prebuilts/api/28.0/public/crash_dump.te
- create mode 100644 prebuilts/api/28.0/public/device.te
- create mode 100644 prebuilts/api/28.0/public/dex2oat.te
- create mode 100644 prebuilts/api/28.0/public/dhcp.te
- create mode 100644 prebuilts/api/28.0/public/display_service_server.te
- create mode 100644 prebuilts/api/28.0/public/dnsmasq.te
- create mode 100644 prebuilts/api/28.0/public/domain.te
- create mode 100644 prebuilts/api/28.0/public/drmserver.te
- create mode 100644 prebuilts/api/28.0/public/dumpstate.te
- create mode 100644 prebuilts/api/28.0/public/e2fs.te
- create mode 100644 prebuilts/api/28.0/public/ephemeral_app.te
- create mode 100644 prebuilts/api/28.0/public/file.te
- create mode 100644 prebuilts/api/28.0/public/fingerprintd.te
- create mode 100644 prebuilts/api/28.0/public/fsck.te
- create mode 100644 prebuilts/api/28.0/public/fsck_untrusted.te
- create mode 100644 prebuilts/api/28.0/public/gatekeeperd.te
- create mode 100644 prebuilts/api/28.0/public/global_macros
- create mode 100644 prebuilts/api/28.0/public/hal_allocator.te
- create mode 100644 prebuilts/api/28.0/public/hal_audio.te
- create mode 100644 prebuilts/api/28.0/public/hal_audiocontrol.te
- create mode 100644 prebuilts/api/28.0/public/hal_authsecret.te
- create mode 100644 prebuilts/api/28.0/public/hal_bluetooth.te
- create mode 100644 prebuilts/api/28.0/public/hal_bootctl.te
- create mode 100644 prebuilts/api/28.0/public/hal_broadcastradio.te
- create mode 100644 prebuilts/api/28.0/public/hal_camera.te
- create mode 100644 prebuilts/api/28.0/public/hal_cas.te
- create mode 100644 prebuilts/api/28.0/public/hal_configstore.te
- create mode 100644 prebuilts/api/28.0/public/hal_confirmationui.te
- create mode 100644 prebuilts/api/28.0/public/hal_contexthub.te
- create mode 100644 prebuilts/api/28.0/public/hal_drm.te
- create mode 100644 prebuilts/api/28.0/public/hal_dumpstate.te
- create mode 100644 prebuilts/api/28.0/public/hal_evs.te
- create mode 100644 prebuilts/api/28.0/public/hal_fingerprint.te
- create mode 100644 prebuilts/api/28.0/public/hal_gatekeeper.te
- create mode 100644 prebuilts/api/28.0/public/hal_gnss.te
- create mode 100644 prebuilts/api/28.0/public/hal_graphics_allocator.te
- create mode 100644 prebuilts/api/28.0/public/hal_graphics_composer.te
- create mode 100644 prebuilts/api/28.0/public/hal_health.te
- create mode 100644 prebuilts/api/28.0/public/hal_ir.te
- create mode 100644 prebuilts/api/28.0/public/hal_keymaster.te
- create mode 100644 prebuilts/api/28.0/public/hal_light.te
- create mode 100644 prebuilts/api/28.0/public/hal_lowpan.te
- create mode 100644 prebuilts/api/28.0/public/hal_memtrack.te
- create mode 100644 prebuilts/api/28.0/public/hal_neuralnetworks.te
- create mode 100644 prebuilts/api/28.0/public/hal_neverallows.te
- create mode 100644 prebuilts/api/28.0/public/hal_nfc.te
- create mode 100644 prebuilts/api/28.0/public/hal_oemlock.te
- create mode 100644 prebuilts/api/28.0/public/hal_power.te
- create mode 100644 prebuilts/api/28.0/public/hal_secure_element.te
- create mode 100644 prebuilts/api/28.0/public/hal_sensors.te
- create mode 100644 prebuilts/api/28.0/public/hal_telephony.te
- create mode 100644 prebuilts/api/28.0/public/hal_tetheroffload.te
- create mode 100644 prebuilts/api/28.0/public/hal_thermal.te
- create mode 100644 prebuilts/api/28.0/public/hal_tv_cec.te
- create mode 100644 prebuilts/api/28.0/public/hal_tv_input.te
- create mode 100644 prebuilts/api/28.0/public/hal_usb.te
- create mode 100644 prebuilts/api/28.0/public/hal_usb_gadget.te
- create mode 100644 prebuilts/api/28.0/public/hal_vehicle.te
- create mode 100644 prebuilts/api/28.0/public/hal_vibrator.te
- create mode 100644 prebuilts/api/28.0/public/hal_vr.te
- create mode 100644 prebuilts/api/28.0/public/hal_weaver.te
- create mode 100644 prebuilts/api/28.0/public/hal_wifi.te
- create mode 100644 prebuilts/api/28.0/public/hal_wifi_hostapd.te
- create mode 100644 prebuilts/api/28.0/public/hal_wifi_offload.te
- create mode 100644 prebuilts/api/28.0/public/hal_wifi_supplicant.te
- create mode 100644 prebuilts/api/28.0/public/healthd.te
- create mode 100644 prebuilts/api/28.0/public/hwservice.te
- create mode 100644 prebuilts/api/28.0/public/hwservicemanager.te
- create mode 100644 prebuilts/api/28.0/public/idmap.te
- create mode 100644 prebuilts/api/28.0/public/incident.te
- create mode 100644 prebuilts/api/28.0/public/incident_helper.te
- create mode 100644 prebuilts/api/28.0/public/incidentd.te
- create mode 100644 prebuilts/api/28.0/public/init.te
- create mode 100644 prebuilts/api/28.0/public/inputflinger.te
- create mode 100644 prebuilts/api/28.0/public/install_recovery.te
- create mode 100644 prebuilts/api/28.0/public/installd.te
- create mode 100644 prebuilts/api/28.0/public/ioctl_defines
- create mode 100644 prebuilts/api/28.0/public/ioctl_macros
- create mode 100644 prebuilts/api/28.0/public/isolated_app.te
- create mode 100644 prebuilts/api/28.0/public/kernel.te
- create mode 100644 prebuilts/api/28.0/public/keystore.te
- create mode 100644 prebuilts/api/28.0/public/lmkd.te
- create mode 100644 prebuilts/api/28.0/public/logd.te
- create mode 100644 prebuilts/api/28.0/public/logpersist.te
- create mode 100644 prebuilts/api/28.0/public/mdnsd.te
- create mode 100644 prebuilts/api/28.0/public/mediacodec.te
- create mode 100644 prebuilts/api/28.0/public/mediadrmserver.te
- create mode 100644 prebuilts/api/28.0/public/mediaextractor.te
- create mode 100644 prebuilts/api/28.0/public/mediametrics.te
- create mode 100644 prebuilts/api/28.0/public/mediaprovider.te
- create mode 100644 prebuilts/api/28.0/public/mediaserver.te
- create mode 100644 prebuilts/api/28.0/public/modprobe.te
- create mode 100644 prebuilts/api/28.0/public/mtp.te
- create mode 100644 prebuilts/api/28.0/public/net.te
- create mode 100644 prebuilts/api/28.0/public/netd.te
- create mode 100644 prebuilts/api/28.0/public/netutils_wrapper.te
- create mode 100644 prebuilts/api/28.0/public/neverallow_macros
- create mode 100644 prebuilts/api/28.0/public/nfc.te
- create mode 100644 prebuilts/api/28.0/public/otapreopt_chroot.te
- create mode 100644 prebuilts/api/28.0/public/otapreopt_slot.te
- create mode 100644 prebuilts/api/28.0/public/performanced.te
- create mode 100644 prebuilts/api/28.0/public/perfprofd.te
- create mode 100644 prebuilts/api/28.0/public/platform_app.te
- create mode 100644 prebuilts/api/28.0/public/postinstall.te
- create mode 100644 prebuilts/api/28.0/public/postinstall_dexopt.te
- create mode 100644 prebuilts/api/28.0/public/ppp.te
- create mode 100644 prebuilts/api/28.0/public/preopt2cachename.te
- create mode 100644 prebuilts/api/28.0/public/priv_app.te
- create mode 100644 prebuilts/api/28.0/public/profman.te
- create mode 100644 prebuilts/api/28.0/public/property.te
- create mode 100644 prebuilts/api/28.0/public/property_contexts
- create mode 100644 prebuilts/api/28.0/public/racoon.te
- create mode 100644 prebuilts/api/28.0/public/radio.te
- create mode 100644 prebuilts/api/28.0/public/recovery.te
- create mode 100644 prebuilts/api/28.0/public/recovery_persist.te
- create mode 100644 prebuilts/api/28.0/public/recovery_refresh.te
- create mode 100644 prebuilts/api/28.0/public/roles
- create mode 100644 prebuilts/api/28.0/public/runas.te
- create mode 100644 prebuilts/api/28.0/public/sdcardd.te
- create mode 100644 prebuilts/api/28.0/public/secure_element.te
- create mode 100644 prebuilts/api/28.0/public/service.te
- create mode 100644 prebuilts/api/28.0/public/servicemanager.te
- create mode 100644 prebuilts/api/28.0/public/sgdisk.te
- create mode 100644 prebuilts/api/28.0/public/shared_relro.te
- create mode 100644 prebuilts/api/28.0/public/shell.te
- create mode 100644 prebuilts/api/28.0/public/slideshow.te
- create mode 100644 prebuilts/api/28.0/public/su.te
- create mode 100644 prebuilts/api/28.0/public/surfaceflinger.te
- create mode 100644 prebuilts/api/28.0/public/system_app.te
- create mode 100644 prebuilts/api/28.0/public/system_server.te
- create mode 100644 prebuilts/api/28.0/public/te_macros
- create mode 100644 prebuilts/api/28.0/public/tee.te
- create mode 100644 prebuilts/api/28.0/public/thermalserviced.te
- create mode 100644 prebuilts/api/28.0/public/tombstoned.te
- create mode 100644 prebuilts/api/28.0/public/toolbox.te
- create mode 100644 prebuilts/api/28.0/public/traced_probes.te
- create mode 100644 prebuilts/api/28.0/public/traceur_app.te
- create mode 100644 prebuilts/api/28.0/public/tzdatacheck.te
- create mode 100644 prebuilts/api/28.0/public/ueventd.te
- create mode 100644 prebuilts/api/28.0/public/uncrypt.te
- create mode 100644 prebuilts/api/28.0/public/untrusted_app.te
- create mode 100644 prebuilts/api/28.0/public/untrusted_v2_app.te
- create mode 100644 prebuilts/api/28.0/public/update_engine.te
- create mode 100644 prebuilts/api/28.0/public/update_engine_common.te
- create mode 100644 prebuilts/api/28.0/public/update_verifier.te
- create mode 100644 prebuilts/api/28.0/public/usbd.te
- create mode 100644 prebuilts/api/28.0/public/vdc.te
- create mode 100644 prebuilts/api/28.0/public/vendor_init.te
- create mode 100644 prebuilts/api/28.0/public/vendor_shell.te
- create mode 100644 prebuilts/api/28.0/public/vendor_toolbox.te
- create mode 100644 prebuilts/api/28.0/public/virtual_touchpad.te
- create mode 100644 prebuilts/api/28.0/public/vndservice.te
- create mode 100644 prebuilts/api/28.0/public/vndservicemanager.te
- create mode 100644 prebuilts/api/28.0/public/vold.te
- create mode 100644 prebuilts/api/28.0/public/vold_prepare_subdirs.te
- create mode 100644 prebuilts/api/28.0/public/vr_hwc.te
- create mode 100644 prebuilts/api/28.0/public/watchdogd.te
- create mode 100644 prebuilts/api/28.0/public/webview_zygote.te
- create mode 100644 prebuilts/api/28.0/public/wificond.te
- create mode 100644 prebuilts/api/28.0/public/wpantund.te
- create mode 100644 prebuilts/api/28.0/public/zygote.te
- create mode 100644 prebuilts/api/29.0/private/compat/28.0/28.0.cil
- create mode 100644 prebuilts/api/29.0/private/compat/28.0/28.0.ignore.cil
- create mode 100644 prebuilts/api/30.0/private/compat/28.0/28.0.cil
- create mode 100644 prebuilts/api/30.0/private/compat/28.0/28.0.compat.cil
- create mode 100644 prebuilts/api/30.0/private/compat/28.0/28.0.ignore.cil
- create mode 100644 prebuilts/api/31.0/private/compat/28.0/28.0.cil
- create mode 100644 prebuilts/api/31.0/private/compat/28.0/28.0.compat.cil
- create mode 100644 prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil
- create mode 100644 prebuilts/api/32.0/private/compat/28.0/28.0.cil
- create mode 100644 prebuilts/api/32.0/private/compat/28.0/28.0.compat.cil
- create mode 100644 prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil
- create mode 100644 prebuilts/api/33.0/private/compat/28.0/28.0.cil
- create mode 100644 prebuilts/api/33.0/private/compat/28.0/28.0.compat.cil
- create mode 100644 prebuilts/api/33.0/private/compat/28.0/28.0.ignore.cil
- create mode 100644 private/compat/28.0/28.0.cil
- create mode 100644 private/compat/28.0/28.0.compat.cil
- create mode 100644 private/compat/28.0/28.0.ignore.cil
-
-diff --git a/compat/Android.bp b/compat/Android.bp
-index 2c6239f70..528f0a8d8 100644
---- a/compat/Android.bp
-+++ b/compat/Android.bp
-@@ -23,6 +23,13 @@ package {
-     default_applicable_licenses: ["system_sepolicy_license"],
- }
- 
-+se_build_files {
-+    name: "28.0.board.compat.map",
-+    srcs: [
-+        "compat/28.0/28.0.cil",
-+    ],
-+}
-+
- se_build_files {
-     name: "29.0.board.compat.map",
-     srcs: [
-@@ -58,6 +65,13 @@ se_build_files {
-     ],
- }
- 
-+se_build_files {
-+    name: "28.0.board.compat.cil",
-+    srcs: [
-+        "compat/28.0/28.0.compat.cil",
-+    ],
-+}
-+
- se_build_files {
-     name: "29.0.board.compat.cil",
-     srcs: [
-@@ -93,6 +107,13 @@ se_build_files {
-     ],
- }
- 
-+se_build_files {
-+    name: "28.0.board.ignore.map",
-+    srcs: [
-+        "compat/28.0/28.0.ignore.cil",
-+    ],
-+}
-+
- se_build_files {
-     name: "29.0.board.ignore.map",
-     srcs: [
-@@ -128,6 +149,13 @@ se_build_files {
-     ],
- }
- 
-+se_cil_compat_map {
-+    name: "plat_28.0.cil",
-+    stem: "28.0.cil",
-+    bottom_half: [":28.0.board.compat.map{.plat_private}"],
-+    top_half: "plat_29.0.cil",
-+}
-+
- se_cil_compat_map {
-     name: "plat_29.0.cil",
-     stem: "29.0.cil",
-@@ -168,6 +196,14 @@ se_cil_compat_map {
-     version: "33.0",
- }
- 
-+se_cil_compat_map {
-+    name: "system_ext_28.0.cil",
-+    stem: "28.0.cil",
-+    bottom_half: [":28.0.board.compat.map{.system_ext_private}"],
-+    top_half: "system_ext_29.0.cil",
-+    system_ext_specific: true,
-+}
-+
- se_cil_compat_map {
-     name: "system_ext_29.0.cil",
-     stem: "29.0.cil",
-@@ -213,6 +249,14 @@ se_cil_compat_map {
-     version: "33.0",
- }
- 
-+se_cil_compat_map {
-+    name: "product_28.0.cil",
-+    stem: "28.0.cil",
-+    bottom_half: [":28.0.board.compat.map{.product_private}"],
-+    top_half: "product_29.0.cil",
-+    product_specific: true,
-+}
-+
- se_cil_compat_map {
-     name: "product_29.0.cil",
-     stem: "29.0.cil",
-@@ -258,6 +302,12 @@ se_cil_compat_map {
-     version: "33.0",
- }
- 
-+se_cil_compat_map {
-+    name: "28.0.ignore.cil",
-+    bottom_half: [":28.0.board.ignore.map{.plat_private}"],
-+    top_half: "29.0.ignore.cil",
-+}
-+
- se_cil_compat_map {
-     name: "29.0.ignore.cil",
-     bottom_half: [":29.0.board.ignore.map{.plat_private}"],
-@@ -357,6 +407,11 @@ se_cil_compat_map {
-     version: "33.0",
- }
- 
-+se_compat_cil {
-+    name: "28.0.compat.cil",
-+    srcs: [":28.0.board.compat.cil{.plat_private}"],
-+}
-+
- se_compat_cil {
-     name: "29.0.compat.cil",
-     srcs: [":29.0.board.compat.cil{.plat_private}"],
-@@ -387,6 +442,13 @@ se_compat_cil {
-     version: "33.0",
- }
- 
-+se_compat_cil {
-+    name: "system_ext_28.0.compat.cil",
-+    srcs: [":28.0.board.compat.cil{.system_ext_private}"],
-+    stem: "28.0.compat.cil",
-+    system_ext_specific: true,
-+}
-+
- se_compat_cil {
-     name: "system_ext_29.0.compat.cil",
-     srcs: [":29.0.board.compat.cil{.system_ext_private}"],
-diff --git a/prebuilts/api/28.0/private/access_vectors b/prebuilts/api/28.0/private/access_vectors
-new file mode 100644
-index 000000000..898c884cd
---- /dev/null
-+++ b/prebuilts/api/28.0/private/access_vectors
-@@ -0,0 +1,726 @@
-+#
-+# Define common prefixes for access vectors
-+#
-+# common common_name { permission_name ... }
-+
-+
-+#
-+# Define a common prefix for file access vectors.
-+#
-+
-+common file
-+{
-+	ioctl
-+	read
-+	write
-+	create
-+	getattr
-+	setattr
-+	lock
-+	relabelfrom
-+	relabelto
-+	append
-+	map
-+	unlink
-+	link
-+	rename
-+	execute
-+	quotaon
-+	mounton
-+}
-+
-+
-+#
-+# Define a common prefix for socket access vectors.
-+#
-+
-+common socket
-+{
-+# inherited from file
-+	ioctl
-+	read
-+	write
-+	create
-+	getattr
-+	setattr
-+	lock
-+	relabelfrom
-+	relabelto
-+	append
-+	map
-+# socket-specific
-+	bind
-+	connect
-+	listen
-+	accept
-+	getopt
-+	setopt
-+	shutdown
-+	recvfrom
-+	sendto
-+	name_bind
-+}
-+
-+#
-+# Define a common prefix for ipc access vectors.
-+#
-+
-+common ipc
-+{
-+	create
-+	destroy
-+	getattr
-+	setattr
-+	read
-+	write
-+	associate
-+	unix_read
-+	unix_write
-+}
-+
-+#
-+# Define a common for capability access vectors.
-+#
-+common cap
-+{
-+	# The capabilities are defined in include/linux/capability.h
-+	# Capabilities >= 32 are defined in the cap2 common.
-+	# Care should be taken to ensure that these are consistent with
-+	# those definitions. (Order matters)
-+
-+	chown
-+	dac_override
-+	dac_read_search
-+	fowner
-+	fsetid
-+	kill
-+	setgid
-+	setuid
-+	setpcap
-+	linux_immutable
-+	net_bind_service
-+	net_broadcast
-+	net_admin
-+	net_raw
-+	ipc_lock
-+	ipc_owner
-+	sys_module
-+	sys_rawio
-+	sys_chroot
-+	sys_ptrace
-+	sys_pacct
-+	sys_admin
-+	sys_boot
-+	sys_nice
-+	sys_resource
-+	sys_time
-+	sys_tty_config
-+	mknod
-+	lease
-+	audit_write
-+	audit_control
-+	setfcap
-+}
-+
-+common cap2
-+{
-+	mac_override	# unused by SELinux
-+	mac_admin	# unused by SELinux
-+	syslog
-+	wake_alarm
-+	block_suspend
-+	audit_read
-+}
-+
-+#
-+# Define the access vectors.
-+#
-+# class class_name [ inherits common_name ] { permission_name ... }
-+
-+
-+#
-+# Define the access vector interpretation for file-related objects.
-+#
-+
-+class filesystem
-+{
-+	mount
-+	remount
-+	unmount
-+	getattr
-+	relabelfrom
-+	relabelto
-+	associate
-+	quotamod
-+	quotaget
-+}
-+
-+class dir
-+inherits file
-+{
-+	add_name
-+	remove_name
-+	reparent
-+	search
-+	rmdir
-+	open
-+	audit_access
-+	execmod
-+}
-+
-+class file
-+inherits file
-+{
-+	execute_no_trans
-+	entrypoint
-+	execmod
-+	open
-+	audit_access
-+}
-+
-+class lnk_file
-+inherits file
-+{
-+	open
-+	audit_access
-+	execmod
-+}
-+
-+class chr_file
-+inherits file
-+{
-+	execute_no_trans
-+	entrypoint
-+	execmod
-+	open
-+	audit_access
-+}
-+
-+class blk_file
-+inherits file
-+{
-+	open
-+	audit_access
-+	execmod
-+}
-+
-+class sock_file
-+inherits file
-+{
-+	open
-+	audit_access
-+	execmod
-+}
-+
-+class fifo_file
-+inherits file
-+{
-+	open
-+	audit_access
-+	execmod
-+}
-+
-+class fd
-+{
-+	use
-+}
-+
-+
-+#
-+# Define the access vector interpretation for network-related objects.
-+#
-+
-+class socket
-+inherits socket
-+
-+class tcp_socket
-+inherits socket
-+{
-+	node_bind
-+	name_connect
-+}
-+
-+class udp_socket
-+inherits socket
-+{
-+	node_bind
-+}
-+
-+class rawip_socket
-+inherits socket
-+{
-+	node_bind
-+}
-+
-+class node
-+{
-+	recvfrom
-+	sendto
-+}
-+
-+class netif
-+{
-+	ingress
-+	egress
-+}
-+
-+class netlink_socket
-+inherits socket
-+
-+class packet_socket
-+inherits socket
-+
-+class key_socket
-+inherits socket
-+
-+class unix_stream_socket
-+inherits socket
-+{
-+	connectto
-+}
-+
-+class unix_dgram_socket
-+inherits socket
-+
-+class bpf
-+{
-+	map_create
-+	map_read
-+	map_write
-+	prog_load
-+	prog_run
-+}
-+
-+#
-+# Define the access vector interpretation for process-related objects
-+#
-+
-+class process
-+{
-+	fork
-+	transition
-+	sigchld # commonly granted from child to parent
-+	sigkill # cannot be caught or ignored
-+	sigstop # cannot be caught or ignored
-+	signull # for kill(pid, 0)
-+	signal  # all other signals
-+	ptrace
-+	getsched
-+	setsched
-+	getsession
-+	getpgid
-+	setpgid
-+	getcap
-+	setcap
-+	share
-+	getattr
-+	setexec
-+	setfscreate
-+	noatsecure
-+	siginh
-+	setrlimit
-+	rlimitinh
-+	dyntransition
-+	setcurrent
-+	execmem
-+	execstack
-+	execheap
-+	setkeycreate
-+	setsockcreate
-+	getrlimit
-+}
-+
-+
-+#
-+# Define the access vector interpretation for ipc-related objects
-+#
-+
-+class ipc
-+inherits ipc
-+
-+class sem
-+inherits ipc
-+
-+class msgq
-+inherits ipc
-+{
-+	enqueue
-+}
-+
-+class msg
-+{
-+	send
-+	receive
-+}
-+
-+class shm
-+inherits ipc
-+{
-+	lock
-+}
-+
-+
-+#
-+# Define the access vector interpretation for the security server.
-+#
-+
-+class security
-+{
-+	compute_av
-+	compute_create
-+	compute_member
-+	check_context
-+	load_policy
-+	compute_relabel
-+	compute_user
-+	setenforce     # was avc_toggle in system class
-+	setbool
-+	setsecparam
-+	setcheckreqprot
-+	read_policy
-+	validate_trans
-+}
-+
-+
-+#
-+# Define the access vector interpretation for system operations.
-+#
-+
-+class system
-+{
-+	ipc_info
-+	syslog_read
-+	syslog_mod
-+	syslog_console
-+	module_request
-+	module_load
-+}
-+
-+#
-+# Define the access vector interpretation for controlling capabilities
-+#
-+
-+class capability
-+inherits cap
-+
-+class capability2
-+inherits cap2
-+
-+#
-+# Extended Netlink classes
-+#
-+class netlink_route_socket
-+inherits socket
-+{
-+	nlmsg_read
-+	nlmsg_write
-+}
-+
-+class netlink_tcpdiag_socket
-+inherits socket
-+{
-+	nlmsg_read
-+	nlmsg_write
-+}
-+
-+class netlink_nflog_socket
-+inherits socket
-+
-+class netlink_xfrm_socket
-+inherits socket
-+{
-+	nlmsg_read
-+	nlmsg_write
-+}
-+
-+class netlink_selinux_socket
-+inherits socket
-+
-+class netlink_audit_socket
-+inherits socket
-+{
-+	nlmsg_read
-+	nlmsg_write
-+	nlmsg_relay
-+	nlmsg_readpriv
-+	nlmsg_tty_audit
-+}
-+
-+class netlink_dnrt_socket
-+inherits socket
-+
-+# Define the access vector interpretation for controlling
-+# access to IPSec network data by association
-+#
-+class association
-+{
-+	sendto
-+	recvfrom
-+	setcontext
-+	polmatch
-+}
-+
-+# Updated Netlink class for KOBJECT_UEVENT family.
-+class netlink_kobject_uevent_socket
-+inherits socket
-+
-+class appletalk_socket
-+inherits socket
-+
-+class packet
-+{
-+	send
-+	recv
-+	relabelto
-+	flow_in		# deprecated
-+	flow_out	# deprecated
-+	forward_in
-+	forward_out
-+}
-+
-+class key
-+{
-+	view
-+	read
-+	write
-+	search
-+	link
-+	setattr
-+	create
-+}
-+
-+class dccp_socket
-+inherits socket
-+{
-+	node_bind
-+	name_connect
-+}
-+
-+class memprotect
-+{
-+	mmap_zero
-+}
-+
-+# network peer labels
-+class peer
-+{
-+	recv
-+}
-+
-+class kernel_service
-+{
-+	use_as_override
-+	create_files_as
-+}
-+
-+class tun_socket
-+inherits socket
-+{
-+	attach_queue
-+}
-+
-+class binder
-+{
-+	impersonate
-+	call
-+	set_context_mgr
-+	transfer
-+}
-+
-+class netlink_iscsi_socket
-+inherits socket
-+
-+class netlink_fib_lookup_socket
-+inherits socket
-+
-+class netlink_connector_socket
-+inherits socket
-+
-+class netlink_netfilter_socket
-+inherits socket
-+
-+class netlink_generic_socket
-+inherits socket
-+
-+class netlink_scsitransport_socket
-+inherits socket
-+
-+class netlink_rdma_socket
-+inherits socket
-+
-+class netlink_crypto_socket
-+inherits socket
-+
-+#
-+# Define the access vector interpretation for controlling capabilities
-+# in user namespaces
-+#
-+
-+class cap_userns
-+inherits cap
-+
-+class cap2_userns
-+inherits cap2
-+
-+
-+#
-+# Define the access vector interpretation for the new socket classes
-+# enabled by the extended_socket_class policy capability.
-+#
-+
-+#
-+# The next two classes were previously mapped to rawip_socket and therefore
-+# have the same definition as rawip_socket (until further permissions
-+# are defined).
-+#
-+class sctp_socket
-+inherits socket
-+{
-+	node_bind
-+}
-+
-+class icmp_socket
-+inherits socket
-+{
-+	node_bind
-+}
-+
-+#
-+# The remaining network socket classes were previously
-+# mapped to the socket class and therefore have the
-+# same definition as socket.
-+#
-+
-+class ax25_socket
-+inherits socket
-+
-+class ipx_socket
-+inherits socket
-+
-+class netrom_socket
-+inherits socket
-+
-+class atmpvc_socket
-+inherits socket
-+
-+class x25_socket
-+inherits socket
-+
-+class rose_socket
-+inherits socket
-+
-+class decnet_socket
-+inherits socket
-+
-+class atmsvc_socket
-+inherits socket
-+
-+class rds_socket
-+inherits socket
-+
-+class irda_socket
-+inherits socket
-+
-+class pppox_socket
-+inherits socket
-+
-+class llc_socket
-+inherits socket
-+
-+class can_socket
-+inherits socket
-+
-+class tipc_socket
-+inherits socket
-+
-+class bluetooth_socket
-+inherits socket
-+
-+class iucv_socket
-+inherits socket
-+
-+class rxrpc_socket
-+inherits socket
-+
-+class isdn_socket
-+inherits socket
-+
-+class phonet_socket
-+inherits socket
-+
-+class ieee802154_socket
-+inherits socket
-+
-+class caif_socket
-+inherits socket
-+
-+class alg_socket
-+inherits socket
-+
-+class nfc_socket
-+inherits socket
-+
-+class vsock_socket
-+inherits socket
-+
-+class kcm_socket
-+inherits socket
-+
-+class qipcrtr_socket
-+inherits socket
-+
-+class smc_socket
-+inherits socket
-+
-+class property_service
-+{
-+	set
-+}
-+
-+class service_manager
-+{
-+	add
-+	find
-+	list
-+}
-+
-+class hwservice_manager
-+{
-+	add
-+	find
-+	list
-+}
-+
-+class keystore_key
-+{
-+	get_state
-+	get
-+	insert
-+	delete
-+	exist
-+	list
-+	reset
-+	password
-+	lock
-+	unlock
-+	is_empty
-+	sign
-+	verify
-+	grant
-+	duplicate
-+	clear_uid
-+	add_auth
-+	user_changed
-+	gen_unique_id
-+}
-+
-+class drmservice {
-+	consumeRights
-+	setPlaybackStatus
-+	openDecryptSession
-+	closeDecryptSession
-+	initializeDecryptUnit
-+	decrypt
-+	finalizeDecryptUnit
-+	pread
-+}
-diff --git a/prebuilts/api/28.0/private/adbd.te b/prebuilts/api/28.0/private/adbd.te
-new file mode 100644
-index 000000000..77c0d7377
---- /dev/null
-+++ b/prebuilts/api/28.0/private/adbd.te
-@@ -0,0 +1,148 @@
-+### ADB daemon
-+
-+typeattribute adbd coredomain;
-+typeattribute adbd mlstrustedsubject;
-+
-+init_daemon_domain(adbd)
-+
-+domain_auto_trans(adbd, shell_exec, shell)
-+
-+userdebug_or_eng(`
-+  allow adbd self:process setcurrent;
-+  allow adbd su:process dyntransition;
-+')
-+
-+# Do not sanitize the environment or open fds of the shell. Allow signaling
-+# created processes.
-+allow adbd shell:process { noatsecure signal };
-+
-+# Set UID and GID to shell.  Set supplementary groups.
-+allow adbd self:global_capability_class_set { setuid setgid };
-+
-+# Drop capabilities from bounding set on user builds.
-+allow adbd self:global_capability_class_set setpcap;
-+
-+# Create and use network sockets.
-+net_domain(adbd)
-+
-+# Access /dev/usb-ffs/adb/ep0
-+allow adbd functionfs:dir search;
-+allow adbd functionfs:file rw_file_perms;
-+
-+# Use a pseudo tty.
-+allow adbd devpts:chr_file rw_file_perms;
-+
-+# adb push/pull /data/local/tmp.
-+allow adbd shell_data_file:dir create_dir_perms;
-+allow adbd shell_data_file:file create_file_perms;
-+
-+# adb pull /data/local/traces/*
-+allow adbd trace_data_file:dir r_dir_perms;
-+allow adbd trace_data_file:file r_file_perms;
-+
-+# adb pull /data/misc/profman.
-+allow adbd profman_dump_data_file:dir r_dir_perms;
-+allow adbd profman_dump_data_file:file r_file_perms;
-+
-+# adb push/pull sdcard.
-+allow adbd tmpfs:dir search;
-+allow adbd rootfs:lnk_file r_file_perms;  # /sdcard symlink
-+allow adbd tmpfs:lnk_file r_file_perms;   # /mnt/sdcard symlink
-+allow adbd sdcard_type:dir create_dir_perms;
-+allow adbd sdcard_type:file create_file_perms;
-+
-+# adb pull /data/anr/traces.txt
-+allow adbd anr_data_file:dir r_dir_perms;
-+allow adbd anr_data_file:file r_file_perms;
-+
-+# Set service.adb.*, sys.powerctl, and sys.usb.ffs.ready properties.
-+set_prop(adbd, shell_prop)
-+set_prop(adbd, powerctl_prop)
-+set_prop(adbd, ffs_prop)
-+set_prop(adbd, exported_ffs_prop)
-+
-+# Access device logging gating property
-+get_prop(adbd, device_logging_prop)
-+
-+# Read device's serial number from system properties
-+get_prop(adbd, serialno_prop)
-+
-+# Run /system/bin/bu
-+allow adbd system_file:file rx_file_perms;
-+
-+# Perform binder IPC to surfaceflinger (screencap)
-+# XXX Run screencap in a separate domain?
-+binder_use(adbd)
-+binder_call(adbd, surfaceflinger)
-+# b/13188914
-+allow adbd gpu_device:chr_file rw_file_perms;
-+allow adbd ion_device:chr_file rw_file_perms;
-+r_dir_file(adbd, system_file)
-+
-+# Needed for various screenshots
-+hal_client_domain(adbd, hal_graphics_allocator)
-+
-+# Read /data/misc/adb/adb_keys.
-+allow adbd adb_keys_file:dir search;
-+allow adbd adb_keys_file:file r_file_perms;
-+
-+userdebug_or_eng(`
-+  # Write debugging information to /data/adb
-+  # when persist.adb.trace_mask is set
-+  # https://code.google.com/p/android/issues/detail?id=72895
-+  allow adbd adb_data_file:dir rw_dir_perms;
-+  allow adbd adb_data_file:file create_file_perms;
-+')
-+
-+# ndk-gdb invokes adb forward to forward the gdbserver socket.
-+allow adbd app_data_file:dir search;
-+allow adbd app_data_file:sock_file write;
-+allow adbd appdomain:unix_stream_socket connectto;
-+
-+# ndk-gdb invokes adb pull of app_process, linker, and libc.so.
-+allow adbd zygote_exec:file r_file_perms;
-+allow adbd system_file:file r_file_perms;
-+
-+# Allow pulling the SELinux policy for CTS purposes
-+allow adbd selinuxfs:dir r_dir_perms;
-+allow adbd selinuxfs:file r_file_perms;
-+allow adbd kernel:security read_policy;
-+allow adbd service_contexts_file:file r_file_perms;
-+allow adbd file_contexts_file:file r_file_perms;
-+allow adbd seapp_contexts_file:file r_file_perms;
-+allow adbd property_contexts_file:file r_file_perms;
-+allow adbd sepolicy_file:file r_file_perms;
-+
-+# Allow pulling config.gz for CTS purposes
-+allow adbd config_gz:file r_file_perms;
-+
-+allow adbd surfaceflinger_service:service_manager find;
-+allow adbd bootchart_data_file:dir search;
-+allow adbd bootchart_data_file:file r_file_perms;
-+
-+# Allow access to external storage; we have several visible mount points under /storage
-+# and symlinks to primary storage at places like /storage/sdcard0 and /mnt/user/0/primary
-+allow adbd storage_file:dir r_dir_perms;
-+allow adbd storage_file:lnk_file r_file_perms;
-+allow adbd mnt_user_file:dir r_dir_perms;
-+allow adbd mnt_user_file:lnk_file r_file_perms;
-+
-+# Access to /data/media.
-+# This should be removed if sdcardfs is modified to alter the secontext for its
-+# accesses to the underlying FS.
-+allow adbd media_rw_data_file:dir create_dir_perms;
-+allow adbd media_rw_data_file:file create_file_perms;
-+
-+r_dir_file(adbd, apk_data_file)
-+
-+allow adbd rootfs:dir r_dir_perms;
-+
-+###
-+### Neverallow rules
-+###
-+
-+# No transitions from adbd to non-shell, non-crash_dump domains. adbd only ever
-+# transitions to the shell domain (except when it crashes). In particular, we
-+# never want to see a transition from adbd to su (aka "adb root")
-+neverallow adbd { domain -crash_dump -shell }:process transition;
-+neverallow adbd { domain userdebug_or_eng(`-su') }:process dyntransition;
-diff --git a/prebuilts/api/28.0/private/app.te b/prebuilts/api/28.0/private/app.te
-new file mode 100644
-index 000000000..f3e1e2a09
---- /dev/null
-+++ b/prebuilts/api/28.0/private/app.te
-@@ -0,0 +1,7 @@
-+# TODO: deal with tmpfs_domain pub/priv split properly
-+# Read system properties managed by zygote.
-+allow appdomain zygote_tmpfs:file read;
-+
-+neverallow appdomain system_server:udp_socket {
-+        accept append bind create ioctl listen lock name_bind
-+        relabelfrom relabelto setattr shutdown };
-diff --git a/prebuilts/api/28.0/private/app_neverallows.te b/prebuilts/api/28.0/private/app_neverallows.te
-new file mode 100644
-index 000000000..8d9ccd672
---- /dev/null
-+++ b/prebuilts/api/28.0/private/app_neverallows.te
-@@ -0,0 +1,262 @@
-+###
-+### neverallow rules for untrusted app domains
-+###
-+
-+define(`all_untrusted_apps',`{
-+  ephemeral_app
-+  isolated_app
-+  mediaprovider
-+  untrusted_app
-+  untrusted_app_25
-+  untrusted_app_27
-+  untrusted_app_all
-+  untrusted_v2_app
-+}')
-+# Receive or send uevent messages.
-+neverallow all_untrusted_apps domain:netlink_kobject_uevent_socket *;
-+
-+# Receive or send generic netlink messages
-+neverallow all_untrusted_apps domain:netlink_socket *;
-+
-+# Too much leaky information in debugfs. It's a security
-+# best practice to ensure these files aren't readable.
-+neverallow all_untrusted_apps debugfs_type:file read;
-+
-+# Do not allow untrusted apps to register services.
-+# Only trusted components of Android should be registering
-+# services.
-+neverallow all_untrusted_apps service_manager_type:service_manager add;
-+
-+# Do not allow untrusted apps to use VendorBinder
-+neverallow all_untrusted_apps vndbinder_device:chr_file *;
-+neverallow all_untrusted_apps vndservice_manager_type:service_manager *;
-+
-+# Do not allow untrusted apps to connect to the property service
-+# or set properties. b/10243159
-+neverallow { all_untrusted_apps -mediaprovider } property_socket:sock_file write;
-+neverallow { all_untrusted_apps -mediaprovider } init:unix_stream_socket connectto;
-+neverallow { all_untrusted_apps -mediaprovider } property_type:property_service set;
-+
-+# net.dns properties are not a public API. Temporarily exempt pre-Oreo apps,
-+# but otherwise disallow untrusted apps from reading this property.
-+neverallow { all_untrusted_apps -untrusted_app_25 } net_dns_prop:file read;
-+
-+# Do not allow untrusted apps to be assigned mlstrustedsubject.
-+# This would undermine the per-user isolation model being
-+# enforced via levelFrom=user in seapp_contexts and the mls
-+# constraints.  As there is no direct way to specify a neverallow
-+# on attribute assignment, this relies on the fact that fork
-+# permission only makes sense within a domain (hence should
-+# never be granted to any other domain within mlstrustedsubject)
-+# and an untrusted app is allowed fork permission to itself.
-+neverallow all_untrusted_apps mlstrustedsubject:process fork;
-+
-+# Do not allow untrusted apps to hard link to any files.
-+# In particular, if an untrusted app links to other app data
-+# files, installd will not be able to guarantee the deletion
-+# of the linked to file. Hard links also contribute to security
-+# bugs, so we want to ensure untrusted apps never have this
-+# capability.
-+neverallow all_untrusted_apps file_type:file link;
-+
-+# Do not allow untrusted apps to access network MAC address file
-+neverallow all_untrusted_apps sysfs_mac_address:file no_rw_file_perms;
-+
-+# Do not allow any write access to files in /sys
-+neverallow all_untrusted_apps sysfs_type:file { no_w_file_perms no_x_file_perms };
-+
-+# Apps may never access the default sysfs label.
-+neverallow all_untrusted_apps sysfs:file no_rw_file_perms;
-+
-+# Restrict socket ioctls. Either 1. disallow privileged ioctls, 2. disallow the
-+# ioctl permission, or 3. disallow the socket class.
-+neverallowxperm all_untrusted_apps domain:{ rawip_socket tcp_socket udp_socket } ioctl priv_sock_ioctls;
-+neverallow all_untrusted_apps *:{ netlink_route_socket netlink_selinux_socket } ioctl;
-+neverallow all_untrusted_apps *:{
-+  socket netlink_socket packet_socket key_socket appletalk_socket
-+  netlink_tcpdiag_socket netlink_nflog_socket
-+  netlink_xfrm_socket netlink_audit_socket
-+  netlink_dnrt_socket netlink_kobject_uevent_socket tun_socket
-+  netlink_iscsi_socket netlink_fib_lookup_socket netlink_connector_socket
-+  netlink_netfilter_socket netlink_generic_socket netlink_scsitransport_socket
-+  netlink_rdma_socket netlink_crypto_socket
-+} *;
-+
-+# Do not allow untrusted apps access to /cache
-+neverallow { all_untrusted_apps -mediaprovider } { cache_file cache_recovery_file }:dir ~{ r_dir_perms };
-+neverallow { all_untrusted_apps -mediaprovider } { cache_file cache_recovery_file }:file ~{ read getattr };
-+
-+# Do not allow untrusted apps to create/unlink files outside of its sandbox,
-+# internal storage or sdcard.
-+# World accessible data locations allow application to fill the device
-+# with unaccounted for data. This data will not get removed during
-+# application un-installation.
-+neverallow { all_untrusted_apps -mediaprovider } {
-+  fs_type
-+  -sdcard_type
-+  file_type
-+  -app_data_file            # The apps sandbox itself
-+  -media_rw_data_file       # Internal storage. Known that apps can
-+                            # leave artfacts here after uninstall.
-+  -user_profile_data_file   # Access to profile files
-+  userdebug_or_eng(`
-+    -method_trace_data_file # only on ro.debuggable=1
-+    -coredump_file          # userdebug/eng only
-+  ')
-+}:dir_file_class_set { create unlink };
-+
-+# No untrusted component should be touching /dev/fuse
-+neverallow all_untrusted_apps fuse_device:chr_file *;
-+
-+# Do not allow untrusted apps to directly open tun_device
-+neverallow all_untrusted_apps tun_device:chr_file open;
-+
-+# Only allow appending to /data/anr/traces.txt (b/27853304, b/18340553)
-+neverallow all_untrusted_apps anr_data_file:file ~{ open append };
-+neverallow all_untrusted_apps anr_data_file:dir ~search;
-+
-+# Avoid reads from generically labeled /proc files
-+# Create a more specific label if needed
-+neverallow all_untrusted_apps {
-+  proc
-+  proc_asound
-+  proc_filesystems
-+  proc_kmsg
-+  proc_loadavg
-+  proc_mounts
-+  proc_pagetypeinfo
-+  proc_stat
-+  proc_swaps
-+  proc_uptime
-+  proc_version
-+  proc_vmallocinfo
-+  proc_vmstat
-+}:file { no_rw_file_perms no_x_file_perms };
-+
-+# Avoid all access to kernel configuration
-+neverallow all_untrusted_apps config_gz:file { no_rw_file_perms no_x_file_perms };
-+
-+# Do not allow untrusted apps access to preloads data files
-+neverallow all_untrusted_apps preloads_data_file:file no_rw_file_perms;
-+
-+# Locking of files on /system could lead to denial of service attacks
-+# against privileged system components
-+neverallow all_untrusted_apps system_file:file lock;
-+
-+# Do not permit untrusted apps to perform actions on HwBinder service_manager
-+# other than find actions for services listed below
-+neverallow all_untrusted_apps *:hwservice_manager ~find;
-+
-+# Do not permit access from apps which host arbitrary code to HwBinder services,
-+# except those considered sufficiently safe for access from such apps.
-+# The two main reasons for this are:
-+# 1. HwBinder servers do not perform client authentication because HIDL
-+#    currently does not expose caller UID information and, even if it did, many
-+#    HwBinder services either operate at a level below that of apps (e.g., HALs)
-+#    or must not rely on app identity for authorization. Thus, to be safe, the
-+#    default assumption is that every HwBinder service treats all its clients as
-+#    equally authorized to perform operations offered by the service.
-+# 2. HAL servers (a subset of HwBinder services) contain code with higher
-+#    incidence rate of security issues than system/core components and have
-+#    access to lower layes of the stack (all the way down to hardware) thus
-+#    increasing opportunities for bypassing the Android security model.
-+#
-+# Safe services include:
-+# - same process services: because they by definition run in the process
-+#   of the client and thus have the same access as the client domain in which
-+#   the process runs
-+# - coredomain_hwservice: are considered safe because they do not pose risks
-+#   associated with reason #2 above.
-+# - hal_configstore_ISurfaceFlingerConfigs:  becuase it has specifically been
-+#   designed for use by any domain.
-+# - hal_graphics_allocator_hwservice: because these operations are also offered
-+#   by surfaceflinger Binder service, which apps are permitted to access
-+# - hal_omx_hwservice: because this is a HwBinder version of the mediacodec
-+#   Binder service which apps were permitted to access.
-+# - hal_codec2_hwservice: because this is a newer version of hal_omx_hwservice.
-+neverallow all_untrusted_apps {
-+  hwservice_manager_type
-+  -same_process_hwservice
-+  -coredomain_hwservice
-+  -hal_codec2_hwservice
-+  -hal_configstore_ISurfaceFlingerConfigs
-+  -hal_graphics_allocator_hwservice
-+  -hal_omx_hwservice
-+  -hal_cas_hwservice
-+  -hal_neuralnetworks_hwservice
-+  -untrusted_app_visible_hwservice
-+}:hwservice_manager find;
-+
-+# Make sure that the following services are never accessible by untrusted_apps
-+neverallow all_untrusted_apps {
-+  default_android_hwservice
-+  hal_audio_hwservice
-+  hal_authsecret_hwservice
-+  hal_bluetooth_hwservice
-+  hal_bootctl_hwservice
-+  hal_camera_hwservice
-+  hal_confirmationui_hwservice
-+  hal_contexthub_hwservice
-+  hal_drm_hwservice
-+  hal_dumpstate_hwservice
-+  hal_fingerprint_hwservice
-+  hal_gatekeeper_hwservice
-+  hal_gnss_hwservice
-+  hal_graphics_composer_hwservice
-+  hal_health_hwservice
-+  hal_ir_hwservice
-+  hal_keymaster_hwservice
-+  hal_light_hwservice
-+  hal_memtrack_hwservice
-+  hal_nfc_hwservice
-+  hal_oemlock_hwservice
-+  hal_power_hwservice
-+  hal_secure_element_hwservice
-+  hal_sensors_hwservice
-+  hal_telephony_hwservice
-+  hal_thermal_hwservice
-+  hal_tv_cec_hwservice
-+  hal_tv_input_hwservice
-+  hal_usb_hwservice
-+  hal_vibrator_hwservice
-+  hal_vr_hwservice
-+  hal_weaver_hwservice
-+  hal_wifi_hwservice
-+  hal_wifi_offload_hwservice
-+  hal_wifi_supplicant_hwservice
-+  hidl_base_hwservice
-+  system_net_netd_hwservice
-+  thermalcallback_hwservice
-+}:hwservice_manager find;
-+# HwBinder services offered by core components (as opposed to vendor components)
-+# are considered somewhat safer due to point #2 above.
-+neverallow all_untrusted_apps {
-+  coredomain_hwservice
-+  -same_process_hwservice
-+  -hidl_allocator_hwservice # Designed for use by any domain
-+  -hidl_manager_hwservice # Designed for use by any domain
-+  -hidl_memory_hwservice # Designed for use by any domain
-+  -hidl_token_hwservice # Designed for use by any domain
-+}:hwservice_manager find;
-+
-+# SELinux is not an API for untrusted apps to use
-+neverallow all_untrusted_apps selinuxfs:file no_rw_file_perms;
-+
-+# Restrict *Binder access from apps to HAL domains. We can only do this on full
-+# Treble devices where *Binder communications between apps and HALs are tightly
-+# restricted.
-+full_treble_only(`
-+  neverallow all_untrusted_apps {
-+    halserverdomain
-+    -coredomain
-+    -hal_configstore_server
-+    -hal_graphics_allocator_server
-+    -hal_cas_server
-+    -hal_neuralnetworks_server
-+    -binder_in_vendor_violators # TODO(b/35870313): Remove once all violations are gone
-+    -untrusted_app_visible_halserver
-+  }:binder { call transfer };
-+')
-+
-+# Untrusted apps are not allowed to find mediaextractor update service.
-+neverallow all_untrusted_apps mediaextractor_update_service:service_manager find;
-diff --git a/prebuilts/api/28.0/private/asan_extract.te b/prebuilts/api/28.0/private/asan_extract.te
-new file mode 100644
-index 000000000..1c20d78ec
---- /dev/null
-+++ b/prebuilts/api/28.0/private/asan_extract.te
-@@ -0,0 +1,8 @@
-+# type_transition must be private policy the domain_trans rules could stay
-+# public, but conceptually should go with this
-+# Technically not a daemon but we do want the transition from init domain to
-+# asan_extract to occur.
-+with_asan(`
-+typeattribute asan_extract coredomain;
-+init_daemon_domain(asan_extract)
-+')
-diff --git a/prebuilts/api/28.0/private/atrace.te b/prebuilts/api/28.0/private/atrace.te
-new file mode 100644
-index 000000000..630935da0
---- /dev/null
-+++ b/prebuilts/api/28.0/private/atrace.te
-@@ -0,0 +1,46 @@
-+# Domain for atrace process.
-+# It is spawned either by traced_probes or by init for the boottrace service.
-+
-+type atrace, domain, coredomain;
-+type atrace_exec, exec_type, file_type;
-+
-+# boottrace services uses /data/misc/boottrace/categories
-+allow atrace boottrace_data_file:dir search;
-+allow atrace boottrace_data_file:file r_file_perms;
-+
-+# Allow atrace to access tracefs.
-+allow atrace debugfs_tracing:dir r_dir_perms;
-+allow atrace debugfs_tracing:file rw_file_perms;
-+allow atrace debugfs_trace_marker:file getattr;
-+
-+# atrace sets debug.atrace.* properties
-+set_prop(atrace, debug_prop)
-+
-+# atrace pokes all the binder-enabled processes at startup with a
-+# SYSPROPS_TRANSACTION, to tell them to reload the debug.atrace.* properties.
-+
-+binder_use(atrace)
-+allow atrace healthd:binder call;
-+allow atrace surfaceflinger:binder call;
-+get_prop(atrace, hwservicemanager_prop)
-+
-+allow atrace {
-+  service_manager_type
-+  -incident_service
-+  -netd_service
-+  -stats_service
-+  -dumpstate_service
-+  -installd_service
-+  -vold_service
-+}:service_manager { find };
-+allow atrace servicemanager:service_manager list;
-+
-+userdebug_or_eng(`
-+  # atrace is generally invoked as a standalone binary from shell or perf
-+  # daemons like Perfetto traced_probes. However, in userdebug builds, there is
-+  # a further option to run atrace as an init daemon for boot tracing.
-+  init_daemon_domain(atrace)
-+
-+  allow atrace debugfs_tracing_debug:dir r_dir_perms;
-+  allow atrace debugfs_tracing_debug:file rw_file_perms;
-+')
-diff --git a/prebuilts/api/28.0/private/audioserver.te b/prebuilts/api/28.0/private/audioserver.te
-new file mode 100644
-index 000000000..1d4223fe0
---- /dev/null
-+++ b/prebuilts/api/28.0/private/audioserver.te
-@@ -0,0 +1,88 @@
-+# audioserver - audio services daemon
-+
-+typeattribute audioserver coredomain;
-+
-+type audioserver_exec, exec_type, file_type;
-+init_daemon_domain(audioserver)
-+
-+r_dir_file(audioserver, sdcard_type)
-+
-+binder_use(audioserver)
-+binder_call(audioserver, binderservicedomain)
-+binder_call(audioserver, appdomain)
-+binder_service(audioserver)
-+
-+hal_client_domain(audioserver, hal_allocator)
-+# /system/lib64/hw for always-passthrough Allocator HAL ashmem / mapper .so
-+r_dir_file(audioserver, system_file)
-+
-+hal_client_domain(audioserver, hal_audio)
-+
-+userdebug_or_eng(`
-+  # used for TEE sink - pcm capture for debug.
-+  allow audioserver media_data_file:dir create_dir_perms;
-+  allow audioserver audioserver_data_file:dir create_dir_perms;
-+  allow audioserver audioserver_data_file:file create_file_perms;
-+
-+  # ptrace to processes in the same domain for memory leak detection
-+  allow audioserver self:process ptrace;
-+')
-+
-+add_service(audioserver, audioserver_service)
-+allow audioserver activity_service:service_manager find;
-+allow audioserver appops_service:service_manager find;
-+allow audioserver batterystats_service:service_manager find;
-+allow audioserver permission_service:service_manager find;
-+allow audioserver power_service:service_manager find;
-+allow audioserver scheduling_policy_service:service_manager find;
-+allow audioserver mediametrics_service:service_manager find;
-+
-+# Allow read/write access to bluetooth-specific properties
-+set_prop(audioserver, bluetooth_a2dp_offload_prop)
-+set_prop(audioserver, bluetooth_prop)
-+set_prop(audioserver, exported_bluetooth_prop)
-+
-+# Grant access to audio files to audioserver
-+allow audioserver audio_data_file:dir ra_dir_perms;
-+allow audioserver audio_data_file:file create_file_perms;
-+
-+# allow access to ALSA MMAP FDs for AAudio API
-+allow audioserver audio_device:chr_file { read write };
-+
-+not_full_treble(`allow audioserver audio_device:dir r_dir_perms;')
-+not_full_treble(`allow audioserver audio_device:chr_file rw_file_perms;')
-+
-+# For A2DP bridge which is loaded directly into audioserver
-+unix_socket_connect(audioserver, bluetooth, bluetooth)
-+
-+# Allow shell commands from ADB and shell for CTS testing/dumping
-+allow audioserver adbd:fd use;
-+allow audioserver adbd:unix_stream_socket { read write };
-+allow audioserver shell:fifo_file { read write };
-+
-+# Allow shell commands from ADB for CTS testing/dumping
-+userdebug_or_eng(`
-+  allow audioserver su:fd use;
-+  allow audioserver su:fifo_file { read write };
-+  allow audioserver su:unix_stream_socket { read write };
-+')
-+
-+###
-+### neverallow rules
-+###
-+
-+# audioserver should never execute any executable without a
-+# domain transition
-+neverallow audioserver { file_type fs_type }:file execute_no_trans;
-+
-+# The goal of the mediaserver split is to place media processing code into
-+# restrictive sandboxes with limited responsibilities and thus limited
-+# permissions. Example: Audioserver is only responsible for controlling audio
-+# hardware and processing audio content. Cameraserver does the same for camera
-+# hardware/content. Etc.
-+#
-+# Media processing code is inherently risky and thus should have limited
-+# permissions and be isolated from the rest of the system and network.
-+# Lengthier explanation here:
-+# https://android-developers.googleblog.com/2016/05/hardening-media-stack.html
-+neverallow audioserver domain:{ tcp_socket udp_socket rawip_socket } *;
-diff --git a/prebuilts/api/28.0/private/binder_in_vendor_violators.te b/prebuilts/api/28.0/private/binder_in_vendor_violators.te
-new file mode 100644
-index 000000000..4a1218e1d
---- /dev/null
-+++ b/prebuilts/api/28.0/private/binder_in_vendor_violators.te
-@@ -0,0 +1 @@
-+allow binder_in_vendor_violators binder_device:chr_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/private/binderservicedomain.te b/prebuilts/api/28.0/private/binderservicedomain.te
-new file mode 100644
-index 000000000..0891ee5b2
---- /dev/null
-+++ b/prebuilts/api/28.0/private/binderservicedomain.te
-@@ -0,0 +1,22 @@
-+# Rules common to all binder service domains
-+
-+# Allow dumpstate and incidentd to collect information from binder services
-+allow binderservicedomain { dumpstate incidentd }:fd use;
-+allow binderservicedomain { dumpstate incidentd }:unix_stream_socket { read write getopt getattr };
-+allow binderservicedomain { dumpstate incidentd }:fifo_file  { getattr write };
-+allow binderservicedomain shell_data_file:file { getattr write };
-+
-+# Allow dumpsys to work from adb shell or the serial console
-+allow binderservicedomain devpts:chr_file rw_file_perms;
-+allow binderservicedomain console_device:chr_file rw_file_perms;
-+
-+# Receive and write to a pipe received over Binder from an app.
-+allow binderservicedomain appdomain:fd use;
-+allow binderservicedomain appdomain:fifo_file write;
-+
-+# allow all services to run permission checks
-+allow binderservicedomain permission_service:service_manager find;
-+
-+allow binderservicedomain keystore:keystore_key { get_state get insert delete exist list sign verify };
-+
-+use_keystore(binderservicedomain)
-diff --git a/prebuilts/api/28.0/private/blank_screen.te b/prebuilts/api/28.0/private/blank_screen.te
-new file mode 100644
-index 000000000..43d273bd0
---- /dev/null
-+++ b/prebuilts/api/28.0/private/blank_screen.te
-@@ -0,0 +1,6 @@
-+type blank_screen, domain, coredomain;
-+type blank_screen_exec, exec_type, file_type;
-+
-+init_daemon_domain(blank_screen)
-+
-+hal_client_domain(blank_screen, hal_light)
-diff --git a/prebuilts/api/28.0/private/blkid.te b/prebuilts/api/28.0/private/blkid.te
-new file mode 100644
-index 000000000..090912b82
---- /dev/null
-+++ b/prebuilts/api/28.0/private/blkid.te
-@@ -0,0 +1,22 @@
-+# blkid called from vold
-+
-+typeattribute blkid coredomain;
-+
-+type blkid_exec, exec_type, file_type;
-+
-+# Allowed read-only access to encrypted devices to extract UUID/label
-+allow blkid block_device:dir search;
-+allow blkid userdata_block_device:blk_file r_file_perms;
-+allow blkid dm_device:blk_file r_file_perms;
-+
-+# Allow stdin/out back to vold
-+allow blkid vold:fd use;
-+allow blkid vold:fifo_file { read write getattr };
-+
-+# For blkid launched through popen()
-+allow blkid blkid_exec:file rx_file_perms;
-+
-+# Only allow entry from vold
-+neverallow { domain -vold } blkid:process transition;
-+neverallow * blkid:process dyntransition;
-+neverallow blkid { file_type fs_type -blkid_exec -shell_exec }:file entrypoint;
-diff --git a/prebuilts/api/28.0/private/blkid_untrusted.te b/prebuilts/api/28.0/private/blkid_untrusted.te
-new file mode 100644
-index 000000000..125677157
---- /dev/null
-+++ b/prebuilts/api/28.0/private/blkid_untrusted.te
-@@ -0,0 +1,37 @@
-+# blkid for untrusted block devices
-+
-+typeattribute blkid_untrusted coredomain;
-+
-+# Allowed read-only access to vold block devices to extract UUID/label
-+allow blkid_untrusted block_device:dir search;
-+allow blkid_untrusted vold_device:blk_file r_file_perms;
-+
-+# Allow stdin/out back to vold
-+allow blkid_untrusted vold:fd use;
-+allow blkid_untrusted vold:fifo_file { read write getattr };
-+
-+# For blkid launched through popen()
-+allow blkid_untrusted blkid_exec:file rx_file_perms;
-+
-+###
-+### neverallow rules
-+###
-+
-+# Untrusted blkid should never be run on block devices holding sensitive data
-+neverallow blkid_untrusted {
-+  boot_block_device
-+  frp_block_device
-+  metadata_block_device
-+  recovery_block_device
-+  root_block_device
-+  swap_block_device
-+  system_block_device
-+  userdata_block_device
-+  cache_block_device
-+  dm_device
-+}:blk_file no_rw_file_perms;
-+
-+# Only allow entry from vold via blkid binary
-+neverallow { domain -vold } blkid_untrusted:process transition;
-+neverallow * blkid_untrusted:process dyntransition;
-+neverallow blkid_untrusted { file_type fs_type -blkid_exec -shell_exec }:file entrypoint;
-diff --git a/prebuilts/api/28.0/private/bluetooth.te b/prebuilts/api/28.0/private/bluetooth.te
-new file mode 100644
-index 000000000..d4198553e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bluetooth.te
-@@ -0,0 +1,80 @@
-+# bluetooth app
-+
-+typeattribute bluetooth coredomain;
-+
-+app_domain(bluetooth)
-+net_domain(bluetooth)
-+
-+# Socket creation under /data/misc/bluedroid.
-+type_transition bluetooth bluetooth_data_file:sock_file bluetooth_socket;
-+
-+# Allow access to net_admin ioctls
-+allowxperm bluetooth self:udp_socket ioctl priv_sock_ioctls;
-+
-+wakelock_use(bluetooth);
-+
-+# Data file accesses.
-+allow bluetooth bluetooth_data_file:dir create_dir_perms;
-+allow bluetooth bluetooth_data_file:notdevfile_class_set create_file_perms;
-+allow bluetooth bluetooth_logs_data_file:dir rw_dir_perms;
-+allow bluetooth bluetooth_logs_data_file:file create_file_perms;
-+
-+# Socket creation under /data/misc/bluedroid.
-+allow bluetooth bluetooth_socket:sock_file create_file_perms;
-+
-+allow bluetooth self:global_capability_class_set net_admin;
-+allow bluetooth self:global_capability2_class_set wake_alarm;
-+
-+# tethering
-+allow bluetooth self:packet_socket create_socket_perms_no_ioctl;
-+allow bluetooth self:global_capability_class_set { net_admin net_raw net_bind_service };
-+allow bluetooth self:tun_socket create_socket_perms_no_ioctl;
-+allow bluetooth tun_device:chr_file rw_file_perms;
-+allow bluetooth efs_file:dir search;
-+
-+# allow Bluetooth to access uhid device for HID profile
-+allow bluetooth uhid_device:chr_file rw_file_perms;
-+
-+# proc access.
-+allow bluetooth proc_bluetooth_writable:file rw_file_perms;
-+
-+# Allow write access to bluetooth specific properties
-+set_prop(bluetooth, bluetooth_a2dp_offload_prop)
-+set_prop(bluetooth, bluetooth_prop)
-+set_prop(bluetooth, exported_bluetooth_prop)
-+set_prop(bluetooth, pan_result_prop)
-+
-+allow bluetooth audioserver_service:service_manager find;
-+allow bluetooth bluetooth_service:service_manager find;
-+allow bluetooth drmserver_service:service_manager find;
-+allow bluetooth mediaserver_service:service_manager find;
-+allow bluetooth radio_service:service_manager find;
-+allow bluetooth app_api_service:service_manager find;
-+allow bluetooth system_api_service:service_manager find;
-+
-+# already open bugreport file descriptors may be shared with
-+# the bluetooth process, from a file in
-+# /data/data/com.android.shell/files/bugreports/bugreport-*.
-+allow bluetooth shell_data_file:file read;
-+
-+# Bluetooth audio needs RT scheduling to meet deadlines, allow sys_nice
-+allow bluetooth self:global_capability_class_set sys_nice;
-+
-+hal_client_domain(bluetooth, hal_bluetooth)
-+hal_client_domain(bluetooth, hal_telephony)
-+
-+# Bluetooth A2DP offload requires binding with audio HAL
-+hal_client_domain(bluetooth, hal_audio)
-+
-+read_runtime_log_tags(bluetooth)
-+
-+###
-+### Neverallow rules
-+###
-+### These are things that the bluetooth app should NEVER be able to do
-+###
-+
-+# Superuser capabilities.
-+# Bluetooth requires net_{admin,raw,bind_service} and wake_alarm and block_suspend and sys_nice.
-+neverallow bluetooth self:global_capability_class_set ~{ net_admin net_raw net_bind_service sys_nice};
-+neverallow bluetooth self:global_capability2_class_set ~{ wake_alarm block_suspend };
-diff --git a/prebuilts/api/28.0/private/bluetoothdomain.te b/prebuilts/api/28.0/private/bluetoothdomain.te
-new file mode 100644
-index 000000000..fe4f0e663
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bluetoothdomain.te
-@@ -0,0 +1,2 @@
-+# Allow clients to use a socket provided by the bluetooth app.
-+allow bluetoothdomain bluetooth:unix_stream_socket { getopt setopt getattr read write ioctl shutdown };
-diff --git a/prebuilts/api/28.0/private/bootanim.te b/prebuilts/api/28.0/private/bootanim.te
-new file mode 100644
-index 000000000..20ff1934b
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bootanim.te
-@@ -0,0 +1,6 @@
-+typeattribute bootanim coredomain;
-+
-+init_daemon_domain(bootanim)
-+
-+# b/68864350
-+dontaudit bootanim unlabeled:dir search;
-diff --git a/prebuilts/api/28.0/private/bootstat.te b/prebuilts/api/28.0/private/bootstat.te
-new file mode 100644
-index 000000000..806144cf6
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bootstat.te
-@@ -0,0 +1,3 @@
-+typeattribute bootstat coredomain;
-+
-+init_daemon_domain(bootstat)
-diff --git a/prebuilts/api/28.0/private/bpfloader.te b/prebuilts/api/28.0/private/bpfloader.te
-new file mode 100644
-index 000000000..4e8ec2b46
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bpfloader.te
-@@ -0,0 +1,30 @@
-+# bpf program loader
-+type bpfloader, domain;
-+type bpfloader_exec, exec_type, file_type;
-+typeattribute bpfloader coredomain;
-+
-+# Process need CAP_NET_ADMIN to run bpf programs as cgroup filter
-+allow bpfloader self:global_capability_class_set net_admin;
-+
-+r_dir_file(bpfloader, cgroup_bpf)
-+
-+# These permission is required for pin bpf program for netd.
-+allow bpfloader fs_bpf:dir  create_dir_perms;
-+allow bpfloader fs_bpf:file create_file_perms;
-+allow bpfloader devpts:chr_file { read write };
-+
-+allow bpfloader netd:fd use;
-+
-+# Use pinned bpf map files from netd.
-+allow bpfloader netd:bpf { map_read map_write };
-+allow bpfloader self:bpf { prog_load prog_run };
-+
-+# Neverallow rules
-+neverallow { domain -bpfloader } *:bpf prog_load;
-+neverallow { domain -bpfloader -netd -netutils_wrapper} *:bpf prog_run;
-+neverallow { domain -netd -bpfloader } bpfloader_exec:file { execute execute_no_trans };
-+neverallow bpfloader domain:{ tcp_socket udp_socket rawip_socket } *;
-+# only system_server, netd and bpfloader can read/write the bpf maps
-+neverallow { domain -system_server -netd -bpfloader} netd:bpf { map_read map_write };
-+
-+dontaudit bpfloader self:capability sys_admin;
-diff --git a/prebuilts/api/28.0/private/bufferhubd.te b/prebuilts/api/28.0/private/bufferhubd.te
-new file mode 100644
-index 000000000..012eb2027
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bufferhubd.te
-@@ -0,0 +1,3 @@
-+typeattribute bufferhubd coredomain;
-+
-+init_daemon_domain(bufferhubd)
-diff --git a/prebuilts/api/28.0/private/bug_map b/prebuilts/api/28.0/private/bug_map
-new file mode 100644
-index 000000000..5c551c83d
---- /dev/null
-+++ b/prebuilts/api/28.0/private/bug_map
-@@ -0,0 +1,45 @@
-+cppreopts cppreopts capability 79414024
-+dexoptanalyzer apk_data_file file 77853712
-+dexoptanalyzer app_data_file file 77853712
-+dexoptanalyzer app_data_file lnk_file 77853712
-+dexoptanalyzer system_data_file lnk_file 77853712
-+dnsmasq netd fifo_file 77868789
-+dnsmasq netd unix_stream_socket 77868789
-+init app_data_file file 77873135
-+init cache_file blk_file 77873135
-+init logpersist file 77873135
-+init nativetest_data_file dir 77873135
-+init pstorefs dir 77873135
-+init shell_data_file dir 77873135
-+init shell_data_file file 77873135
-+init shell_data_file lnk_file 77873135
-+init shell_data_file sock_file 77873135
-+init system_data_file chr_file 77873135
-+mediaextractor app_data_file file 77923736
-+mediaextractor radio_data_file file 77923736
-+mediaprovider cache_file blk_file 77925342
-+mediaprovider mnt_media_rw_file dir 77925342
-+mediaprovider shell_data_file dir 77925342
-+netd priv_app unix_stream_socket 77870037
-+netd untrusted_app unix_stream_socket 77870037
-+netd untrusted_app_25 unix_stream_socket 77870037
-+netd untrusted_app_27 unix_stream_socket 77870037
-+otapreopt_chroot postinstall_file lnk_file 75287236
-+platform_app nfc_data_file dir 74331887
-+postinstall postinstall capability 77958490
-+postinstall_dexopt postinstall_dexopt capability 77958490
-+postinstall_dexopt user_profile_data_file file 77958490
-+priv_app system_data_file dir 72811052
-+profman apk_data_file dir 77922323
-+radio statsdw_socket sock_file 78456764
-+statsd hal_health_default binder 77919007
-+storaged storaged capability 77634061
-+surfaceflinger mediacodec binder 77924251
-+system_server crash_dump process 73128755
-+system_server logd_socket sock_file 64734187
-+system_server sdcardfs file 77856826
-+system_server zygote process 77856826
-+untrusted_app_25 system_data_file dir 72550646
-+untrusted_app_27 system_data_file dir 72550646
-+usbd usbd capability 72472544
-+zygote untrusted_app_25 process 77925912
-diff --git a/prebuilts/api/28.0/private/cameraserver.te b/prebuilts/api/28.0/private/cameraserver.te
-new file mode 100644
-index 000000000..c16c13260
---- /dev/null
-+++ b/prebuilts/api/28.0/private/cameraserver.te
-@@ -0,0 +1,3 @@
-+typeattribute cameraserver coredomain;
-+
-+init_daemon_domain(cameraserver)
-diff --git a/prebuilts/api/28.0/private/charger.te b/prebuilts/api/28.0/private/charger.te
-new file mode 100644
-index 000000000..65109deff
---- /dev/null
-+++ b/prebuilts/api/28.0/private/charger.te
-@@ -0,0 +1 @@
-+typeattribute charger coredomain;
-diff --git a/prebuilts/api/28.0/private/clatd.te b/prebuilts/api/28.0/private/clatd.te
-new file mode 100644
-index 000000000..5ba0fc5cd
---- /dev/null
-+++ b/prebuilts/api/28.0/private/clatd.te
-@@ -0,0 +1 @@
-+typeattribute clatd coredomain;
-diff --git a/prebuilts/api/28.0/private/coredomain.te b/prebuilts/api/28.0/private/coredomain.te
-new file mode 100644
-index 000000000..23224c323
---- /dev/null
-+++ b/prebuilts/api/28.0/private/coredomain.te
-@@ -0,0 +1,15 @@
-+get_prop(coredomain, pm_prop)
-+get_prop(coredomain, exported_pm_prop)
-+
-+full_treble_only(`
-+neverallow {
-+    coredomain
-+
-+    # for chowning
-+    -init
-+
-+    # generic access to sysfs_type
-+    -ueventd
-+    -vold
-+} sysfs_leds:file *;
-+')
-diff --git a/prebuilts/api/28.0/private/cppreopts.te b/prebuilts/api/28.0/private/cppreopts.te
-new file mode 100644
-index 000000000..34f0d669b
---- /dev/null
-+++ b/prebuilts/api/28.0/private/cppreopts.te
-@@ -0,0 +1,6 @@
-+typeattribute cppreopts coredomain;
-+
-+# Technically not a daemon but we do want the transition from init domain to
-+# cppreopts to occur.
-+init_daemon_domain(cppreopts)
-+domain_auto_trans(cppreopts, preopt2cachename_exec, preopt2cachename);
-diff --git a/prebuilts/api/28.0/private/crash_dump.te b/prebuilts/api/28.0/private/crash_dump.te
-new file mode 100644
-index 000000000..c3d2ed5bd
---- /dev/null
-+++ b/prebuilts/api/28.0/private/crash_dump.te
-@@ -0,0 +1,14 @@
-+typeattribute crash_dump coredomain;
-+
-+allow crash_dump {
-+  domain
-+  -bpfloader
-+  -crash_dump
-+  -init
-+  -kernel
-+  -keystore
-+  -logd
-+  -ueventd
-+  -vendor_init
-+  -vold
-+}:process { ptrace signal sigchld sigstop sigkill };
-diff --git a/prebuilts/api/28.0/private/dex2oat.te b/prebuilts/api/28.0/private/dex2oat.te
-new file mode 100644
-index 000000000..fd45484f4
---- /dev/null
-+++ b/prebuilts/api/28.0/private/dex2oat.te
-@@ -0,0 +1 @@
-+typeattribute dex2oat coredomain;
-diff --git a/prebuilts/api/28.0/private/dexoptanalyzer.te b/prebuilts/api/28.0/private/dexoptanalyzer.te
-new file mode 100644
-index 000000000..dfc81b850
---- /dev/null
-+++ b/prebuilts/api/28.0/private/dexoptanalyzer.te
-@@ -0,0 +1,30 @@
-+# dexoptanalyzer
-+type dexoptanalyzer, domain, coredomain, mlstrustedsubject;
-+type dexoptanalyzer_exec, exec_type, file_type;
-+
-+# Reading an APK opens a ZipArchive, which unpack to tmpfs.
-+# Use tmpfs_domain() which will give tmpfs files created by dexoptanalyzer their
-+# own label, which differs from other labels created by other processes.
-+# This allows to distinguish in policy files created by dexoptanalyzer vs other
-+#processes.
-+tmpfs_domain(dexoptanalyzer)
-+
-+# Read symlinks in /data/dalvik-cache. This is required for PIC mode boot
-+# app_data_file the oat file is symlinked to the original file in /system.
-+allow dexoptanalyzer dalvikcache_data_file:dir { getattr search };
-+allow dexoptanalyzer dalvikcache_data_file:file r_file_perms;
-+allow dexoptanalyzer dalvikcache_data_file:lnk_file read;
-+
-+allow dexoptanalyzer installd:fd use;
-+
-+# Allow reading secondary dex files that were reported by the app to the
-+# package manager.
-+allow dexoptanalyzer app_data_file:dir { getattr search };
-+allow dexoptanalyzer app_data_file:file { getattr read };
-+# dexoptanalyzer calls access(2) with W_OK flag on app data. We can use the
-+# "dontaudit...audit_access" policy line to suppress the audit access without
-+# suppressing denial on actual access.
-+dontaudit dexoptanalyzer app_data_file:dir audit_access;
-+
-+# Allow testing /data/user/0 which symlinks to /data/data
-+allow dexoptanalyzer system_data_file:lnk_file { getattr };
-diff --git a/prebuilts/api/28.0/private/dhcp.te b/prebuilts/api/28.0/private/dhcp.te
-new file mode 100644
-index 000000000..b2f8ac7c7
---- /dev/null
-+++ b/prebuilts/api/28.0/private/dhcp.te
-@@ -0,0 +1,4 @@
-+typeattribute dhcp coredomain;
-+
-+init_daemon_domain(dhcp)
-+type_transition dhcp system_data_file:{ dir file } dhcp_data_file;
-diff --git a/prebuilts/api/28.0/private/dnsmasq.te b/prebuilts/api/28.0/private/dnsmasq.te
-new file mode 100644
-index 000000000..96084b490
---- /dev/null
-+++ b/prebuilts/api/28.0/private/dnsmasq.te
-@@ -0,0 +1 @@
-+typeattribute dnsmasq coredomain;
-diff --git a/prebuilts/api/28.0/private/domain.te b/prebuilts/api/28.0/private/domain.te
-new file mode 100644
-index 000000000..5053c287b
---- /dev/null
-+++ b/prebuilts/api/28.0/private/domain.te
-@@ -0,0 +1,118 @@
-+# Transition to crash_dump when /system/bin/crash_dump* is executed.
-+# This occurs when the process crashes.
-+domain_auto_trans(domain, crash_dump_exec, crash_dump);
-+allow domain crash_dump:process sigchld;
-+
-+# Limit ability to ptrace or read sensitive /proc/pid files of processes
-+# with other UIDs to these allowlisted domains.
-+neverallow {
-+  domain
-+  -vold
-+  -dumpstate
-+  userdebug_or_eng(`-incidentd')
-+  -storaged
-+  -system_server
-+  userdebug_or_eng(`-perfprofd')
-+} self:global_capability_class_set sys_ptrace;
-+
-+# Limit ability to generate hardware unique device ID attestations to priv_apps
-+neverallow { domain -priv_app } *:keystore_key gen_unique_id;
-+
-+neverallow {
-+  domain
-+  -init
-+  -vendor_init
-+  userdebug_or_eng(`-domain')
-+} debugfs_tracing_debug:file no_rw_file_perms;
-+
-+# Core domains are not permitted to use kernel interfaces which are not
-+# explicitly labeled.
-+# TODO(b/65643247): Apply these neverallow rules to all coredomain.
-+full_treble_only(`
-+  # /proc
-+  neverallow {
-+    coredomain
-+    -vold
-+  } proc:file no_rw_file_perms;
-+
-+  # /sys
-+  neverallow {
-+    coredomain
-+    -init
-+    -ueventd
-+    -vold
-+  } sysfs:file no_rw_file_perms;
-+
-+  # /dev
-+  neverallow {
-+    coredomain
-+    -fsck
-+    -init
-+    -ueventd
-+  } device:{ blk_file file } no_rw_file_perms;
-+
-+  # debugfs
-+  neverallow {
-+    coredomain
-+    -dumpstate
-+    -init
-+    -system_server
-+  } debugfs:file no_rw_file_perms;
-+
-+  # tracefs
-+  neverallow {
-+    coredomain
-+    -atrace
-+    -dumpstate
-+    -init
-+    userdebug_or_eng(`-perfprofd')
-+    -traced_probes
-+    -shell
-+    -traceur_app
-+  } debugfs_tracing:file no_rw_file_perms;
-+
-+  # inotifyfs
-+  neverallow {
-+    coredomain
-+    -init
-+  } inotify:file no_rw_file_perms;
-+
-+  # pstorefs
-+  neverallow {
-+    coredomain
-+    -bootstat
-+    -charger
-+    -dumpstate
-+    -healthd
-+    userdebug_or_eng(`-incidentd')
-+    -init
-+    -logd
-+    -logpersist
-+    -recovery_persist
-+    -recovery_refresh
-+    -shell
-+    -system_server
-+  } pstorefs:file no_rw_file_perms;
-+
-+  # configfs
-+  neverallow {
-+    coredomain
-+    -init
-+    -system_server
-+  } configfs:file no_rw_file_perms;
-+
-+  # functionfs
-+  neverallow {
-+    coredomain
-+    -adbd
-+    -init
-+    -mediaprovider
-+    -system_server
-+  } functionfs:file no_rw_file_perms;
-+
-+  # usbfs and binfmt_miscfs
-+  neverallow {
-+    coredomain
-+    -init
-+  }{ usbfs binfmt_miscfs }:file no_rw_file_perms;
-+')
-diff --git a/prebuilts/api/28.0/private/drmserver.te b/prebuilts/api/28.0/private/drmserver.te
-new file mode 100644
-index 000000000..afe4f0aae
---- /dev/null
-+++ b/prebuilts/api/28.0/private/drmserver.te
-@@ -0,0 +1,7 @@
-+typeattribute drmserver coredomain;
-+
-+init_daemon_domain(drmserver)
-+
-+type_transition drmserver apk_data_file:sock_file drmserver_socket;
-+
-+typeattribute drmserver_socket coredomain_socket;
-diff --git a/prebuilts/api/28.0/private/dumpstate.te b/prebuilts/api/28.0/private/dumpstate.te
-new file mode 100644
-index 000000000..2c2a62f53
---- /dev/null
-+++ b/prebuilts/api/28.0/private/dumpstate.te
-@@ -0,0 +1,47 @@
-+typeattribute dumpstate coredomain;
-+
-+init_daemon_domain(dumpstate)
-+
-+# Execute and transition to the vdc domain
-+domain_auto_trans(dumpstate, vdc_exec, vdc)
-+
-+# Acquire advisory lock on /system/etc/xtables.lock from ip[6]tables
-+allow dumpstate system_file:file lock;
-+
-+# TODO: deal with tmpfs_domain pub/priv split properly
-+allow dumpstate dumpstate_tmpfs:file execute;
-+
-+# systrace support - allow atrace to run
-+allow dumpstate debugfs_tracing:dir r_dir_perms;
-+allow dumpstate debugfs_tracing:file rw_file_perms;
-+allow dumpstate debugfs_tracing_debug:dir r_dir_perms;
-+allow dumpstate debugfs_trace_marker:file getattr;
-+allow dumpstate atrace_exec:file rx_file_perms;
-+allow dumpstate storaged_exec:file rx_file_perms;
-+
-+# /data/misc/wmtrace for wm traces
-+userdebug_or_eng(`
-+  allow dumpstate wm_trace_data_file:dir r_dir_perms;
-+  allow dumpstate wm_trace_data_file:file r_file_perms;
-+')
-+
-+# Allow dumpstate to make binder calls to storaged service
-+binder_call(dumpstate, storaged)
-+
-+# Allow dumpstate to make binder calls to statsd
-+binder_call(dumpstate, statsd)
-+
-+# Collect metrics on boot time created by init
-+get_prop(dumpstate, boottime_prop)
-+
-+# Signal native processes to dump their stack.
-+allow dumpstate {
-+  statsd
-+}:process signal;
-+
-+# For collecting bugreports.
-+allow dumpstate debugfs_wakeup_sources:file r_file_perms;
-+allow dumpstate dev_type:blk_file getattr;
-+allow dumpstate webview_zygote:process signal;
-+dontaudit dumpstate perfprofd:binder call;
-+dontaudit dumpstate update_engine:binder call;
-diff --git a/prebuilts/api/28.0/private/ephemeral_app.te b/prebuilts/api/28.0/private/ephemeral_app.te
-new file mode 100644
-index 000000000..75a631765
---- /dev/null
-+++ b/prebuilts/api/28.0/private/ephemeral_app.te
-@@ -0,0 +1,81 @@
-+###
-+### Ephemeral apps.
-+###
-+### This file defines the security policy for apps with the ephemeral
-+### feature.
-+###
-+### The ephemeral_app domain is a reduced permissions sandbox allowing
-+### ephemeral applications to be safely installed and run. Non ephemeral
-+### applications may also opt-in to ephemeral to take advantage of the
-+### additional security features.
-+###
-+### PackageManager flags an app as ephemeral at install time.
-+
-+typeattribute ephemeral_app coredomain;
-+
-+net_domain(ephemeral_app)
-+app_domain(ephemeral_app)
-+
-+# Allow ephemeral apps to read/write files in visible storage if provided fds
-+allow ephemeral_app { sdcard_type media_rw_data_file }:file {read write getattr ioctl lock append};
-+
-+# Some apps ship with shared libraries and binaries that they write out
-+# to their sandbox directory and then execute.
-+allow ephemeral_app app_data_file:file {r_file_perms execute};
-+
-+# services
-+allow ephemeral_app audioserver_service:service_manager find;
-+allow ephemeral_app cameraserver_service:service_manager find;
-+allow ephemeral_app mediaserver_service:service_manager find;
-+allow ephemeral_app mediaextractor_service:service_manager find;
-+allow ephemeral_app mediacodec_service:service_manager find;
-+allow ephemeral_app mediametrics_service:service_manager find;
-+allow ephemeral_app mediadrmserver_service:service_manager find;
-+allow ephemeral_app drmserver_service:service_manager find;
-+allow ephemeral_app radio_service:service_manager find;
-+allow ephemeral_app ephemeral_app_api_service:service_manager find;
-+
-+# Write app-specific trace data to the Perfetto traced damon. This requires
-+# connecting to its producer socket and obtaining a (per-process) tmpfs fd.
-+allow ephemeral_app traced:fd use;
-+allow ephemeral_app traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(ephemeral_app, traced_producer, traced)
-+
-+# allow ephemeral apps to use UDP sockets provided by the system server but not
-+# modify them other than to connect
-+allow ephemeral_app system_server:udp_socket {
-+        connect getattr read recvfrom sendto write getopt setopt };
-+
-+###
-+### neverallow rules
-+###
-+
-+neverallow ephemeral_app app_data_file:file execute_no_trans;
-+
-+# Receive or send uevent messages.
-+neverallow ephemeral_app domain:netlink_kobject_uevent_socket *;
-+
-+# Receive or send generic netlink messages
-+neverallow ephemeral_app domain:netlink_socket *;
-+
-+# Too much leaky information in debugfs. It's a security
-+# best practice to ensure these files aren't readable.
-+neverallow ephemeral_app debugfs:file read;
-+
-+# execute gpu_device
-+neverallow ephemeral_app gpu_device:chr_file execute;
-+
-+# access files in /sys with the default sysfs label
-+neverallow ephemeral_app sysfs:file *;
-+
-+# Avoid reads from generically labeled /proc files
-+# Create a more specific label if needed
-+neverallow ephemeral_app proc:file { no_rw_file_perms no_x_file_perms };
-+
-+# Directly access external storage
-+neverallow ephemeral_app { sdcard_type media_rw_data_file }:file {open create};
-+neverallow ephemeral_app { sdcard_type media_rw_data_file }:dir search;
-+
-+# Avoid reads to proc_net, it contains too much device wide information about
-+# ongoing connections.
-+neverallow ephemeral_app proc_net:file no_rw_file_perms;
-diff --git a/prebuilts/api/28.0/private/file.te b/prebuilts/api/28.0/private/file.te
-new file mode 100644
-index 000000000..58ee0def8
---- /dev/null
-+++ b/prebuilts/api/28.0/private/file.te
-@@ -0,0 +1,16 @@
-+# /proc/config.gz
-+type config_gz, fs_type, proc_type;
-+
-+# /data/misc/stats-data, /data/misc/stats-service
-+type stats_data_file, file_type, data_file_type, core_data_file_type;
-+
-+type statsdw_socket, file_type, coredomain_socket, mlstrustedobject;
-+
-+# /data/misc/storaged
-+type storaged_data_file, file_type, data_file_type, core_data_file_type;
-+
-+# /data/misc/wmtrace for wm traces
-+type wm_trace_data_file, file_type, data_file_type, core_data_file_type;
-+
-+# /data/misc/perfetto-traces for perfetto traces
-+type perfetto_traces_data_file, file_type, data_file_type, core_data_file_type;
-diff --git a/prebuilts/api/28.0/private/file_contexts b/prebuilts/api/28.0/private/file_contexts
-new file mode 100644
-index 000000000..564e45c2f
---- /dev/null
-+++ b/prebuilts/api/28.0/private/file_contexts
-@@ -0,0 +1,541 @@
-+###########################################
-+# Root
-+/                   u:object_r:rootfs:s0
-+
-+# Data files
-+/adb_keys           u:object_r:adb_keys_file:s0
-+/build\.prop        u:object_r:rootfs:s0
-+/default\.prop      u:object_r:rootfs:s0
-+/fstab\..*          u:object_r:rootfs:s0
-+/init\..*           u:object_r:rootfs:s0
-+/res(/.*)?          u:object_r:rootfs:s0
-+/selinux_version    u:object_r:rootfs:s0
-+/ueventd\..*        u:object_r:rootfs:s0
-+/verity_key         u:object_r:rootfs:s0
-+
-+# Executables
-+/charger            u:object_r:rootfs:s0
-+/init               u:object_r:init_exec:s0
-+/sbin(/.*)?         u:object_r:rootfs:s0
-+
-+# For kernel modules
-+/lib(/.*)?          u:object_r:rootfs:s0
-+
-+# Empty directories
-+/lost\+found        u:object_r:rootfs:s0
-+/acct               u:object_r:cgroup:s0
-+/config             u:object_r:rootfs:s0
-+/mnt                u:object_r:tmpfs:s0
-+/postinstall        u:object_r:postinstall_mnt_dir:s0
-+/proc               u:object_r:rootfs:s0
-+/sys                u:object_r:sysfs:s0
-+
-+# Symlinks
-+/bin                u:object_r:rootfs:s0
-+/bugreports         u:object_r:rootfs:s0
-+/d                  u:object_r:rootfs:s0
-+/etc                u:object_r:rootfs:s0
-+/sdcard             u:object_r:rootfs:s0
-+
-+# SELinux policy files
-+/vendor_file_contexts   u:object_r:file_contexts_file:s0
-+/nonplat_file_contexts  u:object_r:file_contexts_file:s0
-+/plat_file_contexts     u:object_r:file_contexts_file:s0
-+/mapping_sepolicy\.cil   u:object_r:sepolicy_file:s0
-+/nonplat_sepolicy\.cil   u:object_r:sepolicy_file:s0
-+/plat_sepolicy\.cil      u:object_r:sepolicy_file:s0
-+/plat_property_contexts  u:object_r:property_contexts_file:s0
-+/nonplat_property_contexts  u:object_r:property_contexts_file:s0
-+/vendor_property_contexts   u:object_r:property_contexts_file:s0
-+/seapp_contexts     u:object_r:seapp_contexts_file:s0
-+/nonplat_seapp_contexts     u:object_r:seapp_contexts_file:s0
-+/vendor_seapp_contexts      u:object_r:seapp_contexts_file:s0
-+/plat_seapp_contexts     u:object_r:seapp_contexts_file:s0
-+/sepolicy           u:object_r:sepolicy_file:s0
-+/plat_service_contexts   u:object_r:service_contexts_file:s0
-+/plat_hwservice_contexts   u:object_r:hwservice_contexts_file:s0
-+/nonplat_service_contexts   u:object_r:nonplat_service_contexts_file:s0
-+# Use nonplat_service_contexts_file to allow servicemanager to read it
-+# on non full-treble devices.
-+/vendor_service_contexts    u:object_r:nonplat_service_contexts_file:s0
-+/nonplat_hwservice_contexts   u:object_r:hwservice_contexts_file:s0
-+/vendor_hwservice_contexts    u:object_r:hwservice_contexts_file:s0
-+/vndservice_contexts   u:object_r:vndservice_contexts_file:s0
-+
-+##########################
-+# Devices
-+#
-+/dev(/.*)?		u:object_r:device:s0
-+/dev/akm8973.*		u:object_r:sensors_device:s0
-+/dev/accelerometer	u:object_r:sensors_device:s0
-+/dev/adf[0-9]*		u:object_r:graphics_device:s0
-+/dev/adf-interface[0-9]*\.[0-9]*	u:object_r:graphics_device:s0
-+/dev/adf-overlay-engine[0-9]*\.[0-9]*	u:object_r:graphics_device:s0
-+/dev/alarm		u:object_r:alarm_device:s0
-+/dev/ashmem		u:object_r:ashmem_device:s0
-+/dev/audio.*		u:object_r:audio_device:s0
-+/dev/binder		u:object_r:binder_device:s0
-+/dev/block(/.*)?	u:object_r:block_device:s0
-+/dev/block/dm-[0-9]+	u:object_r:dm_device:s0
-+/dev/block/loop[0-9]*	u:object_r:loop_device:s0
-+/dev/block/vold/.+	u:object_r:vold_device:s0
-+/dev/block/ram[0-9]*	u:object_r:ram_device:s0
-+/dev/block/zram[0-9]*	u:object_r:ram_device:s0
-+/dev/bus/usb(.*)?       u:object_r:usb_device:s0
-+/dev/cam		u:object_r:camera_device:s0
-+/dev/console		u:object_r:console_device:s0
-+/dev/cpuctl(/.*)?	u:object_r:cpuctl_device:s0
-+/dev/memcg(/.*)?        u:object_r:cgroup:s0
-+/dev/device-mapper	u:object_r:dm_device:s0
-+/dev/eac		u:object_r:audio_device:s0
-+/dev/event-log-tags     u:object_r:runtime_event_log_tags_file:s0
-+/dev/fscklogs(/.*)?	u:object_r:fscklogs:s0
-+/dev/full		u:object_r:full_device:s0
-+/dev/fuse		u:object_r:fuse_device:s0
-+/dev/graphics(/.*)?	u:object_r:graphics_device:s0
-+/dev/hw_random		u:object_r:hw_random_device:s0
-+/dev/hwbinder		u:object_r:hwbinder_device:s0
-+/dev/i2c-[0-9]+		u:object_r:i2c_device:s0
-+/dev/input(/.*)?	u:object_r:input_device:s0
-+/dev/iio:device[0-9]+   u:object_r:iio_device:s0
-+/dev/ion		u:object_r:ion_device:s0
-+/dev/keychord   u:object_r:keychord_device:s0
-+/dev/kmem		u:object_r:kmem_device:s0
-+/dev/loop-control	u:object_r:loop_control_device:s0
-+/dev/mem		u:object_r:kmem_device:s0
-+/dev/modem.*		u:object_r:radio_device:s0
-+/dev/mtd(/.*)?		u:object_r:mtd_device:s0
-+/dev/mtp_usb		u:object_r:mtp_device:s0
-+/dev/pmsg0		u:object_r:pmsg_device:s0
-+/dev/pn544		u:object_r:nfc_device:s0
-+/dev/port		u:object_r:port_device:s0
-+/dev/ppp		u:object_r:ppp_device:s0
-+/dev/ptmx		u:object_r:ptmx_device:s0
-+/dev/pvrsrvkm		u:object_r:gpu_device:s0
-+/dev/kmsg		u:object_r:kmsg_device:s0
-+/dev/kmsg_debug	u:object_r:kmsg_debug_device:s0
-+/dev/null		u:object_r:null_device:s0
-+/dev/nvhdcp1		u:object_r:video_device:s0
-+/dev/random		u:object_r:random_device:s0
-+/dev/rpmsg-omx[0-9]	u:object_r:rpmsg_device:s0
-+/dev/rproc_user	u:object_r:rpmsg_device:s0
-+/dev/rtc[0-9]      u:object_r:rtc_device:s0
-+/dev/snd(/.*)?		u:object_r:audio_device:s0
-+/dev/snd/audio_timer_device	u:object_r:audio_timer_device:s0
-+/dev/snd/audio_seq_device	u:object_r:audio_seq_device:s0
-+/dev/socket(/.*)?	u:object_r:socket_device:s0
-+/dev/socket/adbd	u:object_r:adbd_socket:s0
-+/dev/socket/dnsproxyd	u:object_r:dnsproxyd_socket:s0
-+/dev/socket/dumpstate	u:object_r:dumpstate_socket:s0
-+/dev/socket/fwmarkd	u:object_r:fwmarkd_socket:s0
-+/dev/socket/lmkd        u:object_r:lmkd_socket:s0
-+/dev/socket/logd	u:object_r:logd_socket:s0
-+/dev/socket/logdr	u:object_r:logdr_socket:s0
-+/dev/socket/logdw	u:object_r:logdw_socket:s0
-+/dev/socket/statsdw	u:object_r:statsdw_socket:s0
-+/dev/socket/mdns	u:object_r:mdns_socket:s0
-+/dev/socket/mdnsd	u:object_r:mdnsd_socket:s0
-+/dev/socket/mtpd	u:object_r:mtpd_socket:s0
-+/dev/socket/netd	u:object_r:netd_socket:s0
-+/dev/socket/pdx/system/buffer_hub	u:object_r:pdx_bufferhub_dir:s0
-+/dev/socket/pdx/system/buffer_hub/client	u:object_r:pdx_bufferhub_client_endpoint_socket:s0
-+/dev/socket/pdx/system/performance	u:object_r:pdx_performance_dir:s0
-+/dev/socket/pdx/system/performance/client	u:object_r:pdx_performance_client_endpoint_socket:s0
-+/dev/socket/pdx/system/vr/display	u:object_r:pdx_display_dir:s0
-+/dev/socket/pdx/system/vr/display/client	u:object_r:pdx_display_client_endpoint_socket:s0
-+/dev/socket/pdx/system/vr/display/manager	u:object_r:pdx_display_manager_endpoint_socket:s0
-+/dev/socket/pdx/system/vr/display/screenshot	u:object_r:pdx_display_screenshot_endpoint_socket:s0
-+/dev/socket/pdx/system/vr/display/vsync	u:object_r:pdx_display_vsync_endpoint_socket:s0
-+/dev/socket/property_service	u:object_r:property_socket:s0
-+/dev/socket/racoon	u:object_r:racoon_socket:s0
-+/dev/socket/rild	u:object_r:rild_socket:s0
-+/dev/socket/rild-debug	u:object_r:rild_debug_socket:s0
-+/dev/socket/tombstoned_crash u:object_r:tombstoned_crash_socket:s0
-+/dev/socket/tombstoned_java_trace u:object_r:tombstoned_java_trace_socket:s0
-+/dev/socket/tombstoned_intercept u:object_r:tombstoned_intercept_socket:s0
-+/dev/socket/traced_producer	u:object_r:traced_producer_socket:s0
-+/dev/socket/traced_consumer	u:object_r:traced_consumer_socket:s0
-+/dev/socket/uncrypt	u:object_r:uncrypt_socket:s0
-+/dev/socket/wpa_eth[0-9] u:object_r:wpa_socket:s0
-+/dev/socket/wpa_wlan[0-9] u:object_r:wpa_socket:s0
-+/dev/socket/zygote	u:object_r:zygote_socket:s0
-+/dev/socket/zygote_secondary	u:object_r:zygote_socket:s0
-+/dev/spdif_out.*	u:object_r:audio_device:s0
-+/dev/tegra.*		u:object_r:video_device:s0
-+/dev/tty		u:object_r:owntty_device:s0
-+/dev/tty[0-9]*		u:object_r:tty_device:s0
-+/dev/ttyS[0-9]*		u:object_r:serial_device:s0
-+/dev/tun		u:object_r:tun_device:s0
-+/dev/uhid		u:object_r:uhid_device:s0
-+/dev/uinput		u:object_r:uhid_device:s0
-+/dev/uio[0-9]*		u:object_r:uio_device:s0
-+/dev/urandom		u:object_r:random_device:s0
-+/dev/usb_accessory	u:object_r:usbaccessory_device:s0
-+/dev/v4l-touch[0-9]*	u:object_r:input_device:s0
-+/dev/vcs[0-9a-z]*	u:object_r:vcs_device:s0
-+/dev/video[0-9]*	u:object_r:video_device:s0
-+/dev/vndbinder		u:object_r:vndbinder_device:s0
-+/dev/watchdog		u:object_r:watchdog_device:s0
-+/dev/xt_qtaguid	u:object_r:qtaguid_device:s0
-+/dev/zero		u:object_r:zero_device:s0
-+/dev/__properties__ u:object_r:properties_device:s0
-+/dev/__properties__/property_info   u:object_r:property_info:s0
-+#############################
-+# System files
-+#
-+/system(/.*)?		u:object_r:system_file:s0
-+/system/bin/atrace	u:object_r:atrace_exec:s0
-+/system/bin/blank_screen	u:object_r:blank_screen_exec:s0
-+/system/bin/e2fsdroid		u:object_r:e2fs_exec:s0
-+/system/bin/mke2fs		u:object_r:e2fs_exec:s0
-+/system/bin/e2fsck	--	u:object_r:fsck_exec:s0
-+/system/bin/fsck\.f2fs	--	u:object_r:fsck_exec:s0
-+/system/bin/sload_f2fs	--	u:object_r:e2fs_exec:s0
-+/system/bin/make_f2fs	--	u:object_r:e2fs_exec:s0
-+/system/bin/fsck_msdos	--	u:object_r:fsck_exec:s0
-+/system/bin/tune2fs	--	u:object_r:fsck_exec:s0
-+/system/bin/toolbox	--	u:object_r:toolbox_exec:s0
-+/system/bin/toybox	--	u:object_r:toolbox_exec:s0
-+/system/bin/logcat	--	u:object_r:logcat_exec:s0
-+/system/bin/logcatd	--	u:object_r:logcat_exec:s0
-+/system/bin/sh		--	u:object_r:shell_exec:s0
-+/system/bin/run-as	--	u:object_r:runas_exec:s0
-+/system/bin/bootanimation u:object_r:bootanim_exec:s0
-+/system/bin/bootstat		u:object_r:bootstat_exec:s0
-+/system/bin/app_process32	u:object_r:zygote_exec:s0
-+/system/bin/app_process64	u:object_r:zygote_exec:s0
-+/system/bin/servicemanager	u:object_r:servicemanager_exec:s0
-+/system/bin/hwservicemanager	u:object_r:hwservicemanager_exec:s0
-+/system/bin/surfaceflinger	u:object_r:surfaceflinger_exec:s0
-+/system/bin/bufferhubd	u:object_r:bufferhubd_exec:s0
-+/system/bin/performanced	u:object_r:performanced_exec:s0
-+/system/bin/drmserver	u:object_r:drmserver_exec:s0
-+/system/bin/dumpstate   u:object_r:dumpstate_exec:s0
-+/system/bin/incident   u:object_r:incident_exec:s0
-+/system/bin/incidentd   u:object_r:incidentd_exec:s0
-+/system/bin/incident_helper  u:object_r:incident_helper_exec:s0
-+/system/bin/netutils-wrapper-1\.0    u:object_r:netutils_wrapper_exec:s0
-+/system/bin/vold	u:object_r:vold_exec:s0
-+/system/bin/netd	u:object_r:netd_exec:s0
-+/system/bin/wificond	u:object_r:wificond_exec:s0
-+/system/bin/audioserver	u:object_r:audioserver_exec:s0
-+/system/bin/mediadrmserver	u:object_r:mediadrmserver_exec:s0
-+/system/bin/mediaserver	u:object_r:mediaserver_exec:s0
-+/system/bin/mediametrics	u:object_r:mediametrics_exec:s0
-+/system/bin/cameraserver	u:object_r:cameraserver_exec:s0
-+/system/bin/mediaextractor	u:object_r:mediaextractor_exec:s0
-+/system/bin/mdnsd	u:object_r:mdnsd_exec:s0
-+/system/bin/installd	u:object_r:installd_exec:s0
-+/system/bin/otapreopt_chroot   u:object_r:otapreopt_chroot_exec:s0
-+/system/bin/otapreopt_slot   u:object_r:otapreopt_slot_exec:s0
-+/system/bin/keystore	u:object_r:keystore_exec:s0
-+/system/bin/fingerprintd u:object_r:fingerprintd_exec:s0
-+/system/bin/gatekeeperd u:object_r:gatekeeperd_exec:s0
-+/system/bin/crash_dump32 u:object_r:crash_dump_exec:s0
-+/system/bin/crash_dump64 u:object_r:crash_dump_exec:s0
-+/system/bin/tombstoned u:object_r:tombstoned_exec:s0
-+/system/bin/recovery-persist     u:object_r:recovery_persist_exec:s0
-+/system/bin/recovery-refresh     u:object_r:recovery_refresh_exec:s0
-+/system/bin/sdcard      u:object_r:sdcardd_exec:s0
-+/system/bin/dhcpcd      u:object_r:dhcp_exec:s0
-+/system/bin/dhcpcd-6.8.2	u:object_r:dhcp_exec:s0
-+/system/bin/mtpd	u:object_r:mtp_exec:s0
-+/system/bin/pppd	u:object_r:ppp_exec:s0
-+/system/bin/racoon	u:object_r:racoon_exec:s0
-+/system/xbin/su		u:object_r:su_exec:s0
-+/system/bin/perfprofd  u:object_r:perfprofd_exec:s0
-+/system/bin/dnsmasq     u:object_r:dnsmasq_exec:s0
-+/system/bin/healthd     u:object_r:healthd_exec:s0
-+/system/bin/clatd	u:object_r:clatd_exec:s0
-+/system/bin/lmkd        u:object_r:lmkd_exec:s0
-+/system/bin/usbd   u:object_r:usbd_exec:s0
-+/system/bin/inputflinger u:object_r:inputflinger_exec:s0
-+/system/bin/logd        u:object_r:logd_exec:s0
-+/system/bin/perfetto        u:object_r:perfetto_exec:s0
-+/system/bin/traced        u:object_r:traced_exec:s0
-+/system/bin/traced_probes        u:object_r:traced_probes_exec:s0
-+/system/bin/uncrypt     u:object_r:uncrypt_exec:s0
-+/system/bin/update_verifier u:object_r:update_verifier_exec:s0
-+/system/bin/logwrapper  u:object_r:system_file:s0
-+/system/bin/vdc         u:object_r:vdc_exec:s0
-+/system/bin/cppreopts.sh   u:object_r:cppreopts_exec:s0
-+/system/bin/preopt2cachename u:object_r:preopt2cachename_exec:s0
-+/system/bin/install-recovery.sh u:object_r:install_recovery_exec:s0
-+/system/bin/dex2oat(d)?     u:object_r:dex2oat_exec:s0
-+/system/bin/dexoptanalyzer(d)?     u:object_r:dexoptanalyzer_exec:s0
-+# patchoat executable has (essentially) the same requirements as dex2oat.
-+/system/bin/patchoat(d)?    u:object_r:dex2oat_exec:s0
-+/system/bin/profman(d)?     u:object_r:profman_exec:s0
-+/system/bin/sgdisk      u:object_r:sgdisk_exec:s0
-+/system/bin/blkid       u:object_r:blkid_exec:s0
-+/system/bin/tzdatacheck u:object_r:tzdatacheck_exec:s0
-+/system/bin/idmap u:object_r:idmap_exec:s0
-+/system/bin/update_engine        u:object_r:update_engine_exec:s0
-+/system/bin/bspatch              u:object_r:update_engine_exec:s0
-+/system/bin/storaged             u:object_r:storaged_exec:s0
-+/system/bin/thermalserviced      u:object_r:thermalserviced_exec:s0
-+/system/bin/wpantund             u:object_r:wpantund_exec:s0
-+/system/bin/virtual_touchpad     u:object_r:virtual_touchpad_exec:s0
-+/system/bin/hw/android\.hidl\.allocator@1\.0-service          u:object_r:hal_allocator_default_exec:s0
-+/system/etc/selinux/mapping/[0-9]+\.[0-9]+\.cil       u:object_r:sepolicy_file:s0
-+/system/etc/selinux/plat_mac_permissions\.xml u:object_r:mac_perms_file:s0
-+/system/etc/selinux/plat_property_contexts  u:object_r:property_contexts_file:s0
-+/system/etc/selinux/plat_service_contexts  u:object_r:service_contexts_file:s0
-+/system/etc/selinux/plat_hwservice_contexts  u:object_r:hwservice_contexts_file:s0
-+/system/etc/selinux/plat_file_contexts  u:object_r:file_contexts_file:s0
-+/system/etc/selinux/plat_seapp_contexts  u:object_r:seapp_contexts_file:s0
-+/system/etc/selinux/plat_sepolicy.cil       u:object_r:sepolicy_file:s0
-+/system/etc/selinux/plat_and_mapping_sepolicy\.cil\.sha256 u:object_r:sepolicy_file:s0
-+/system/bin/vr_hwc               u:object_r:vr_hwc_exec:s0
-+/system/bin/adbd                 u:object_r:adbd_exec:s0
-+/system/bin/vold_prepare_subdirs u:object_r:vold_prepare_subdirs_exec:s0
-+/system/bin/stats                u:object_r:stats_exec:s0
-+/system/bin/statsd               u:object_r:statsd_exec:s0
-+/system/bin/bpfloader            u:object_r:bpfloader_exec:s0
-+/system/bin/wait_for_keymaster   u:object_r:wait_for_keymaster_exec:s0
-+
-+#############################
-+# Vendor files
-+#
-+/(vendor|system/vendor)(/.*)?                  u:object_r:vendor_file:s0
-+/(vendor|system/vendor)/bin/sh                 u:object_r:vendor_shell_exec:s0
-+/(vendor|system/vendor)/bin/toybox_vendor      u:object_r:vendor_toolbox_exec:s0
-+/(vendor|system/vendor)/bin/toolbox            u:object_r:vendor_toolbox_exec:s0
-+/(vendor|system/vendor)/etc(/.*)?              u:object_r:vendor_configs_file:s0
-+
-+/(vendor|system/vendor)/lib(64)?/egl(/.*)?     u:object_r:same_process_hal_file:s0
-+
-+/(vendor|system/vendor)/lib(64)?/vndk-sp(/.*)? u:object_r:vndk_sp_file:s0
-+
-+/(vendor|system/vendor)/manifest.xml           u:object_r:vendor_configs_file:s0
-+/(vendor|system/vendor)/compatibility_matrix.xml u:object_r:vendor_configs_file:s0
-+/(vendor|system/vendor)/etc/vintf(/.*)?        u:object_r:vendor_configs_file:s0
-+/(vendor|system/vendor)/app(/.*)?              u:object_r:vendor_app_file:s0
-+/(vendor|system/vendor)/priv-app(/.*)?         u:object_r:vendor_app_file:s0
-+/(vendor|system/vendor)/overlay(/.*)?          u:object_r:vendor_overlay_file:s0
-+/(vendor|system/vendor)/framework(/.*)?        u:object_r:vendor_framework_file:s0
-+
-+# HAL location
-+/(vendor|system/vendor)/lib(64)?/hw            u:object_r:vendor_hal_file:s0
-+
-+#############################
-+# OEM and ODM files
-+#
-+/(odm|vendor/odm)(/.*)?                       u:object_r:vendor_file:s0
-+/(odm|vendor/odm)/lib(64)?/egl(/.*)?          u:object_r:same_process_hal_file:s0
-+/(odm|vendor/odm)/lib(64)?/hw                 u:object_r:vendor_hal_file:s0
-+/(odm|vendor/odm)/lib(64)?/vndk-sp(/.*)?      u:object_r:vndk_sp_file:s0
-+/(odm|vendor/odm)/bin/sh                      u:object_r:vendor_shell_exec:s0
-+/(odm|vendor/odm)/etc(/.*)?                   u:object_r:vendor_configs_file:s0
-+/(odm|vendor/odm)/app(/.*)?                   u:object_r:vendor_app_file:s0
-+/(odm|vendor/odm)/priv-app(/.*)?              u:object_r:vendor_app_file:s0
-+/(odm|vendor/odm)/overlay(/.*)?               u:object_r:vendor_overlay_file:s0
-+/(odm|vendor/odm)/framework(/.*)?             u:object_r:vendor_framework_file:s0
-+
-+/oem(/.*)?              u:object_r:oemfs:s0
-+
-+# The precompiled monolithic sepolicy will be under /odm only when
-+# BOARD_USES_ODMIMAGE is true: a separate odm.img is built.
-+/odm/etc/selinux/precompiled_sepolicy                           u:object_r:sepolicy_file:s0
-+/odm/etc/selinux/precompiled_sepolicy\.plat_and_mapping\.sha256 u:object_r:sepolicy_file:s0
-+
-+/(odm|vendor/odm)/etc/selinux/odm_sepolicy.cil                  u:object_r:sepolicy_file:s0
-+/(odm|vendor/odm)/etc/selinux/odm_file_contexts                 u:object_r:file_contexts_file:s0
-+/(odm|vendor/odm)/etc/selinux/odm_seapp_contexts                u:object_r:seapp_contexts_file:s0
-+/(odm|vendor/odm)/etc/selinux/odm_property_contexts             u:object_r:property_contexts_file:s0
-+/(odm|vendor/odm)/etc/selinux/odm_hwservice_contexts            u:object_r:hwservice_contexts_file:s0
-+/(odm|vendor/odm)/etc/selinux/odm_mac_permissions.xml           u:object_r:mac_perms_file:s0
-+
-+#############################
-+# Product files
-+#
-+/(product|system/product)(/.*)?               u:object_r:system_file:s0
-+
-+#############################
-+# Data files
-+#
-+# NOTE: When modifying existing label rules, changes may also need to
-+# propagate to the "Expanded data files" section.
-+#
-+/data(/.*)?		u:object_r:system_data_file:s0
-+/data/.layout_version		u:object_r:install_data_file:s0
-+/data/unencrypted(/.*)?         u:object_r:unencrypted_data_file:s0
-+/data/backup(/.*)?		u:object_r:backup_data_file:s0
-+/data/secure/backup(/.*)?	u:object_r:backup_data_file:s0
-+/data/system/ndebugsocket	u:object_r:system_ndebug_socket:s0
-+/data/drm(/.*)?		u:object_r:drm_data_file:s0
-+/data/resource-cache(/.*)? u:object_r:resourcecache_data_file:s0
-+/data/dalvik-cache(/.*)? u:object_r:dalvikcache_data_file:s0
-+/data/ota(/.*)? u:object_r:ota_data_file:s0
-+/data/ota_package(/.*)? u:object_r:ota_package_file:s0
-+/data/adb(/.*)?		u:object_r:adb_data_file:s0
-+/data/anr(/.*)?		u:object_r:anr_data_file:s0
-+/data/app(/.*)?                       u:object_r:apk_data_file:s0
-+/data/app/[^/]+/oat(/.*)?                u:object_r:dalvikcache_data_file:s0
-+/data/app/vmdl[^/]+\.tmp(/.*)?           u:object_r:apk_tmp_file:s0
-+/data/app/vmdl[^/]+\.tmp/oat(/.*)?           u:object_r:dalvikcache_data_file:s0
-+/data/app-private(/.*)?               u:object_r:apk_private_data_file:s0
-+/data/app-private/vmdl.*\.tmp(/.*)?   u:object_r:apk_private_tmp_file:s0
-+/data/tombstones(/.*)?	u:object_r:tombstone_data_file:s0
-+/data/vendor/tombstones/wifi(/.*)? u:object_r:tombstone_wifi_data_file:s0
-+/data/local/tmp(/.*)?	u:object_r:shell_data_file:s0
-+/data/local/tmp/ltp(/.*)?   u:object_r:nativetest_data_file:s0
-+/data/local/traces(/.*)?	u:object_r:trace_data_file:s0
-+/data/media(/.*)?	u:object_r:media_rw_data_file:s0
-+/data/mediadrm(/.*)?	u:object_r:media_data_file:s0
-+/data/nativetest(/.*)?	u:object_r:nativetest_data_file:s0
-+/data/nativetest64(/.*)?	u:object_r:nativetest_data_file:s0
-+/data/property(/.*)?	u:object_r:property_data_file:s0
-+/data/preloads(/.*)?	u:object_r:preloads_data_file:s0
-+/data/preloads/media(/.*)?	u:object_r:preloads_media_file:s0
-+/data/preloads/demo(/.*)?	u:object_r:preloads_media_file:s0
-+
-+# Misc data
-+/data/misc/adb(/.*)?            u:object_r:adb_keys_file:s0
-+/data/misc/apns(/.*)?           u:object_r:radio_data_file:s0
-+/data/misc/audio(/.*)?          u:object_r:audio_data_file:s0
-+/data/misc/audioserver(/.*)?    u:object_r:audioserver_data_file:s0
-+/data/misc/audiohal(/.*)?       u:object_r:audiohal_data_file:s0
-+/data/misc/bootstat(/.*)?       u:object_r:bootstat_data_file:s0
-+/data/misc/boottrace(/.*)?      u:object_r:boottrace_data_file:s0
-+/data/misc/bluetooth(/.*)?      u:object_r:bluetooth_data_file:s0
-+/data/misc/bluetooth/logs(/.*)? u:object_r:bluetooth_logs_data_file:s0
-+/data/misc/bluedroid(/.*)?      u:object_r:bluetooth_data_file:s0
-+/data/misc/bluedroid/\.a2dp_ctrl u:object_r:bluetooth_socket:s0
-+/data/misc/bluedroid/\.a2dp_data u:object_r:bluetooth_socket:s0
-+/data/misc/camera(/.*)?         u:object_r:camera_data_file:s0
-+/data/misc/carrierid(/.*)?      u:object_r:radio_data_file:s0
-+/data/misc/dhcp(/.*)?           u:object_r:dhcp_data_file:s0
-+/data/misc/dhcp-6.8.2(/.*)?     u:object_r:dhcp_data_file:s0
-+/data/misc/gatekeeper(/.*)?     u:object_r:gatekeeper_data_file:s0
-+/data/misc/incidents(/.*)?	    u:object_r:incident_data_file:s0
-+/data/misc/keychain(/.*)?       u:object_r:keychain_data_file:s0
-+/data/misc/keystore(/.*)?       u:object_r:keystore_data_file:s0
-+/data/misc/logd(/.*)?           u:object_r:misc_logd_file:s0
-+/data/misc/media(/.*)?          u:object_r:media_data_file:s0
-+/data/misc/net(/.*)?            u:object_r:net_data_file:s0
-+/data/misc/network_watchlist(/.*)? u:object_r:network_watchlist_data_file:s0
-+/data/misc/perfetto-traces(/.*)? u:object_r:perfetto_traces_data_file:s0
-+/data/misc/recovery(/.*)?       u:object_r:recovery_data_file:s0
-+/data/misc/shared_relro(/.*)?   u:object_r:shared_relro_file:s0
-+/data/misc/sms(/.*)?            u:object_r:radio_data_file:s0
-+/data/misc/stats-data(/.*)?     u:object_r:stats_data_file:s0
-+/data/misc/stats-service(/.*)?  u:object_r:stats_data_file:s0
-+/data/misc/systemkeys(/.*)?     u:object_r:systemkeys_data_file:s0
-+/data/misc/textclassifier(/.*)?       u:object_r:textclassifier_data_file:s0
-+/data/misc/user(/.*)?           u:object_r:misc_user_data_file:s0
-+/data/misc/vpn(/.*)?            u:object_r:vpn_data_file:s0
-+/data/misc/wifi(/.*)?           u:object_r:wifi_data_file:s0
-+/data/misc/wifi/sockets(/.*)?   u:object_r:wpa_socket:s0
-+/data/misc/wifi/sockets/wpa_ctrl.*   u:object_r:system_wpa_socket:s0
-+/data/misc/zoneinfo(/.*)?       u:object_r:zoneinfo_data_file:s0
-+/data/misc/vold(/.*)?           u:object_r:vold_data_file:s0
-+/data/misc/perfprofd(/.*)?      u:object_r:perfprofd_data_file:s0
-+/data/misc/update_engine(/.*)?  u:object_r:update_engine_data_file:s0
-+/data/misc/update_engine_log(/.*)?  u:object_r:update_engine_log_data_file:s0
-+/data/system/heapdump(/.*)?     u:object_r:heapdump_data_file:s0
-+/data/misc/trace(/.*)?          u:object_r:method_trace_data_file:s0
-+/data/misc/wmtrace(/.*)?        u:object_r:wm_trace_data_file:s0
-+# TODO(calin) label profile reference differently so that only
-+# profman run as a special user can write to them
-+/data/misc/profiles/cur(/.*)?       u:object_r:user_profile_data_file:s0
-+/data/misc/profiles/ref(/.*)?       u:object_r:user_profile_data_file:s0
-+/data/misc/profman(/.*)?        u:object_r:profman_dump_data_file:s0
-+/data/vendor(/.*)?              u:object_r:vendor_data_file:s0
-+/data/vendor_ce(/.*)?           u:object_r:vendor_data_file:s0
-+/data/vendor_de(/.*)?           u:object_r:vendor_data_file:s0
-+
-+# storaged proto files
-+/data/misc_de/[0-9]+/storaged(/.*)?       u:object_r:storaged_data_file:s0
-+/data/misc_ce/[0-9]+/storaged(/.*)?       u:object_r:storaged_data_file:s0
-+
-+# Fingerprint data
-+/data/system/users/[0-9]+/fpdata(/.*)? u:object_r:fingerprintd_data_file:s0
-+
-+# Fingerprint vendor data file
-+/data/vendor_de/[0-9]+/fpdata(/.*)? u:object_r:fingerprint_vendor_data_file:s0
-+
-+# Bootchart data
-+/data/bootchart(/.*)?		u:object_r:bootchart_data_file:s0
-+
-+#############################
-+# Expanded data files
-+#
-+/mnt/expand(/.*)?                                   u:object_r:mnt_expand_file:s0
-+/mnt/expand/[^/]+(/.*)?                             u:object_r:system_data_file:s0
-+/mnt/expand/[^/]+/app(/.*)?                         u:object_r:apk_data_file:s0
-+/mnt/expand/[^/]+/app/[^/]+/oat(/.*)?               u:object_r:dalvikcache_data_file:s0
-+/mnt/expand/[^/]+/app/vmdl[^/]+\.tmp(/.*)?          u:object_r:apk_tmp_file:s0
-+/mnt/expand/[^/]+/app/vmdl[^/]+\.tmp/oat(/.*)?      u:object_r:dalvikcache_data_file:s0
-+/mnt/expand/[^/]+/local/tmp(/.*)?                   u:object_r:shell_data_file:s0
-+/mnt/expand/[^/]+/media(/.*)?                       u:object_r:media_rw_data_file:s0
-+/mnt/expand/[^/]+/misc/vold(/.*)?                   u:object_r:vold_data_file:s0
-+
-+# coredump directory for userdebug/eng devices
-+/cores(/.*)?                    u:object_r:coredump_file:s0
-+
-+# Wallpaper files
-+/data/system/users/[0-9]+/wallpaper_lock_orig	u:object_r:wallpaper_file:s0
-+/data/system/users/[0-9]+/wallpaper_lock	u:object_r:wallpaper_file:s0
-+/data/system/users/[0-9]+/wallpaper_orig	u:object_r:wallpaper_file:s0
-+/data/system/users/[0-9]+/wallpaper		u:object_r:wallpaper_file:s0
-+
-+# Ringtone files
-+/data/system_de/[0-9]+/ringtones(/.*)?          u:object_r:ringtone_file:s0
-+
-+# ShortcutManager icons, e.g.
-+#   /data/system_ce/0/shortcut_service/bitmaps/com.example.app/1457472879282.png
-+/data/system_ce/[0-9]+/shortcut_service/bitmaps(/.*)? u:object_r:shortcut_manager_icons:s0
-+
-+# User icon files
-+/data/system/users/[0-9]+/photo.png             u:object_r:icon_file:s0
-+
-+# vold per-user data
-+/data/misc_de/[0-9]+/vold(/.*)?           u:object_r:vold_data_file:s0
-+/data/misc_ce/[0-9]+/vold(/.*)?           u:object_r:vold_data_file:s0
-+
-+#############################
-+# efs files
-+#
-+/efs(/.*)?		u:object_r:efs_file:s0
-+
-+#############################
-+# Cache files
-+#
-+/cache(/.*)?		u:object_r:cache_file:s0
-+/cache/recovery(/.*)?	u:object_r:cache_recovery_file:s0
-+# General backup/restore interchange with apps
-+/cache/backup_stage(/.*)?	u:object_r:cache_backup_file:s0
-+# LocalTransport (backup) uses this subtree
-+/cache/backup(/.*)?		u:object_r:cache_private_backup_file:s0
-+
-+/data/cache(/.*)?		u:object_r:cache_file:s0
-+/data/cache/recovery(/.*)?	u:object_r:cache_recovery_file:s0
-+# General backup/restore interchange with apps
-+/data/cache/backup_stage(/.*)?	u:object_r:cache_backup_file:s0
-+# LocalTransport (backup) uses this subtree
-+/data/cache/backup(/.*)?	u:object_r:cache_private_backup_file:s0
-+
-+#############################
-+# Metadata files
-+#
-+/metadata(/.*)?           u:object_r:metadata_file:s0
-+/metadata/vold(/.*)?      u:object_r:vold_metadata_file:s0
-+
-+#############################
-+# asec containers
-+/mnt/asec(/.*)?             u:object_r:asec_apk_file:s0
-+/mnt/asec/[^/]+/[^/]+\.zip  u:object_r:asec_public_file:s0
-+/mnt/asec/[^/]+/lib(/.*)?   u:object_r:asec_public_file:s0
-+/data/app-asec(/.*)?        u:object_r:asec_image_file:s0
-+
-+#############################
-+# external storage
-+/mnt/media_rw(/.*)?         u:object_r:mnt_media_rw_file:s0
-+/mnt/user(/.*)?             u:object_r:mnt_user_file:s0
-+/mnt/runtime(/.*)?          u:object_r:storage_file:s0
-+/storage(/.*)?              u:object_r:storage_file:s0
-+
-+#############################
-+# mount point for read-write vendor partitions
-+/mnt/vendor(/.*)?          u:object_r:mnt_vendor_file:s0
-diff --git a/prebuilts/api/28.0/private/file_contexts_asan b/prebuilts/api/28.0/private/file_contexts_asan
-new file mode 100644
-index 000000000..17ee9d795
---- /dev/null
-+++ b/prebuilts/api/28.0/private/file_contexts_asan
-@@ -0,0 +1,11 @@
-+/data/asan/system/lib(/.*)?                u:object_r:system_file:s0
-+/data/asan/system/lib64(/.*)?              u:object_r:system_file:s0
-+/data/asan/vendor/lib(/.*)?                u:object_r:system_file:s0
-+/data/asan/vendor/lib64(/.*)?              u:object_r:system_file:s0
-+/data/asan/odm/lib(/.*)?                   u:object_r:system_file:s0
-+/data/asan/odm/lib64(/.*)?                 u:object_r:system_file:s0
-+/system/bin/asan_extract       u:object_r:asan_extract_exec:s0
-+/system/bin/asanwrapper        u:object_r:asanwrapper_exec:s0
-+/system/bin/asan/app_process   u:object_r:zygote_exec:s0
-+/system/bin/asan/app_process32 u:object_r:zygote_exec:s0
-+/system/bin/asan/app_process64 u:object_r:zygote_exec:s0
-diff --git a/prebuilts/api/28.0/private/fingerprintd.te b/prebuilts/api/28.0/private/fingerprintd.te
-new file mode 100644
-index 000000000..eb73ef8cc
---- /dev/null
-+++ b/prebuilts/api/28.0/private/fingerprintd.te
-@@ -0,0 +1,3 @@
-+typeattribute fingerprintd coredomain;
-+
-+init_daemon_domain(fingerprintd)
-diff --git a/prebuilts/api/28.0/private/fs_use b/prebuilts/api/28.0/private/fs_use
-new file mode 100644
-index 000000000..c4d25a2b9
---- /dev/null
-+++ b/prebuilts/api/28.0/private/fs_use
-@@ -0,0 +1,22 @@
-+# Label inodes via getxattr.
-+fs_use_xattr yaffs2 u:object_r:labeledfs:s0;
-+fs_use_xattr jffs2 u:object_r:labeledfs:s0;
-+fs_use_xattr ext2 u:object_r:labeledfs:s0;
-+fs_use_xattr ext3 u:object_r:labeledfs:s0;
-+fs_use_xattr ext4 u:object_r:labeledfs:s0;
-+fs_use_xattr xfs u:object_r:labeledfs:s0;
-+fs_use_xattr btrfs u:object_r:labeledfs:s0;
-+fs_use_xattr f2fs u:object_r:labeledfs:s0;
-+fs_use_xattr squashfs u:object_r:labeledfs:s0;
-+
-+# Label inodes from task label.
-+fs_use_task pipefs u:object_r:pipefs:s0;
-+fs_use_task sockfs u:object_r:sockfs:s0;
-+
-+# Label inodes from combination of task label and fs label.
-+# Define type_transition rules if you want per-domain types.
-+fs_use_trans devpts u:object_r:devpts:s0;
-+fs_use_trans tmpfs u:object_r:tmpfs:s0;
-+fs_use_trans devtmpfs u:object_r:device:s0;
-+fs_use_trans shm u:object_r:shm:s0;
-+fs_use_trans mqueue u:object_r:mqueue:s0;
-diff --git a/prebuilts/api/28.0/private/fsck.te b/prebuilts/api/28.0/private/fsck.te
-new file mode 100644
-index 000000000..f8e09b645
---- /dev/null
-+++ b/prebuilts/api/28.0/private/fsck.te
-@@ -0,0 +1,5 @@
-+typeattribute fsck coredomain;
-+
-+init_daemon_domain(fsck)
-+
-+allow fsck metadata_block_device:blk_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/private/fsck_untrusted.te b/prebuilts/api/28.0/private/fsck_untrusted.te
-new file mode 100644
-index 000000000..9a57bf027
---- /dev/null
-+++ b/prebuilts/api/28.0/private/fsck_untrusted.te
-@@ -0,0 +1 @@
-+typeattribute fsck_untrusted coredomain;
-diff --git a/prebuilts/api/28.0/private/gatekeeperd.te b/prebuilts/api/28.0/private/gatekeeperd.te
-new file mode 100644
-index 000000000..5e4d0a2e9
---- /dev/null
-+++ b/prebuilts/api/28.0/private/gatekeeperd.te
-@@ -0,0 +1,3 @@
-+typeattribute gatekeeperd coredomain;
-+
-+init_daemon_domain(gatekeeperd)
-diff --git a/prebuilts/api/28.0/private/genfs_contexts b/prebuilts/api/28.0/private/genfs_contexts
-new file mode 100644
-index 000000000..7e2ea5092
---- /dev/null
-+++ b/prebuilts/api/28.0/private/genfs_contexts
-@@ -0,0 +1,244 @@
-+# Label inodes with the fs label.
-+genfscon rootfs / u:object_r:rootfs:s0
-+# proc labeling can be further refined (longest matching prefix).
-+genfscon proc / u:object_r:proc:s0
-+genfscon proc /asound u:object_r:proc_asound:s0
-+genfscon proc /buddyinfo u:object_r:proc_buddyinfo:s0
-+genfscon proc /cmdline u:object_r:proc_cmdline:s0
-+genfscon proc /config.gz u:object_r:config_gz:s0
-+genfscon proc /diskstats u:object_r:proc_diskstats:s0
-+genfscon proc /filesystems u:object_r:proc_filesystems:s0
-+genfscon proc /interrupts u:object_r:proc_interrupts:s0
-+genfscon proc /iomem u:object_r:proc_iomem:s0
-+genfscon proc /kmsg u:object_r:proc_kmsg:s0
-+genfscon proc /loadavg u:object_r:proc_loadavg:s0
-+genfscon proc /meminfo u:object_r:proc_meminfo:s0
-+genfscon proc /misc u:object_r:proc_misc:s0
-+genfscon proc /modules u:object_r:proc_modules:s0
-+genfscon proc /mounts u:object_r:proc_mounts:s0
-+genfscon proc /net u:object_r:proc_net:s0
-+genfscon proc /net/xt_qtaguid/ctrl u:object_r:qtaguid_proc:s0
-+genfscon proc /net/xt_qtaguid/ u:object_r:proc_qtaguid_stat:s0
-+genfscon proc /cpuinfo u:object_r:proc_cpuinfo:s0
-+genfscon proc /pagetypeinfo u:object_r:proc_pagetypeinfo:s0
-+genfscon proc /softirqs u:object_r:proc_timer:s0
-+genfscon proc /stat u:object_r:proc_stat:s0
-+genfscon proc /swaps u:object_r:proc_swaps:s0
-+genfscon proc /sysrq-trigger u:object_r:proc_sysrq:s0
-+genfscon proc /sys/abi/swp u:object_r:proc_abi:s0
-+genfscon proc /sys/fs/pipe-max-size u:object_r:proc_pipe_conf:s0
-+genfscon proc /sys/fs/protected_hardlinks u:object_r:proc_security:s0
-+genfscon proc /sys/fs/protected_symlinks u:object_r:proc_security:s0
-+genfscon proc /sys/fs/suid_dumpable u:object_r:proc_security:s0
-+genfscon proc /sys/kernel/core_pattern u:object_r:usermodehelper:s0
-+genfscon proc /sys/kernel/core_pipe_limit u:object_r:usermodehelper:s0
-+genfscon proc /sys/kernel/domainname u:object_r:proc_hostname:s0
-+genfscon proc /sys/kernel/dmesg_restrict u:object_r:proc_security:s0
-+genfscon proc /sys/kernel/hostname u:object_r:proc_hostname:s0
-+genfscon proc /sys/kernel/hotplug u:object_r:usermodehelper:s0
-+genfscon proc /sys/kernel/hung_task_timeout_secs u:object_r:proc_hung_task:s0
-+genfscon proc /sys/kernel/kptr_restrict u:object_r:proc_security:s0
-+genfscon proc /sys/kernel/modprobe u:object_r:usermodehelper:s0
-+genfscon proc /sys/kernel/modules_disabled u:object_r:proc_security:s0
-+genfscon proc /sys/kernel/panic_on_oops u:object_r:proc_panic:s0
-+genfscon proc /sys/kernel/perf_event_max_sample_rate u:object_r:proc_perf:s0
-+genfscon proc /sys/kernel/perf_event_paranoid u:object_r:proc_perf:s0
-+genfscon proc /sys/kernel/pid_max u:object_r:proc_pid_max:s0
-+genfscon proc /sys/kernel/poweroff_cmd u:object_r:usermodehelper:s0
-+genfscon proc /sys/kernel/random u:object_r:proc_random:s0
-+genfscon proc /sys/kernel/randomize_va_space u:object_r:proc_security:s0
-+genfscon proc /sys/kernel/sched_child_runs_first u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sched_latency_ns u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sched_rt_period_us u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sched_rt_runtime_us u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sched_schedstats u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sched_tunable_scaling u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sched_wakeup_granularity_ns u:object_r:proc_sched:s0
-+genfscon proc /sys/kernel/sysrq u:object_r:proc_sysrq:s0
-+genfscon proc /sys/kernel/usermodehelper u:object_r:usermodehelper:s0
-+genfscon proc /sys/net u:object_r:proc_net:s0
-+genfscon proc /sys/vm/dirty_background_ratio u:object_r:proc_dirty:s0
-+genfscon proc /sys/vm/dirty_expire_centisecs u:object_r:proc_dirty:s0
-+genfscon proc /sys/vm/extra_free_kbytes u:object_r:proc_extra_free_kbytes:s0
-+genfscon proc /sys/vm/max_map_count u:object_r:proc_max_map_count:s0
-+genfscon proc /sys/vm/mmap_min_addr u:object_r:proc_security:s0
-+genfscon proc /sys/vm/mmap_rnd_bits u:object_r:proc_security:s0
-+genfscon proc /sys/vm/mmap_rnd_compat_bits u:object_r:proc_security:s0
-+genfscon proc /sys/vm/page-cluster u:object_r:proc_page_cluster:s0
-+genfscon proc /sys/vm/drop_caches u:object_r:proc_drop_caches:s0
-+genfscon proc /sys/vm/overcommit_memory u:object_r:proc_overcommit_memory:s0
-+genfscon proc /sys/vm/min_free_order_shift u:object_r:proc_min_free_order_shift:s0
-+genfscon proc /timer_list u:object_r:proc_timer:s0
-+genfscon proc /timer_stats u:object_r:proc_timer:s0
-+genfscon proc /tty/drivers u:object_r:proc_tty_drivers:s0
-+genfscon proc /uid/ u:object_r:proc_uid_time_in_state:s0
-+genfscon proc /uid_cputime/show_uid_stat u:object_r:proc_uid_cputime_showstat:s0
-+genfscon proc /uid_cputime/remove_uid_range u:object_r:proc_uid_cputime_removeuid:s0
-+genfscon proc /uid_io/stats u:object_r:proc_uid_io_stats:s0
-+genfscon proc /uid_procstat/set u:object_r:proc_uid_procstat_set:s0
-+genfscon proc /uid_time_in_state u:object_r:proc_uid_time_in_state:s0
-+genfscon proc /uid_concurrent_active_time u:object_r:proc_uid_concurrent_active_time:s0
-+genfscon proc /uid_concurrent_policy_time u:object_r:proc_uid_concurrent_policy_time:s0
-+genfscon proc /uid_cpupower/ u:object_r:proc_uid_cpupower:s0
-+genfscon proc /uptime u:object_r:proc_uptime:s0
-+genfscon proc /version u:object_r:proc_version:s0
-+genfscon proc /vmallocinfo u:object_r:proc_vmallocinfo:s0
-+genfscon proc /vmstat u:object_r:proc_vmstat:s0
-+genfscon proc /zoneinfo u:object_r:proc_zoneinfo:s0
-+
-+# selinuxfs booleans can be individually labeled.
-+genfscon selinuxfs / u:object_r:selinuxfs:s0
-+genfscon cgroup / u:object_r:cgroup:s0
-+genfscon cgroup2 / u:object_r:cgroup_bpf:s0
-+# sysfs labels can be set by userspace.
-+genfscon sysfs / u:object_r:sysfs:s0
-+genfscon sysfs /devices/system/cpu u:object_r:sysfs_devices_system_cpu:s0
-+genfscon sysfs /class/android_usb                 u:object_r:sysfs_android_usb:s0
-+genfscon sysfs /class/leds                        u:object_r:sysfs_leds:s0
-+genfscon sysfs /class/net                         u:object_r:sysfs_net:s0
-+genfscon sysfs /class/rtc                         u:object_r:sysfs_rtc:s0
-+genfscon sysfs /class/switch                      u:object_r:sysfs_switch:s0
-+genfscon sysfs /devices/platform/nfc-power/nfc_power u:object_r:sysfs_nfc_power_writable:s0
-+genfscon sysfs /devices/virtual/android_usb     u:object_r:sysfs_android_usb:s0
-+genfscon sysfs /devices/virtual/block/dm-       u:object_r:sysfs_dm:s0
-+genfscon sysfs /devices/virtual/block/zram0     u:object_r:sysfs_zram:s0
-+genfscon sysfs /devices/virtual/block/zram1     u:object_r:sysfs_zram:s0
-+genfscon sysfs /devices/virtual/block/zram0/uevent    u:object_r:sysfs_zram_uevent:s0
-+genfscon sysfs /devices/virtual/block/zram1/uevent    u:object_r:sysfs_zram_uevent:s0
-+genfscon sysfs /devices/virtual/misc/hw_random    u:object_r:sysfs_hwrandom:s0
-+genfscon sysfs /devices/virtual/switch          u:object_r:sysfs_switch:s0
-+genfscon sysfs /firmware/devicetree/base/firmware/android u:object_r:sysfs_dt_firmware_android:s0
-+genfscon sysfs /fs/ext4/features                  u:object_r:sysfs_fs_ext4_features:s0
-+genfscon sysfs /power/autosleep u:object_r:sysfs_power:s0
-+genfscon sysfs /power/state u:object_r:sysfs_power:s0
-+genfscon sysfs /power/wakeup_count u:object_r:sysfs_power:s0
-+genfscon sysfs /power/wake_lock u:object_r:sysfs_wake_lock:s0
-+genfscon sysfs /power/wake_unlock u:object_r:sysfs_wake_lock:s0
-+genfscon sysfs /kernel/memory_state_time u:object_r:sysfs_power:s0
-+genfscon sysfs /kernel/ipv4 u:object_r:sysfs_ipv4:s0
-+genfscon sysfs /kernel/notes u:object_r:sysfs_kernel_notes:s0
-+genfscon sysfs /kernel/uevent_helper u:object_r:sysfs_usermodehelper:s0
-+genfscon sysfs /kernel/wakeup_reasons u:object_r:sysfs_wakeup_reasons:s0
-+genfscon sysfs /module/lowmemorykiller u:object_r:sysfs_lowmemorykiller:s0
-+genfscon sysfs /module/wlan/parameters/fwpath u:object_r:sysfs_wlan_fwpath:s0
-+genfscon sysfs /devices/virtual/timed_output/vibrator/enable u:object_r:sysfs_vibrator:s0
-+
-+genfscon debugfs /mmc0                                u:object_r:debugfs_mmc:s0
-+genfscon debugfs /tracing                             u:object_r:debugfs_tracing_debug:s0
-+genfscon tracefs /                                    u:object_r:debugfs_tracing_debug:s0
-+genfscon debugfs /tracing/tracing_on                  u:object_r:debugfs_tracing:s0
-+genfscon tracefs /tracing_on                          u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/trace                       u:object_r:debugfs_tracing:s0
-+genfscon tracefs /trace                               u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/per_cpu/cpu                 u:object_r:debugfs_tracing:s0
-+genfscon tracefs /per_cpu/cpu                         u:object_r:debugfs_tracing:s0
-+
-+genfscon debugfs /tracing/instances                   u:object_r:debugfs_tracing_instances:s0
-+genfscon tracefs /instances                           u:object_r:debugfs_tracing_instances:s0
-+genfscon debugfs /tracing/instances/wifi              u:object_r:debugfs_wifi_tracing:s0
-+genfscon tracefs /instances/wifi                      u:object_r:debugfs_wifi_tracing:s0
-+genfscon debugfs /tracing/trace_marker                u:object_r:debugfs_trace_marker:s0
-+genfscon tracefs /trace_marker                        u:object_r:debugfs_trace_marker:s0
-+genfscon debugfs /wakeup_sources                      u:object_r:debugfs_wakeup_sources:s0
-+
-+genfscon debugfs /tracing/events/workqueue/                          u:object_r:debugfs_tracing_debug:s0
-+genfscon debugfs /tracing/events/regulator/                          u:object_r:debugfs_tracing_debug:s0
-+genfscon debugfs /tracing/events/pagecache/                          u:object_r:debugfs_tracing_debug:s0
-+genfscon debugfs /tracing/events/irq/                                u:object_r:debugfs_tracing_debug:s0
-+genfscon debugfs /tracing/events/ipi/                                u:object_r:debugfs_tracing_debug:s0
-+genfscon debugfs /tracing/events/f2fs/f2fs_sync_file_enter/          u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/f2fs/f2fs_sync_file_exit/           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/f2fs/f2fs_write_begin/              u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/f2fs/f2fs_write_end/                u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/ext4/ext4_da_write_begin/           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/ext4/ext4_da_write_end/             u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/ext4/ext4_sync_file_enter/          u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/ext4/ext4_sync_file_exit/           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/block/block_rq_issue/               u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/block/block_rq_complete/            u:object_r:debugfs_tracing:s0
-+
-+genfscon tracefs /events/workqueue/                          u:object_r:debugfs_tracing_debug:s0
-+genfscon tracefs /events/regulator/                          u:object_r:debugfs_tracing_debug:s0
-+genfscon tracefs /events/pagecache/                          u:object_r:debugfs_tracing_debug:s0
-+genfscon tracefs /events/irq/                                u:object_r:debugfs_tracing_debug:s0
-+genfscon tracefs /events/ipi/                                u:object_r:debugfs_tracing_debug:s0
-+genfscon tracefs /events/f2fs/f2fs_sync_file_enter/          u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/f2fs/f2fs_sync_file_exit/           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/f2fs/f2fs_write_begin/              u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/f2fs/f2fs_write_end/                u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/ext4/ext4_da_write_begin/           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/ext4/ext4_da_write_end/             u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/ext4/ext4_sync_file_enter/          u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/ext4/ext4_sync_file_exit/           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/block/block_rq_issue/               u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/block/block_rq_complete/            u:object_r:debugfs_tracing:s0
-+
-+genfscon tracefs /trace_clock                                            u:object_r:debugfs_tracing:s0
-+genfscon tracefs /buffer_size_kb                                         u:object_r:debugfs_tracing:s0
-+genfscon tracefs /options/overwrite                                      u:object_r:debugfs_tracing:s0
-+genfscon tracefs /options/print-tgid                                     u:object_r:debugfs_tracing:s0
-+genfscon tracefs /saved_cmdlines_size                                    u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/sched/sched_switch/                             u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/sched/sched_wakeup/                             u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/sched/sched_blocked_reason/                     u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/sched/sched_cpu_hotplug/                        u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/cgroup/                                         u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/power/cpu_frequency/                            u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/power/cpu_idle/                                 u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/power/clock_set_rate/                           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/power/cpu_frequency_limits/                     u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/cpufreq_interactive/                            u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/vmscan/mm_vmscan_direct_reclaim_begin/          u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/vmscan/mm_vmscan_direct_reclaim_end/            u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/vmscan/mm_vmscan_kswapd_wake/                   u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/vmscan/mm_vmscan_kswapd_sleep/                  u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/binder/binder_transaction/                      u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/binder/binder_transaction_received/             u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/binder/binder_lock/                             u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/binder/binder_locked/                           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/binder/binder_unlock/                           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/lowmemorykiller/                                u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/sync/                                           u:object_r:debugfs_tracing:s0
-+genfscon tracefs /events/fence/                                          u:object_r:debugfs_tracing:s0
-+
-+genfscon debugfs /tracing/trace_clock                                            u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/buffer_size_kb                                         u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/options/overwrite                                      u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/options/print-tgid                                     u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/saved_cmdlines_size                                    u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/sched/sched_switch/                             u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/sched/sched_wakeup/                             u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/sched/sched_blocked_reason/                     u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/sched/sched_cpu_hotplug/                        u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/cgroup/                                         u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/power/cpu_frequency/                            u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/power/cpu_idle/                                 u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/power/clock_set_rate/                           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/power/cpu_frequency_limits/                     u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/cpufreq_interactive/                            u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/vmscan/mm_vmscan_direct_reclaim_begin/          u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/vmscan/mm_vmscan_direct_reclaim_end/            u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/vmscan/mm_vmscan_kswapd_wake/                   u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/vmscan/mm_vmscan_kswapd_sleep/                  u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/binder/binder_transaction/                      u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/binder/binder_transaction_received/             u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/binder/binder_lock/                             u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/binder/binder_locked/                           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/binder/binder_unlock/                           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/lowmemorykiller/                                u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/sync/                                           u:object_r:debugfs_tracing:s0
-+genfscon debugfs /tracing/events/fence/                                          u:object_r:debugfs_tracing:s0
-+
-+genfscon inotifyfs / u:object_r:inotify:s0
-+genfscon vfat / u:object_r:vfat:s0
-+genfscon exfat / u:object_r:exfat:s0
-+genfscon debugfs / u:object_r:debugfs:s0
-+genfscon fuse / u:object_r:fuse:s0
-+genfscon configfs / u:object_r:configfs:s0
-+genfscon sdcardfs / u:object_r:sdcardfs:s0
-+genfscon esdfs / u:object_r:sdcardfs:s0
-+genfscon pstore / u:object_r:pstorefs:s0
-+genfscon functionfs / u:object_r:functionfs:s0
-+genfscon usbfs / u:object_r:usbfs:s0
-+genfscon binfmt_misc / u:object_r:binfmt_miscfs:s0
-+genfscon bpf / u:object_r:fs_bpf:s0
-diff --git a/prebuilts/api/28.0/private/hal_allocator_default.te b/prebuilts/api/28.0/private/hal_allocator_default.te
-new file mode 100644
-index 000000000..49ef1781b
---- /dev/null
-+++ b/prebuilts/api/28.0/private/hal_allocator_default.te
-@@ -0,0 +1,5 @@
-+type hal_allocator_default, domain, coredomain;
-+hal_server_domain(hal_allocator_default, hal_allocator)
-+
-+type hal_allocator_default_exec, exec_type, file_type;
-+init_daemon_domain(hal_allocator_default)
-diff --git a/prebuilts/api/28.0/private/halclientdomain.te b/prebuilts/api/28.0/private/halclientdomain.te
-new file mode 100644
-index 000000000..9dcd3ee38
---- /dev/null
-+++ b/prebuilts/api/28.0/private/halclientdomain.te
-@@ -0,0 +1,13 @@
-+###
-+### Rules for all domains which are clients of a HAL
-+###
-+
-+# Find out whether a HAL in passthrough/in-process mode or
-+# binderized/out-of-process mode
-+hwbinder_use(halclientdomain)
-+
-+# Used to wait for hwservicemanager
-+get_prop(halclientdomain, hwservicemanager_prop)
-+
-+# Wait for HAL server to be up (used by getService)
-+allow halclientdomain hidl_manager_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/private/halserverdomain.te b/prebuilts/api/28.0/private/halserverdomain.te
-new file mode 100644
-index 000000000..f36e0e7d8
---- /dev/null
-+++ b/prebuilts/api/28.0/private/halserverdomain.te
-@@ -0,0 +1,12 @@
-+###
-+### Rules for all domains which offer a HAL service over HwBinder
-+###
-+
-+# Register the HAL service with hwservicemanager
-+hwbinder_use(halserverdomain)
-+
-+# Find HAL implementations
-+allow halserverdomain system_file:dir r_dir_perms;
-+
-+# Used to wait for hwservicemanager
-+get_prop(halserverdomain, hwservicemanager_prop)
-diff --git a/prebuilts/api/28.0/private/healthd.te b/prebuilts/api/28.0/private/healthd.te
-new file mode 100644
-index 000000000..20d079173
---- /dev/null
-+++ b/prebuilts/api/28.0/private/healthd.te
-@@ -0,0 +1,6 @@
-+typeattribute healthd coredomain;
-+
-+init_daemon_domain(healthd)
-+
-+# Allow healthd to serve health HAL
-+hal_server_domain(healthd, hal_health)
-diff --git a/prebuilts/api/28.0/private/hwservice_contexts b/prebuilts/api/28.0/private/hwservice_contexts
-new file mode 100644
-index 000000000..c75c0a576
---- /dev/null
-+++ b/prebuilts/api/28.0/private/hwservice_contexts
-@@ -0,0 +1,71 @@
-+android.frameworks.displayservice::IDisplayService              u:object_r:fwk_display_hwservice:s0
-+android.frameworks.schedulerservice::ISchedulingPolicyService   u:object_r:fwk_scheduler_hwservice:s0
-+android.frameworks.sensorservice::ISensorManager                u:object_r:fwk_sensor_hwservice:s0
-+android.hardware.audio.effect::IEffectsFactory                  u:object_r:hal_audio_hwservice:s0
-+android.hardware.audio::IDevicesFactory                         u:object_r:hal_audio_hwservice:s0
-+android.hardware.authsecret::IAuthSecret                        u:object_r:hal_authsecret_hwservice:s0
-+android.hardware.automotive.audiocontrol::IAudioControl         u:object_r:hal_audiocontrol_hwservice:s0
-+android.hardware.automotive.evs::IEvsEnumerator                 u:object_r:hal_evs_hwservice:s0
-+android.hardware.automotive.vehicle::IVehicle                   u:object_r:hal_vehicle_hwservice:s0
-+android.hardware.biometrics.fingerprint::IBiometricsFingerprint u:object_r:hal_fingerprint_hwservice:s0
-+android.hardware.bluetooth::IBluetoothHci                       u:object_r:hal_bluetooth_hwservice:s0
-+android.hardware.bluetooth.a2dp::IBluetoothAudioOffload         u:object_r:hal_audio_hwservice:s0
-+android.hardware.boot::IBootControl                             u:object_r:hal_bootctl_hwservice:s0
-+android.hardware.broadcastradio::IBroadcastRadio                u:object_r:hal_broadcastradio_hwservice:s0
-+android.hardware.broadcastradio::IBroadcastRadioFactory         u:object_r:hal_broadcastradio_hwservice:s0
-+android.hardware.camera.provider::ICameraProvider               u:object_r:hal_camera_hwservice:s0
-+android.hardware.configstore::ISurfaceFlingerConfigs            u:object_r:hal_configstore_ISurfaceFlingerConfigs:s0
-+android.hardware.confirmationui::IConfirmationUI                u:object_r:hal_confirmationui_hwservice:s0
-+android.hardware.contexthub::IContexthub                        u:object_r:hal_contexthub_hwservice:s0
-+android.hardware.cas::IMediaCasService                          u:object_r:hal_cas_hwservice:s0
-+android.hardware.drm::ICryptoFactory                            u:object_r:hal_drm_hwservice:s0
-+android.hardware.drm::IDrmFactory                               u:object_r:hal_drm_hwservice:s0
-+android.hardware.dumpstate::IDumpstateDevice                    u:object_r:hal_dumpstate_hwservice:s0
-+android.hardware.gatekeeper::IGatekeeper                        u:object_r:hal_gatekeeper_hwservice:s0
-+android.hardware.gnss::IGnss                                    u:object_r:hal_gnss_hwservice:s0
-+android.hardware.graphics.allocator::IAllocator                 u:object_r:hal_graphics_allocator_hwservice:s0
-+android.hardware.graphics.composer::IComposer                   u:object_r:hal_graphics_composer_hwservice:s0
-+android.hardware.graphics.mapper::IMapper                       u:object_r:hal_graphics_mapper_hwservice:s0
-+android.hardware.health::IHealth                                u:object_r:hal_health_hwservice:s0
-+android.hardware.ir::IConsumerIr                                u:object_r:hal_ir_hwservice:s0
-+android.hardware.keymaster::IKeymasterDevice                    u:object_r:hal_keymaster_hwservice:s0
-+android.hardware.light::ILight                                  u:object_r:hal_light_hwservice:s0
-+android.hardware.lowpan::ILowpanDevice                          u:object_r:hal_lowpan_hwservice:s0
-+android.hardware.media.omx::IOmx                                u:object_r:hal_omx_hwservice:s0
-+android.hardware.media.omx::IOmxStore                           u:object_r:hal_omx_hwservice:s0
-+android.hardware.memtrack::IMemtrack                            u:object_r:hal_memtrack_hwservice:s0
-+android.hardware.neuralnetworks::IDevice                        u:object_r:hal_neuralnetworks_hwservice:s0
-+android.hardware.nfc::INfc                                      u:object_r:hal_nfc_hwservice:s0
-+android.hardware.oemlock::IOemLock                              u:object_r:hal_oemlock_hwservice:s0
-+android.hardware.power::IPower                                  u:object_r:hal_power_hwservice:s0
-+android.hardware.radio.config::IRadioConfig                     u:object_r:hal_telephony_hwservice:s0
-+android.hardware.radio.deprecated::IOemHook                     u:object_r:hal_telephony_hwservice:s0
-+android.hardware.radio::IRadio                                  u:object_r:hal_telephony_hwservice:s0
-+android.hardware.radio::ISap                                    u:object_r:hal_telephony_hwservice:s0
-+android.hardware.renderscript::IDevice                          u:object_r:hal_renderscript_hwservice:s0
-+android.hardware.secure_element::ISecureElement                 u:object_r:hal_secure_element_hwservice:s0
-+android.hardware.sensors::ISensors                              u:object_r:hal_sensors_hwservice:s0
-+android.hardware.soundtrigger::ISoundTriggerHw                  u:object_r:hal_audio_hwservice:s0
-+android.hardware.tetheroffload.config::IOffloadConfig           u:object_r:hal_tetheroffload_hwservice:s0
-+android.hardware.tetheroffload.control::IOffloadControl         u:object_r:hal_tetheroffload_hwservice:s0
-+android.hardware.thermal::IThermal                              u:object_r:hal_thermal_hwservice:s0
-+android.hardware.thermal::IThermalCallback                      u:object_r:thermalcallback_hwservice:s0
-+android.hardware.tv.cec::IHdmiCec                               u:object_r:hal_tv_cec_hwservice:s0
-+android.hardware.tv.input::ITvInput                             u:object_r:hal_tv_input_hwservice:s0
-+android.hardware.usb::IUsb                                      u:object_r:hal_usb_hwservice:s0
-+android.hardware.usb.gadget::IUsbGadget                         u:object_r:hal_usb_gadget_hwservice:s0
-+android.hardware.vibrator::IVibrator                            u:object_r:hal_vibrator_hwservice:s0
-+android.hardware.vr::IVr                                        u:object_r:hal_vr_hwservice:s0
-+android.hardware.weaver::IWeaver                                u:object_r:hal_weaver_hwservice:s0
-+android.hardware.wifi::IWifi                                    u:object_r:hal_wifi_hwservice:s0
-+android.hardware.wifi.hostapd::IHostapd                         u:object_r:hal_wifi_hostapd_hwservice:s0
-+android.hardware.wifi.offload::IOffload                         u:object_r:hal_wifi_offload_hwservice:s0
-+android.hardware.wifi.supplicant::ISupplicant                   u:object_r:hal_wifi_supplicant_hwservice:s0
-+android.hidl.allocator::IAllocator                              u:object_r:hidl_allocator_hwservice:s0
-+android.hidl.base::IBase                                        u:object_r:hidl_base_hwservice:s0
-+android.hidl.manager::IServiceManager                           u:object_r:hidl_manager_hwservice:s0
-+android.hidl.memory::IMapper                                    u:object_r:hidl_memory_hwservice:s0
-+android.hidl.token::ITokenManager                               u:object_r:hidl_token_hwservice:s0
-+android.system.net.netd::INetd                                  u:object_r:system_net_netd_hwservice:s0
-+android.system.wifi.keystore::IKeystore                         u:object_r:system_wifi_keystore_hwservice:s0
-+*                                                               u:object_r:default_android_hwservice:s0
-diff --git a/prebuilts/api/28.0/private/hwservicemanager.te b/prebuilts/api/28.0/private/hwservicemanager.te
-new file mode 100644
-index 000000000..0705cc711
---- /dev/null
-+++ b/prebuilts/api/28.0/private/hwservicemanager.te
-@@ -0,0 +1,8 @@
-+typeattribute hwservicemanager coredomain;
-+
-+init_daemon_domain(hwservicemanager)
-+
-+add_hwservice(hwservicemanager, hidl_manager_hwservice)
-+add_hwservice(hwservicemanager, hidl_token_hwservice)
-+
-+set_prop(hwservicemanager, ctl_interface_start_prop)
-diff --git a/prebuilts/api/28.0/private/idmap.te b/prebuilts/api/28.0/private/idmap.te
-new file mode 100644
-index 000000000..73abf3552
---- /dev/null
-+++ b/prebuilts/api/28.0/private/idmap.te
-@@ -0,0 +1 @@
-+typeattribute idmap coredomain;
-diff --git a/prebuilts/api/28.0/private/incident.te b/prebuilts/api/28.0/private/incident.te
-new file mode 100644
-index 000000000..1844898ea
---- /dev/null
-+++ b/prebuilts/api/28.0/private/incident.te
-@@ -0,0 +1,30 @@
-+typeattribute incident coredomain;
-+
-+type incident_exec, exec_type, file_type;
-+
-+# switch to incident domain for incident command
-+domain_auto_trans(shell, incident_exec, incident)
-+
-+# allow incident access to stdout from its parent shell.
-+allow incident shell:fd use;
-+
-+# allow incident be able to output data for CTS to fetch.
-+allow incident devpts:chr_file { read write };
-+
-+# allow incident to communicate use, read and write over the adb
-+# connection.
-+allow incident adbd:fd use;
-+allow incident adbd:unix_stream_socket { read write };
-+
-+# allow adbd to reap incident
-+allow incident adbd:process { sigchld };
-+
-+# Allow the incident command to talk to the incidentd over the binder, and get
-+# back the incident report data from a ParcelFileDescriptor.
-+binder_use(incident)
-+allow incident incident_service:service_manager find;
-+binder_call(incident, incidentd)
-+allow incident incidentd:fifo_file write;
-+
-+# only allow incident being called by shell
-+neverallow { domain -su -shell -incident } incident_exec:file { execute execute_no_trans };
-diff --git a/prebuilts/api/28.0/private/incident_helper.te b/prebuilts/api/28.0/private/incident_helper.te
-new file mode 100644
-index 000000000..e1e3fc826
---- /dev/null
-+++ b/prebuilts/api/28.0/private/incident_helper.te
-@@ -0,0 +1,14 @@
-+typeattribute incident_helper coredomain;
-+
-+type incident_helper_exec, exec_type, file_type;
-+
-+# switch to incident_helper domain for incident_helper command
-+domain_auto_trans(incidentd, incident_helper_exec, incident_helper)
-+
-+# use pipe to transmit data from/to incidentd/incident_helper for parsing
-+allow incident_helper { shell incident incidentd }:fd use;
-+allow incident_helper { shell incident incidentd }:fifo_file { getattr read write };
-+allow incident_helper incidentd:unix_stream_socket { read write };
-+
-+# only allow incidentd and shell to call incident_helper
-+neverallow { domain -incidentd -incident_helper -shell } incident_helper_exec:file { execute execute_no_trans };
-diff --git a/prebuilts/api/28.0/private/incidentd.te b/prebuilts/api/28.0/private/incidentd.te
-new file mode 100644
-index 000000000..4ae928e79
---- /dev/null
-+++ b/prebuilts/api/28.0/private/incidentd.te
-@@ -0,0 +1,165 @@
-+typeattribute incidentd coredomain;
-+typeattribute incidentd mlstrustedsubject;
-+
-+init_daemon_domain(incidentd)
-+type incidentd_exec, exec_type, file_type;
-+binder_use(incidentd)
-+wakelock_use(incidentd)
-+
-+# Allow incidentd to scan through /proc/pid for all processes
-+r_dir_file(incidentd, domain)
-+
-+# Allow incidentd to kill incident_helper when timeout
-+allow incidentd incident_helper:process sigkill;
-+
-+# Allow executing files on system, such as:
-+#   /system/bin/toolbox
-+#   /system/bin/logcat
-+#   /system/bin/dumpsys
-+allow incidentd system_file:file execute_no_trans;
-+allow incidentd toolbox_exec:file rx_file_perms;
-+
-+# section id 2001, allow reading /proc/pagetypeinfo
-+allow incidentd proc_pagetypeinfo:file r_file_perms;
-+
-+# section id 2002, allow reading /d/wakeup_sources
-+allow incidentd debugfs_wakeup_sources:file r_file_perms;
-+
-+# section id 2003, allow executing top
-+allow incidentd proc_meminfo:file { open read };
-+
-+# section id 2004, allow reading /sys/devices/system/cpu/cpufreq/all_time_in_state
-+allow incidentd sysfs_devices_system_cpu:file r_file_perms;
-+
-+# section id 2005, allow reading ps dump in full
-+allow incidentd domain:process getattr;
-+
-+# section id 2006, allow reading /sys/class/power_supply/bms/battery_type
-+allow incidentd sysfs_batteryinfo:dir { search };
-+allow incidentd sysfs_batteryinfo:file r_file_perms;
-+
-+# section id 2007, allow reading LAST_KMSG /sys/fs/pstore/console-ramoops
-+userdebug_or_eng(`allow incidentd pstorefs:dir search');
-+userdebug_or_eng(`allow incidentd pstorefs:file r_file_perms');
-+
-+# Create and write into /data/misc/incidents
-+allow incidentd incident_data_file:dir rw_dir_perms;
-+allow incidentd incident_data_file:file create_file_perms;
-+
-+# Enable incidentd to get stack traces.
-+binder_use(incidentd)
-+hwbinder_use(incidentd)
-+allow incidentd hwservicemanager:hwservice_manager { list };
-+get_prop(incidentd, hwservicemanager_prop)
-+allow incidentd hidl_manager_hwservice:hwservice_manager { find };
-+
-+# Read files in /proc
-+allow incidentd {
-+  proc_cmdline
-+  proc_pipe_conf
-+  proc_stat
-+}:file r_file_perms;
-+
-+# Signal java processes to dump their stack and get the results
-+allow incidentd { appdomain ephemeral_app system_server }:process signal;
-+
-+# Signal native processes to dump their stack.
-+# This list comes from native_processes_to_dump in incidentd/utils.c
-+allow incidentd {
-+  # This list comes from native_processes_to_dump in dumputils/dump_utils.cpp
-+  audioserver
-+  cameraserver
-+  drmserver
-+  inputflinger
-+  mediadrmserver
-+  mediaextractor
-+  mediametrics
-+  mediaserver
-+  sdcardd
-+  statsd
-+  surfaceflinger
-+
-+  # This list comes from hal_interfaces_to_dump in dumputils/dump_utils.cpp
-+  hal_audio_server
-+  hal_bluetooth_server
-+  hal_camera_server
-+  hal_graphics_composer_server
-+  hal_sensors_server
-+  hal_vr_server
-+  mediacodec # TODO(b/36375899): hal_omx_server
-+}:process signal;
-+
-+# Allow incidentd to make binder calls to any binder service
-+binder_call(incidentd, system_server)
-+binder_call(incidentd, appdomain)
-+
-+# Reading /proc/PID/maps of other processes
-+userdebug_or_eng(`allow incidentd self:global_capability_class_set { sys_ptrace }');
-+# incidentd has capability sys_ptrace, but should only use that capability for
-+# accessing sensitive /proc/PID files, never for using ptrace attach.
-+neverallow incidentd *:process ptrace;
-+
-+allow incidentd self:global_capability_class_set {
-+    # Send signals to processes
-+    kill
-+};
-+
-+# Connect to tombstoned to intercept dumps.
-+unix_socket_connect(incidentd, tombstoned_intercept, tombstoned)
-+
-+# Run a shell.
-+allow incidentd shell_exec:file rx_file_perms;
-+
-+# logd access - work to be done is a PII safe log (possibly an event log?)
-+userdebug_or_eng(`read_logd(incidentd)')
-+# TODO control_logd(incidentd)
-+
-+# Allow incidentd to find these standard groups of services.
-+# Others can be allowlisted individually.
-+allow incidentd {
-+  system_server_service
-+  app_api_service
-+  system_api_service
-+}:service_manager find;
-+
-+# Only incidentd can publish the binder service
-+add_service(incidentd, incident_service)
-+
-+# Allow pipes from (and only from) incident
-+allow incidentd incident:fd use;
-+allow incidentd incident:fifo_file write;
-+
-+# Allow incident to call back to incident with status updates.
-+binder_call(incidentd, incident)
-+
-+###
-+### neverallow rules
-+###
-+
-+# only system_server, system_app and incident command can find the incident service
-+neverallow {
-+  domain
-+  -incident
-+  -incidentd
-+  -statsd
-+  -system_app
-+  -system_server
-+} incident_service:service_manager find;
-+
-+# only incidentd and the other root services in limited circumstances
-+# can get to the files in /data/misc/incidents
-+#
-+# write, execute, append are forbidden almost everywhere
-+neverallow { domain -incidentd -init -vold } incident_data_file:file {
-+  w_file_perms
-+  x_file_perms
-+  create
-+  rename
-+  setattr
-+  unlink
-+  append
-+};
-+# read is also allowed by system_server, for when the file is handed to dropbox
-+neverallow { domain -incidentd -init -vold -system_server } incident_data_file:file r_file_perms;
-+# limited access to the directory itself
-+neverallow { domain -incidentd -init -vold } incident_data_file:dir create_dir_perms;
-diff --git a/prebuilts/api/28.0/private/init.te b/prebuilts/api/28.0/private/init.te
-new file mode 100644
-index 000000000..e9959d3d2
---- /dev/null
-+++ b/prebuilts/api/28.0/private/init.te
-@@ -0,0 +1,22 @@
-+typeattribute init coredomain;
-+
-+tmpfs_domain(init)
-+
-+# Transitions to seclabel processes in init.rc
-+domain_trans(init, rootfs, charger)
-+domain_trans(init, rootfs, healthd)
-+domain_trans(init, rootfs, slideshow)
-+domain_auto_trans(init, e2fs_exec, e2fs)
-+recovery_only(`
-+  domain_trans(init, rootfs, adbd)
-+  domain_trans(init, rootfs, recovery)
-+')
-+domain_trans(init, shell_exec, shell)
-+domain_trans(init, init_exec, ueventd)
-+domain_trans(init, init_exec, watchdogd)
-+domain_trans(init, init_exec, vendor_init)
-+domain_trans(init, { rootfs toolbox_exec }, modprobe)
-+# case where logpersistd is actually logcat -f in logd context (nee: logcatd)
-+userdebug_or_eng(`
-+  domain_auto_trans(init, logcat_exec, logpersist)
-+')
-diff --git a/prebuilts/api/28.0/private/initial_sid_contexts b/prebuilts/api/28.0/private/initial_sid_contexts
-new file mode 100644
-index 000000000..98190510f
---- /dev/null
-+++ b/prebuilts/api/28.0/private/initial_sid_contexts
-@@ -0,0 +1,27 @@
-+sid kernel u:r:kernel:s0
-+sid security u:object_r:kernel:s0
-+sid unlabeled u:object_r:unlabeled:s0
-+sid fs u:object_r:labeledfs:s0
-+sid file u:object_r:unlabeled:s0
-+sid file_labels u:object_r:unlabeled:s0
-+sid init u:object_r:unlabeled:s0
-+sid any_socket u:object_r:unlabeled:s0
-+sid port u:object_r:port:s0
-+sid netif u:object_r:netif:s0
-+sid netmsg u:object_r:unlabeled:s0
-+sid node u:object_r:node:s0
-+sid igmp_packet u:object_r:unlabeled:s0
-+sid icmp_socket u:object_r:unlabeled:s0
-+sid tcp_socket u:object_r:unlabeled:s0
-+sid sysctl_modprobe u:object_r:unlabeled:s0
-+sid sysctl u:object_r:proc:s0
-+sid sysctl_fs u:object_r:unlabeled:s0
-+sid sysctl_kernel u:object_r:unlabeled:s0
-+sid sysctl_net u:object_r:unlabeled:s0
-+sid sysctl_net_unix u:object_r:unlabeled:s0
-+sid sysctl_vm u:object_r:unlabeled:s0
-+sid sysctl_dev u:object_r:unlabeled:s0
-+sid kmod u:object_r:unlabeled:s0
-+sid policy u:object_r:unlabeled:s0
-+sid scmp_packet u:object_r:unlabeled:s0
-+sid devnull u:object_r:null_device:s0
-diff --git a/prebuilts/api/28.0/private/initial_sids b/prebuilts/api/28.0/private/initial_sids
-new file mode 100644
-index 000000000..91ac816ba
---- /dev/null
-+++ b/prebuilts/api/28.0/private/initial_sids
-@@ -0,0 +1,35 @@
-+# FLASK
-+
-+#
-+# Define initial security identifiers
-+#
-+
-+sid kernel
-+sid security
-+sid unlabeled
-+sid fs
-+sid file
-+sid file_labels
-+sid init
-+sid any_socket
-+sid port
-+sid netif
-+sid netmsg
-+sid node
-+sid igmp_packet
-+sid icmp_socket
-+sid tcp_socket
-+sid sysctl_modprobe
-+sid sysctl
-+sid sysctl_fs
-+sid sysctl_kernel
-+sid sysctl_net
-+sid sysctl_net_unix
-+sid sysctl_vm
-+sid sysctl_dev
-+sid kmod
-+sid policy
-+sid scmp_packet
-+sid devnull
-+
-+# FLASK
-diff --git a/prebuilts/api/28.0/private/inputflinger.te b/prebuilts/api/28.0/private/inputflinger.te
-new file mode 100644
-index 000000000..9696b491b
---- /dev/null
-+++ b/prebuilts/api/28.0/private/inputflinger.te
-@@ -0,0 +1,3 @@
-+typeattribute inputflinger coredomain;
-+
-+init_daemon_domain(inputflinger)
-diff --git a/prebuilts/api/28.0/private/install_recovery.te b/prebuilts/api/28.0/private/install_recovery.te
-new file mode 100644
-index 000000000..b79d683a6
---- /dev/null
-+++ b/prebuilts/api/28.0/private/install_recovery.te
-@@ -0,0 +1,3 @@
-+typeattribute install_recovery coredomain;
-+
-+init_daemon_domain(install_recovery)
-diff --git a/prebuilts/api/28.0/private/installd.te b/prebuilts/api/28.0/private/installd.te
-new file mode 100644
-index 000000000..055371631
---- /dev/null
-+++ b/prebuilts/api/28.0/private/installd.te
-@@ -0,0 +1,22 @@
-+typeattribute installd coredomain;
-+
-+init_daemon_domain(installd)
-+
-+# Run dex2oat in its own sandbox.
-+domain_auto_trans(installd, dex2oat_exec, dex2oat)
-+
-+# Run dexoptanalyzer in its own sandbox.
-+domain_auto_trans(installd, dexoptanalyzer_exec, dexoptanalyzer)
-+
-+# Run profman in its own sandbox.
-+domain_auto_trans(installd, profman_exec, profman)
-+
-+# Run idmap in its own sandbox.
-+domain_auto_trans(installd, idmap_exec, idmap)
-+
-+# Create /data/.layout_version.* file
-+type_transition installd system_data_file:file install_data_file;
-+
-+# For collecting bugreports.
-+allow installd dumpstate:fd use;
-+allow installd dumpstate:fifo_file r_file_perms;
-diff --git a/prebuilts/api/28.0/private/isolated_app.te b/prebuilts/api/28.0/private/isolated_app.te
-new file mode 100644
-index 000000000..6af6040d7
---- /dev/null
-+++ b/prebuilts/api/28.0/private/isolated_app.te
-@@ -0,0 +1,119 @@
-+###
-+### Services with isolatedProcess=true in their manifest.
-+###
-+### This file defines the rules for isolated apps. An "isolated
-+### app" is an APP with UID between AID_ISOLATED_START (99000)
-+### and AID_ISOLATED_END (99999).
-+###
-+
-+typeattribute isolated_app coredomain;
-+
-+app_domain(isolated_app)
-+
-+# Access already open app data files received over Binder or local socket IPC.
-+allow isolated_app app_data_file:file { append read write getattr lock };
-+
-+allow isolated_app activity_service:service_manager find;
-+allow isolated_app display_service:service_manager find;
-+allow isolated_app webviewupdate_service:service_manager find;
-+
-+# Google Breakpad (crash reporter for Chrome) relies on ptrace
-+# functionality. Without the ability to ptrace, the crash reporter
-+# tool is broken.
-+# b/20150694
-+# https://code.google.com/p/chromium/issues/detail?id=475270
-+allow isolated_app self:process ptrace;
-+
-+# b/32896414: Allow accessing sdcard file descriptors passed to isolated_apps
-+# by other processes. Open should never be allowed, and is blocked by
-+# neverallow rules below.
-+# media_rw_data_file is included for sdcardfs, and can be removed if sdcardfs
-+# is modified to change the secontext when accessing the lower filesystem.
-+allow isolated_app { sdcard_type media_rw_data_file }:file { read write append getattr lock };
-+
-+# For webviews, isolated_app processes can be forked from the webview_zygote
-+# in addition to the zygote. Allow access to resources inherited from the
-+# webview_zygote process. These rules are specialized copies of the ones in app.te.
-+# Inherit FDs from the webview_zygote.
-+allow isolated_app webview_zygote:fd use;
-+# Notify webview_zygote of child death.
-+allow isolated_app webview_zygote:process sigchld;
-+# Inherit logd write socket.
-+allow isolated_app webview_zygote:unix_dgram_socket write;
-+# Read system properties managed by webview_zygote.
-+allow isolated_app webview_zygote_tmpfs:file read;
-+
-+# TODO (b/63631799) fix this access
-+# suppress denials to /data/local/tmp
-+dontaudit isolated_app shell_data_file:dir search;
-+
-+# Write app-specific trace data to the Perfetto traced damon. This requires
-+# connecting to its producer socket and obtaining a (per-process) tmpfs fd.
-+allow isolated_app traced:fd use;
-+allow isolated_app traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(isolated_app, traced_producer, traced)
-+
-+#####
-+##### Neverallow
-+#####
-+
-+# Do not allow isolated_app to directly open tun_device
-+neverallow isolated_app tun_device:chr_file open;
-+
-+# Isolated apps should not directly open app data files themselves.
-+neverallow isolated_app app_data_file:file open;
-+
-+# Only allow appending to /data/anr/traces.txt (b/27853304, b/18340553)
-+# TODO: are there situations where isolated_apps write to this file?
-+# TODO: should we tighten these restrictions further?
-+neverallow isolated_app anr_data_file:file ~{ open append };
-+neverallow isolated_app anr_data_file:dir ~search;
-+
-+# Isolated apps must not be permitted to use HwBinder
-+neverallow isolated_app hwbinder_device:chr_file *;
-+neverallow isolated_app *:hwservice_manager *;
-+
-+# Isolated apps must not be permitted to use VndBinder
-+neverallow isolated_app vndbinder_device:chr_file *;
-+
-+# Isolated apps must not be permitted to perform actions on Binder and VndBinder service_manager
-+# except the find actions for services allowlisted below.
-+neverallow isolated_app *:service_manager ~find;
-+
-+# b/17487348
-+# Isolated apps can only access three services,
-+# activity_service, display_service and webviewupdate_service.
-+neverallow isolated_app {
-+    service_manager_type
-+    -activity_service
-+    -display_service
-+    -webviewupdate_service
-+}:service_manager find;
-+
-+# Isolated apps shouldn't be able to access the driver directly.
-+neverallow isolated_app gpu_device:chr_file { rw_file_perms execute };
-+
-+# Do not allow isolated_app access to /cache
-+neverallow isolated_app cache_file:dir ~{ r_dir_perms };
-+neverallow isolated_app cache_file:file ~{ read getattr };
-+
-+# Do not allow isolated_app to access external storage, except for files passed
-+# via file descriptors (b/32896414).
-+neverallow isolated_app { storage_file mnt_user_file sdcard_type }:dir ~getattr;
-+neverallow isolated_app { storage_file mnt_user_file }:file_class_set *;
-+neverallow isolated_app sdcard_type:{ devfile_class_set lnk_file sock_file fifo_file } *;
-+neverallow isolated_app sdcard_type:file ~{ read write append getattr lock };
-+
-+# Do not allow USB access
-+neverallow isolated_app { usb_device usbaccessory_device }:chr_file *;
-+
-+# Restrict the webview_zygote control socket.
-+neverallow isolated_app webview_zygote:sock_file write;
-+
-+# Limit the /sys files which isolated_app can access. This is important
-+# for controlling isolated_app attack surface.
-+neverallow isolated_app {
-+  sysfs_type
-+  -sysfs_devices_system_cpu
-+  -sysfs_usb # TODO: check with audio team if needed for isolated_app (b/28417852)
-+}:file no_rw_file_perms;
-diff --git a/prebuilts/api/28.0/private/kernel.te b/prebuilts/api/28.0/private/kernel.te
-new file mode 100644
-index 000000000..a4e6ebe36
---- /dev/null
-+++ b/prebuilts/api/28.0/private/kernel.te
-@@ -0,0 +1,3 @@
-+typeattribute kernel coredomain;
-+
-+domain_auto_trans(kernel, init_exec, init)
-diff --git a/prebuilts/api/28.0/private/keys.conf b/prebuilts/api/28.0/private/keys.conf
-new file mode 100644
-index 000000000..7bb3ad55e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/keys.conf
-@@ -0,0 +1,24 @@
-+#
-+# Maps an arbitrary tag [TAGNAME] with the string contents found in
-+# TARGET_BUILD_VARIANT. Common convention is to start TAGNAME with an @ and
-+# name it after the base file name of the pem file.
-+#
-+# Each tag (section) then allows one to specify any string found in
-+# TARGET_BUILD_VARIANT. Typcially this is user, eng, and userdebug. Another
-+# option is to use ALL which will match ANY TARGET_BUILD_VARIANT string.
-+#
-+
-+[@PLATFORM]
-+ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/platform.x509.pem
-+
-+[@MEDIA]
-+ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/media.x509.pem
-+
-+[@SHARED]
-+ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/shared.x509.pem
-+
-+# Example of ALL TARGET_BUILD_VARIANTS
-+[@RELEASE]
-+ENG       : $DEFAULT_SYSTEM_DEV_CERTIFICATE/testkey.x509.pem
-+USER      : $DEFAULT_SYSTEM_DEV_CERTIFICATE/testkey.x509.pem
-+USERDEBUG : $DEFAULT_SYSTEM_DEV_CERTIFICATE/testkey.x509.pem
-diff --git a/prebuilts/api/28.0/private/keystore.te b/prebuilts/api/28.0/private/keystore.te
-new file mode 100644
-index 000000000..7f71028ba
---- /dev/null
-+++ b/prebuilts/api/28.0/private/keystore.te
-@@ -0,0 +1,19 @@
-+typeattribute keystore coredomain;
-+
-+init_daemon_domain(keystore)
-+
-+# talk to keymaster
-+hal_client_domain(keystore, hal_keymaster)
-+
-+# talk to confirmationui
-+hal_client_domain(keystore, hal_confirmationui)
-+
-+# This is used for the ConfirmationUI async callback.
-+allow keystore platform_app:binder call;
-+
-+# Offer the Wifi Keystore HwBinder service
-+typeattribute keystore wifi_keystore_service_server;
-+add_hwservice(keystore, system_wifi_keystore_hwservice)
-+
-+# Allow to check whether security logging is enabled.
-+get_prop(keystore, device_logging_prop)
-diff --git a/prebuilts/api/28.0/private/lmkd.te b/prebuilts/api/28.0/private/lmkd.te
-new file mode 100644
-index 000000000..a07ce879c
---- /dev/null
-+++ b/prebuilts/api/28.0/private/lmkd.te
-@@ -0,0 +1,3 @@
-+typeattribute lmkd coredomain;
-+
-+init_daemon_domain(lmkd)
-diff --git a/prebuilts/api/28.0/private/logd.te b/prebuilts/api/28.0/private/logd.te
-new file mode 100644
-index 000000000..4338e4005
---- /dev/null
-+++ b/prebuilts/api/28.0/private/logd.te
-@@ -0,0 +1,39 @@
-+typeattribute logd coredomain;
-+
-+init_daemon_domain(logd)
-+
-+# logd is not allowed to write anywhere other than /data/misc/logd, and then
-+# only on userdebug or eng builds
-+# TODO: deal with tmpfs_domain pub/priv split properly
-+neverallow logd {
-+  file_type
-+  -logd_tmpfs
-+  -runtime_event_log_tags_file
-+  userdebug_or_eng(`-coredump_file -misc_logd_file')
-+}:file { create write append };
-+
-+# protect the event-log-tags file
-+neverallow {
-+  domain
-+  -appdomain # covered below
-+  -bootstat
-+  -dumpstate
-+  -init
-+  -logd
-+  userdebug_or_eng(`-logpersist')
-+  -servicemanager
-+  -system_server
-+  -surfaceflinger
-+  -zygote
-+} runtime_event_log_tags_file:file no_rw_file_perms;
-+
-+neverallow {
-+  appdomain
-+  -bluetooth
-+  -platform_app
-+  -priv_app
-+  -radio
-+  -shell
-+  userdebug_or_eng(`-su')
-+  -system_app
-+} runtime_event_log_tags_file:file no_rw_file_perms;
-diff --git a/prebuilts/api/28.0/private/logpersist.te b/prebuilts/api/28.0/private/logpersist.te
-new file mode 100644
-index 000000000..8cdbd2dd0
---- /dev/null
-+++ b/prebuilts/api/28.0/private/logpersist.te
-@@ -0,0 +1,24 @@
-+typeattribute logpersist coredomain;
-+
-+# android debug log storage in logpersist domains (eng and userdebug only)
-+userdebug_or_eng(`
-+
-+  r_dir_file(logpersist, cgroup)
-+
-+  allow logpersist misc_logd_file:file create_file_perms;
-+  allow logpersist misc_logd_file:dir rw_dir_perms;
-+
-+  allow logpersist self:global_capability_class_set sys_nice;
-+  allow logpersist pstorefs:dir search;
-+  allow logpersist pstorefs:file r_file_perms;
-+
-+  control_logd(logpersist)
-+  unix_socket_connect(logpersist, logdr, logd)
-+  read_runtime_log_tags(logpersist)
-+
-+')
-+
-+# logpersist is allowed to write to /data/misc/log for userdebug and eng builds
-+neverallow logpersist { file_type userdebug_or_eng(`-misc_logd_file -coredump_file') }:file { create write append };
-+neverallow { domain -init userdebug_or_eng(`-logpersist -logd -dumpstate') } misc_logd_file:file no_rw_file_perms;
-+neverallow { domain -init userdebug_or_eng(`-logpersist -logd') } misc_logd_file:dir { add_name link relabelfrom remove_name rename reparent rmdir write };
-diff --git a/prebuilts/api/28.0/private/mac_permissions.xml b/prebuilts/api/28.0/private/mac_permissions.xml
-new file mode 100644
-index 000000000..1fcd2a409
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mac_permissions.xml
-@@ -0,0 +1,59 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<policy>
-+
-+<!--
-+
-+    * A signature is a hex encoded X.509 certificate or a tag defined in
-+      keys.conf and is required for each signer tag. The signature can
-+      either appear as a set of attached cert child tags or as an attribute.
-+    * A signer tag must contain a seinfo tag XOR multiple package stanzas.
-+    * Each signer/package tag is allowed to contain one seinfo tag. This tag
-+      represents additional info that each app can use in setting a SELinux security
-+      context on the eventual process as well as the apps data directory.
-+    * seinfo assignments are made according to the following rules:
-+      - Stanzas with package name refinements will be checked first.
-+      - Stanzas w/o package name refinements will be checked second.
-+      - The "default" seinfo label is automatically applied.
-+
-+    * valid stanzas can take one of the following forms:
-+
-+     // single cert protecting seinfo
-+     <signer signature="@PLATFORM" >
-+       <seinfo value="platform" />
-+     </signer>
-+
-+     // multiple certs protecting seinfo (all contained certs must match)
-+     <signer>
-+       <cert signature="@PLATFORM1"/>
-+       <cert signature="@PLATFORM2"/>
-+       <seinfo value="platform" />
-+     </signer>
-+
-+     // single cert protecting explicitly named app
-+     <signer signature="@PLATFORM" >
-+       <package name="com.android.foo">
-+         <seinfo value="bar" />
-+       </package>
-+     </signer>
-+
-+     // multiple certs protecting explicitly named app (all certs must match)
-+     <signer>
-+       <cert signature="@PLATFORM1"/>
-+       <cert signature="@PLATFORM2"/>
-+       <package name="com.android.foo">
-+         <seinfo value="bar" />
-+       </package>
-+     </signer>
-+-->
-+
-+    <!-- Platform dev key in AOSP -->
-+    <signer signature="@PLATFORM" >
-+      <seinfo value="platform" />
-+    </signer>
-+
-+    <!-- Media key in AOSP -->
-+    <signer signature="@MEDIA" >
-+      <seinfo value="media" />
-+    </signer>
-+
-+</policy>
-diff --git a/prebuilts/api/28.0/private/mdnsd.te b/prebuilts/api/28.0/private/mdnsd.te
-new file mode 100644
-index 000000000..96259e298
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mdnsd.te
-@@ -0,0 +1,12 @@
-+# mdns daemon
-+
-+typeattribute mdnsd coredomain;
-+typeattribute mdnsd mlstrustedsubject;
-+
-+type mdnsd_exec, exec_type, file_type;
-+init_daemon_domain(mdnsd)
-+
-+net_domain(mdnsd)
-+
-+# Read from /proc/net
-+r_dir_file(mdnsd, proc_net)
-diff --git a/prebuilts/api/28.0/private/mediadrmserver.te b/prebuilts/api/28.0/private/mediadrmserver.te
-new file mode 100644
-index 000000000..d5270e28e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mediadrmserver.te
-@@ -0,0 +1,7 @@
-+typeattribute mediadrmserver coredomain;
-+
-+init_daemon_domain(mediadrmserver)
-+
-+# allocate and use graphic buffers
-+hal_client_domain(mediadrmserver, hal_graphics_allocator)
-+auditallow mediadrmserver hal_graphics_allocator_server:binder call;
-diff --git a/prebuilts/api/28.0/private/mediaextractor.te b/prebuilts/api/28.0/private/mediaextractor.te
-new file mode 100644
-index 000000000..c1a85219c
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mediaextractor.te
-@@ -0,0 +1,3 @@
-+typeattribute mediaextractor coredomain;
-+
-+init_daemon_domain(mediaextractor)
-diff --git a/prebuilts/api/28.0/private/mediametrics.te b/prebuilts/api/28.0/private/mediametrics.te
-new file mode 100644
-index 000000000..f8b2fa5cd
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mediametrics.te
-@@ -0,0 +1,3 @@
-+typeattribute mediametrics coredomain;
-+
-+init_daemon_domain(mediametrics)
-diff --git a/prebuilts/api/28.0/private/mediaprovider.te b/prebuilts/api/28.0/private/mediaprovider.te
-new file mode 100644
-index 000000000..f5c9f690e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mediaprovider.te
-@@ -0,0 +1,43 @@
-+###
-+### A domain for android.process.media, which contains both
-+### MediaProvider and DownloadProvider and associated services.
-+###
-+
-+typeattribute mediaprovider coredomain;
-+app_domain(mediaprovider)
-+
-+# DownloadProvider accesses the network.
-+net_domain(mediaprovider)
-+
-+# DownloadProvider uses /cache.
-+allow mediaprovider cache_file:dir create_dir_perms;
-+allow mediaprovider cache_file:file create_file_perms;
-+# /cache is a symlink to /data/cache on some devices. Allow reading the link.
-+allow mediaprovider cache_file:lnk_file r_file_perms;
-+# mediaprovider searches through /cache looking for orphans
-+# Ignore denials to /cache/recovery and /cache/backup.
-+dontaudit mediaprovider cache_private_backup_file:dir getattr;
-+dontaudit mediaprovider cache_recovery_file:dir getattr;
-+
-+# Access external sdcards through /mnt/media_rw
-+allow mediaprovider { mnt_media_rw_file }:dir search;
-+
-+allow mediaprovider app_api_service:service_manager find;
-+allow mediaprovider audioserver_service:service_manager find;
-+allow mediaprovider drmserver_service:service_manager find;
-+allow mediaprovider mediaextractor_service:service_manager find;
-+allow mediaprovider mediaserver_service:service_manager find;
-+
-+# Allow MediaProvider to read/write cached ringtones (opened by system).
-+allow mediaprovider ringtone_file:file { getattr read write };
-+
-+# MtpServer uses /dev/mtp_usb
-+allow mediaprovider mtp_device:chr_file rw_file_perms;
-+
-+# MtpServer uses /dev/usb-ffs/mtp
-+allow mediaprovider functionfs:dir search;
-+allow mediaprovider functionfs:file rw_file_perms;
-+
-+# MtpServer sets sys.usb.ffs.mtp.ready
-+set_prop(mediaprovider, ffs_prop)
-+set_prop(mediaprovider, exported_ffs_prop)
-diff --git a/prebuilts/api/28.0/private/mediaserver.te b/prebuilts/api/28.0/private/mediaserver.te
-new file mode 100644
-index 000000000..a5fa9e10e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mediaserver.te
-@@ -0,0 +1,11 @@
-+typeattribute mediaserver coredomain;
-+
-+init_daemon_domain(mediaserver)
-+
-+# allocate and use graphic buffers
-+hal_client_domain(mediaserver, hal_graphics_allocator)
-+
-+# TODO(b/36375899): Remove this once OMX HAL is attributized and mediaserver is marked as a client
-+# of OMX HAL.
-+allow mediaserver hal_codec2_hwservice:hwservice_manager find;
-+allow mediaserver hal_omx_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/private/mls b/prebuilts/api/28.0/private/mls
-new file mode 100644
-index 000000000..3b8ee3f47
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mls
-@@ -0,0 +1,100 @@
-+#################################################
-+# MLS policy constraints
-+#
-+
-+#
-+# Process constraints
-+#
-+
-+# Process transition:  Require equivalence unless the subject is trusted.
-+mlsconstrain process { transition dyntransition }
-+	     ((h1 eq h2 and l1 eq l2) or t1 == mlstrustedsubject);
-+
-+# Process read operations: No read up unless trusted.
-+mlsconstrain process { getsched getsession getpgid getcap getattr ptrace share }
-+	     (l1 dom l2 or t1 == mlstrustedsubject);
-+
-+# Process write operations:  Require equivalence unless trusted.
-+mlsconstrain process { sigkill sigstop signal setsched setpgid setcap setrlimit ptrace share }
-+	     (l1 eq l2 or t1 == mlstrustedsubject);
-+
-+#
-+# Socket constraints
-+#
-+
-+# Create/relabel operations:  Subject must be equivalent to object unless
-+# the subject is trusted.  Sockets inherit the range of their creator.
-+mlsconstrain socket_class_set { create relabelfrom relabelto }
-+	     ((h1 eq h2 and l1 eq l2) or t1 == mlstrustedsubject);
-+
-+# Datagram send: Sender must be equivalent to the receiver unless one of them
-+# is trusted.
-+mlsconstrain unix_dgram_socket { sendto }
-+	     (l1 eq l2 or t1 == mlstrustedsubject or t2 == mlstrustedsubject);
-+
-+# Stream connect:  Client must be equivalent to server unless one of them
-+# is trusted.
-+mlsconstrain unix_stream_socket { connectto }
-+	     (l1 eq l2 or t1 == mlstrustedsubject or t2 == mlstrustedsubject);
-+
-+#
-+# Directory/file constraints
-+#
-+
-+# Create/relabel operations:  Subject must be equivalent to object unless
-+# the subject is trusted. Also, files should always be single-level.
-+# Do NOT exempt mlstrustedobject types from this constraint.
-+mlsconstrain dir_file_class_set { create relabelfrom relabelto }
-+	     (l2 eq h2 and (l1 eq l2 or t1 == mlstrustedsubject));
-+
-+#
-+# Constraints for app data files only.
-+#
-+
-+# Only constrain open, not read/write.
-+# Also constrain other forms of manipulation, e.g. chmod/chown, unlink, rename, etc.
-+# Subject must dominate object unless the subject is trusted.
-+mlsconstrain dir { open search setattr rename add_name remove_name reparent rmdir }
-+	     (t2 != app_data_file or l1 dom l2 or t1 == mlstrustedsubject);
-+mlsconstrain { file lnk_file sock_file } { open setattr unlink link rename }
-+	     (t2 != app_data_file or l1 dom l2 or t1 == mlstrustedsubject);
-+
-+#
-+# Constraints for file types other than app data files.
-+#
-+
-+# Read operations: Subject must dominate object unless the subject
-+# or the object is trusted.
-+mlsconstrain dir { read getattr search }
-+	     (t2 == app_data_file or l1 dom l2 or t1 == mlstrustedsubject or t2 == mlstrustedobject);
-+
-+mlsconstrain { file lnk_file sock_file chr_file blk_file } { read getattr execute }
-+	     (t2 == app_data_file or l1 dom l2 or t1 == mlstrustedsubject or t2 == mlstrustedobject);
-+
-+# Write operations: Subject must be equivalent to the object unless the
-+# subject or the object is trusted.
-+mlsconstrain dir { write setattr rename add_name remove_name reparent rmdir }
-+	     (t2 == app_data_file or l1 eq l2 or t1 == mlstrustedsubject or t2 == mlstrustedobject);
-+
-+mlsconstrain { file lnk_file sock_file chr_file blk_file } { write setattr append unlink link rename }
-+	     (t2 == app_data_file or l1 eq l2 or t1 == mlstrustedsubject or t2 == mlstrustedobject);
-+
-+# Special case for FIFOs.
-+# These can be unnamed pipes, in which case they will be labeled with the
-+# creating process' label. Thus we also have an exemption when the "object"
-+# is a domain type, so that processes can communicate via unnamed pipes
-+# passed by binder or local socket IPC.
-+mlsconstrain fifo_file { read getattr }
-+	     (l1 dom l2 or t1 == mlstrustedsubject or t2 == mlstrustedobject or t2 == domain);
-+
-+mlsconstrain fifo_file { write setattr append unlink link rename }
-+	     (l1 eq l2 or t1 == mlstrustedsubject or t2 == mlstrustedobject or t2 == domain);
-+
-+#
-+# Binder IPC constraints
-+#
-+# Presently commented out, as apps are expected to call one another.
-+# This would only make sense if apps were assigned categories
-+# based on allowable communications rather than per-app categories.
-+#mlsconstrain binder call
-+#	(l1 eq l2 or t1 == mlstrustedsubject or t2 == mlstrustedsubject);
-diff --git a/prebuilts/api/28.0/private/mls_decl b/prebuilts/api/28.0/private/mls_decl
-new file mode 100644
-index 000000000..dd53bea7e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mls_decl
-@@ -0,0 +1,10 @@
-+#########################################
-+# MLS declarations
-+#
-+
-+# Generate the desired number of sensitivities and categories.
-+gen_sens(mls_num_sens)
-+gen_cats(mls_num_cats)
-+
-+# Generate level definitions for each sensitivity and category.
-+gen_levels(mls_num_sens,mls_num_cats)
-diff --git a/prebuilts/api/28.0/private/mls_macros b/prebuilts/api/28.0/private/mls_macros
-new file mode 100644
-index 000000000..83e05425b
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mls_macros
-@@ -0,0 +1,54 @@
-+########################################
-+#
-+# gen_cats(N)
-+#
-+# declares categores c0 to c(N-1)
-+#
-+define(`decl_cats',`dnl
-+category c$1;
-+ifelse(`$1',`$2',,`decl_cats(incr($1),$2)')dnl
-+')
-+
-+define(`gen_cats',`decl_cats(0,decr($1))')
-+
-+########################################
-+#
-+# gen_sens(N)
-+#
-+# declares sensitivites s0 to s(N-1) with dominance
-+# in increasing numeric order with s0 lowest, s(N-1) highest
-+#
-+define(`decl_sens',`dnl
-+sensitivity s$1;
-+ifelse(`$1',`$2',,`decl_sens(incr($1),$2)')dnl
-+')
-+
-+define(`gen_dominance',`s$1 ifelse(`$1',`$2',,`gen_dominance(incr($1),$2)')')
-+
-+define(`gen_sens',`
-+# Each sensitivity has a name and zero or more aliases.
-+decl_sens(0,decr($1))
-+
-+# Define the ordering of the sensitivity levels (least to greatest)
-+dominance { gen_dominance(0,decr($1)) }
-+')
-+
-+########################################
-+#
-+# gen_levels(N,M)
-+#
-+# levels from s0 to (N-1) with categories c0 to (M-1)
-+#
-+define(`decl_levels',`dnl
-+level s$1:c0.c$3;
-+ifelse(`$1',`$2',,`decl_levels(incr($1),$2,$3)')dnl
-+')
-+
-+define(`gen_levels',`decl_levels(0,decr($1),decr($2))')
-+
-+########################################
-+#
-+# Basic level names for system low and high
-+#
-+define(`mls_systemlow',`s0')
-+define(`mls_systemhigh',`s`'decr(mls_num_sens):c0.c`'decr(mls_num_cats)')
-diff --git a/prebuilts/api/28.0/private/modprobe.te b/prebuilts/api/28.0/private/modprobe.te
-new file mode 100644
-index 000000000..98586756f
---- /dev/null
-+++ b/prebuilts/api/28.0/private/modprobe.te
-@@ -0,0 +1 @@
-+typeattribute modprobe coredomain;
-diff --git a/prebuilts/api/28.0/private/mtp.te b/prebuilts/api/28.0/private/mtp.te
-new file mode 100644
-index 000000000..732e111ed
---- /dev/null
-+++ b/prebuilts/api/28.0/private/mtp.te
-@@ -0,0 +1,3 @@
-+typeattribute mtp coredomain;
-+
-+init_daemon_domain(mtp)
-diff --git a/prebuilts/api/28.0/private/net.te b/prebuilts/api/28.0/private/net.te
-new file mode 100644
-index 000000000..f16daf94c
---- /dev/null
-+++ b/prebuilts/api/28.0/private/net.te
-@@ -0,0 +1,24 @@
-+###
-+### Domain with network access
-+###
-+
-+# Use network sockets.
-+allow netdomain self:tcp_socket create_stream_socket_perms;
-+allow netdomain self:{ udp_socket rawip_socket } create_socket_perms;
-+# Connect to ports.
-+allow netdomain port_type:tcp_socket name_connect;
-+# Bind to ports.
-+allow {netdomain -ephemeral_app} node_type:{ tcp_socket udp_socket } node_bind;
-+allow {netdomain -ephemeral_app} port_type:udp_socket name_bind;
-+allow {netdomain -ephemeral_app} port_type:tcp_socket name_bind;
-+# See changes to the routing table.
-+allow netdomain self:netlink_route_socket { create read getattr write setattr lock append bind connect getopt setopt shutdown nlmsg_read };
-+
-+# Talks to netd via dnsproxyd socket.
-+unix_socket_connect(netdomain, dnsproxyd, netd)
-+
-+# Talks to netd via fwmarkd socket.
-+unix_socket_connect(netdomain, fwmarkd, netd)
-+
-+# Connect to mdnsd via mdnsd socket.
-+unix_socket_connect(netdomain, mdnsd, mdnsd)
-diff --git a/prebuilts/api/28.0/private/netd.te b/prebuilts/api/28.0/private/netd.te
-new file mode 100644
-index 000000000..281105d04
---- /dev/null
-+++ b/prebuilts/api/28.0/private/netd.te
-@@ -0,0 +1,15 @@
-+typeattribute netd coredomain;
-+
-+init_daemon_domain(netd)
-+
-+# Allow netd to spawn dnsmasq in it's own domain
-+domain_auto_trans(netd, dnsmasq_exec, dnsmasq)
-+
-+# Allow netd to start clatd in its own domain
-+domain_auto_trans(netd, clatd_exec, clatd)
-+
-+# Allow netd to start bpfloader_exec in its own domain
-+domain_auto_trans(netd, bpfloader_exec, bpfloader)
-+
-+# give netd permission to setup iptables rule with xt_bpf
-+allow netd bpfloader:bpf prog_run;
-diff --git a/prebuilts/api/28.0/private/netutils_wrapper.te b/prebuilts/api/28.0/private/netutils_wrapper.te
-new file mode 100644
-index 000000000..ea58814e1
---- /dev/null
-+++ b/prebuilts/api/28.0/private/netutils_wrapper.te
-@@ -0,0 +1,41 @@
-+typeattribute netutils_wrapper coredomain;
-+
-+r_dir_file(netutils_wrapper, system_file);
-+
-+# For netutils (ip, iptables, tc)
-+allow netutils_wrapper self:global_capability_class_set net_raw;
-+
-+allow netutils_wrapper system_file:file { execute execute_no_trans };
-+allow netutils_wrapper proc_net:file { open read getattr };
-+allow netutils_wrapper self:rawip_socket create_socket_perms;
-+allow netutils_wrapper self:udp_socket create_socket_perms;
-+allow netutils_wrapper self:global_capability_class_set net_admin;
-+# ip utils need everything but ioctl
-+allow netutils_wrapper self:netlink_route_socket ~ioctl;
-+allow netutils_wrapper self:netlink_xfrm_socket ~ioctl;
-+
-+# For netutils (ndc) to be able to talk to netd
-+allow netutils_wrapper netd_socket:sock_file { open getattr read write append };
-+allow netutils_wrapper netd:unix_stream_socket { read getattr connectto };
-+
-+# For vendor code that update the iptables rules at runtime. They need to reload
-+# the whole chain including the xt_bpf rules. They need to access to the pinned
-+# program when reloading the rule.
-+allow netutils_wrapper fs_bpf:dir search;
-+allow netutils_wrapper fs_bpf:file { read write };
-+allow netutils_wrapper bpfloader:bpf prog_run;
-+
-+# For /data/misc/net access to ndc and ip
-+r_dir_file(netutils_wrapper, net_data_file)
-+
-+domain_auto_trans({
-+    domain
-+    -coredomain
-+    -appdomain
-+}, netutils_wrapper_exec, netutils_wrapper)
-+
-+# suppress spurious denials
-+dontaudit netutils_wrapper self:global_capability_class_set sys_resource;
-+
-+# netutils wrapper may only use the following capabilities.
-+neverallow netutils_wrapper self:global_capability_class_set ~{ net_admin net_raw };
-diff --git a/prebuilts/api/28.0/private/nfc.te b/prebuilts/api/28.0/private/nfc.te
-new file mode 100644
-index 000000000..5e8567291
---- /dev/null
-+++ b/prebuilts/api/28.0/private/nfc.te
-@@ -0,0 +1,34 @@
-+# nfc subsystem
-+typeattribute nfc coredomain;
-+app_domain(nfc)
-+net_domain(nfc)
-+
-+binder_service(nfc)
-+add_service(nfc, nfc_service)
-+
-+hal_client_domain(nfc, hal_nfc)
-+
-+# Data file accesses.
-+allow nfc nfc_data_file:dir create_dir_perms;
-+allow nfc nfc_data_file:notdevfile_class_set create_file_perms;
-+
-+# SoundPool loading and playback
-+allow nfc audioserver_service:service_manager find;
-+allow nfc drmserver_service:service_manager find;
-+allow nfc mediacodec_service:service_manager find;
-+allow nfc mediametrics_service:service_manager find;
-+allow nfc mediaextractor_service:service_manager find;
-+allow nfc mediaserver_service:service_manager find;
-+
-+allow nfc radio_service:service_manager find;
-+allow nfc app_api_service:service_manager find;
-+allow nfc system_api_service:service_manager find;
-+allow nfc vr_manager_service:service_manager find;
-+allow nfc secure_element_service:service_manager find;
-+
-+set_prop(nfc, nfc_prop);
-+
-+# already open bugreport file descriptors may be shared with
-+# the nfc process, from a file in
-+# /data/data/com.android.shell/files/bugreports/bugreport-*.
-+allow nfc shell_data_file:file read;
-diff --git a/prebuilts/api/28.0/private/otapreopt_chroot.te b/prebuilts/api/28.0/private/otapreopt_chroot.te
-new file mode 100644
-index 000000000..1f69931c8
---- /dev/null
-+++ b/prebuilts/api/28.0/private/otapreopt_chroot.te
-@@ -0,0 +1,4 @@
-+typeattribute otapreopt_chroot coredomain;
-+
-+# Allow to transition to postinstall_ota, to run otapreopt in its own sandbox.
-+domain_auto_trans(otapreopt_chroot, postinstall_file, postinstall_dexopt)
-diff --git a/prebuilts/api/28.0/private/otapreopt_slot.te b/prebuilts/api/28.0/private/otapreopt_slot.te
-new file mode 100644
-index 000000000..98b93d406
---- /dev/null
-+++ b/prebuilts/api/28.0/private/otapreopt_slot.te
-@@ -0,0 +1,5 @@
-+typeattribute otapreopt_slot coredomain;
-+
-+# Technically not a daemon but we do want the transition from init domain to
-+# cppreopts to occur.
-+init_daemon_domain(otapreopt_slot)
-diff --git a/prebuilts/api/28.0/private/perfetto.te b/prebuilts/api/28.0/private/perfetto.te
-new file mode 100644
-index 000000000..67725bfca
---- /dev/null
-+++ b/prebuilts/api/28.0/private/perfetto.te
-@@ -0,0 +1,68 @@
-+# Perfetto command-line client. Can be used only from the domains that are
-+# explicitly allowlisted with a domain_auto_trans(X, perfetto_exec, perfetto).
-+# This command line client accesses the privileged socket of the traced
-+# daemon.
-+
-+type perfetto, domain, coredomain;
-+type perfetto_exec, exec_type, file_type;
-+
-+tmpfs_domain(perfetto);
-+
-+# Allow to access traced's privileged consumer socket.
-+unix_socket_connect(perfetto, traced_consumer, traced)
-+
-+# Allow to write and unlink traces into /data/misc/perfetto-traces.
-+allow perfetto perfetto_traces_data_file:dir rw_dir_perms;
-+allow perfetto perfetto_traces_data_file:file create_file_perms;
-+
-+# Allow to access binder to pass the traces to Dropbox.
-+binder_use(perfetto)
-+binder_call(perfetto, system_server)
-+allow perfetto dropbox_service:service_manager find;
-+
-+# Allow statsd and shell to pipe the trace config to perfetto on stdin and to
-+# print out on stdout/stderr.
-+allow perfetto statsd:fd use;
-+allow perfetto statsd:fifo_file { getattr read write };
-+allow perfetto shell:fd use;
-+allow perfetto shell:fifo_file { getattr read write };
-+
-+# Allow to communicate use, read and write over the adb connection.
-+allow perfetto adbd:fd use;
-+allow perfetto adbd:unix_stream_socket { read write };
-+
-+# allow adbd to reap perfetto
-+allow perfetto adbd:process { sigchld };
-+
-+# Allow to access /dev/pts when launched in an adb shell.
-+allow perfetto devpts:chr_file rw_file_perms;
-+
-+###
-+### Neverallow rules
-+###
-+### perfetto should NEVER do any of this
-+
-+# Disallow mapping executable memory (execstack and exec are already disallowed
-+# globally in domain.te).
-+neverallow perfetto self:process execmem;
-+
-+# Block device access.
-+neverallow perfetto dev_type:blk_file { read write };
-+
-+# ptrace any other process
-+neverallow perfetto domain:process ptrace;
-+
-+# Disallows access to other /data files.
-+neverallow perfetto {
-+  data_file_type
-+  -system_data_file
-+  # TODO(b/72998741) Remove exemption. Further restricted in a subsequent
-+  # neverallow. Currently only getattr and search are allowed.
-+  -vendor_data_file
-+  -zoneinfo_data_file
-+  -perfetto_traces_data_file
-+}:dir *;
-+neverallow perfetto { system_data_file -perfetto_traces_data_file }:dir ~{ getattr search };
-+neverallow perfetto zoneinfo_data_file:dir ~r_dir_perms;
-+neverallow perfetto { data_file_type -zoneinfo_data_file -perfetto_traces_data_file }:lnk_file *;
-+neverallow perfetto { data_file_type -zoneinfo_data_file -perfetto_traces_data_file }:file ~write;
-diff --git a/prebuilts/api/28.0/private/performanced.te b/prebuilts/api/28.0/private/performanced.te
-new file mode 100644
-index 000000000..792826e02
---- /dev/null
-+++ b/prebuilts/api/28.0/private/performanced.te
-@@ -0,0 +1,3 @@
-+typeattribute performanced coredomain;
-+
-+init_daemon_domain(performanced)
-diff --git a/prebuilts/api/28.0/private/perfprofd.te b/prebuilts/api/28.0/private/perfprofd.te
-new file mode 100644
-index 000000000..4da541032
---- /dev/null
-+++ b/prebuilts/api/28.0/private/perfprofd.te
-@@ -0,0 +1,8 @@
-+userdebug_or_eng(`
-+  typeattribute perfprofd coredomain;
-+  init_daemon_domain(perfprofd)
-+')
-+
-+# Only servicemanager, statsd, su and systemserver can communicate.
-+neverallow { domain userdebug_or_eng(`-statsd') } perfprofd:binder call;
-+neverallow perfprofd { domain userdebug_or_eng(`-servicemanager -statsd -su -system_server') }:binder call;
-diff --git a/prebuilts/api/28.0/private/platform_app.te b/prebuilts/api/28.0/private/platform_app.te
-new file mode 100644
-index 000000000..6d6ec9832
---- /dev/null
-+++ b/prebuilts/api/28.0/private/platform_app.te
-@@ -0,0 +1,85 @@
-+###
-+### Apps signed with the platform key.
-+###
-+
-+typeattribute platform_app coredomain;
-+
-+app_domain(platform_app)
-+
-+# Access the network.
-+net_domain(platform_app)
-+# Access bluetooth.
-+bluetooth_domain(platform_app)
-+# Read from /data/local/tmp or /data/data/com.android.shell.
-+allow platform_app shell_data_file:dir search;
-+allow platform_app shell_data_file:file { open getattr read };
-+allow platform_app icon_file:file { open getattr read };
-+# Populate /data/app/vmdl*.tmp, /data/app-private/vmdl*.tmp files
-+# created by system server.
-+allow platform_app { apk_tmp_file apk_private_tmp_file }:dir rw_dir_perms;
-+allow platform_app { apk_tmp_file apk_private_tmp_file }:file rw_file_perms;
-+allow platform_app apk_private_data_file:dir search;
-+# ASEC
-+allow platform_app asec_apk_file:dir create_dir_perms;
-+allow platform_app asec_apk_file:file create_file_perms;
-+
-+# Access to /data/media.
-+allow platform_app media_rw_data_file:dir create_dir_perms;
-+allow platform_app media_rw_data_file:file create_file_perms;
-+
-+# Write to /cache.
-+allow platform_app cache_file:dir create_dir_perms;
-+allow platform_app cache_file:file create_file_perms;
-+
-+# Direct access to vold-mounted storage under /mnt/media_rw
-+# This is a performance optimization that allows platform apps to bypass the FUSE layer
-+allow platform_app mnt_media_rw_file:dir r_dir_perms;
-+allow platform_app sdcard_type:dir create_dir_perms;
-+allow platform_app sdcard_type:file create_file_perms;
-+
-+# com.android.systemui
-+allow platform_app rootfs:dir getattr;
-+
-+# com.android.captiveportallogin reads /proc/vmstat
-+allow platform_app {
-+  proc_vmstat
-+}:file r_file_perms;
-+
-+allow platform_app audioserver_service:service_manager find;
-+allow platform_app cameraserver_service:service_manager find;
-+allow platform_app drmserver_service:service_manager find;
-+allow platform_app mediaserver_service:service_manager find;
-+allow platform_app mediametrics_service:service_manager find;
-+allow platform_app mediaextractor_service:service_manager find;
-+allow platform_app mediacodec_service:service_manager find;
-+allow platform_app mediadrmserver_service:service_manager find;
-+allow platform_app persistent_data_block_service:service_manager find;
-+allow platform_app radio_service:service_manager find;
-+allow platform_app thermal_service:service_manager find;
-+allow platform_app timezone_service:service_manager find;
-+allow platform_app app_api_service:service_manager find;
-+allow platform_app system_api_service:service_manager find;
-+allow platform_app vr_manager_service:service_manager find;
-+
-+# Access to /data/preloads
-+allow platform_app preloads_data_file:file r_file_perms;
-+allow platform_app preloads_data_file:dir r_dir_perms;
-+allow platform_app preloads_media_file:file r_file_perms;
-+allow platform_app preloads_media_file:dir r_dir_perms;
-+
-+read_runtime_log_tags(platform_app)
-+
-+# allow platform apps to use UDP sockets provided by the system server but not
-+# modify them other than to connect
-+allow platform_app system_server:udp_socket {
-+        connect getattr read recvfrom sendto write getopt setopt };
-+
-+# allow platform apps to connect to the property service
-+set_prop(platform_app, test_boot_reason_prop)
-+
-+###
-+### Neverallow rules
-+###
-+
-+# app domains which access /dev/fuse should not run as platform_app
-+neverallow platform_app fuse_device:chr_file *;
-diff --git a/prebuilts/api/28.0/private/policy_capabilities b/prebuilts/api/28.0/private/policy_capabilities
-new file mode 100644
-index 000000000..2df2c34b9
---- /dev/null
-+++ b/prebuilts/api/28.0/private/policy_capabilities
-@@ -0,0 +1,12 @@
-+# Enable new networking controls.
-+policycap network_peer_controls;
-+
-+# Enable open permission check.
-+policycap open_perms;
-+
-+# Enable separate security classes for
-+# all network address families previously
-+# mapped to the socket class and for
-+# ICMP and SCTP sockets previously mapped
-+# to the rawip_socket class.
-+policycap extended_socket_class;
-diff --git a/prebuilts/api/28.0/private/port_contexts b/prebuilts/api/28.0/private/port_contexts
-new file mode 100644
-index 000000000..c60089e02
---- /dev/null
-+++ b/prebuilts/api/28.0/private/port_contexts
-@@ -0,0 +1,2 @@
-+# portcon statements go here, e.g.
-+# portcon tcp 80 u:object_r:http_port:s0
-diff --git a/prebuilts/api/28.0/private/postinstall.te b/prebuilts/api/28.0/private/postinstall.te
-new file mode 100644
-index 000000000..363e362dd
---- /dev/null
-+++ b/prebuilts/api/28.0/private/postinstall.te
-@@ -0,0 +1,3 @@
-+typeattribute postinstall coredomain;
-+
-+domain_auto_trans(postinstall, otapreopt_chroot_exec, otapreopt_chroot)
-diff --git a/prebuilts/api/28.0/private/postinstall_dexopt.te b/prebuilts/api/28.0/private/postinstall_dexopt.te
-new file mode 100644
-index 000000000..ff5fe8735
---- /dev/null
-+++ b/prebuilts/api/28.0/private/postinstall_dexopt.te
-@@ -0,0 +1,5 @@
-+typeattribute postinstall_dexopt coredomain;
-+
-+# Run dex2oat/patchoat in its own sandbox.
-+# We have to manually transition, as we don't have an entrypoint.
-+domain_auto_trans(postinstall_dexopt, postinstall_file, dex2oat)
-diff --git a/prebuilts/api/28.0/private/ppp.te b/prebuilts/api/28.0/private/ppp.te
-new file mode 100644
-index 000000000..968b221b6
---- /dev/null
-+++ b/prebuilts/api/28.0/private/ppp.te
-@@ -0,0 +1,3 @@
-+typeattribute ppp coredomain;
-+
-+domain_auto_trans(mtp, ppp_exec, ppp)
-diff --git a/prebuilts/api/28.0/private/preopt2cachename.te b/prebuilts/api/28.0/private/preopt2cachename.te
-new file mode 100644
-index 000000000..d10f76766
---- /dev/null
-+++ b/prebuilts/api/28.0/private/preopt2cachename.te
-@@ -0,0 +1 @@
-+typeattribute preopt2cachename coredomain;
-diff --git a/prebuilts/api/28.0/private/priv_app.te b/prebuilts/api/28.0/private/priv_app.te
-new file mode 100644
-index 000000000..9ff8d0910
---- /dev/null
-+++ b/prebuilts/api/28.0/private/priv_app.te
-@@ -0,0 +1,206 @@
-+###
-+### A domain for further sandboxing privileged apps.
-+###
-+
-+typeattribute priv_app coredomain;
-+app_domain(priv_app)
-+
-+# Access the network.
-+net_domain(priv_app)
-+# Access bluetooth.
-+bluetooth_domain(priv_app)
-+
-+# Allow the allocation and use of ptys
-+# Used by: https://play.privileged.com/store/apps/details?id=jackpal.androidterm
-+create_pty(priv_app)
-+
-+# webview crash handling depends on self ptrace (b/27697529, b/20150694, b/19277529#comment7)
-+allow priv_app self:process ptrace;
-+
-+# Some apps ship with shared libraries that they write out
-+# to their sandbox directory and then dlopen().
-+allow priv_app app_data_file:file execute;
-+
-+allow priv_app app_api_service:service_manager find;
-+allow priv_app audioserver_service:service_manager find;
-+allow priv_app cameraserver_service:service_manager find;
-+allow priv_app drmserver_service:service_manager find;
-+allow priv_app mediacodec_service:service_manager find;
-+allow priv_app mediadrmserver_service:service_manager find;
-+allow priv_app mediaextractor_service:service_manager find;
-+allow priv_app mediametrics_service:service_manager find;
-+allow priv_app mediaserver_service:service_manager find;
-+allow priv_app network_watchlist_service:service_manager find;
-+allow priv_app nfc_service:service_manager find;
-+allow priv_app oem_lock_service:service_manager find;
-+allow priv_app persistent_data_block_service:service_manager find;
-+allow priv_app radio_service:service_manager find;
-+allow priv_app recovery_service:service_manager find;
-+allow priv_app stats_service:service_manager find;
-+allow priv_app system_api_service:service_manager find;
-+
-+# Write to /cache.
-+allow priv_app { cache_file cache_recovery_file }:dir create_dir_perms;
-+allow priv_app { cache_file cache_recovery_file }:file create_file_perms;
-+# /cache is a symlink to /data/cache on some devices. Allow reading the link.
-+allow priv_app cache_file:lnk_file r_file_perms;
-+
-+# Write to /data/ota_package for OTA packages.
-+allow priv_app ota_package_file:dir rw_dir_perms;
-+allow priv_app ota_package_file:file create_file_perms;
-+
-+# Access to /data/media.
-+allow priv_app media_rw_data_file:dir create_dir_perms;
-+allow priv_app media_rw_data_file:file create_file_perms;
-+
-+# Used by Finsky / Android "Verify Apps" functionality when
-+# running "adb install foo.apk".
-+allow priv_app shell_data_file:file r_file_perms;
-+allow priv_app shell_data_file:dir r_dir_perms;
-+
-+# Allow traceur to pass file descriptors through a content provider to betterbug
-+allow priv_app trace_data_file:file { getattr read };
-+
-+# Allow verifier to access staged apks.
-+allow priv_app { apk_tmp_file apk_private_tmp_file }:dir r_dir_perms;
-+allow priv_app { apk_tmp_file apk_private_tmp_file }:file r_file_perms;
-+
-+# b/18504118: Allow reads from /data/anr/traces.txt
-+allow priv_app anr_data_file:file r_file_perms;
-+
-+# Allow GMS core to access perfprofd output, which is stored
-+# in /data/misc/perfprofd/. GMS core will need to list all
-+# data stored in that directory to process them one by one.
-+userdebug_or_eng(`
-+  allow priv_app perfprofd_data_file:file r_file_perms;
-+  allow priv_app perfprofd_data_file:dir r_dir_perms;
-+')
-+
-+# For AppFuse.
-+allow priv_app vold:fd use;
-+allow priv_app fuse_device:chr_file { read write };
-+
-+# /proc access
-+allow priv_app {
-+  proc_vmstat
-+}:file r_file_perms;
-+
-+allow priv_app sysfs_type:dir search;
-+# Read access to /sys/class/net/wlan*/address
-+r_dir_file(priv_app, sysfs_net)
-+# Read access to /sys/block/zram*/mm_stat
-+r_dir_file(priv_app, sysfs_zram)
-+
-+r_dir_file(priv_app, rootfs)
-+
-+# Allow GMS core to open kernel config for OTA matching through libvintf
-+allow priv_app config_gz:file { open read getattr };
-+
-+# access the mac address
-+allowxperm priv_app self:udp_socket ioctl SIOCGIFHWADDR;
-+
-+# Allow GMS core to communicate with update_engine for A/B update.
-+binder_call(priv_app, update_engine)
-+allow priv_app update_engine_service:service_manager find;
-+
-+# Allow GMS core to communicate with dumpsys storaged.
-+binder_call(priv_app, storaged)
-+allow priv_app storaged_service:service_manager find;
-+
-+# Allow GMS core to access system_update_service (e.g. to publish pending
-+# system update info).
-+allow priv_app system_update_service:service_manager find;
-+
-+# Allow GMS core to communicate with statsd.
-+binder_call(priv_app, statsd)
-+
-+# Allow Phone to read/write cached ringtones (opened by system).
-+allow priv_app ringtone_file:file { getattr read write };
-+
-+# Access to /data/preloads
-+allow priv_app preloads_data_file:file r_file_perms;
-+allow priv_app preloads_data_file:dir r_dir_perms;
-+allow priv_app preloads_media_file:file r_file_perms;
-+allow priv_app preloads_media_file:dir r_dir_perms;
-+
-+# Allow privileged apps (e.g. GMS core) to generate unique hardware IDs
-+allow priv_app keystore:keystore_key gen_unique_id;
-+
-+# Allow GMS core to access /sys/fs/selinux/policyvers for compatibility check
-+allow priv_app selinuxfs:file r_file_perms;
-+
-+read_runtime_log_tags(priv_app)
-+
-+# Write app-specific trace data to the Perfetto traced damon. This requires
-+# connecting to its producer socket and obtaining a (per-process) tmpfs fd.
-+allow priv_app traced:fd use;
-+allow priv_app traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(priv_app, traced_producer, traced)
-+
-+# suppress denials for non-API accesses.
-+dontaudit priv_app exec_type:file getattr;
-+dontaudit priv_app device:dir read;
-+dontaudit priv_app fs_bpf:dir search;
-+dontaudit priv_app net_dns_prop:file read;
-+dontaudit priv_app proc:file read;
-+dontaudit priv_app proc_interrupts:file read;
-+dontaudit priv_app proc_modules:file read;
-+dontaudit priv_app proc_stat:file read;
-+dontaudit priv_app proc_version:file read;
-+dontaudit priv_app sysfs:dir read;
-+dontaudit priv_app sysfs_android_usb:file read;
-+dontaudit priv_app wifi_prop:file read;
-+dontaudit priv_app { wifi_prop exported_wifi_prop }:file read;
-+
-+# allow privileged apps to use UDP sockets provided by the system server but not
-+# modify them other than to connect
-+allow priv_app system_server:udp_socket {
-+        connect getattr read recvfrom sendto write getopt setopt };
-+
-+###
-+### neverallow rules
-+###
-+
-+# Receive or send uevent messages.
-+neverallow priv_app domain:netlink_kobject_uevent_socket *;
-+
-+# Receive or send generic netlink messages
-+neverallow priv_app domain:netlink_socket *;
-+
-+# Too much leaky information in debugfs. It's a security
-+# best practice to ensure these files aren't readable.
-+neverallow priv_app debugfs:file read;
-+
-+# Do not allow privileged apps to register services.
-+# Only trusted components of Android should be registering
-+# services.
-+neverallow priv_app service_manager_type:service_manager add;
-+
-+# Do not allow privileged apps to connect to the property service
-+# or set properties. b/10243159
-+neverallow priv_app property_socket:sock_file write;
-+neverallow priv_app init:unix_stream_socket connectto;
-+neverallow priv_app property_type:property_service set;
-+
-+# Do not allow priv_app to be assigned mlstrustedsubject.
-+# This would undermine the per-user isolation model being
-+# enforced via levelFrom=user in seapp_contexts and the mls
-+# constraints.  As there is no direct way to specify a neverallow
-+# on attribute assignment, this relies on the fact that fork
-+# permission only makes sense within a domain (hence should
-+# never be granted to any other domain within mlstrustedsubject)
-+# and priv_app is allowed fork permission to itself.
-+neverallow priv_app mlstrustedsubject:process fork;
-+
-+# Do not allow priv_app to hard link to any files.
-+# In particular, if priv_app links to other app data
-+# files, installd will not be able to guarantee the deletion
-+# of the linked to file. Hard links also contribute to security
-+# bugs, so we want to ensure priv_app never has this
-+# capability.
-+neverallow priv_app file_type:file link;
-+
-+# priv apps should not be able to open trace data files, they should depend
-+# upon traceur to pass a file descriptor which they can then read
-+neverallow priv_app trace_data_file:dir *;
-+neverallow priv_app trace_data_file:file { no_w_file_perms open };
-diff --git a/prebuilts/api/28.0/private/profman.te b/prebuilts/api/28.0/private/profman.te
-new file mode 100644
-index 000000000..f61d05efe
---- /dev/null
-+++ b/prebuilts/api/28.0/private/profman.te
-@@ -0,0 +1 @@
-+typeattribute profman coredomain;
-diff --git a/prebuilts/api/28.0/private/property_contexts b/prebuilts/api/28.0/private/property_contexts
-new file mode 100644
-index 000000000..32be0b377
---- /dev/null
-+++ b/prebuilts/api/28.0/private/property_contexts
-@@ -0,0 +1,147 @@
-+##########################
-+# property service keys
-+#
-+#
-+net.rmnet               u:object_r:net_radio_prop:s0
-+net.gprs                u:object_r:net_radio_prop:s0
-+net.ppp                 u:object_r:net_radio_prop:s0
-+net.qmi                 u:object_r:net_radio_prop:s0
-+net.lte                 u:object_r:net_radio_prop:s0
-+net.cdma                u:object_r:net_radio_prop:s0
-+net.dns                 u:object_r:net_dns_prop:s0
-+sys.usb.config          u:object_r:system_radio_prop:s0
-+ril.                    u:object_r:radio_prop:s0
-+ro.ril.                 u:object_r:radio_prop:s0
-+gsm.                    u:object_r:radio_prop:s0
-+persist.radio           u:object_r:radio_prop:s0
-+
-+net.                    u:object_r:system_prop:s0
-+dev.                    u:object_r:system_prop:s0
-+ro.runtime.             u:object_r:system_prop:s0
-+ro.runtime.firstboot    u:object_r:firstboot_prop:s0
-+hw.                     u:object_r:system_prop:s0
-+ro.hw.                  u:object_r:system_prop:s0
-+sys.                    u:object_r:system_prop:s0
-+sys.cppreopt            u:object_r:cppreopt_prop:s0
-+sys.powerctl            u:object_r:powerctl_prop:s0
-+sys.usb.ffs.            u:object_r:ffs_prop:s0
-+service.                u:object_r:system_prop:s0
-+dhcp.                   u:object_r:dhcp_prop:s0
-+dhcp.bt-pan.result      u:object_r:pan_result_prop:s0
-+bluetooth.              u:object_r:bluetooth_prop:s0
-+
-+debug.                  u:object_r:debug_prop:s0
-+debug.db.               u:object_r:debuggerd_prop:s0
-+dumpstate.              u:object_r:dumpstate_prop:s0
-+dumpstate.options       u:object_r:dumpstate_options_prop:s0
-+log.                    u:object_r:log_prop:s0
-+log.tag                 u:object_r:log_tag_prop:s0
-+log.tag.WifiHAL         u:object_r:wifi_log_prop:s0
-+security.perf_harden    u:object_r:shell_prop:s0
-+service.adb.root        u:object_r:shell_prop:s0
-+service.adb.tcp.port    u:object_r:shell_prop:s0
-+
-+persist.audio.          u:object_r:audio_prop:s0
-+persist.bluetooth.      u:object_r:bluetooth_prop:s0
-+persist.debug.          u:object_r:persist_debug_prop:s0
-+persist.logd.           u:object_r:logd_prop:s0
-+ro.logd.                u:object_r:logd_prop:s0
-+persist.logd.security   u:object_r:device_logging_prop:s0
-+persist.logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
-+logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
-+persist.log.tag         u:object_r:log_tag_prop:s0
-+persist.mmc.            u:object_r:mmc_prop:s0
-+persist.netd.stable_secret      u:object_r:netd_stable_secret_prop:s0
-+persist.sys.            u:object_r:system_prop:s0
-+persist.sys.safemode    u:object_r:safemode_prop:s0
-+ro.sys.safemode         u:object_r:safemode_prop:s0
-+persist.sys.audit_safemode      u:object_r:safemode_prop:s0
-+persist.service.        u:object_r:system_prop:s0
-+persist.service.bdroid. u:object_r:bluetooth_prop:s0
-+persist.security.       u:object_r:system_prop:s0
-+persist.traced.enable   u:object_r:traced_enabled_prop:s0
-+persist.vendor.overlay.  u:object_r:overlay_prop:s0
-+ro.boot.vendor.overlay.  u:object_r:overlay_prop:s0
-+ro.boottime.             u:object_r:boottime_prop:s0
-+ro.serialno             u:object_r:serialno_prop:s0
-+ro.boot.btmacaddr       u:object_r:bluetooth_prop:s0
-+ro.boot.serialno        u:object_r:serialno_prop:s0
-+ro.bt.                  u:object_r:bluetooth_prop:s0
-+ro.boot.bootreason      u:object_r:bootloader_boot_reason_prop:s0
-+persist.sys.boot.reason u:object_r:last_boot_reason_prop:s0
-+sys.boot.reason         u:object_r:system_boot_reason_prop:s0
-+pm.                     u:object_r:pm_prop:s0
-+test.sys.boot.reason    u:object_r:test_boot_reason_prop:s0
-+
-+# Boolean property set by system server upon boot indicating
-+# if device owner is provisioned.
-+ro.device_owner         u:object_r:device_logging_prop:s0
-+
-+# selinux non-persistent properties
-+selinux.restorecon_recursive   u:object_r:restorecon_prop:s0
-+
-+# default property context
-+*                       u:object_r:default_prop:s0
-+
-+# data partition encryption properties
-+vold.                   u:object_r:vold_prop:s0
-+ro.crypto.              u:object_r:vold_prop:s0
-+
-+# ro.build.fingerprint is either set in /system/build.prop, or is
-+# set at runtime by system_server.
-+ro.build.fingerprint    u:object_r:fingerprint_prop:s0
-+
-+ro.persistent_properties.ready  u:object_r:persistent_properties_ready_prop:s0
-+
-+# ctl properties
-+ctl.bootanim            u:object_r:ctl_bootanim_prop:s0
-+ctl.android.hardware.dumpstate u:object_r:ctl_dumpstate_prop:s0
-+ctl.dumpstate           u:object_r:ctl_dumpstate_prop:s0
-+ctl.fuse_               u:object_r:ctl_fuse_prop:s0
-+ctl.mdnsd               u:object_r:ctl_mdnsd_prop:s0
-+ctl.ril-daemon          u:object_r:ctl_rildaemon_prop:s0
-+ctl.bugreport           u:object_r:ctl_bugreport_prop:s0
-+ctl.console             u:object_r:ctl_console_prop:s0
-+ctl.                    u:object_r:ctl_default_prop:s0
-+
-+# Don't allow blind access to all services
-+ctl.sigstop_on$         u:object_r:ctl_sigstop_prop:s0
-+ctl.sigstop_off$        u:object_r:ctl_sigstop_prop:s0
-+ctl.start$              u:object_r:ctl_start_prop:s0
-+ctl.stop$               u:object_r:ctl_stop_prop:s0
-+ctl.restart$            u:object_r:ctl_restart_prop:s0
-+ctl.interface_start$    u:object_r:ctl_interface_start_prop:s0
-+ctl.interface_stop$     u:object_r:ctl_interface_stop_prop:s0
-+ctl.interface_restart$  u:object_r:ctl_interface_restart_prop:s0
-+
-+# NFC properties
-+nfc.                    u:object_r:nfc_prop:s0
-+
-+# These properties are not normally set by processes other than init.
-+# They are only distinguished here for setting by qemu-props on the
-+# emulator/goldfish.
-+config.                 u:object_r:config_prop:s0
-+ro.config.              u:object_r:config_prop:s0
-+dalvik.                 u:object_r:dalvik_prop:s0
-+ro.dalvik.              u:object_r:dalvik_prop:s0
-+
-+# Shared between system server and wificond
-+wlan.                   u:object_r:wifi_prop:s0
-+
-+# Lowpan properties
-+lowpan.                 u:object_r:lowpan_prop:s0
-+ro.lowpan.              u:object_r:lowpan_prop:s0
-+
-+# hwservicemanager properties
-+hwservicemanager.       u:object_r:hwservicemanager_prop:s0
-+
-+# Common default properties for vendor and odm.
-+init.svc.odm.           u:object_r:vendor_default_prop:s0
-+init.svc.vendor.        u:object_r:vendor_default_prop:s0
-+ro.hardware.            u:object_r:vendor_default_prop:s0
-+ro.odm.                 u:object_r:vendor_default_prop:s0
-+ro.vendor.              u:object_r:vendor_default_prop:s0
-+odm.                    u:object_r:vendor_default_prop:s0
-+persist.odm.            u:object_r:vendor_default_prop:s0
-+persist.vendor.         u:object_r:vendor_default_prop:s0
-+vendor.                 u:object_r:vendor_default_prop:s0
-diff --git a/prebuilts/api/28.0/private/racoon.te b/prebuilts/api/28.0/private/racoon.te
-new file mode 100644
-index 000000000..42ea7c9e4
---- /dev/null
-+++ b/prebuilts/api/28.0/private/racoon.te
-@@ -0,0 +1,3 @@
-+typeattribute racoon coredomain;
-+
-+init_daemon_domain(racoon)
-diff --git a/prebuilts/api/28.0/private/radio.te b/prebuilts/api/28.0/private/radio.te
-new file mode 100644
-index 000000000..b4f539048
---- /dev/null
-+++ b/prebuilts/api/28.0/private/radio.te
-@@ -0,0 +1,5 @@
-+typeattribute radio coredomain;
-+
-+app_domain(radio)
-+
-+read_runtime_log_tags(radio)
-diff --git a/prebuilts/api/28.0/private/recovery.te b/prebuilts/api/28.0/private/recovery.te
-new file mode 100644
-index 000000000..2a7fdc7e1
---- /dev/null
-+++ b/prebuilts/api/28.0/private/recovery.te
-@@ -0,0 +1 @@
-+typeattribute recovery coredomain;
-diff --git a/prebuilts/api/28.0/private/recovery_persist.te b/prebuilts/api/28.0/private/recovery_persist.te
-new file mode 100644
-index 000000000..1fdd7583d
---- /dev/null
-+++ b/prebuilts/api/28.0/private/recovery_persist.te
-@@ -0,0 +1,7 @@
-+typeattribute recovery_persist coredomain;
-+
-+init_daemon_domain(recovery_persist)
-+
-+# recovery_persist is not allowed to write anywhere other than recovery_data_file
-+# TODO: deal with tmpfs_domain pub/priv split properly
-+neverallow recovery_persist { file_type -recovery_data_file -recovery_persist_tmpfs userdebug_or_eng(`-coredump_file') }:file write;
-diff --git a/prebuilts/api/28.0/private/recovery_refresh.te b/prebuilts/api/28.0/private/recovery_refresh.te
-new file mode 100644
-index 000000000..327098dad
---- /dev/null
-+++ b/prebuilts/api/28.0/private/recovery_refresh.te
-@@ -0,0 +1,7 @@
-+typeattribute recovery_refresh coredomain;
-+
-+init_daemon_domain(recovery_refresh)
-+
-+# recovery_refresh is not allowed to write anywhere
-+# TODO: deal with tmpfs_domain pub/priv split properly
-+neverallow recovery_refresh { file_type -recovery_refresh_tmpfs userdebug_or_eng(`-coredump_file') }:file write;
-diff --git a/prebuilts/api/28.0/private/roles_decl b/prebuilts/api/28.0/private/roles_decl
-new file mode 100644
-index 000000000..c84fcba0f
---- /dev/null
-+++ b/prebuilts/api/28.0/private/roles_decl
-@@ -0,0 +1 @@
-+role r;
-diff --git a/prebuilts/api/28.0/private/runas.te b/prebuilts/api/28.0/private/runas.te
-new file mode 100644
-index 000000000..ef31aac34
---- /dev/null
-+++ b/prebuilts/api/28.0/private/runas.te
-@@ -0,0 +1,4 @@
-+typeattribute runas coredomain;
-+
-+# ndk-gdb invokes adb shell run-as.
-+domain_auto_trans(shell, runas_exec, runas)
-diff --git a/prebuilts/api/28.0/private/sdcardd.te b/prebuilts/api/28.0/private/sdcardd.te
-new file mode 100644
-index 000000000..126d64349
---- /dev/null
-+++ b/prebuilts/api/28.0/private/sdcardd.te
-@@ -0,0 +1,3 @@
-+typeattribute sdcardd coredomain;
-+
-+type_transition sdcardd system_data_file:{ dir file } media_rw_data_file;
-diff --git a/prebuilts/api/28.0/private/seapp_contexts b/prebuilts/api/28.0/private/seapp_contexts
-new file mode 100644
-index 000000000..c21d49f2a
---- /dev/null
-+++ b/prebuilts/api/28.0/private/seapp_contexts
-@@ -0,0 +1,118 @@
-+# Input selectors:
-+#       isSystemServer (boolean)
-+#       isEphemeralApp (boolean)
-+#       isV2App (boolean)
-+#       isOwner (boolean)
-+#       user (string)
-+#       seinfo (string)
-+#       name (string)
-+#       path (string)
-+#       isPrivApp (boolean)
-+#       minTargetSdkVersion (unsigned integer)
-+# isSystemServer=true can only be used once.
-+# An unspecified isSystemServer defaults to false.
-+# isEphemeralApp=true will match apps marked by PackageManager as Ephemeral
-+# isV2App=true will match apps in the v2 app sandbox.
-+# isOwner=true will only match for the owner/primary user.
-+# isOwner=false will only match for secondary users.
-+# If unspecified, the entry can match either case.
-+# An unspecified string selector will match any value.
-+# A user string selector that ends in * will perform a prefix match.
-+# user=_app will match any regular app UID.
-+# user=_isolated will match any isolated service UID.
-+# isPrivApp=true will only match for applications preinstalled in
-+#       /system/priv-app.
-+# minTargetSdkVersion will match applications with a targetSdkVersion
-+#       greater than or equal to the specified value. If unspecified,
-+#       it has a default value of 0.
-+# All specified input selectors in an entry must match (i.e. logical AND).
-+# Matching is case-insensitive.
-+#
-+# Precedence rules (see external/selinux/libselinux/src/android/android.c seapp_context_cmp()):
-+#       (1) isSystemServer=true before isSystemServer=false.
-+#       (2) Specified isEphemeralApp= before unspecified isEphemeralApp= boolean.
-+#       (3) Specified isV2App= before unspecified isV2App= boolean.
-+#       (4) Specified isOwner= before unspecified isOwner= boolean.
-+#       (5) Specified user= string before unspecified user= string.
-+#       (6) Fixed user= string before user= prefix (i.e. ending in *).
-+#       (7) Longer user= prefix before shorter user= prefix.
-+#       (8) Specified seinfo= string before unspecified seinfo= string.
-+#           ':' character is reserved and may not be used.
-+#       (9) Specified name= string before unspecified name= string.
-+#       (10) Specified path= string before unspecified path= string.
-+#       (11) Specified isPrivApp= before unspecified isPrivApp= boolean.
-+#       (12) Higher value of minTargetSdkVersion= before lower value of minTargetSdkVersion=
-+#              integer. Note that minTargetSdkVersion= defaults to 0 if unspecified.
-+#
-+# Outputs:
-+#       domain (string)
-+#       type (string)
-+#       levelFrom (string; one of none, all, app, or user)
-+#       level (string)
-+# Only entries that specify domain= will be used for app process labeling.
-+# Only entries that specify type= will be used for app directory labeling.
-+# levelFrom=user is only supported for _app or _isolated UIDs.
-+# levelFrom=app or levelFrom=all is only supported for _app UIDs.
-+# level may be used to specify a fixed level for any UID.
-+#
-+#
-+# Neverallow Assertions
-+# Additional compile time assertion checks can be added as well. The assertion
-+# rules are lines beginning with the keyword neverallow. Full support for PCRE
-+# regular expressions exists on all input and output selectors. Neverallow
-+# rules are never output to the built seapp_contexts file. Like all keywords,
-+# neverallows are case-insensitive. A neverallow is asserted when all key value
-+# inputs are matched on a key value rule line.
-+#
-+
-+# only the system server can be in system_server domain
-+neverallow isSystemServer=false domain=system_server
-+neverallow isSystemServer="" domain=system_server
-+
-+# system domains should never be assigned outside of system uid
-+neverallow user=((?!system).)* domain=system_app
-+neverallow user=((?!system).)* type=system_app_data_file
-+
-+# anything with a non-known uid with a specified name should have a specified seinfo
-+neverallow user=_app name=.* seinfo=""
-+neverallow user=_app name=.* seinfo=default
-+
-+# neverallow shared relro to any other domain
-+# and neverallow any other uid into shared_relro
-+neverallow user=shared_relro domain=((?!shared_relro).)*
-+neverallow user=((?!shared_relro).)* domain=shared_relro
-+
-+# neverallow non-isolated uids into isolated_app domain
-+# and vice versa
-+neverallow user=_isolated domain=((?!isolated_app).)*
-+neverallow user=((?!_isolated).)* domain=isolated_app
-+
-+# uid shell should always be in shell domain, however non-shell
-+# uid's can be in shell domain
-+neverallow user=shell domain=((?!shell).)*
-+
-+# only the package named com.android.shell can run in the shell domain
-+neverallow domain=shell name=((?!com\.android\.shell).)*
-+neverallow user=shell name=((?!com\.android\.shell).)*
-+
-+# Ephemeral Apps must run in the ephemeral_app domain
-+neverallow isEphemeralApp=true domain=((?!ephemeral_app).)*
-+
-+isSystemServer=true domain=system_server
-+user=_app seinfo=platform name=com.android.traceur domain=traceur_app type=app_data_file levelFrom=all
-+user=system seinfo=platform domain=system_app type=system_app_data_file
-+user=bluetooth seinfo=platform domain=bluetooth type=bluetooth_data_file
-+user=nfc seinfo=platform domain=nfc type=nfc_data_file
-+user=secure_element seinfo=platform domain=secure_element levelFrom=all
-+user=radio seinfo=platform domain=radio type=radio_data_file
-+user=shared_relro domain=shared_relro
-+user=shell seinfo=platform domain=shell name=com.android.shell type=shell_data_file
-+user=webview_zygote seinfo=webview_zygote domain=webview_zygote
-+user=_isolated domain=isolated_app levelFrom=all
-+user=_app seinfo=media domain=mediaprovider name=android.process.media type=app_data_file levelFrom=user
-+user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
-+user=_app isV2App=true isEphemeralApp=true domain=ephemeral_app type=app_data_file levelFrom=all
-+user=_app isPrivApp=true domain=priv_app type=app_data_file levelFrom=user
-+user=_app minTargetSdkVersion=28 domain=untrusted_app type=app_data_file levelFrom=all
-+user=_app minTargetSdkVersion=26 domain=untrusted_app_27 type=app_data_file levelFrom=user
-+user=_app domain=untrusted_app_25 type=app_data_file levelFrom=user
-diff --git a/prebuilts/api/28.0/private/secure_element.te b/prebuilts/api/28.0/private/secure_element.te
-new file mode 100644
-index 000000000..57f512bbd
---- /dev/null
-+++ b/prebuilts/api/28.0/private/secure_element.te
-@@ -0,0 +1,14 @@
-+# secure element subsystem
-+typeattribute secure_element coredomain;
-+app_domain(secure_element)
-+
-+binder_service(secure_element)
-+add_service(secure_element, secure_element_service)
-+
-+allow secure_element app_api_service:service_manager find;
-+hal_client_domain(secure_element, hal_secure_element)
-+
-+# already open bugreport file descriptors may be shared with
-+# the secure element process, from a file in
-+# /data/data/com.android.shell/files/bugreports/bugreport-*.
-+allow secure_element shell_data_file:file read;
-diff --git a/prebuilts/api/28.0/private/security_classes b/prebuilts/api/28.0/private/security_classes
-new file mode 100644
-index 000000000..251b72168
---- /dev/null
-+++ b/prebuilts/api/28.0/private/security_classes
-@@ -0,0 +1,146 @@
-+# FLASK
-+
-+#
-+# Define the security object classes
-+#
-+
-+# Classes marked as userspace are classes
-+# for userspace object managers
-+
-+class security
-+class process
-+class system
-+class capability
-+
-+# file-related classes
-+class filesystem
-+class file
-+class dir
-+class fd
-+class lnk_file
-+class chr_file
-+class blk_file
-+class sock_file
-+class fifo_file
-+
-+# network-related classes
-+class socket
-+class tcp_socket
-+class udp_socket
-+class rawip_socket
-+class node
-+class netif
-+class netlink_socket
-+class packet_socket
-+class key_socket
-+class unix_stream_socket
-+class unix_dgram_socket
-+class bpf
-+
-+# sysv-ipc-related classes
-+class sem
-+class msg
-+class msgq
-+class shm
-+class ipc
-+
-+# extended netlink sockets
-+class netlink_route_socket
-+class netlink_tcpdiag_socket
-+class netlink_nflog_socket
-+class netlink_xfrm_socket
-+class netlink_selinux_socket
-+class netlink_audit_socket
-+class netlink_dnrt_socket
-+
-+# IPSec association
-+class association
-+
-+# Updated Netlink class for KOBJECT_UEVENT family.
-+class netlink_kobject_uevent_socket
-+
-+class appletalk_socket
-+
-+class packet
-+
-+# Kernel access key retention
-+class key
-+
-+class dccp_socket
-+
-+class memprotect
-+
-+# network peer labels
-+class peer
-+
-+# Capabilities >= 32
-+class capability2
-+
-+# kernel services that need to override task security, e.g. cachefiles
-+class kernel_service
-+
-+class tun_socket
-+
-+class binder
-+
-+# Updated netlink classes for more recent netlink protocols.
-+class netlink_iscsi_socket
-+class netlink_fib_lookup_socket
-+class netlink_connector_socket
-+class netlink_netfilter_socket
-+class netlink_generic_socket
-+class netlink_scsitransport_socket
-+class netlink_rdma_socket
-+class netlink_crypto_socket
-+
-+# Capability checks when on a non-init user namespace
-+class cap_userns
-+class cap2_userns
-+
-+# New socket classes introduced by extended_socket_class policy capability.
-+# These two were previously mapped to rawip_socket.
-+class sctp_socket
-+class icmp_socket
-+# These were previously mapped to socket.
-+class ax25_socket
-+class ipx_socket
-+class netrom_socket
-+class atmpvc_socket
-+class x25_socket
-+class rose_socket
-+class decnet_socket
-+class atmsvc_socket
-+class rds_socket
-+class irda_socket
-+class pppox_socket
-+class llc_socket
-+class can_socket
-+class tipc_socket
-+class bluetooth_socket
-+class iucv_socket
-+class rxrpc_socket
-+class isdn_socket
-+class phonet_socket
-+class ieee802154_socket
-+class caif_socket
-+class alg_socket
-+class nfc_socket
-+class vsock_socket
-+class kcm_socket
-+class qipcrtr_socket
-+class smc_socket
-+
-+# Property service
-+class property_service          # userspace
-+
-+# Service manager
-+class service_manager           # userspace
-+
-+# hardware service manager      # userspace
-+class hwservice_manager
-+
-+# Keystore Key
-+class keystore_key              # userspace
-+
-+class drmservice                # userspace
-+# FLASK
-diff --git a/prebuilts/api/28.0/private/service.te b/prebuilts/api/28.0/private/service.te
-new file mode 100644
-index 000000000..3fec8825a
---- /dev/null
-+++ b/prebuilts/api/28.0/private/service.te
-@@ -0,0 +1,2 @@
-+type stats_service, service_manager_type;
-+type statscompanion_service, system_server_service, service_manager_type;
-diff --git a/prebuilts/api/28.0/private/service_contexts b/prebuilts/api/28.0/private/service_contexts
-new file mode 100644
-index 000000000..5ec45a23e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/service_contexts
-@@ -0,0 +1,188 @@
-+accessibility                             u:object_r:accessibility_service:s0
-+account                                   u:object_r:account_service:s0
-+activity                                  u:object_r:activity_service:s0
-+alarm                                     u:object_r:alarm_service:s0
-+android.os.UpdateEngineService            u:object_r:update_engine_service:s0
-+android.security.keystore                 u:object_r:keystore_service:s0
-+android.service.gatekeeper.IGateKeeperService    u:object_r:gatekeeper_service:s0
-+appops                                    u:object_r:appops_service:s0
-+appwidget                                 u:object_r:appwidget_service:s0
-+assetatlas                                u:object_r:assetatlas_service:s0
-+audio                                     u:object_r:audio_service:s0
-+autofill                                  u:object_r:autofill_service:s0
-+backup                                    u:object_r:backup_service:s0
-+batteryproperties                         u:object_r:batteryproperties_service:s0
-+batterystats                              u:object_r:batterystats_service:s0
-+battery                                   u:object_r:battery_service:s0
-+binder_calls_stats                        u:object_r:binder_calls_stats_service:s0
-+bluetooth_manager                         u:object_r:bluetooth_manager_service:s0
-+bluetooth                                 u:object_r:bluetooth_service:s0
-+broadcastradio                            u:object_r:broadcastradio_service:s0
-+carrier_config                            u:object_r:radio_service:s0
-+clipboard                                 u:object_r:clipboard_service:s0
-+com.android.net.IProxyService             u:object_r:IProxyService_service:s0
-+commontime_management                     u:object_r:commontime_management_service:s0
-+common_time.clock                         u:object_r:mediaserver_service:s0
-+common_time.config                        u:object_r:mediaserver_service:s0
-+companiondevice                           u:object_r:companion_device_service:s0
-+connectivity                              u:object_r:connectivity_service:s0
-+connmetrics                               u:object_r:connmetrics_service:s0
-+consumer_ir                               u:object_r:consumer_ir_service:s0
-+content                                   u:object_r:content_service:s0
-+contexthub                                u:object_r:contexthub_service:s0
-+country_detector                          u:object_r:country_detector_service:s0
-+coverage                                  u:object_r:coverage_service:s0
-+cpuinfo                                   u:object_r:cpuinfo_service:s0
-+crossprofileapps                          u:object_r:crossprofileapps_service:s0
-+dbinfo                                    u:object_r:dbinfo_service:s0
-+device_policy                             u:object_r:device_policy_service:s0
-+device_identifiers                        u:object_r:device_identifiers_service:s0
-+deviceidle                                u:object_r:deviceidle_service:s0
-+devicestoragemonitor                      u:object_r:devicestoragemonitor_service:s0
-+diskstats                                 u:object_r:diskstats_service:s0
-+display                                   u:object_r:display_service:s0
-+netd_listener                             u:object_r:netd_listener_service:s0
-+network_watchlist                         u:object_r:network_watchlist_service:s0
-+DockObserver                              u:object_r:DockObserver_service:s0
-+dreams                                    u:object_r:dreams_service:s0
-+drm.drmManager                            u:object_r:drmserver_service:s0
-+dropbox                                   u:object_r:dropbox_service:s0
-+dumpstate                                 u:object_r:dumpstate_service:s0
-+econtroller                               u:object_r:radio_service:s0
-+euicc_card_controller                     u:object_r:radio_service:s0
-+lowpan                                    u:object_r:lowpan_service:s0
-+ethernet                                  u:object_r:ethernet_service:s0
-+fingerprint                               u:object_r:fingerprint_service:s0
-+font                                      u:object_r:font_service:s0
-+android.hardware.fingerprint.IFingerprintDaemon u:object_r:fingerprintd_service:s0
-+gfxinfo                                   u:object_r:gfxinfo_service:s0
-+graphicsstats                             u:object_r:graphicsstats_service:s0
-+gpu                                       u:object_r:gpu_service:s0
-+hardware                                  u:object_r:hardware_service:s0
-+hardware_properties                       u:object_r:hardware_properties_service:s0
-+hdmi_control                              u:object_r:hdmi_control_service:s0
-+incident                                  u:object_r:incident_service:s0
-+inputflinger                              u:object_r:inputflinger_service:s0
-+input_method                              u:object_r:input_method_service:s0
-+input                                     u:object_r:input_service:s0
-+installd                                  u:object_r:installd_service:s0
-+iphonesubinfo_msim                        u:object_r:radio_service:s0
-+iphonesubinfo2                            u:object_r:radio_service:s0
-+iphonesubinfo                             u:object_r:radio_service:s0
-+ims                                       u:object_r:radio_service:s0
-+imms                                      u:object_r:imms_service:s0
-+ipsec                                     u:object_r:ipsec_service:s0
-+isms_msim                                 u:object_r:radio_service:s0
-+isms2                                     u:object_r:radio_service:s0
-+isms                                      u:object_r:radio_service:s0
-+isub                                      u:object_r:radio_service:s0
-+jobscheduler                              u:object_r:jobscheduler_service:s0
-+launcherapps                              u:object_r:launcherapps_service:s0
-+location                                  u:object_r:location_service:s0
-+lock_settings                             u:object_r:lock_settings_service:s0
-+media.aaudio                              u:object_r:audioserver_service:s0
-+media.audio_flinger                       u:object_r:audioserver_service:s0
-+media.audio_policy                        u:object_r:audioserver_service:s0
-+media.camera                              u:object_r:cameraserver_service:s0
-+media.camera.proxy                        u:object_r:cameraproxy_service:s0
-+media.log                                 u:object_r:audioserver_service:s0
-+media.player                              u:object_r:mediaserver_service:s0
-+media.metrics                             u:object_r:mediametrics_service:s0
-+media.extractor                           u:object_r:mediaextractor_service:s0
-+media.extractor.update                    u:object_r:mediaextractor_update_service:s0
-+media.codec                               u:object_r:mediacodec_service:s0
-+media.resource_manager                    u:object_r:mediaserver_service:s0
-+media.sound_trigger_hw                    u:object_r:audioserver_service:s0
-+media.drm                                 u:object_r:mediadrmserver_service:s0
-+media_projection                          u:object_r:media_projection_service:s0
-+media_resource_monitor                    u:object_r:media_session_service:s0
-+media_router                              u:object_r:media_router_service:s0
-+media_session                             u:object_r:media_session_service:s0
-+meminfo                                   u:object_r:meminfo_service:s0
-+midi                                      u:object_r:midi_service:s0
-+mount                                     u:object_r:mount_service:s0
-+netd                                      u:object_r:netd_service:s0
-+netpolicy                                 u:object_r:netpolicy_service:s0
-+netstats                                  u:object_r:netstats_service:s0
-+network_management                        u:object_r:network_management_service:s0
-+network_score                             u:object_r:network_score_service:s0
-+network_time_update_service               u:object_r:network_time_update_service:s0
-+nfc                                       u:object_r:nfc_service:s0
-+notification                              u:object_r:notification_service:s0
-+oem_lock                                  u:object_r:oem_lock_service:s0
-+otadexopt                                 u:object_r:otadexopt_service:s0
-+overlay                                   u:object_r:overlay_service:s0
-+package                                   u:object_r:package_service:s0
-+package_native                            u:object_r:package_native_service:s0
-+perfprofd                                 u:object_r:perfprofd_service:s0
-+permission                                u:object_r:permission_service:s0
-+persistent_data_block                     u:object_r:persistent_data_block_service:s0
-+phone_msim                                u:object_r:radio_service:s0
-+phone1                                    u:object_r:radio_service:s0
-+phone2                                    u:object_r:radio_service:s0
-+phone                                     u:object_r:radio_service:s0
-+pinner                                    u:object_r:pinner_service:s0
-+power                                     u:object_r:power_service:s0
-+print                                     u:object_r:print_service:s0
-+processinfo                               u:object_r:processinfo_service:s0
-+procstats                                 u:object_r:procstats_service:s0
-+radio.phonesubinfo                        u:object_r:radio_service:s0
-+radio.phone                               u:object_r:radio_service:s0
-+radio.sms                                 u:object_r:radio_service:s0
-+recovery                                  u:object_r:recovery_service:s0
-+restrictions                              u:object_r:restrictions_service:s0
-+rttmanager                                u:object_r:rttmanager_service:s0
-+samplingprofiler                          u:object_r:samplingprofiler_service:s0
-+scheduling_policy                         u:object_r:scheduling_policy_service:s0
-+search                                    u:object_r:search_service:s0
-+secure_element                            u:object_r:secure_element_service:s0
-+sec_key_att_app_id_provider               u:object_r:sec_key_att_app_id_provider_service:s0
-+sensorservice                             u:object_r:sensorservice_service:s0
-+serial                                    u:object_r:serial_service:s0
-+servicediscovery                          u:object_r:servicediscovery_service:s0
-+settings                                  u:object_r:settings_service:s0
-+shortcut                                  u:object_r:shortcut_service:s0
-+simphonebook_msim                         u:object_r:radio_service:s0
-+simphonebook2                             u:object_r:radio_service:s0
-+simphonebook                              u:object_r:radio_service:s0
-+sip                                       u:object_r:radio_service:s0
-+slice                                     u:object_r:slice_service:s0
-+stats                                     u:object_r:stats_service:s0
-+statscompanion                            u:object_r:statscompanion_service:s0
-+soundtrigger                              u:object_r:voiceinteraction_service:s0
-+statusbar                                 u:object_r:statusbar_service:s0
-+storaged                                  u:object_r:storaged_service:s0
-+storaged_pri                              u:object_r:storaged_service:s0
-+storagestats                              u:object_r:storagestats_service:s0
-+SurfaceFlinger                            u:object_r:surfaceflinger_service:s0
-+system_update                             u:object_r:system_update_service:s0
-+task                                      u:object_r:task_service:s0
-+telecom                                   u:object_r:telecom_service:s0
-+telephony.registry                        u:object_r:registry_service:s0
-+textclassification                        u:object_r:textclassification_service:s0
-+textservices                              u:object_r:textservices_service:s0
-+timezone                                  u:object_r:timezone_service:s0
-+thermalservice                            u:object_r:thermal_service:s0
-+trust                                     u:object_r:trust_service:s0
-+tv_input                                  u:object_r:tv_input_service:s0
-+uimode                                    u:object_r:uimode_service:s0
-+updatelock                                u:object_r:updatelock_service:s0
-+usagestats                                u:object_r:usagestats_service:s0
-+usb                                       u:object_r:usb_service:s0
-+user                                      u:object_r:user_service:s0
-+vibrator                                  u:object_r:vibrator_service:s0
-+virtual_touchpad                          u:object_r:virtual_touchpad_service:s0
-+voiceinteraction                          u:object_r:voiceinteraction_service:s0
-+vold                                      u:object_r:vold_service:s0
-+vr_hwc                                    u:object_r:vr_hwc_service:s0
-+vrmanager                                 u:object_r:vr_manager_service:s0
-+wallpaper                                 u:object_r:wallpaper_service:s0
-+webviewupdate                             u:object_r:webviewupdate_service:s0
-+wifip2p                                   u:object_r:wifip2p_service:s0
-+wifiscanner                               u:object_r:wifiscanner_service:s0
-+wifi                                      u:object_r:wifi_service:s0
-+wificond                                  u:object_r:wificond_service:s0
-+wifiaware                                 u:object_r:wifiaware_service:s0
-+wifirtt                                   u:object_r:rttmanager_service:s0
-+window                                    u:object_r:window_service:s0
-+*                                         u:object_r:default_android_service:s0
-diff --git a/prebuilts/api/28.0/private/servicemanager.te b/prebuilts/api/28.0/private/servicemanager.te
-new file mode 100644
-index 000000000..9f675a2be
---- /dev/null
-+++ b/prebuilts/api/28.0/private/servicemanager.te
-@@ -0,0 +1,5 @@
-+typeattribute servicemanager coredomain;
-+
-+init_daemon_domain(servicemanager)
-+
-+read_runtime_log_tags(servicemanager)
-diff --git a/prebuilts/api/28.0/private/sgdisk.te b/prebuilts/api/28.0/private/sgdisk.te
-new file mode 100644
-index 000000000..a17342e01
---- /dev/null
-+++ b/prebuilts/api/28.0/private/sgdisk.te
-@@ -0,0 +1 @@
-+typeattribute sgdisk coredomain;
-diff --git a/prebuilts/api/28.0/private/shared_relro.te b/prebuilts/api/28.0/private/shared_relro.te
-new file mode 100644
-index 000000000..02f720682
---- /dev/null
-+++ b/prebuilts/api/28.0/private/shared_relro.te
-@@ -0,0 +1,5 @@
-+typeattribute shared_relro coredomain;
-+
-+# The shared relro process is a Java program forked from the zygote, so it
-+# inherits from app to get basic permissions it needs to run.
-+app_domain(shared_relro)
-diff --git a/prebuilts/api/28.0/private/shell.te b/prebuilts/api/28.0/private/shell.te
-new file mode 100644
-index 000000000..130a13015
---- /dev/null
-+++ b/prebuilts/api/28.0/private/shell.te
-@@ -0,0 +1,53 @@
-+typeattribute shell coredomain;
-+
-+# allow shell input injection
-+allow shell uhid_device:chr_file rw_file_perms;
-+
-+# systrace support - allow atrace to run
-+allow shell debugfs_tracing_debug:dir r_dir_perms;
-+allow shell debugfs_tracing:dir r_dir_perms;
-+allow shell debugfs_tracing:file rw_file_perms;
-+allow shell debugfs_trace_marker:file getattr;
-+allow shell atrace_exec:file rx_file_perms;
-+
-+userdebug_or_eng(`
-+  allow shell debugfs_tracing_debug:file rw_file_perms;
-+')
-+
-+# read config.gz for CTS purposes
-+allow shell config_gz:file r_file_perms;
-+
-+# Run app_process.
-+# XXX Transition into its own domain?
-+app_domain(shell)
-+
-+# allow shell to call dumpsys storaged
-+binder_call(shell, storaged)
-+
-+# Perform SELinux access checks, needed for CTS
-+selinux_check_access(shell)
-+selinux_check_context(shell)
-+
-+# Control Perfetto traced and obtain traces from it.
-+# Needed for Studio and debugging.
-+unix_socket_connect(shell, traced_consumer, traced)
-+
-+# Allow shell binaries to write trace data to Perfetto. Used for testing and
-+# cmdline utils.
-+allow shell traced:fd use;
-+allow shell traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(shell, traced_producer, traced)
-+
-+domain_auto_trans(shell, vendor_shell_exec, vendor_shell)
-+
-+# Allow shell binaries to exec the perfetto cmdline util and have that
-+# transition into its own domain, so that it behaves consistently to
-+# when exec()-d by statsd.
-+domain_auto_trans(shell, perfetto_exec, perfetto)
-+
-+# Allow shell to run adb shell cmd stats commands. Needed for CTS.
-+binder_call(shell, statsd);
-+
-+# Allow shell to read and unlink traces stored in /data/misc/perfetto-traces.
-+allow shell perfetto_traces_data_file:dir rw_dir_perms;
-+allow shell perfetto_traces_data_file:file r_file_perms;
-diff --git a/prebuilts/api/28.0/private/slideshow.te b/prebuilts/api/28.0/private/slideshow.te
-new file mode 100644
-index 000000000..7dfa994ea
---- /dev/null
-+++ b/prebuilts/api/28.0/private/slideshow.te
-@@ -0,0 +1 @@
-+typeattribute slideshow coredomain;
-diff --git a/prebuilts/api/28.0/private/stats.te b/prebuilts/api/28.0/private/stats.te
-new file mode 100644
-index 000000000..019dfc82c
---- /dev/null
-+++ b/prebuilts/api/28.0/private/stats.te
-@@ -0,0 +1,24 @@
-+type stats, domain;
-+typeattribute stats coredomain;
-+type stats_exec, exec_type, file_type;
-+
-+# switch to stats domain for stats command
-+domain_auto_trans(shell, stats_exec, stats)
-+
-+# allow stats access to stdout from its parent shell.
-+allow stats shell:fd use;
-+
-+# allow stats to communicate use, read and write over the adb
-+# connection.
-+allow stats adbd:fd use;
-+allow stats adbd:unix_stream_socket { read write };
-+
-+# allow adbd to reap stats
-+allow stats adbd:process { sigchld };
-+
-+# Allow the stats command to talk to the statsd over the binder, and get
-+# back the stats report data from a ParcelFileDescriptor.
-+binder_use(stats)
-+allow stats stats_service:service_manager find;
-+binder_call(stats, statsd)
-+allow stats statsd:fifo_file write;
-diff --git a/prebuilts/api/28.0/private/statsd.te b/prebuilts/api/28.0/private/statsd.te
-new file mode 100644
-index 000000000..74b89c242
---- /dev/null
-+++ b/prebuilts/api/28.0/private/statsd.te
-@@ -0,0 +1,116 @@
-+type statsd, domain, mlstrustedsubject;
-+typeattribute statsd coredomain;
-+
-+init_daemon_domain(statsd)
-+
-+type statsd_exec, exec_type, file_type;
-+binder_use(statsd)
-+
-+# Allow statsd to scan through /proc/pid for all processes.
-+r_dir_file(statsd, domain)
-+
-+# Allow executing files on system, such as running a shell or running:
-+#   /system/bin/toolbox
-+#   /system/bin/logcat
-+#   /system/bin/dumpsys
-+allow statsd devpts:chr_file { getattr ioctl read write };
-+allow statsd shell_exec:file rx_file_perms;
-+allow statsd system_file:file execute_no_trans;
-+allow statsd toolbox_exec:file rx_file_perms;
-+
-+userdebug_or_eng(`
-+  allow statsd su:fifo_file read;
-+')
-+
-+# Create, read, and write into /data/misc/stats-data, /data/misc/stats-system.
-+allow statsd stats_data_file:dir create_dir_perms;
-+allow statsd stats_data_file:file create_file_perms;
-+
-+# Allow statsd to make binder calls to any binder service.
-+binder_call(statsd, appdomain)
-+binder_call(statsd, healthd)
-+binder_call(statsd, incidentd)
-+userdebug_or_eng(`
-+  binder_call(statsd, perfprofd)
-+')
-+binder_call(statsd, statscompanion_service)
-+binder_call(statsd, system_server)
-+
-+# Allow logd access.
-+read_logd(statsd)
-+control_logd(statsd)
-+
-+# Allow to exec the perfetto cmdline client and pass it the trace config on
-+# stdint through a pipe. It allows statsd to  capture traces and hand them
-+# to Android dropbox.
-+allow statsd perfetto_exec:file rx_file_perms;
-+domain_auto_trans(statsd, perfetto_exec, perfetto)
-+
-+# Grant statsd with permissions to register the services.
-+allow statsd {
-+  app_api_service
-+  incident_service
-+  statscompanion_service
-+  system_api_service
-+}:service_manager find;
-+
-+# Grant statsd to access health hal to access battery metrics.
-+allow statsd hal_health_hwservice:hwservice_manager find;
-+
-+# Only statsd can publish the binder service.
-+add_service(statsd, stats_service)
-+
-+# Allow pipes from (and only from) stats.
-+allow statsd stats:fd use;
-+allow statsd stats:fifo_file write;
-+
-+# Allow statsd to send dump info to dumpstate
-+allow statsd dumpstate:fd use;
-+allow statsd dumpstate:fifo_file { getattr write };
-+
-+# Allow statsd to call back to stats with status updates.
-+binder_call(statsd, stats)
-+
-+# Allow access to with hardware layer and process stats.
-+allow statsd proc_uid_cputime_showstat:file { getattr open read };
-+hal_client_domain(statsd, hal_health)
-+hal_client_domain(statsd, hal_power)
-+hal_client_domain(statsd, hal_thermal)
-+
-+# Allow 'adb shell cmd' to upload configs and download output.
-+allow statsd adbd:fd use;
-+allow statsd adbd:unix_stream_socket { getattr read write };
-+allow statsd shell:fifo_file { getattr read };
-+
-+unix_socket_send(bluetooth, statsdw, statsd)
-+unix_socket_send(bootstat, statsdw, statsd)
-+unix_socket_send(lmkd, statsdw, statsd)
-+unix_socket_send(platform_app, statsdw, statsd)
-+unix_socket_send(radio, statsdw, statsd)
-+unix_socket_send(statsd, statsdw, statsd)
-+unix_socket_send(system_server, statsdw, statsd)
-+
-+###
-+### neverallow rules
-+###
-+
-+# Only system_server, system_app, traceur_app, and stats command can find the stats service.
-+neverallow {
-+  domain
-+  -dumpstate
-+  -priv_app
-+  -shell
-+  -stats
-+  -statsd
-+  -system_app
-+  -system_server
-+  -traceur_app
-+} stats_service:service_manager find;
-+
-+# Only statsd and the other root services in limited circumstances.
-+# can get to the files in /data/misc/stats-data, /data/misc/stats-service.
-+# Other services are prohibitted from accessing the file.
-+neverallow { domain -statsd -system_server -init -vold } stats_data_file:file *;
-+
-+# Limited access to the directory itself.
-+neverallow { domain -statsd -system_server -init -vold } stats_data_file:dir *;
-diff --git a/prebuilts/api/28.0/private/storaged.te b/prebuilts/api/28.0/private/storaged.te
-new file mode 100644
-index 000000000..8ad872f61
---- /dev/null
-+++ b/prebuilts/api/28.0/private/storaged.te
-@@ -0,0 +1,61 @@
-+# storaged daemon
-+type storaged, domain, coredomain, mlstrustedsubject;
-+type storaged_exec, exec_type, file_type;
-+
-+init_daemon_domain(storaged)
-+
-+# Read access to pseudo filesystems
-+r_dir_file(storaged, proc_net)
-+r_dir_file(storaged, domain)
-+
-+# Read /proc/uid_io/stats
-+allow storaged proc_uid_io_stats:file r_file_perms;
-+
-+# Read /data/system/packages.list
-+allow storaged system_data_file:file r_file_perms;
-+
-+# Store storaged proto file
-+allow storaged storaged_data_file:dir rw_dir_perms;
-+allow storaged storaged_data_file:file create_file_perms;
-+
-+userdebug_or_eng(`
-+  # Read access to debugfs
-+  allow storaged debugfs_mmc:dir search;
-+  allow storaged debugfs_mmc:file r_file_perms;
-+')
-+
-+# Needed to provide debug dump output via dumpsys pipes.
-+allow storaged shell:fd use;
-+allow storaged shell:fifo_file write;
-+
-+# Needed for GMScore to call dumpsys storaged
-+allow storaged priv_app:fd use;
-+allow storaged app_data_file:file write;
-+allow storaged permission_service:service_manager find;
-+
-+# Binder permissions
-+add_service(storaged, storaged_service)
-+
-+binder_use(storaged)
-+binder_call(storaged, system_server)
-+
-+hal_client_domain(storaged, hal_health)
-+
-+# Implements a dumpsys interface.
-+allow storaged dumpstate:fd use;
-+
-+# use a subset of the package manager service
-+allow storaged package_native_service:service_manager find;
-+
-+# Kernel does extra check on CAP_DAC_OVERRIDE for libbinder when storaged is
-+# running as root. See b/35323867 #3.
-+dontaudit storaged self:global_capability_class_set dac_override;
-+
-+# For collecting bugreports.
-+allow storaged dumpstate:fifo_file write;
-+
-+###
-+### neverallow
-+###
-+neverallow storaged domain:process ptrace;
-+neverallow storaged self:capability_class_set *;
-diff --git a/prebuilts/api/28.0/private/su.te b/prebuilts/api/28.0/private/su.te
-new file mode 100644
-index 000000000..16e47bbbf
---- /dev/null
-+++ b/prebuilts/api/28.0/private/su.te
-@@ -0,0 +1,23 @@
-+userdebug_or_eng(`
-+  typeattribute su coredomain;
-+
-+  domain_auto_trans(shell, su_exec, su)
-+  # Allow dumpstate to call su on userdebug / eng builds to collect
-+  # additional information.
-+  domain_auto_trans(dumpstate, su_exec, su)
-+
-+  # Make sure that dumpstate runs the same from the "su" domain as
-+  # from the "init" domain.
-+  domain_auto_trans(su, dumpstate_exec, dumpstate)
-+
-+  # Put the incident command into its domain so it is the same on user, userdebug and eng.
-+  domain_auto_trans(su, incident_exec, incident)
-+
-+  # Put the perfetto command into its domain so it is the same on user, userdebug and eng.
-+  domain_auto_trans(su, perfetto_exec, perfetto)
-+
-+  # su is also permissive to permit setenforce.
-+  permissive su;
-+
-+  app_domain(su)
-+')
-diff --git a/prebuilts/api/28.0/private/surfaceflinger.te b/prebuilts/api/28.0/private/surfaceflinger.te
-new file mode 100644
-index 000000000..e2f1a0721
---- /dev/null
-+++ b/prebuilts/api/28.0/private/surfaceflinger.te
-@@ -0,0 +1,121 @@
-+# surfaceflinger - display compositor service
-+
-+typeattribute surfaceflinger coredomain;
-+
-+type surfaceflinger_exec, exec_type, file_type;
-+init_daemon_domain(surfaceflinger)
-+
-+typeattribute surfaceflinger mlstrustedsubject;
-+typeattribute surfaceflinger display_service_server;
-+
-+read_runtime_log_tags(surfaceflinger)
-+
-+# Perform HwBinder IPC.
-+hal_client_domain(surfaceflinger, hal_graphics_allocator)
-+hal_client_domain(surfaceflinger, hal_graphics_composer)
-+hal_client_domain(surfaceflinger, hal_configstore)
-+hal_client_domain(surfaceflinger, hal_power)
-+allow surfaceflinger hidl_token_hwservice:hwservice_manager find;
-+
-+# Perform Binder IPC.
-+binder_use(surfaceflinger)
-+binder_call(surfaceflinger, binderservicedomain)
-+binder_call(surfaceflinger, appdomain)
-+binder_call(surfaceflinger, bootanim)
-+binder_service(surfaceflinger)
-+
-+# Binder IPC to bu, presently runs in adbd domain.
-+binder_call(surfaceflinger, adbd)
-+
-+# Read /proc/pid files for Binder clients.
-+r_dir_file(surfaceflinger, binderservicedomain)
-+r_dir_file(surfaceflinger, appdomain)
-+
-+# Access the GPU.
-+allow surfaceflinger gpu_device:chr_file rw_file_perms;
-+
-+# Access /dev/graphics/fb0.
-+allow surfaceflinger graphics_device:dir search;
-+allow surfaceflinger graphics_device:chr_file rw_file_perms;
-+
-+# Access /dev/video1.
-+allow surfaceflinger video_device:dir r_dir_perms;
-+allow surfaceflinger video_device:chr_file rw_file_perms;
-+
-+# Create and use netlink kobject uevent sockets.
-+allow surfaceflinger self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+
-+# Set properties.
-+set_prop(surfaceflinger, system_prop)
-+set_prop(surfaceflinger, exported_system_prop)
-+set_prop(surfaceflinger, exported2_system_prop)
-+set_prop(surfaceflinger, exported3_system_prop)
-+set_prop(surfaceflinger, ctl_bootanim_prop)
-+
-+# Use open files supplied by an app.
-+allow surfaceflinger appdomain:fd use;
-+allow surfaceflinger app_data_file:file { read write };
-+
-+# Allow writing surface traces to /data/misc/wmtrace.
-+userdebug_or_eng(`
-+  allow surfaceflinger wm_trace_data_file:dir rw_dir_perms;
-+  allow surfaceflinger wm_trace_data_file:file { getattr setattr create w_file_perms };
-+')
-+
-+# Use socket supplied by adbd, for cmd gpu vkjson etc.
-+allow surfaceflinger adbd:unix_stream_socket { read write getattr };
-+
-+# Allow a dumpstate triggered screenshot
-+binder_call(surfaceflinger, dumpstate)
-+binder_call(surfaceflinger, shell)
-+r_dir_file(surfaceflinger, dumpstate)
-+
-+# Needed on some devices for playing DRM protected content,
-+# but seems expected and appropriate for all devices.
-+allow surfaceflinger tee_device:chr_file rw_file_perms;
-+
-+
-+# media.player service
-+add_service(surfaceflinger, gpu_service)
-+
-+# do not use add_service() as hal_graphics_composer_default may be the
-+# provider as well
-+#add_service(surfaceflinger, surfaceflinger_service)
-+allow surfaceflinger surfaceflinger_service:service_manager { add find };
-+
-+allow surfaceflinger mediaserver_service:service_manager find;
-+allow surfaceflinger permission_service:service_manager find;
-+allow surfaceflinger power_service:service_manager find;
-+allow surfaceflinger vr_manager_service:service_manager find;
-+allow surfaceflinger window_service:service_manager find;
-+
-+
-+# allow self to set SCHED_FIFO
-+allow surfaceflinger self:global_capability_class_set sys_nice;
-+allow surfaceflinger proc_meminfo:file r_file_perms;
-+r_dir_file(surfaceflinger, cgroup)
-+r_dir_file(surfaceflinger, system_file)
-+allow surfaceflinger tmpfs:dir r_dir_perms;
-+allow surfaceflinger system_server:fd use;
-+allow surfaceflinger ion_device:chr_file r_file_perms;
-+
-+# pdx IPC
-+pdx_server(surfaceflinger, display_client)
-+pdx_server(surfaceflinger, display_manager)
-+pdx_server(surfaceflinger, display_screenshot)
-+pdx_server(surfaceflinger, display_vsync)
-+
-+pdx_client(surfaceflinger, bufferhub_client)
-+pdx_client(surfaceflinger, performance_client)
-+
-+###
-+### Neverallow rules
-+###
-+### surfaceflinger should NEVER do any of this
-+
-+# Do not allow accessing SDcard files as unsafe ejection could
-+# cause the kernel to kill the process.
-+neverallow surfaceflinger sdcard_type:file rw_file_perms;
-+
-+# b/68864350
-+dontaudit surfaceflinger unlabeled:dir search;
-diff --git a/prebuilts/api/28.0/private/system_app.te b/prebuilts/api/28.0/private/system_app.te
-new file mode 100644
-index 000000000..eb7e05052
---- /dev/null
-+++ b/prebuilts/api/28.0/private/system_app.te
-@@ -0,0 +1,129 @@
-+###
-+### Apps that run with the system UID, e.g. com.android.system.ui,
-+### com.android.settings.  These are not as privileged as the system
-+### server.
-+###
-+
-+typeattribute system_app coredomain;
-+
-+app_domain(system_app)
-+net_domain(system_app)
-+binder_service(system_app)
-+
-+# android.ui and system.ui
-+allow system_app rootfs:dir getattr;
-+
-+# Read and write /data/data subdirectory.
-+allow system_app system_app_data_file:dir create_dir_perms;
-+allow system_app system_app_data_file:{ file lnk_file } create_file_perms;
-+
-+# Read and write to /data/misc/user.
-+allow system_app misc_user_data_file:dir create_dir_perms;
-+allow system_app misc_user_data_file:file create_file_perms;
-+
-+# Access to vold-mounted storage for measuring free space
-+allow system_app mnt_media_rw_file:dir search;
-+
-+# Read wallpaper file.
-+allow system_app wallpaper_file:file r_file_perms;
-+
-+# Read icon file.
-+allow system_app icon_file:file r_file_perms;
-+
-+# Write to properties
-+set_prop(system_app, bluetooth_a2dp_offload_prop)
-+set_prop(system_app, bluetooth_prop)
-+set_prop(system_app, debug_prop)
-+set_prop(system_app, system_prop)
-+set_prop(system_app, exported_bluetooth_prop)
-+set_prop(system_app, exported_system_prop)
-+set_prop(system_app, exported2_system_prop)
-+set_prop(system_app, exported3_system_prop)
-+set_prop(system_app, logd_prop)
-+set_prop(system_app, net_radio_prop)
-+set_prop(system_app, system_radio_prop)
-+set_prop(system_app, exported_system_radio_prop)
-+set_prop(system_app, log_tag_prop)
-+userdebug_or_eng(`set_prop(system_app, logpersistd_logging_prop)')
-+auditallow system_app net_radio_prop:property_service set;
-+auditallow system_app system_radio_prop:property_service set;
-+auditallow system_app exported_system_radio_prop:property_service set;
-+
-+# ctl interface
-+set_prop(system_app, ctl_default_prop)
-+set_prop(system_app, ctl_bugreport_prop)
-+
-+# Create /data/anr/traces.txt.
-+allow system_app anr_data_file:dir ra_dir_perms;
-+allow system_app anr_data_file:file create_file_perms;
-+
-+# Settings need to access app name and icon from asec
-+allow system_app asec_apk_file:file r_file_perms;
-+
-+# Allow system apps (like Settings) to interact with statsd
-+binder_call(system_app, statsd)
-+
-+# Allow system apps to interact with incidentd
-+binder_call(system_app, incidentd)
-+
-+allow system_app servicemanager:service_manager list;
-+# TODO: scope this down? Too broad?
-+allow system_app {
-+  service_manager_type
-+  -dumpstate_service
-+  -installd_service
-+  -netd_service
-+  -virtual_touchpad_service
-+  -vold_service
-+  -vr_hwc_service
-+}:service_manager find;
-+# suppress denials for services system_app should not be accessing.
-+dontaudit system_app {
-+  dumpstate_service
-+  installd_service
-+  netd_service
-+  virtual_touchpad_service
-+  vold_service
-+  vr_hwc_service
-+}:service_manager find;
-+
-+allow system_app keystore:keystore_key {
-+    get_state
-+    get
-+    insert
-+    delete
-+    exist
-+    list
-+    reset
-+    password
-+    lock
-+    unlock
-+    is_empty
-+    sign
-+    verify
-+    grant
-+    duplicate
-+    clear_uid
-+    user_changed
-+};
-+
-+# settings app reads /proc/version
-+allow system_app {
-+  proc_version
-+}:file r_file_perms;
-+
-+control_logd(system_app)
-+read_runtime_log_tags(system_app)
-+get_prop(system_app, device_logging_prop)
-+
-+# allow system apps to use UDP sockets provided by the system server but not
-+# modify them other than to connect
-+allow system_app system_server:udp_socket {
-+        connect getattr read recvfrom sendto write getopt setopt };
-+
-+###
-+### Neverallow rules
-+###
-+
-+# app domains which access /dev/fuse should not run as system_app
-+neverallow system_app fuse_device:chr_file *;
-diff --git a/prebuilts/api/28.0/private/system_server.te b/prebuilts/api/28.0/private/system_server.te
-new file mode 100644
-index 000000000..2927e0bca
---- /dev/null
-+++ b/prebuilts/api/28.0/private/system_server.te
-@@ -0,0 +1,868 @@
-+#
-+# System Server aka system_server spawned by zygote.
-+# Most of the framework services run in this process.
-+#
-+
-+typeattribute system_server coredomain;
-+typeattribute system_server mlstrustedsubject;
-+
-+# Define a type for tmpfs-backed ashmem regions.
-+tmpfs_domain(system_server)
-+
-+# Create a socket for connections from crash_dump.
-+type_transition system_server system_data_file:sock_file system_ndebug_socket "ndebugsocket";
-+
-+allow system_server zygote_tmpfs:file read;
-+
-+# For art.
-+allow system_server dalvikcache_data_file:dir r_dir_perms;
-+allow system_server dalvikcache_data_file:file r_file_perms;
-+
-+# When running system server under --invoke-with, we'll try to load the boot image under the
-+# system server domain, following links to the system partition.
-+with_asan(`allow system_server dalvikcache_data_file:lnk_file r_file_perms;')
-+
-+# /data/resource-cache
-+allow system_server resourcecache_data_file:file r_file_perms;
-+allow system_server resourcecache_data_file:dir r_dir_perms;
-+
-+# ptrace to processes in the same domain for debugging crashes.
-+allow system_server self:process ptrace;
-+
-+# Child of the zygote.
-+allow system_server zygote:fd use;
-+allow system_server zygote:process sigchld;
-+
-+# May kill zygote on crashes.
-+allow system_server zygote:process sigkill;
-+allow system_server crash_dump:process sigkill;
-+allow system_server webview_zygote:process sigkill;
-+
-+# Read /system/bin/app_process.
-+allow system_server zygote_exec:file r_file_perms;
-+
-+# Needed to close the zygote socket, which involves getopt / getattr
-+allow system_server zygote:unix_stream_socket { getopt getattr };
-+
-+# system server gets network and bluetooth permissions.
-+net_domain(system_server)
-+# in addition to ioctls allowlisted for all domains, also allow system_server
-+# to use privileged ioctls commands. Needed to set up VPNs.
-+allowxperm system_server self:udp_socket ioctl priv_sock_ioctls;
-+bluetooth_domain(system_server)
-+
-+# These are the capabilities assigned by the zygote to the
-+# system server.
-+allow system_server self:global_capability_class_set {
-+    ipc_lock
-+    kill
-+    net_admin
-+    net_bind_service
-+    net_broadcast
-+    net_raw
-+    sys_boot
-+    sys_nice
-+    sys_ptrace
-+    sys_time
-+    sys_tty_config
-+};
-+
-+wakelock_use(system_server)
-+
-+# Trigger module auto-load.
-+allow system_server kernel:system module_request;
-+
-+# Allow alarmtimers to be set
-+allow system_server self:global_capability2_class_set wake_alarm;
-+
-+# Create and share netlink_netfilter_sockets for tetheroffload.
-+allow system_server self:netlink_netfilter_socket create_socket_perms_no_ioctl;
-+
-+# Use netlink uevent sockets.
-+allow system_server self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+
-+# Use generic netlink sockets.
-+allow system_server self:netlink_socket create_socket_perms_no_ioctl;
-+allow system_server self:netlink_generic_socket create_socket_perms_no_ioctl;
-+
-+# libvintf reads the kernel config to verify vendor interface compatibility.
-+allow system_server config_gz:file { read open };
-+
-+# Use generic "sockets" where the address family is not known
-+# to the kernel. The ioctl permission is specifically omitted here, but may
-+# be added to device specific policy along with the ioctl commands to be
-+# allowlisted.
-+allow system_server self:socket create_socket_perms_no_ioctl;
-+
-+# Set and get routes directly via netlink.
-+allow system_server self:netlink_route_socket nlmsg_write;
-+
-+# Kill apps.
-+allow system_server appdomain:process { getpgid sigkill signal };
-+
-+# Set scheduling info for apps.
-+allow system_server appdomain:process { getsched setsched };
-+allow system_server audioserver:process { getsched setsched };
-+allow system_server hal_audio:process { getsched setsched };
-+allow system_server hal_bluetooth:process { getsched setsched };
-+allow system_server mediacodec:process { getsched setsched };
-+allow system_server cameraserver:process { getsched setsched };
-+allow system_server hal_camera:process { getsched setsched };
-+allow system_server mediaserver:process { getsched setsched };
-+allow system_server bootanim:process { getsched setsched };
-+
-+# Allow system_server to write to /proc/<pid>/timerslack_ns
-+allow system_server appdomain:file w_file_perms;
-+allow system_server audioserver:file w_file_perms;
-+allow system_server mediacodec:file w_file_perms;
-+allow system_server cameraserver:file w_file_perms;
-+allow system_server hal_audio_server:file w_file_perms;
-+
-+# Read /proc/pid data for all domains. This is used by ProcessCpuTracker
-+# within system_server to keep track of memory and CPU usage for
-+# all processes on the device. In addition, /proc/pid files access is needed
-+# for dumping stack traces of native processes.
-+r_dir_file(system_server, domain)
-+
-+# Read/Write to /proc/net/xt_qtaguid/ctrl and and /dev/xt_qtaguid.
-+allow system_server qtaguid_proc:file rw_file_perms;
-+allow system_server qtaguid_device:chr_file rw_file_perms;
-+
-+# Write /proc/uid_cputime/remove_uid_range.
-+allow system_server proc_uid_cputime_removeuid:file { w_file_perms getattr };
-+
-+# Write /proc/uid_procstat/set.
-+allow system_server proc_uid_procstat_set:file { w_file_perms getattr };
-+
-+# Write to /proc/sysrq-trigger.
-+allow system_server proc_sysrq:file rw_file_perms;
-+
-+# Read /sys/kernel/debug/wakeup_sources.
-+allow system_server debugfs:file r_file_perms;
-+allow system_server debugfs_wakeup_sources:file r_file_perms;
-+
-+# Delete /data/misc/stats-data/ and /data/misc/stats-service/ directories.
-+allow system_server stats_data_file:dir { open read remove_name search write };
-+allow system_server stats_data_file:file unlink;
-+
-+# The DhcpClient and WifiWatchdog use packet_sockets
-+allow system_server self:packet_socket create_socket_perms_no_ioctl;
-+
-+# NetworkDiagnostics requires explicit bind() calls to ping sockets. These aren't actually the same
-+# as raw sockets, but the kernel doesn't yet distinguish between the two.
-+allow system_server node:rawip_socket node_bind;
-+
-+# 3rd party VPN clients require a tun_socket to be created
-+allow system_server self:tun_socket create_socket_perms_no_ioctl;
-+
-+# Talk to init and various daemons via sockets.
-+unix_socket_connect(system_server, lmkd, lmkd)
-+unix_socket_connect(system_server, mtpd, mtp)
-+unix_socket_connect(system_server, netd, netd)
-+unix_socket_connect(system_server, zygote, zygote)
-+unix_socket_connect(system_server, racoon, racoon)
-+unix_socket_connect(system_server, uncrypt, uncrypt)
-+
-+# Communicate over a socket created by surfaceflinger.
-+allow system_server surfaceflinger:unix_stream_socket { read write setopt };
-+
-+# Communicate over a socket created by webview_zygote.
-+allow system_server webview_zygote:unix_stream_socket { read write connectto setopt };
-+
-+# Perform Binder IPC.
-+binder_use(system_server)
-+binder_call(system_server, appdomain)
-+binder_call(system_server, binderservicedomain)
-+binder_call(system_server, dumpstate)
-+binder_call(system_server, fingerprintd)
-+binder_call(system_server, gatekeeperd)
-+binder_call(system_server, installd)
-+binder_call(system_server, incidentd)
-+binder_call(system_server, netd)
-+binder_call(system_server, statsd)
-+binder_call(system_server, storaged)
-+binder_call(system_server, vold)
-+binder_call(system_server, wificond)
-+binder_call(system_server, wpantund)
-+binder_service(system_server)
-+
-+# Use HALs
-+hal_client_domain(system_server, hal_allocator)
-+hal_client_domain(system_server, hal_authsecret)
-+hal_client_domain(system_server, hal_broadcastradio)
-+hal_client_domain(system_server, hal_configstore)
-+hal_client_domain(system_server, hal_contexthub)
-+hal_client_domain(system_server, hal_fingerprint)
-+hal_client_domain(system_server, hal_gnss)
-+hal_client_domain(system_server, hal_graphics_allocator)
-+hal_client_domain(system_server, hal_health)
-+hal_client_domain(system_server, hal_ir)
-+hal_client_domain(system_server, hal_light)
-+hal_client_domain(system_server, hal_memtrack)
-+hal_client_domain(system_server, hal_neuralnetworks)
-+hal_client_domain(system_server, hal_oemlock)
-+allow system_server hal_codec2_hwservice:hwservice_manager find;
-+allow system_server hal_omx_hwservice:hwservice_manager find;
-+allow system_server hidl_token_hwservice:hwservice_manager find;
-+hal_client_domain(system_server, hal_power)
-+hal_client_domain(system_server, hal_sensors)
-+hal_client_domain(system_server, hal_tetheroffload)
-+hal_client_domain(system_server, hal_thermal)
-+hal_client_domain(system_server, hal_tv_cec)
-+hal_client_domain(system_server, hal_tv_input)
-+hal_client_domain(system_server, hal_usb)
-+hal_client_domain(system_server, hal_usb_gadget)
-+hal_client_domain(system_server, hal_vibrator)
-+hal_client_domain(system_server, hal_vr)
-+hal_client_domain(system_server, hal_weaver)
-+hal_client_domain(system_server, hal_wifi)
-+hal_client_domain(system_server, hal_wifi_hostapd)
-+hal_client_domain(system_server, hal_wifi_offload)
-+hal_client_domain(system_server, hal_wifi_supplicant)
-+
-+binder_call(system_server, mediacodec)
-+
-+# Talk with graphics composer fences
-+allow system_server hal_graphics_composer:fd use;
-+
-+# Use RenderScript always-passthrough HAL
-+allow system_server hal_renderscript_hwservice:hwservice_manager find;
-+
-+# Offer HwBinder services
-+add_hwservice(system_server, fwk_scheduler_hwservice)
-+add_hwservice(system_server, fwk_sensor_hwservice)
-+
-+# Talk to tombstoned to get ANR traces.
-+unix_socket_connect(system_server, tombstoned_intercept, tombstoned)
-+
-+# List HAL interfaces to get ANR traces.
-+allow system_server hwservicemanager:hwservice_manager list;
-+
-+# Send signals to trigger ANR traces.
-+allow system_server {
-+  # This is derived from the list that system server defines as interesting native processes
-+  # to dump during ANRs or watchdog aborts, defined in NATIVE_STACKS_OF_INTEREST in
-+  # frameworks/base/services/core/java/com/android/server/Watchdog.java.
-+  audioserver
-+  cameraserver
-+  drmserver
-+  inputflinger
-+  mediadrmserver
-+  mediaextractor
-+  mediaserver
-+  mediametrics
-+  sdcardd
-+  statsd
-+  surfaceflinger
-+
-+  # This list comes from HAL_INTERFACES_OF_INTEREST in
-+  # frameworks/base/services/core/java/com/android/server/Watchdog.java.
-+  hal_audio_server
-+  hal_bluetooth_server
-+  hal_camera_server
-+  hal_graphics_composer_server
-+  hal_sensors_server
-+  hal_vr_server
-+  mediacodec # TODO(b/36375899): hal_omx_server
-+}:process { signal };
-+
-+# Use sockets received over binder from various services.
-+allow system_server audioserver:tcp_socket rw_socket_perms;
-+allow system_server audioserver:udp_socket rw_socket_perms;
-+allow system_server mediaserver:tcp_socket rw_socket_perms;
-+allow system_server mediaserver:udp_socket rw_socket_perms;
-+
-+# Use sockets received over binder from various services.
-+allow system_server mediadrmserver:tcp_socket rw_socket_perms;
-+allow system_server mediadrmserver:udp_socket rw_socket_perms;
-+
-+# Get file context
-+allow system_server file_contexts_file:file r_file_perms;
-+# access for mac_permissions
-+allow system_server mac_perms_file: file r_file_perms;
-+# Check SELinux permissions.
-+selinux_check_access(system_server)
-+
-+allow system_server sysfs_type:dir search;
-+
-+r_dir_file(system_server, sysfs_android_usb)
-+allow system_server sysfs_android_usb:file w_file_perms;
-+
-+r_dir_file(system_server, sysfs_ipv4)
-+allow system_server sysfs_ipv4:file w_file_perms;
-+
-+r_dir_file(system_server, sysfs_rtc)
-+r_dir_file(system_server, sysfs_switch)
-+r_dir_file(system_server, sysfs_wakeup_reasons)
-+
-+allow system_server sysfs_nfc_power_writable:file rw_file_perms;
-+allow system_server sysfs_mac_address:file r_file_perms;
-+allow system_server sysfs_power:dir search;
-+allow system_server sysfs_power:file rw_file_perms;
-+allow system_server sysfs_thermal:dir search;
-+allow system_server sysfs_thermal:file r_file_perms;
-+
-+# TODO: Remove when HALs are forced into separate processes
-+allow system_server sysfs_vibrator:file { write append };
-+
-+# TODO: added to match above sysfs rule. Remove me?
-+allow system_server sysfs_usb:file w_file_perms;
-+
-+# Access devices.
-+allow system_server device:dir r_dir_perms;
-+allow system_server mdns_socket:sock_file rw_file_perms;
-+allow system_server alarm_device:chr_file rw_file_perms;
-+allow system_server gpu_device:chr_file rw_file_perms;
-+allow system_server iio_device:chr_file rw_file_perms;
-+allow system_server input_device:dir r_dir_perms;
-+allow system_server input_device:chr_file rw_file_perms;
-+allow system_server radio_device:chr_file r_file_perms;
-+allow system_server tty_device:chr_file rw_file_perms;
-+allow system_server usbaccessory_device:chr_file rw_file_perms;
-+allow system_server video_device:dir r_dir_perms;
-+allow system_server video_device:chr_file rw_file_perms;
-+allow system_server adbd_socket:sock_file rw_file_perms;
-+allow system_server rtc_device:chr_file rw_file_perms;
-+allow system_server audio_device:dir r_dir_perms;
-+
-+# write access needed for MIDI
-+allow system_server audio_device:chr_file rw_file_perms;
-+
-+# tun device used for 3rd party vpn apps
-+allow system_server tun_device:chr_file rw_file_perms;
-+
-+# Manage system data files.
-+allow system_server system_data_file:dir create_dir_perms;
-+allow system_server system_data_file:notdevfile_class_set create_file_perms;
-+allow system_server keychain_data_file:dir create_dir_perms;
-+allow system_server keychain_data_file:file create_file_perms;
-+allow system_server keychain_data_file:lnk_file create_file_perms;
-+
-+# Manage /data/app.
-+allow system_server apk_data_file:dir create_dir_perms;
-+allow system_server apk_data_file:{ file lnk_file } { create_file_perms link };
-+allow system_server apk_tmp_file:dir create_dir_perms;
-+allow system_server apk_tmp_file:file create_file_perms;
-+
-+# Access /vendor/{app,framework,overlay}
-+r_dir_file(system_server, vendor_app_file)
-+r_dir_file(system_server, vendor_framework_file)
-+r_dir_file(system_server, vendor_overlay_file)
-+
-+# Manage /data/app-private.
-+allow system_server apk_private_data_file:dir create_dir_perms;
-+allow system_server apk_private_data_file:file create_file_perms;
-+allow system_server apk_private_tmp_file:dir create_dir_perms;
-+allow system_server apk_private_tmp_file:file create_file_perms;
-+
-+# Manage files within asec containers.
-+allow system_server asec_apk_file:dir create_dir_perms;
-+allow system_server asec_apk_file:file create_file_perms;
-+allow system_server asec_public_file:file create_file_perms;
-+
-+# Manage /data/anr.
-+#
-+# TODO: Some of these permissions can be withdrawn once we've switched to the
-+# new stack dumping mechanism, see b/32064548 and the rules below. In particular,
-+# the system_server should never need to create a new anr_data_file:file or write
-+# to one, but it will still need to read and append to existing files.
-+allow system_server anr_data_file:dir create_dir_perms;
-+allow system_server anr_data_file:file create_file_perms;
-+
-+# New stack dumping scheme : request an output FD from tombstoned via a unix
-+# domain socket.
-+#
-+# Allow system_server to connect and write to the tombstoned java trace socket in
-+# order to dump its traces. Also allow the system server to write its traces to
-+# dumpstate during bugreport capture and incidentd during incident collection.
-+unix_socket_connect(system_server, tombstoned_java_trace, tombstoned)
-+allow system_server tombstoned:fd use;
-+allow system_server dumpstate:fifo_file append;
-+allow system_server incidentd:fifo_file append;
-+
-+# Read /data/misc/incidents - only read. The fd will be sent over binder,
-+# with no DAC access to it, for dropbox to read.
-+allow system_server incident_data_file:file read;
-+
-+# Allow dropbox to read /data/misc/perfetto-traces. Only the fd is sent over
-+# binder.
-+allow system_server perfetto_traces_data_file:file read;
-+allow system_server perfetto:fd use;
-+
-+# Allow dropbox to read /data/misc/perfprofd. Only the fd is sent over binder.
-+userdebug_or_eng(`
-+  allow system_server perfprofd_data_file:file read;
-+  allow system_server perfprofd:fd use;
-+')
-+
-+# Manage /data/backup.
-+allow system_server backup_data_file:dir create_dir_perms;
-+allow system_server backup_data_file:file create_file_perms;
-+
-+# Write to /data/system/heapdump
-+allow system_server heapdump_data_file:dir rw_dir_perms;
-+allow system_server heapdump_data_file:file create_file_perms;
-+
-+# Manage /data/misc/adb.
-+allow system_server adb_keys_file:dir create_dir_perms;
-+allow system_server adb_keys_file:file create_file_perms;
-+
-+# Manage /data/misc/network_watchlist
-+allow system_server network_watchlist_data_file:dir create_dir_perms;
-+allow system_server network_watchlist_data_file:file create_file_perms;
-+
-+# Manage /data/misc/sms.
-+# TODO:  Split into a separate type?
-+allow system_server radio_data_file:dir create_dir_perms;
-+allow system_server radio_data_file:file create_file_perms;
-+
-+# Manage /data/misc/systemkeys.
-+allow system_server systemkeys_data_file:dir create_dir_perms;
-+allow system_server systemkeys_data_file:file create_file_perms;
-+
-+# Manage /data/misc/textclassifier.
-+allow system_server textclassifier_data_file:dir create_dir_perms;
-+allow system_server textclassifier_data_file:file create_file_perms;
-+
-+# Access /data/tombstones.
-+allow system_server tombstone_data_file:dir r_dir_perms;
-+allow system_server tombstone_data_file:file r_file_perms;
-+
-+# Manage /data/misc/vpn.
-+allow system_server vpn_data_file:dir create_dir_perms;
-+allow system_server vpn_data_file:file create_file_perms;
-+
-+# Manage /data/misc/wifi.
-+allow system_server wifi_data_file:dir create_dir_perms;
-+allow system_server wifi_data_file:file create_file_perms;
-+
-+# Manage /data/misc/zoneinfo.
-+allow system_server zoneinfo_data_file:dir create_dir_perms;
-+allow system_server zoneinfo_data_file:file create_file_perms;
-+
-+# Walk /data/data subdirectories.
-+# Types extracted from seapp_contexts type= fields.
-+allow system_server { system_app_data_file bluetooth_data_file nfc_data_file radio_data_file shell_data_file app_data_file }:dir { getattr read search };
-+# Also permit for unlabeled /data/data subdirectories and
-+# for unlabeled asec containers on upgrades from 4.2.
-+allow system_server unlabeled:dir r_dir_perms;
-+# Read pkg.apk file before it has been relabeled by vold.
-+allow system_server unlabeled:file r_file_perms;
-+
-+# Populate com.android.providers.settings/databases/settings.db.
-+allow system_server system_app_data_file:dir create_dir_perms;
-+allow system_server system_app_data_file:file create_file_perms;
-+
-+# Receive and use open app data files passed over binder IPC.
-+# Types extracted from seapp_contexts type= fields.
-+allow system_server { system_app_data_file bluetooth_data_file nfc_data_file radio_data_file shell_data_file app_data_file }:file { getattr read write append };
-+
-+# Access to /data/media for measuring disk usage.
-+allow system_server media_rw_data_file:dir { search getattr open read };
-+
-+# Receive and use open /data/media files passed over binder IPC.
-+# Also used for measuring disk usage.
-+allow system_server media_rw_data_file:file { getattr read write append };
-+
-+# Relabel apk files.
-+allow system_server { apk_tmp_file apk_private_tmp_file }:{ dir file } { relabelfrom relabelto };
-+allow system_server { apk_data_file apk_private_data_file }:{ dir file } { relabelfrom relabelto };
-+
-+# Relabel wallpaper.
-+allow system_server system_data_file:file relabelfrom;
-+allow system_server wallpaper_file:file relabelto;
-+allow system_server wallpaper_file:file { rw_file_perms rename unlink };
-+
-+# Backup of wallpaper imagery uses temporary hard links to avoid data churn
-+allow system_server { system_data_file wallpaper_file }:file link;
-+
-+# ShortcutManager icons
-+allow system_server system_data_file:dir relabelfrom;
-+allow system_server shortcut_manager_icons:dir { create_dir_perms relabelto };
-+allow system_server shortcut_manager_icons:file create_file_perms;
-+
-+# Manage ringtones.
-+allow system_server ringtone_file:dir { create_dir_perms relabelto };
-+allow system_server ringtone_file:file create_file_perms;
-+
-+# Relabel icon file.
-+allow system_server icon_file:file relabelto;
-+allow system_server icon_file:file { rw_file_perms unlink };
-+
-+# FingerprintService.java does a restorecon of the directory /data/system/users/[0-9]+/fpdata(/.*)?
-+allow system_server system_data_file:dir relabelfrom;
-+
-+# Property Service write
-+set_prop(system_server, system_prop)
-+set_prop(system_server, exported_system_prop)
-+set_prop(system_server, exported2_system_prop)
-+set_prop(system_server, exported3_system_prop)
-+set_prop(system_server, safemode_prop)
-+set_prop(system_server, dhcp_prop)
-+set_prop(system_server, net_radio_prop)
-+set_prop(system_server, net_dns_prop)
-+set_prop(system_server, system_radio_prop)
-+set_prop(system_server, exported_system_radio_prop)
-+set_prop(system_server, debug_prop)
-+set_prop(system_server, powerctl_prop)
-+set_prop(system_server, fingerprint_prop)
-+set_prop(system_server, exported_fingerprint_prop)
-+set_prop(system_server, device_logging_prop)
-+set_prop(system_server, dumpstate_options_prop)
-+set_prop(system_server, overlay_prop)
-+set_prop(system_server, exported_overlay_prop)
-+set_prop(system_server, pm_prop)
-+set_prop(system_server, exported_pm_prop)
-+userdebug_or_eng(`set_prop(system_server, wifi_log_prop)')
-+
-+# ctl interface
-+set_prop(system_server, ctl_default_prop)
-+set_prop(system_server, ctl_bugreport_prop)
-+
-+# cppreopt property
-+set_prop(system_server, cppreopt_prop)
-+
-+# BootReceiver to read ro.boot.bootreason
-+get_prop(system_server, bootloader_boot_reason_prop)
-+# PowerManager to read persist.sys.boot.reason
-+get_prop(system_server, last_boot_reason_prop)
-+
-+# Collect metrics on boot time created by init
-+get_prop(system_server, boottime_prop)
-+
-+# Read device's serial number from system properties
-+get_prop(system_server, serialno_prop)
-+
-+# Read/write the property which keeps track of whether this is the first start of system_server
-+set_prop(system_server, firstboot_prop)
-+
-+# Audio service in system server can read exported audio properties,
-+# such as camera shutter enforcement
-+get_prop(system_server, exported_audio_prop)
-+
-+# Create a socket for connections from debuggerd.
-+allow system_server system_ndebug_socket:sock_file create_file_perms;
-+
-+# Manage cache files.
-+allow system_server cache_file:lnk_file r_file_perms;
-+allow system_server { cache_file cache_recovery_file }:dir { relabelfrom create_dir_perms };
-+allow system_server { cache_file cache_recovery_file }:file { relabelfrom create_file_perms };
-+allow system_server { cache_file cache_recovery_file }:fifo_file create_file_perms;
-+
-+allow system_server system_file:dir r_dir_perms;
-+allow system_server system_file:lnk_file r_file_perms;
-+
-+# LocationManager(e.g, GPS) needs to read and write
-+# to uart driver and ctrl proc entry
-+allow system_server gps_control:file rw_file_perms;
-+
-+# Allow system_server to use app-created sockets and pipes.
-+allow system_server appdomain:{ tcp_socket udp_socket } { getattr getopt setopt read write shutdown };
-+allow system_server appdomain:{ fifo_file unix_stream_socket } { getattr read write };
-+
-+# BackupManagerService needs to manipulate backup data files
-+allow system_server cache_backup_file:dir rw_dir_perms;
-+allow system_server cache_backup_file:file create_file_perms;
-+# LocalTransport works inside /cache/backup
-+allow system_server cache_private_backup_file:dir create_dir_perms;
-+allow system_server cache_private_backup_file:file create_file_perms;
-+
-+# Allow system to talk to usb device
-+allow system_server usb_device:chr_file rw_file_perms;
-+allow system_server usb_device:dir r_dir_perms;
-+
-+# Read from HW RNG (needed by EntropyMixer).
-+allow system_server hw_random_device:chr_file r_file_perms;
-+
-+# Read and delete files under /dev/fscklogs.
-+r_dir_file(system_server, fscklogs)
-+allow system_server fscklogs:dir { write remove_name };
-+allow system_server fscklogs:file unlink;
-+
-+# logd access, system_server inherit logd write socket
-+# (urge is to deprecate this long term)
-+allow system_server zygote:unix_dgram_socket write;
-+
-+# Read from log daemon.
-+read_logd(system_server)
-+read_runtime_log_tags(system_server)
-+
-+# Be consistent with DAC permissions. Allow system_server to write to
-+# /sys/module/lowmemorykiller/parameters/adj
-+# /sys/module/lowmemorykiller/parameters/minfree
-+allow system_server sysfs_lowmemorykiller:file { getattr w_file_perms };
-+
-+# Read /sys/fs/pstore/console-ramoops
-+# Don't worry about overly broad permissions for now, as there's
-+# only one file in /sys/fs/pstore
-+allow system_server pstorefs:dir r_dir_perms;
-+allow system_server pstorefs:file r_file_perms;
-+
-+# /sys access
-+allow system_server sysfs_zram:dir search;
-+allow system_server sysfs_zram:file r_file_perms;
-+
-+add_service(system_server, system_server_service);
-+allow system_server audioserver_service:service_manager find;
-+allow system_server batteryproperties_service:service_manager find;
-+allow system_server cameraserver_service:service_manager find;
-+allow system_server drmserver_service:service_manager find;
-+allow system_server dumpstate_service:service_manager find;
-+allow system_server fingerprintd_service:service_manager find;
-+allow system_server hal_fingerprint_service:service_manager find;
-+allow system_server gatekeeper_service:service_manager find;
-+allow system_server incident_service:service_manager find;
-+allow system_server installd_service:service_manager find;
-+allow system_server keystore_service:service_manager find;
-+allow system_server mediaserver_service:service_manager find;
-+allow system_server mediametrics_service:service_manager find;
-+allow system_server mediaextractor_service:service_manager find;
-+allow system_server mediacodec_service:service_manager find;
-+allow system_server mediadrmserver_service:service_manager find;
-+allow system_server netd_service:service_manager find;
-+allow system_server nfc_service:service_manager find;
-+allow system_server radio_service:service_manager find;
-+allow system_server stats_service:service_manager find;
-+allow system_server storaged_service:service_manager find;
-+allow system_server surfaceflinger_service:service_manager find;
-+allow system_server vold_service:service_manager find;
-+allow system_server wificond_service:service_manager find;
-+
-+add_service(system_server, batteryproperties_service)
-+
-+allow system_server keystore:keystore_key {
-+	get_state
-+	get
-+	insert
-+	delete
-+	exist
-+	list
-+	reset
-+	password
-+	lock
-+	unlock
-+	is_empty
-+	sign
-+	verify
-+	grant
-+	duplicate
-+	clear_uid
-+	add_auth
-+	user_changed
-+};
-+
-+# Allow system server to search and write to the persistent factory reset
-+# protection partition. This block device does not get wiped in a factory reset.
-+allow system_server block_device:dir search;
-+allow system_server frp_block_device:blk_file rw_file_perms;
-+
-+# Clean up old cgroups
-+allow system_server cgroup:dir { remove_name rmdir };
-+
-+# /oem access
-+r_dir_file(system_server, oemfs)
-+
-+# Allow resolving per-user storage symlinks
-+allow system_server { mnt_user_file storage_file }:dir { getattr search };
-+allow system_server { mnt_user_file storage_file }:lnk_file { getattr read };
-+
-+# Allow statfs() on storage devices, which happens fast enough that
-+# we shouldn't be killed during unsafe removal
-+allow system_server sdcard_type:dir { getattr search };
-+
-+# Traverse into expanded storage
-+allow system_server mnt_expand_file:dir r_dir_perms;
-+
-+# Allow system process to relabel the fingerprint directory after mkdir
-+# and delete the directory and files when no longer needed
-+allow system_server fingerprintd_data_file:dir { r_dir_perms remove_name rmdir relabelto write };
-+allow system_server fingerprintd_data_file:file { getattr unlink };
-+
-+# Allow system process to read network MAC address
-+allow system_server sysfs_mac_address:file r_file_perms;
-+
-+userdebug_or_eng(`
-+  # Allow system server to create and write method traces in /data/misc/trace.
-+  allow system_server method_trace_data_file:dir w_dir_perms;
-+  allow system_server method_trace_data_file:file { create w_file_perms };
-+
-+  # Allow system server to read dmesg
-+  allow system_server kernel:system syslog_read;
-+
-+  # Allow writing and removing window traces in /data/misc/wmtrace.
-+  allow system_server wm_trace_data_file:dir rw_dir_perms;
-+  allow system_server wm_trace_data_file:file { getattr setattr create unlink w_file_perms };
-+')
-+
-+# For AppFuse.
-+allow system_server vold:fd use;
-+allow system_server fuse_device:chr_file { read write ioctl getattr };
-+allow system_server app_fuse_file:dir rw_dir_perms;
-+allow system_server app_fuse_file:file { read write open getattr append };
-+
-+# For configuring sdcardfs
-+allow system_server configfs:dir { create_dir_perms };
-+allow system_server configfs:file { getattr open create unlink write };
-+
-+# Connect to adbd and use a socket transferred from it.
-+# Used for e.g. jdwp.
-+allow system_server adbd:unix_stream_socket connectto;
-+allow system_server adbd:fd use;
-+allow system_server adbd:unix_stream_socket { getattr getopt ioctl read write shutdown };
-+
-+# Allow invoking tools like "timeout"
-+allow system_server toolbox_exec:file rx_file_perms;
-+
-+# Postinstall
-+#
-+# For OTA dexopt, allow calls coming from postinstall.
-+binder_call(system_server, postinstall)
-+
-+allow system_server postinstall:fifo_file write;
-+allow system_server update_engine:fd use;
-+allow system_server update_engine:fifo_file write;
-+
-+# Access to /data/preloads
-+allow system_server preloads_data_file:file { r_file_perms unlink };
-+allow system_server preloads_data_file:dir { r_dir_perms write remove_name rmdir };
-+allow system_server preloads_media_file:file { r_file_perms unlink };
-+allow system_server preloads_media_file:dir { r_dir_perms write remove_name rmdir };
-+
-+r_dir_file(system_server, cgroup)
-+allow system_server ion_device:chr_file r_file_perms;
-+
-+r_dir_file(system_server, proc_asound)
-+r_dir_file(system_server, proc_net)
-+r_dir_file(system_server, proc_qtaguid_stat)
-+allow system_server {
-+  proc_loadavg
-+  proc_meminfo
-+  proc_pagetypeinfo
-+  proc_pipe_conf
-+  proc_stat
-+  proc_uid_cputime_showstat
-+  proc_uid_time_in_state
-+  proc_uid_concurrent_active_time
-+  proc_uid_concurrent_policy_time
-+  proc_version
-+  proc_vmallocinfo
-+}:file r_file_perms;
-+
-+allow system_server proc_uid_time_in_state:dir r_dir_perms;
-+allow system_server proc_uid_cpupower:file r_file_perms;
-+
-+r_dir_file(system_server, rootfs)
-+
-+# Allow WifiService to start, stop, and read wifi-specific trace events.
-+allow system_server debugfs_tracing_instances:dir search;
-+allow system_server debugfs_wifi_tracing:dir search;
-+allow system_server debugfs_wifi_tracing:file rw_file_perms;
-+
-+# allow system_server to exec shell, asanwrapper & zygote(app_process) on ASAN builds. Needed to run
-+# asanwrapper.
-+with_asan(`
-+  allow system_server shell_exec:file rx_file_perms;
-+  allow system_server asanwrapper_exec:file rx_file_perms;
-+  allow system_server zygote_exec:file rx_file_perms;
-+')
-+
-+# allow system_server to read the eBPF maps that stores the traffic stats information amd clean up
-+# the map after snapshot is recorded
-+allow system_server fs_bpf:dir search;
-+allow system_server fs_bpf:file read;
-+allow system_server netd:bpf map_read;
-+
-+# ART Profiles.
-+# Allow system_server to open profile snapshots for read.
-+# System server never reads the actual content. It passes the descriptor to
-+# to privileged apps which acquire the permissions to inspect the profiles.
-+allow system_server user_profile_data_file:dir { getattr search };
-+allow system_server user_profile_data_file:file { getattr open read };
-+
-+# System server may dump profile data for debuggable apps in the /data/misc/profman.
-+# As such it needs to be able create files but it should never read from them.
-+allow system_server profman_dump_data_file:file { create getattr setattr w_file_perms};
-+allow system_server profman_dump_data_file:dir w_dir_perms;
-+
-+# On userdebug build we may profile system server. Allow it to write and create its own profile.
-+userdebug_or_eng(`
-+  allow system_server user_profile_data_file:file create_file_perms;
-+')
-+
-+userdebug_or_eng(`
-+  # Allow system server to notify mediaextractor of the plugin update.
-+  allow system_server mediaextractor_update_service:service_manager find;
-+')
-+
-+# UsbDeviceManager uses /dev/usb-ffs
-+allow system_server functionfs:dir search;
-+allow system_server functionfs:file rw_file_perms;
-+
-+###
-+### Neverallow rules
-+###
-+### system_server should NEVER do any of this
-+
-+# Do not allow opening files from external storage as unsafe ejection
-+# could cause the kernel to kill the system_server.
-+neverallow system_server sdcard_type:dir { open read write };
-+neverallow system_server sdcard_type:file rw_file_perms;
-+
-+# system server should never be operating on zygote spawned app data
-+# files directly. Rather, they should always be passed via a
-+# file descriptor.
-+# Types extracted from seapp_contexts type= fields, excluding
-+# those types that system_server needs to open directly.
-+neverallow system_server { bluetooth_data_file nfc_data_file shell_data_file app_data_file }:file { open create unlink link };
-+
-+# Forking and execing is inherently dangerous and racy. See, for
-+# example, https://www.linuxprogrammingblog.com/threads-and-fork-think-twice-before-using-them
-+# Prevent the addition of new file execs to stop the problem from
-+# getting worse. b/28035297
-+neverallow system_server {
-+  file_type
-+  -toolbox_exec
-+  -logcat_exec
-+  with_asan(`-shell_exec -asanwrapper_exec -zygote_exec')
-+}:file execute_no_trans;
-+
-+# Ensure that system_server doesn't perform any domain transitions other than
-+# transitioning to the crash_dump domain when a crash occurs.
-+neverallow system_server { domain -crash_dump }:process transition;
-+neverallow system_server *:process dyntransition;
-+
-+# Only allow crash_dump to connect to system_ndebug_socket.
-+neverallow { domain -init -system_server -crash_dump } system_ndebug_socket:sock_file { open write };
-+
-+# system_server should never be executing dex2oat. This is either
-+# a bug (for example, bug 16317188), or represents an attempt by
-+# system server to dynamically load a dex file, something we do not
-+# want to allow.
-+neverallow system_server dex2oat_exec:file no_x_file_perms;
-+
-+# system_server should never execute or load executable shared libraries
-+# in /data
-+neverallow system_server data_file_type:file no_x_file_perms;
-+
-+# The only block device system_server should be accessing is
-+# the frp_block_device. This helps avoid a system_server to root
-+# escalation by writing to raw block devices.
-+neverallow system_server { dev_type -frp_block_device }:blk_file no_rw_file_perms;
-+
-+# system_server should never use JIT functionality
-+neverallow system_server self:process execmem;
-+neverallow system_server ashmem_device:chr_file execute;
-+
-+# TODO: deal with tmpfs_domain pub/priv split properly
-+neverallow system_server system_server_tmpfs:file execute;
-+
-+# dexoptanalyzer is currently used only for secondary dex files which
-+# system_server should never access.
-+neverallow system_server dexoptanalyzer_exec:file no_x_file_perms;
-+
-+# No ptracing others
-+neverallow system_server { domain -system_server }:process ptrace;
-+
-+# CAP_SYS_RESOURCE was traditionally needed for sensitive /proc/PID
-+# file read access. However, that is now unnecessary (b/34951864)
-+neverallow system_server system_server:global_capability_class_set sys_resource;
-diff --git a/prebuilts/api/28.0/private/technical_debt.cil b/prebuilts/api/28.0/private/technical_debt.cil
-new file mode 100644
-index 000000000..7f9d315ed
---- /dev/null
-+++ b/prebuilts/api/28.0/private/technical_debt.cil
-@@ -0,0 +1,38 @@
-+; THIS IS A WORKAROUND for the current limitations of the module policy language
-+; This should be used sparingly until we figure out a saner way to achieve the
-+; stuff below, for example, by improving typeattribute statement of module
-+; language.
-+;
-+; NOTE: This file has no effect on recovery policy.
-+
-+; Apps, except isolated apps, are clients of Allocator HAL
-+; Unfortunately, we can't currently express this in module policy language:
-+;     typeattribute { appdomain -isolated_app } hal_allocator_client;
-+;     typeattribute hal_allocator_client halclientdomain;
-+(typeattributeset hal_allocator_client ((and (appdomain) ((not (isolated_app))))))
-+(typeattributeset halclientdomain (hal_allocator_client))
-+
-+; Apps, except isolated apps, are clients of Configstore HAL
-+; Unfortunately, we can't currently express this in module policy language:
-+;     typeattribute { appdomain -isolated_app } hal_configstore_client;
-+(typeattributeset hal_configstore_client ((and (appdomain) ((not (isolated_app))))))
-+
-+; Apps, except isolated apps, are clients of Graphics Allocator HAL
-+; Unfortunately, we can't currently express this in module policy language:
-+;     typeattribute { appdomain -isolated_app } hal_graphics_allocator_client;
-+(typeattributeset hal_graphics_allocator_client ((and (appdomain) ((not (isolated_app))))))
-+
-+; Apps, except isolated apps, are clients of Cas HAL
-+; Unfortunately, we can't currently express this in module policy language:
-+;     typeattribute { appdomain -isolated_app } hal_cas_client;
-+(typeattributeset hal_cas_client ((and (appdomain) ((not (isolated_app))))))
-+
-+; Domains hosting Camera HAL implementations are clients of Allocator HAL
-+; Unfortunately, we can't currently express this in module policy language:
-+;     typeattribute hal_camera hal_allocator_client;
-+(typeattributeset hal_allocator_client (hal_camera))
-+
-+; Apps, except isolated apps, are clients of Neuralnetworks HAL
-+; Unfortunately, we can't currently express this in module policy language:
-+;     typeattribute { appdomain -isolated_app } hal_neuralnetworks_client;
-+(typeattributeset hal_neuralnetworks_client ((and (appdomain) ((not (isolated_app))))))
-diff --git a/prebuilts/api/28.0/private/thermalserviced.te b/prebuilts/api/28.0/private/thermalserviced.te
-new file mode 100644
-index 000000000..8fa08e066
---- /dev/null
-+++ b/prebuilts/api/28.0/private/thermalserviced.te
-@@ -0,0 +1,3 @@
-+typeattribute thermalserviced coredomain;
-+
-+init_daemon_domain(thermalserviced)
-diff --git a/prebuilts/api/28.0/private/tombstoned.te b/prebuilts/api/28.0/private/tombstoned.te
-new file mode 100644
-index 000000000..305f9d006
---- /dev/null
-+++ b/prebuilts/api/28.0/private/tombstoned.te
-@@ -0,0 +1,3 @@
-+typeattribute tombstoned coredomain;
-+
-+init_daemon_domain(tombstoned)
-diff --git a/prebuilts/api/28.0/private/toolbox.te b/prebuilts/api/28.0/private/toolbox.te
-new file mode 100644
-index 000000000..a2b958dba
---- /dev/null
-+++ b/prebuilts/api/28.0/private/toolbox.te
-@@ -0,0 +1,3 @@
-+typeattribute toolbox coredomain;
-+
-+init_daemon_domain(toolbox)
-diff --git a/prebuilts/api/28.0/private/traced.te b/prebuilts/api/28.0/private/traced.te
-new file mode 100644
-index 000000000..49edc5174
---- /dev/null
-+++ b/prebuilts/api/28.0/private/traced.te
-@@ -0,0 +1,60 @@
-+# Perfetto user-space tracing daemon (unprivileged)
-+type traced, domain, coredomain, mlstrustedsubject;
-+type traced_exec, exec_type, file_type;
-+
-+# Allow init to exec the daemon.
-+init_daemon_domain(traced)
-+
-+# Allow apps in other MLS contexts (for multi-user) to access
-+# share memory buffers created by traced.
-+typeattribute traced_tmpfs mlstrustedobject;
-+
-+# Allow traced to start with a lower scheduling class and change
-+# class accordingly to what defined in the config provided by
-+# the privileged process that controls it.
-+allow traced self:global_capability_class_set { sys_nice };
-+
-+# Allow to pass a file descriptor for the output trace from "perfetto" (the
-+# cmdline client) and other shell binaries to traced and let traced write
-+# directly into that (rather than returning the trace contents over the socket).
-+allow traced perfetto:fd use;
-+allow traced shell:fd use;
-+allow traced perfetto_traces_data_file:file { read write };
-+
-+###
-+### Neverallow rules
-+###
-+### traced should NEVER do any of this
-+
-+# Disallow mapping executable memory (execstack and exec are already disallowed
-+# globally in domain.te).
-+neverallow traced self:process execmem;
-+
-+# Block device access.
-+neverallow traced dev_type:blk_file { read write };
-+
-+# ptrace any other process
-+neverallow traced domain:process ptrace;
-+
-+# Disallows access to /data files, still allowing to write to file descriptors
-+# passed through the socket.
-+neverallow traced {
-+  data_file_type
-+  -system_data_file
-+  # TODO(b/72998741) Remove vendor_data_file exemption. Further restricted in a
-+  # subsequent neverallow. Currently only getattr and search are allowed.
-+  -vendor_data_file
-+  -zoneinfo_data_file
-+}:dir *;
-+neverallow traced { system_data_file }:dir ~{ getattr search };
-+neverallow traced zoneinfo_data_file:dir ~r_dir_perms;
-+neverallow traced { data_file_type -zoneinfo_data_file }:lnk_file *;
-+neverallow traced {
-+  data_file_type
-+  -zoneinfo_data_file
-+  -perfetto_traces_data_file
-+}:file ~write;
-+
-+# Only init is allowed to enter the traced domain via exec()
-+neverallow { domain -init } traced:process transition;
-+neverallow * traced:process dyntransition;
-diff --git a/prebuilts/api/28.0/private/traced_probes.te b/prebuilts/api/28.0/private/traced_probes.te
-new file mode 100644
-index 000000000..e32e2e697
---- /dev/null
-+++ b/prebuilts/api/28.0/private/traced_probes.te
-@@ -0,0 +1,99 @@
-+# Perfetto tracing probes, has tracefs access.
-+type traced_probes_exec, exec_type, file_type;
-+
-+# Allow init to exec the daemon.
-+init_daemon_domain(traced_probes)
-+
-+# Write trace data to the Perfetto traced damon. This requires connecting to its
-+# producer socket and obtaining a (per-process) tmpfs fd.
-+allow traced_probes traced:fd use;
-+allow traced_probes traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(traced_probes, traced_producer, traced)
-+
-+# Allow traced_probes to access tracefs.
-+allow traced_probes debugfs_tracing:dir r_dir_perms;
-+allow traced_probes debugfs_tracing:file rw_file_perms;
-+allow traced_probes debugfs_trace_marker:file getattr;
-+
-+# TODO(primiano): temporarily I/O tracing categories are still
-+# userdebug only until we nail down the denylist/allowlist.
-+userdebug_or_eng(`
-+allow traced_probes debugfs_tracing_debug:file rw_file_perms;
-+')
-+
-+# Allow traced_probes to start with a higher scheduling class and then downgrade
-+# itself.
-+allow traced_probes self:global_capability_class_set { sys_nice };
-+
-+# Allow procfs access
-+r_dir_file(traced_probes, domain)
-+
-+# Allow to log to kernel dmesg when starting / stopping ftrace.
-+allow traced_probes kmsg_device:chr_file write;
-+
-+# Allow traced_probes to list the system partition.
-+allow traced_probes system_file:dir { open read };
-+
-+# Allow traced_probes to list some of the data partition.
-+allow traced_probes self:capability dac_read_search;
-+
-+allow traced_probes apk_data_file:dir { getattr open read search };
-+allow traced_probes dalvikcache_data_file:dir { getattr open read search };
-+userdebug_or_eng(`
-+allow traced_probes system_data_file:dir { getattr open read search };
-+')
-+allow traced_probes system_app_data_file:dir { getattr open read search };
-+allow traced_probes backup_data_file:dir { getattr open read search };
-+allow traced_probes bootstat_data_file:dir { getattr open read search };
-+allow traced_probes update_engine_data_file:dir { getattr open read search };
-+allow traced_probes update_engine_log_data_file:dir { getattr open read search };
-+allow traced_probes user_profile_data_file:dir { getattr open read search };
-+
-+# Allow traced_probes to run atrace. atrace pokes at system services to enable
-+# their userspace TRACE macros.
-+domain_auto_trans(traced_probes, atrace_exec, atrace);
-+
-+# This is needed for: path="/system/bin/linker64"
-+# scontext=u:r:atrace:s0 tcontext=u:r:traced_probes:s0 tclass=fd
-+allow atrace traced_probes:fd use;
-+
-+###
-+### Neverallow rules
-+###
-+### traced_probes should NEVER do any of this
-+
-+# Disallow mapping executable memory (execstack and exec are already disallowed
-+# globally in domain.te).
-+neverallow traced_probes self:process execmem;
-+
-+# Block device access.
-+neverallow traced_probes dev_type:blk_file { read write };
-+
-+# ptrace any other app
-+neverallow traced_probes domain:process ptrace;
-+
-+# Disallows access to /data files.
-+neverallow traced_probes {
-+  data_file_type
-+  -apk_data_file
-+  -dalvikcache_data_file
-+  -system_data_file
-+  -system_app_data_file
-+  -backup_data_file
-+  -bootstat_data_file
-+  -update_engine_data_file
-+  -update_engine_log_data_file
-+  -user_profile_data_file
-+  # TODO(b/72998741) Remove vendor_data_file exemption. Further restricted in a
-+  # subsequent neverallow. Currently only getattr and search are allowed.
-+  -vendor_data_file
-+  -zoneinfo_data_file
-+}:dir *;
-+neverallow traced_probes system_data_file:dir ~{ getattr userdebug_or_eng(`open read') search };
-+neverallow traced_probes zoneinfo_data_file:dir ~r_dir_perms;
-+neverallow traced_probes { data_file_type -zoneinfo_data_file }:lnk_file *;
-+neverallow traced_probes { data_file_type -zoneinfo_data_file }:file *;
-+
-+# Only init is allowed to enter the traced_probes domain via exec()
-+neverallow { domain -init } traced_probes:process transition;
-+neverallow * traced_probes:process dyntransition;
-diff --git a/prebuilts/api/28.0/private/traceur_app.te b/prebuilts/api/28.0/private/traceur_app.te
-new file mode 100644
-index 000000000..a3c435ce5
---- /dev/null
-+++ b/prebuilts/api/28.0/private/traceur_app.te
-@@ -0,0 +1,15 @@
-+typeattribute traceur_app coredomain;
-+
-+app_domain(traceur_app);
-+allow traceur_app debugfs_tracing:file rw_file_perms;
-+allow traceur_app debugfs_tracing_debug:dir r_dir_perms;
-+
-+userdebug_or_eng(`
-+  allow traceur_app debugfs_tracing_debug:file rw_file_perms;
-+')
-+
-+allow traceur_app trace_data_file:file create_file_perms;
-+allow traceur_app trace_data_file:dir rw_dir_perms;
-+allow traceur_app atrace_exec:file rx_file_perms;
-+
-+dontaudit traceur_app debugfs_tracing_debug:file audit_access;
-diff --git a/prebuilts/api/28.0/private/tzdatacheck.te b/prebuilts/api/28.0/private/tzdatacheck.te
-new file mode 100644
-index 000000000..502735cad
---- /dev/null
-+++ b/prebuilts/api/28.0/private/tzdatacheck.te
-@@ -0,0 +1,3 @@
-+typeattribute tzdatacheck coredomain;
-+
-+init_daemon_domain(tzdatacheck)
-diff --git a/prebuilts/api/28.0/private/ueventd.te b/prebuilts/api/28.0/private/ueventd.te
-new file mode 100644
-index 000000000..1bd67735e
---- /dev/null
-+++ b/prebuilts/api/28.0/private/ueventd.te
-@@ -0,0 +1,3 @@
-+typeattribute ueventd coredomain;
-+
-+tmpfs_domain(ueventd)
-diff --git a/prebuilts/api/28.0/private/uncrypt.te b/prebuilts/api/28.0/private/uncrypt.te
-new file mode 100644
-index 000000000..e4e9224d9
---- /dev/null
-+++ b/prebuilts/api/28.0/private/uncrypt.te
-@@ -0,0 +1,3 @@
-+typeattribute uncrypt coredomain;
-+
-+init_daemon_domain(uncrypt)
-diff --git a/prebuilts/api/28.0/private/untrusted_app.te b/prebuilts/api/28.0/private/untrusted_app.te
-new file mode 100644
-index 000000000..c15fa2244
---- /dev/null
-+++ b/prebuilts/api/28.0/private/untrusted_app.te
-@@ -0,0 +1,25 @@
-+###
-+### Untrusted apps.
-+###
-+### This file defines the rules for untrusted apps.
-+### Apps are labeled based on mac_permissions.xml (maps signer and
-+### optionally package name to seinfo value) and seapp_contexts (maps UID
-+### and optionally seinfo value to domain for process and type for data
-+### directory).  The untrusted_app domain is the default assignment in
-+### seapp_contexts for any app with UID between APP_AID (10000)
-+### and AID_ISOLATED_START (99000) if the app has no specific seinfo
-+### value as determined from mac_permissions.xml.  In current AOSP, this
-+### domain is assigned to all non-system apps as well as to any system apps
-+### that are not signed by the platform key.  To move
-+### a system app into a specific domain, add a signer entry for it to
-+### mac_permissions.xml and assign it one of the pre-existing seinfo values
-+### or define and use a new seinfo value in both mac_permissions.xml and
-+### seapp_contexts.
-+###
-+
-+typeattribute untrusted_app coredomain;
-+
-+app_domain(untrusted_app)
-+untrusted_app_domain(untrusted_app)
-+net_domain(untrusted_app)
-+bluetooth_domain(untrusted_app)
-diff --git a/prebuilts/api/28.0/private/untrusted_app_25.te b/prebuilts/api/28.0/private/untrusted_app_25.te
-new file mode 100644
-index 000000000..ba2c1e1c7
---- /dev/null
-+++ b/prebuilts/api/28.0/private/untrusted_app_25.te
-@@ -0,0 +1,42 @@
-+###
-+### Untrusted_app_25
-+###
-+### This file defines the rules for untrusted apps running with
-+### targetSdkVersion <= 25.
-+###
-+### Apps are labeled based on mac_permissions.xml (maps signer and
-+### optionally package name to seinfo value) and seapp_contexts (maps UID
-+### and optionally seinfo value to domain for process and type for data
-+### directory).  The untrusted_app domain is the default assignment in
-+### seapp_contexts for any app with UID between APP_AID (10000)
-+### and AID_ISOLATED_START (99000) if the app has no specific seinfo
-+### value as determined from mac_permissions.xml.  In current AOSP, this
-+### domain is assigned to all non-system apps as well as to any system apps
-+### that are not signed by the platform key.  To move
-+### a system app into a specific domain, add a signer entry for it to
-+### mac_permissions.xml and assign it one of the pre-existing seinfo values
-+### or define and use a new seinfo value in both mac_permissions.xml and
-+### seapp_contexts.
-+###
-+
-+typeattribute untrusted_app_25 coredomain;
-+
-+app_domain(untrusted_app_25)
-+untrusted_app_domain(untrusted_app_25)
-+net_domain(untrusted_app_25)
-+bluetooth_domain(untrusted_app_25)
-+
-+# b/34115651 - net.dns* properties read
-+# This will go away in a future Android release
-+get_prop(untrusted_app_25, net_dns_prop)
-+
-+# b/35917228 - /proc/misc access
-+# This will go away in a future Android release
-+allow untrusted_app_25 proc_misc:file r_file_perms;
-+
-+# Access to /proc/tty/drivers, to allow apps to determine if they
-+# are running in an emulated environment.
-+# b/33214085 b/33814662 b/33791054 b/33211769
-+# https://github.com/strazzere/anti-emulator/blob/master/AntiEmulator/src/diff/strazzere/anti/emulator/FindEmulator.java
-+# This will go away in a future Android release
-+allow untrusted_app_25 proc_tty_drivers:file r_file_perms;
-diff --git a/prebuilts/api/28.0/private/untrusted_app_27.te b/prebuilts/api/28.0/private/untrusted_app_27.te
-new file mode 100644
-index 000000000..79c776287
---- /dev/null
-+++ b/prebuilts/api/28.0/private/untrusted_app_27.te
-@@ -0,0 +1,28 @@
-+###
-+### Untrusted_27.
-+###
-+### This file defines the rules for untrusted apps running with
-+### 25 < targetSdkVersion <= 27.
-+###
-+### This file defines the rules for untrusted apps.
-+### Apps are labeled based on mac_permissions.xml (maps signer and
-+### optionally package name to seinfo value) and seapp_contexts (maps UID
-+### and optionally seinfo value to domain for process and type for data
-+### directory).  The untrusted_app_27 domain is the default assignment in
-+### seapp_contexts for any app with UID between APP_AID (10000)
-+### and AID_ISOLATED_START (99000) if the app has no specific seinfo
-+### value as determined from mac_permissions.xml.  In current AOSP, this
-+### domain is assigned to all non-system apps as well as to any system apps
-+### that are not signed by the platform key.  To move
-+### a system app into a specific domain, add a signer entry for it to
-+### mac_permissions.xml and assign it one of the pre-existing seinfo values
-+### or define and use a new seinfo value in both mac_permissions.xml and
-+### seapp_contexts.
-+###
-+
-+typeattribute untrusted_app_27 coredomain;
-+
-+app_domain(untrusted_app_27)
-+untrusted_app_domain(untrusted_app_27)
-+net_domain(untrusted_app_27)
-+bluetooth_domain(untrusted_app_27)
-diff --git a/prebuilts/api/28.0/private/untrusted_app_all.te b/prebuilts/api/28.0/private/untrusted_app_all.te
-new file mode 100644
-index 000000000..6cf166827
---- /dev/null
-+++ b/prebuilts/api/28.0/private/untrusted_app_all.te
-@@ -0,0 +1,140 @@
-+###
-+### Untrusted_app_all.
-+###
-+### This file defines the rules shared by all untrusted app domains except
-+### apps which target the v2 security sandbox (ephemeral_app for instant apps,
-+### untrusted_v2_app for fully installed v2 apps).
-+### Apps are labeled based on mac_permissions.xml (maps signer and
-+### optionally package name to seinfo value) and seapp_contexts (maps UID
-+### and optionally seinfo value to domain for process and type for data
-+### directory).  The untrusted_app_all attribute is assigned to all default
-+### seapp_contexts for any app with UID between APP_AID (10000)
-+### and AID_ISOLATED_START (99000) if the app has no specific seinfo
-+### value as determined from mac_permissions.xml.  In current AOSP, this
-+### attribute is assigned to all non-system apps as well as to any system apps
-+### that are not signed by the platform key.  To move
-+### a system app into a specific domain, add a signer entry for it to
-+### mac_permissions.xml and assign it one of the pre-existing seinfo values
-+### or define and use a new seinfo value in both mac_permissions.xml and
-+### seapp_contexts.
-+###
-+### Note that rules that should apply to all untrusted apps must be in app.te or also
-+### added to untrusted_v2_app.te and ephemeral_app.te.
-+
-+# Legacy text relocations
-+allow untrusted_app_all apk_data_file:file execmod;
-+
-+# Some apps ship with shared libraries and binaries that they write out
-+# to their sandbox directory and then execute.
-+allow untrusted_app_all app_data_file:file { rx_file_perms execmod };
-+
-+# ASEC
-+allow untrusted_app_all asec_apk_file:file r_file_perms;
-+allow untrusted_app_all asec_apk_file:dir r_dir_perms;
-+# Execute libs in asec containers.
-+allow untrusted_app_all asec_public_file:file { execute execmod };
-+
-+# Used by Finsky / Android "Verify Apps" functionality when
-+# running "adb install foo.apk".
-+# TODO: Long term, we don't want apps probing into shell data files.
-+# Figure out a way to remove these rules.
-+allow untrusted_app_all shell_data_file:file r_file_perms;
-+allow untrusted_app_all shell_data_file:dir r_dir_perms;
-+
-+# Allow traceur to pass file descriptors through a content provider to untrusted apps
-+# for the purpose of sharing files through e.g. gmail
-+allow untrusted_app_all trace_data_file:file { getattr read };
-+
-+# untrusted apps should not be able to open trace data files, they should depend
-+# upon traceur to pass a file descriptor
-+neverallow untrusted_app_all trace_data_file:dir *;
-+neverallow untrusted_app_all trace_data_file:file { no_w_file_perms open };
-+
-+# Allow to read staged apks.
-+allow untrusted_app_all { apk_tmp_file apk_private_tmp_file }:file {read getattr};
-+
-+# Read and write system app data files passed over Binder.
-+# Motivating case was /data/data/com.android.settings/cache/*.jpg for
-+# cropping or taking user photos.
-+allow untrusted_app_all system_app_data_file:file { read write getattr };
-+
-+#
-+# Rules migrated from old app domains coalesced into untrusted_app.
-+# This includes what used to be media_app, shared_app, and release_app.
-+#
-+
-+# Access to /data/media.
-+allow untrusted_app_all media_rw_data_file:dir create_dir_perms;
-+allow untrusted_app_all media_rw_data_file:file create_file_perms;
-+
-+# Traverse into /mnt/media_rw for bypassing FUSE daemon
-+# TODO: narrow this to just MediaProvider
-+allow untrusted_app_all mnt_media_rw_file:dir search;
-+
-+# allow cts to query all services
-+allow untrusted_app_all servicemanager:service_manager list;
-+
-+allow untrusted_app_all audioserver_service:service_manager find;
-+allow untrusted_app_all cameraserver_service:service_manager find;
-+allow untrusted_app_all drmserver_service:service_manager find;
-+allow untrusted_app_all mediaserver_service:service_manager find;
-+allow untrusted_app_all mediaextractor_service:service_manager find;
-+allow untrusted_app_all mediacodec_service:service_manager find;
-+allow untrusted_app_all mediametrics_service:service_manager find;
-+allow untrusted_app_all mediadrmserver_service:service_manager find;
-+allow untrusted_app_all nfc_service:service_manager find;
-+allow untrusted_app_all radio_service:service_manager find;
-+allow untrusted_app_all app_api_service:service_manager find;
-+allow untrusted_app_all vr_manager_service:service_manager find;
-+
-+# Allow GMS core to access perfprofd output, which is stored
-+# in /data/misc/perfprofd/. GMS core will need to list all
-+# data stored in that directory to process them one by one.
-+userdebug_or_eng(`
-+  allow untrusted_app_all perfprofd_data_file:file r_file_perms;
-+  allow untrusted_app_all perfprofd_data_file:dir r_dir_perms;
-+')
-+
-+# gdbserver for ndk-gdb ptrace attaches to app process.
-+allow untrusted_app_all self:process ptrace;
-+
-+# Cts: HwRngTest
-+allow untrusted_app_all sysfs_hwrandom:dir search;
-+allow untrusted_app_all sysfs_hwrandom:file r_file_perms;
-+
-+# Allow apps to view preloaded media content
-+allow untrusted_app_all preloads_media_file:dir r_dir_perms;
-+allow untrusted_app_all preloads_media_file:file r_file_perms;
-+allow untrusted_app_all preloads_data_file:dir search;
-+
-+# Allow untrusted apps read / execute access to /vendor/app for there can
-+# be pre-installed vendor apps that package a library within themselves.
-+# TODO (b/37784178) Consider creating  a special type for /vendor/app installed
-+# apps.
-+allow untrusted_app_all vendor_app_file:dir { open getattr read search };
-+allow untrusted_app_all vendor_app_file:file { open getattr read execute };
-+allow untrusted_app_all vendor_app_file:lnk_file { open getattr read };
-+
-+# Write app-specific trace data to the Perfetto traced damon. This requires
-+# connecting to its producer socket and obtaining a (per-process) tmpfs fd.
-+allow untrusted_app_all traced:fd use;
-+allow untrusted_app_all traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(untrusted_app_all, traced_producer, traced)
-+
-+# allow untrusted apps to use UDP sockets provided by the system server but not
-+# modify them other than to connect
-+allow untrusted_app_all system_server:udp_socket {
-+        connect getattr read recvfrom sendto write getopt setopt };
-+
-+# Allow the allocation and use of ptys
-+# Used by: https://play.google.com/store/apps/details?id=jackpal.androidterm
-+create_pty(untrusted_app_all)
-+
-+# This is allowed for targetSdkVersion <= 25 but disallowed on newer versions.
-+dontaudit untrusted_app_all net_dns_prop:file read;
-+
-+# These have been disallowed since Android O.
-+# For P, we assume that apps are safely handling the denial.
-+dontaudit untrusted_app_all proc_stat:file read;
-+dontaudit untrusted_app_all proc_vmstat:file read;
-+dontaudit untrusted_app_all proc_uptime:file read;
-diff --git a/prebuilts/api/28.0/private/untrusted_v2_app.te b/prebuilts/api/28.0/private/untrusted_v2_app.te
-new file mode 100644
-index 000000000..8f4bceb2c
---- /dev/null
-+++ b/prebuilts/api/28.0/private/untrusted_v2_app.te
-@@ -0,0 +1,47 @@
-+###
-+### Untrusted v2 sandbox apps.
-+###
-+
-+typeattribute untrusted_v2_app coredomain;
-+
-+app_domain(untrusted_v2_app)
-+net_domain(untrusted_v2_app)
-+bluetooth_domain(untrusted_v2_app)
-+
-+# Read and write system app data files passed over Binder.
-+# Motivating case was /data/data/com.android.settings/cache/*.jpg for
-+# cropping or taking user photos.
-+allow untrusted_v2_app system_app_data_file:file { read write getattr };
-+
-+# Access to /data/media.
-+allow untrusted_v2_app media_rw_data_file:dir create_dir_perms;
-+allow untrusted_v2_app media_rw_data_file:file create_file_perms;
-+
-+# Traverse into /mnt/media_rw for bypassing FUSE daemon
-+# TODO: narrow this to just MediaProvider
-+allow untrusted_v2_app mnt_media_rw_file:dir search;
-+
-+# allow cts to query all services
-+allow untrusted_v2_app servicemanager:service_manager list;
-+
-+allow untrusted_v2_app audioserver_service:service_manager find;
-+allow untrusted_v2_app cameraserver_service:service_manager find;
-+allow untrusted_v2_app drmserver_service:service_manager find;
-+allow untrusted_v2_app mediaserver_service:service_manager find;
-+allow untrusted_v2_app mediaextractor_service:service_manager find;
-+allow untrusted_v2_app mediacodec_service:service_manager find;
-+allow untrusted_v2_app mediametrics_service:service_manager find;
-+allow untrusted_v2_app mediadrmserver_service:service_manager find;
-+allow untrusted_v2_app nfc_service:service_manager find;
-+allow untrusted_v2_app radio_service:service_manager find;
-+# TODO: potentially provide a tighter list of services here
-+allow untrusted_v2_app app_api_service:service_manager find;
-+
-+# gdbserver for ndk-gdb ptrace attaches to app process.
-+allow untrusted_v2_app self:process ptrace;
-+
-+# Write app-specific trace data to the Perfetto traced damon. This requires
-+# connecting to its producer socket and obtaining a (per-process) tmpfs fd.
-+allow untrusted_v2_app traced:fd use;
-+allow untrusted_v2_app traced_tmpfs:file { read write getattr map };
-+unix_socket_connect(untrusted_v2_app, traced_producer, traced)
-diff --git a/prebuilts/api/28.0/private/update_engine.te b/prebuilts/api/28.0/private/update_engine.te
-new file mode 100644
-index 000000000..5af7db681
---- /dev/null
-+++ b/prebuilts/api/28.0/private/update_engine.te
-@@ -0,0 +1,3 @@
-+typeattribute update_engine coredomain;
-+
-+init_daemon_domain(update_engine);
-diff --git a/prebuilts/api/28.0/private/update_engine_common.te b/prebuilts/api/28.0/private/update_engine_common.te
-new file mode 100644
-index 000000000..a7fb58471
---- /dev/null
-+++ b/prebuilts/api/28.0/private/update_engine_common.te
-@@ -0,0 +1,5 @@
-+# type_transition must be private policy the domain_trans rules could stay
-+# public, but conceptually should go with this
-+# The postinstall program is run by update_engine_common and will always be tagged as a
-+# postinstall_file regardless of its attributes in the new system.
-+domain_auto_trans(update_engine_common, postinstall_file, postinstall)
-diff --git a/prebuilts/api/28.0/private/update_verifier.te b/prebuilts/api/28.0/private/update_verifier.te
-new file mode 100644
-index 000000000..1b934d980
---- /dev/null
-+++ b/prebuilts/api/28.0/private/update_verifier.te
-@@ -0,0 +1,3 @@
-+typeattribute update_verifier coredomain;
-+
-+init_daemon_domain(update_verifier)
-diff --git a/prebuilts/api/28.0/private/usbd.te b/prebuilts/api/28.0/private/usbd.te
-new file mode 100644
-index 000000000..13a0ad7a6
---- /dev/null
-+++ b/prebuilts/api/28.0/private/usbd.te
-@@ -0,0 +1,12 @@
-+typeattribute usbd coredomain;
-+
-+init_daemon_domain(usbd)
-+
-+# Access usb gadget hal
-+hal_client_domain(usbd, hal_usb_gadget)
-+
-+# Access persist.sys.usb.config
-+get_prop(usbd, system_prop)
-+
-+# start adbd during boot if adb is enabled
-+set_prop(usbd, ctl_default_prop)
-diff --git a/prebuilts/api/28.0/private/users b/prebuilts/api/28.0/private/users
-new file mode 100644
-index 000000000..51b7b57e6
---- /dev/null
-+++ b/prebuilts/api/28.0/private/users
-@@ -0,0 +1 @@
-+user u roles { r } level s0 range s0 - mls_systemhigh;
-diff --git a/prebuilts/api/28.0/private/vdc.te b/prebuilts/api/28.0/private/vdc.te
-new file mode 100644
-index 000000000..bc7409eee
---- /dev/null
-+++ b/prebuilts/api/28.0/private/vdc.te
-@@ -0,0 +1,3 @@
-+typeattribute vdc coredomain;
-+
-+init_daemon_domain(vdc)
-diff --git a/prebuilts/api/28.0/private/vendor_init.te b/prebuilts/api/28.0/private/vendor_init.te
-new file mode 100644
-index 000000000..50efc22d6
---- /dev/null
-+++ b/prebuilts/api/28.0/private/vendor_init.te
-@@ -0,0 +1,4 @@
-+# Creating files on sysfs is impossible so this isn't a threat
-+# Sometimes we have to write to non-existent files to avoid conditional
-+# init behavior. See b/35303861 for an example.
-+dontaudit vendor_init sysfs:dir write;
-diff --git a/prebuilts/api/28.0/private/virtual_touchpad.te b/prebuilts/api/28.0/private/virtual_touchpad.te
-new file mode 100644
-index 000000000..e735172fe
---- /dev/null
-+++ b/prebuilts/api/28.0/private/virtual_touchpad.te
-@@ -0,0 +1,3 @@
-+typeattribute virtual_touchpad coredomain;
-+
-+init_daemon_domain(virtual_touchpad)
-diff --git a/prebuilts/api/28.0/private/vold.te b/prebuilts/api/28.0/private/vold.te
-new file mode 100644
-index 000000000..a6d1001d1
---- /dev/null
-+++ b/prebuilts/api/28.0/private/vold.te
-@@ -0,0 +1,19 @@
-+typeattribute vold coredomain;
-+
-+init_daemon_domain(vold)
-+
-+# Switch to more restrictive domains when executing common tools
-+domain_auto_trans(vold, sgdisk_exec, sgdisk);
-+domain_auto_trans(vold, sdcardd_exec, sdcardd);
-+
-+# For a handful of probing tools, we choose an even more restrictive
-+# domain when working with untrusted block devices
-+domain_trans(vold, shell_exec, blkid);
-+domain_trans(vold, shell_exec, blkid_untrusted);
-+domain_trans(vold, fsck_exec, fsck);
-+domain_trans(vold, fsck_exec, fsck_untrusted);
-+
-+# Newly created storage dirs are always treated as mount stubs to prevent us
-+# from accidentally writing when the mount point isn't present.
-+type_transition vold storage_file:dir storage_stub_file;
-+type_transition vold mnt_media_rw_file:dir mnt_media_rw_stub_file;
-diff --git a/prebuilts/api/28.0/private/vold_prepare_subdirs.te b/prebuilts/api/28.0/private/vold_prepare_subdirs.te
-new file mode 100644
-index 000000000..0a115584a
---- /dev/null
-+++ b/prebuilts/api/28.0/private/vold_prepare_subdirs.te
-@@ -0,0 +1,26 @@
-+domain_auto_trans(vold, vold_prepare_subdirs_exec, vold_prepare_subdirs)
-+
-+allow vold_prepare_subdirs system_file:file execute_no_trans;
-+allow vold_prepare_subdirs shell_exec:file rx_file_perms;
-+allow vold_prepare_subdirs toolbox_exec:file rx_file_perms;
-+allow vold_prepare_subdirs devpts:chr_file rw_file_perms;
-+allow vold_prepare_subdirs vold:fd use;
-+allow vold_prepare_subdirs vold:fifo_file { read write };
-+allow vold_prepare_subdirs file_contexts_file:file r_file_perms;
-+allow vold_prepare_subdirs self:global_capability_class_set { chown dac_override fowner };
-+allow vold_prepare_subdirs self:process setfscreate;
-+allow vold_prepare_subdirs {
-+  system_data_file
-+  vendor_data_file
-+}:dir { open read write add_name remove_name rmdir relabelfrom };
-+allow vold_prepare_subdirs {
-+    fingerprint_vendor_data_file
-+    storaged_data_file
-+    vold_data_file
-+}:dir { create_dir_perms relabelto };
-+allow vold_prepare_subdirs {
-+    fingerprint_vendor_data_file
-+    storaged_data_file
-+    system_data_file
-+    vold_data_file
-+}:file { getattr unlink };
-diff --git a/prebuilts/api/28.0/private/vr_hwc.te b/prebuilts/api/28.0/private/vr_hwc.te
-new file mode 100644
-index 000000000..053c03d98
---- /dev/null
-+++ b/prebuilts/api/28.0/private/vr_hwc.te
-@@ -0,0 +1,6 @@
-+typeattribute vr_hwc coredomain;
-+
-+# Daemon started by init.
-+init_daemon_domain(vr_hwc)
-+
-+hal_server_domain(vr_hwc, hal_graphics_composer)
-diff --git a/prebuilts/api/28.0/private/wait_for_keymaster.te b/prebuilts/api/28.0/private/wait_for_keymaster.te
-new file mode 100644
-index 000000000..8b8dd2927
---- /dev/null
-+++ b/prebuilts/api/28.0/private/wait_for_keymaster.te
-@@ -0,0 +1,9 @@
-+# wait_for_keymaster service
-+type wait_for_keymaster, domain, coredomain;
-+type wait_for_keymaster_exec, exec_type, file_type;
-+
-+init_daemon_domain(wait_for_keymaster)
-+
-+hal_client_domain(wait_for_keymaster, hal_keymaster)
-+
-+allow wait_for_keymaster kmsg_device:chr_file w_file_perms;
-diff --git a/prebuilts/api/28.0/private/watchdogd.te b/prebuilts/api/28.0/private/watchdogd.te
-new file mode 100644
-index 000000000..36dd30fd7
---- /dev/null
-+++ b/prebuilts/api/28.0/private/watchdogd.te
-@@ -0,0 +1 @@
-+typeattribute watchdogd coredomain;
-diff --git a/prebuilts/api/28.0/private/webview_zygote.te b/prebuilts/api/28.0/private/webview_zygote.te
-new file mode 100644
-index 000000000..55b268a30
---- /dev/null
-+++ b/prebuilts/api/28.0/private/webview_zygote.te
-@@ -0,0 +1,140 @@
-+# webview_zygote is an auxiliary zygote process that is used to spawn
-+# isolated_app processes for rendering untrusted web content.
-+
-+typeattribute webview_zygote coredomain;
-+
-+# The webview_zygote needs to be able to transition domains.
-+typeattribute webview_zygote mlstrustedsubject;
-+
-+# Allow access to temporary files, which is normally permitted through
-+# a domain macro.
-+tmpfs_domain(webview_zygote);
-+
-+# Allow reading/executing installed binaries to enable preloading the
-+# installed WebView implementation.
-+allow webview_zygote apk_data_file:dir r_dir_perms;
-+allow webview_zygote apk_data_file:file { r_file_perms execute };
-+
-+# Access to the WebView relro file.
-+allow webview_zygote shared_relro_file:dir search;
-+allow webview_zygote shared_relro_file:file r_file_perms;
-+
-+# Set the UID/GID of the process.
-+allow webview_zygote self:global_capability_class_set { setgid setuid };
-+# Drop capabilities from bounding set.
-+allow webview_zygote self:global_capability_class_set setpcap;
-+# Switch SELinux context to app domains.
-+allow webview_zygote self:process setcurrent;
-+allow webview_zygote isolated_app:process dyntransition;
-+
-+# For art.
-+allow webview_zygote dalvikcache_data_file:dir r_dir_perms;
-+allow webview_zygote dalvikcache_data_file:lnk_file r_file_perms;
-+allow webview_zygote dalvikcache_data_file:file { r_file_perms execute };
-+
-+# Allow webview_zygote to stat the files that it opens. It must
-+# be able to inspect them so that it can reopen them on fork
-+# if necessary: b/30963384.
-+allow webview_zygote debugfs_trace_marker:file getattr;
-+
-+# Allow webview_zygote to manage the pgroup of its children.
-+allow webview_zygote system_server:process getpgid;
-+
-+# Interaction between the webview_zygote and its children.
-+allow webview_zygote isolated_app:process setpgid;
-+
-+# TODO (b/63631799) fix this access
-+# Suppress denials to storage. Webview zygote should not be accessing.
-+dontaudit webview_zygote mnt_expand_file:dir getattr;
-+
-+# TODO (b/72957399) remove this when webview_zygote is reparented to
-+# app_process zygote
-+dontaudit webview_zygote dex2oat_exec:file execute;
-+
-+# Get seapp_contexts
-+allow webview_zygote seapp_contexts_file:file r_file_perms;
-+# Check validity of SELinux context before use.
-+selinux_check_context(webview_zygote)
-+# Check SELinux permissions.
-+selinux_check_access(webview_zygote)
-+
-+# Directory listing in /system.
-+allow webview_zygote system_file:dir r_dir_perms;
-+
-+# Read system properties managed by zygote.
-+allow webview_zygote zygote_tmpfs:file read;
-+# Child of zygote.
-+allow webview_zygote zygote:fd use;
-+allow webview_zygote zygote:process sigchld;
-+
-+# Allow apps access to /vendor/overlay
-+r_dir_file(webview_zygote, vendor_overlay_file)
-+
-+#####
-+##### Neverallow
-+#####
-+
-+# Only permit transition to isolated_app.
-+neverallow webview_zygote { domain -isolated_app }:process dyntransition;
-+
-+# Only setcon() transitions, no exec() based transitions, except for crash_dump.
-+neverallow webview_zygote { domain -crash_dump }:process transition;
-+
-+# Must not exec() a program without changing domains.
-+# Having said that, exec() above is not allowed.
-+neverallow webview_zygote *:file execute_no_trans;
-+
-+# The only way to enter this domain is for the zygote to fork a new
-+# webview_zygote child.
-+neverallow { domain -zygote } webview_zygote:process dyntransition;
-+
-+# Disallow write access to properties.
-+neverallow webview_zygote property_socket:sock_file write;
-+neverallow webview_zygote property_type:property_service set;
-+
-+# Should not have any access to app data files.
-+neverallow webview_zygote {
-+    app_data_file
-+    system_app_data_file
-+    bluetooth_data_file
-+    nfc_data_file
-+    radio_data_file
-+    shell_data_file
-+}:file { rwx_file_perms };
-+
-+neverallow webview_zygote {
-+    service_manager_type
-+    -activity_service
-+    -webviewupdate_service
-+}:service_manager find;
-+
-+# Isolated apps shouldn't be able to access the driver directly.
-+neverallow webview_zygote gpu_device:chr_file { rwx_file_perms };
-+
-+# Do not allow webview_zygote access to /cache.
-+neverallow webview_zygote cache_file:dir ~{ r_dir_perms };
-+neverallow webview_zygote cache_file:file ~{ read getattr };
-+
-+# Do not allow most socket access. This is socket_class_set, excluding unix_dgram_socket,
-+# unix_stream_socket, and netlink_selinux_socket.
-+neverallow webview_zygote domain:{
-+  socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket
-+  appletalk_socket netlink_route_socket netlink_tcpdiag_socket
-+  netlink_nflog_socket netlink_xfrm_socket netlink_audit_socket
-+  netlink_dnrt_socket netlink_kobject_uevent_socket tun_socket netlink_iscsi_socket
-+  netlink_fib_lookup_socket netlink_connector_socket netlink_netfilter_socket
-+  netlink_generic_socket netlink_scsitransport_socket netlink_rdma_socket netlink_crypto_socket
-+  sctp_socket icmp_socket ax25_socket ipx_socket netrom_socket atmpvc_socket
-+  x25_socket rose_socket decnet_socket atmsvc_socket rds_socket irda_socket
-+  pppox_socket llc_socket can_socket tipc_socket bluetooth_socket iucv_socket
-+  rxrpc_socket isdn_socket phonet_socket ieee802154_socket caif_socket
-+  alg_socket nfc_socket vsock_socket kcm_socket qipcrtr_socket smc_socket
-+} *;
-+
-+# Do not allow access to Bluetooth-related system properties.
-+# neverallow rules for Bluetooth-related data files are listed above.
-+neverallow webview_zygote {
-+  bluetooth_a2dp_offload_prop
-+  bluetooth_prop
-+  exported_bluetooth_prop
-+}:file create_file_perms;
-diff --git a/prebuilts/api/28.0/private/wificond.te b/prebuilts/api/28.0/private/wificond.te
-new file mode 100644
-index 000000000..cc7644745
---- /dev/null
-+++ b/prebuilts/api/28.0/private/wificond.te
-@@ -0,0 +1,4 @@
-+typeattribute wificond coredomain;
-+
-+init_daemon_domain(wificond)
-+hal_client_domain(wificond, hal_wifi_offload)
-diff --git a/prebuilts/api/28.0/private/wpantund.te b/prebuilts/api/28.0/private/wpantund.te
-new file mode 100644
-index 000000000..e91662cb7
---- /dev/null
-+++ b/prebuilts/api/28.0/private/wpantund.te
-@@ -0,0 +1,3 @@
-+typeattribute wpantund coredomain;
-+
-+init_daemon_domain(wpantund)
-diff --git a/prebuilts/api/28.0/private/zygote.te b/prebuilts/api/28.0/private/zygote.te
-new file mode 100644
-index 000000000..2dcbdf1aa
---- /dev/null
-+++ b/prebuilts/api/28.0/private/zygote.te
-@@ -0,0 +1,140 @@
-+# zygote
-+typeattribute zygote coredomain;
-+typeattribute zygote mlstrustedsubject;
-+
-+init_daemon_domain(zygote)
-+
-+read_runtime_log_tags(zygote)
-+
-+# Override DAC on files and switch uid/gid.
-+allow zygote self:global_capability_class_set { dac_override setgid setuid fowner chown };
-+
-+# Drop capabilities from bounding set.
-+allow zygote self:global_capability_class_set setpcap;
-+
-+# Switch SELinux context to app domains.
-+allow zygote self:process setcurrent;
-+allow zygote system_server:process dyntransition;
-+allow zygote appdomain:process dyntransition;
-+allow zygote webview_zygote:process dyntransition;
-+
-+# Allow zygote to read app /proc/pid dirs (b/10455872).
-+allow zygote appdomain:dir { getattr search };
-+allow zygote appdomain:file { r_file_perms };
-+
-+# Move children into the peer process group.
-+allow zygote system_server:process { getpgid setpgid };
-+allow zygote appdomain:process { getpgid setpgid };
-+allow zygote webview_zygote:process { getpgid setpgid };
-+
-+# Read system data.
-+allow zygote system_data_file:dir r_dir_perms;
-+allow zygote system_data_file:file r_file_perms;
-+
-+# Write to /data/dalvik-cache.
-+allow zygote dalvikcache_data_file:dir create_dir_perms;
-+allow zygote dalvikcache_data_file:file create_file_perms;
-+
-+# Create symlinks in /data/dalvik-cache.
-+allow zygote dalvikcache_data_file:lnk_file create_file_perms;
-+
-+# Write to /data/resource-cache.
-+allow zygote resourcecache_data_file:dir rw_dir_perms;
-+allow zygote resourcecache_data_file:file create_file_perms;
-+
-+# When WITH_DEXPREOPT is true, the zygote does not load executable content from
-+# /data/dalvik-cache.
-+allow { zygote with_dexpreopt(`-zygote') } dalvikcache_data_file:file execute;
-+
-+# Execute idmap and dex2oat within zygote's own domain.
-+# TODO:  Should either of these be transitioned to the same domain
-+# used by installd or stay in-domain for zygote?
-+allow zygote idmap_exec:file rx_file_perms;
-+allow zygote dex2oat_exec:file rx_file_perms;
-+
-+# Allow apps access to /vendor/overlay
-+r_dir_file(zygote, vendor_overlay_file)
-+
-+# Control cgroups.
-+allow zygote cgroup:dir create_dir_perms;
-+allow zygote cgroup:{ file lnk_file } r_file_perms;
-+allow zygote self:global_capability_class_set sys_admin;
-+
-+# Allow zygote to stat the files that it opens. The zygote must
-+# be able to inspect them so that it can reopen them on fork
-+# if necessary: b/30963384.
-+allow zygote pmsg_device:chr_file getattr;
-+allow zygote debugfs_trace_marker:file getattr;
-+
-+# Get seapp_contexts
-+allow zygote seapp_contexts_file:file r_file_perms;
-+# Check validity of SELinux context before use.
-+selinux_check_context(zygote)
-+# Check SELinux permissions.
-+selinux_check_access(zygote)
-+
-+# Native bridge functionality requires that zygote replaces
-+# /proc/cpuinfo with /system/lib/<ISA>/cpuinfo using a bind mount
-+allow zygote proc_cpuinfo:file mounton;
-+
-+# Allow remounting rootfs as MS_SLAVE.
-+allow zygote rootfs:dir mounton;
-+allow zygote tmpfs:filesystem { mount unmount };
-+allow zygote fuse:filesystem { unmount };
-+allow zygote sdcardfs:filesystem { unmount };
-+
-+# Allow creating user-specific storage source if started before vold.
-+allow zygote mnt_user_file:dir create_dir_perms;
-+allow zygote mnt_user_file:lnk_file create_file_perms;
-+# Allowed to mount user-specific storage into place
-+allow zygote storage_file:dir { search mounton };
-+
-+# Handle --invoke-with command when launching Zygote with a wrapper command.
-+allow zygote zygote_exec:file rx_file_perms;
-+
-+# Read access to pseudo filesystems.
-+r_dir_file(zygote, proc_net)
-+
-+# Root fs.
-+r_dir_file(zygote, rootfs)
-+
-+# System file accesses.
-+r_dir_file(zygote, system_file)
-+
-+userdebug_or_eng(`
-+  # Allow zygote to create and write method traces in /data/misc/trace.
-+  allow zygote method_trace_data_file:dir w_dir_perms;
-+  allow zygote method_trace_data_file:file { create w_file_perms };
-+')
-+
-+allow zygote ion_device:chr_file r_file_perms;
-+allow zygote tmpfs:dir r_dir_perms;
-+
-+# Let the zygote access overlays so it can initialize the AssetManager.
-+get_prop(zygote, overlay_prop)
-+get_prop(zygote, exported_overlay_prop)
-+
-+###
-+### neverallow rules
-+###
-+
-+# Ensure that all types assigned to app processes are included
-+# in the appdomain attribute, so that all allow and neverallow rules
-+# written on appdomain are applied to all app processes.
-+# This is achieved by ensuring that it is impossible for zygote to
-+# setcon (dyntransition) to any types other than those associated
-+# with appdomain plus system_server and webview_zygote.
-+neverallow zygote ~{ appdomain system_server webview_zygote }:process dyntransition;
-+
-+# Zygote should never execute anything from /data except for /data/dalvik-cache files.
-+neverallow zygote {
-+  data_file_type
-+  -dalvikcache_data_file # map PROT_EXEC
-+}:file no_x_file_perms;
-+
-+# Do not allow access to Bluetooth-related system properties and files
-+neverallow zygote {
-+  bluetooth_a2dp_offload_prop
-+  bluetooth_prop
-+  exported_bluetooth_prop
-+}:file create_file_perms;
-diff --git a/prebuilts/api/28.0/public/adbd.te b/prebuilts/api/28.0/public/adbd.te
-new file mode 100644
-index 000000000..95854c01e
---- /dev/null
-+++ b/prebuilts/api/28.0/public/adbd.te
-@@ -0,0 +1,4 @@
-+# adbd seclabel is specified in init.rc since
-+# it lives in the rootfs and has no unique file type.
-+type adbd, domain;
-+type adbd_exec, exec_type, file_type;
-diff --git a/prebuilts/api/28.0/public/app.te b/prebuilts/api/28.0/public/app.te
-new file mode 100644
-index 000000000..55308da51
---- /dev/null
-+++ b/prebuilts/api/28.0/public/app.te
-@@ -0,0 +1,572 @@
-+###
-+### Domain for all zygote spawned apps
-+###
-+### This file is the base policy for all zygote spawned apps.
-+### Other policy files, such as isolated_app.te, untrusted_app.te, etc
-+### extend from this policy. Only policies which should apply to ALL
-+### zygote spawned apps should be added here.
-+###
-+
-+# WebView and other application-specific JIT compilers
-+allow appdomain self:process execmem;
-+
-+allow appdomain ashmem_device:chr_file execute;
-+
-+# Receive and use open file descriptors inherited from zygote.
-+allow appdomain zygote:fd use;
-+
-+# gdbserver for ndk-gdb reads the zygote.
-+# valgrind needs mmap exec for zygote
-+allow appdomain zygote_exec:file rx_file_perms;
-+
-+# Notify zygote of death;
-+allow appdomain zygote:process sigchld;
-+
-+# Place process into foreground / background
-+allow appdomain cgroup:dir { search write };
-+allow appdomain cgroup:file rw_file_perms;
-+
-+# Read /data/dalvik-cache.
-+allow appdomain dalvikcache_data_file:dir { search getattr };
-+allow appdomain dalvikcache_data_file:file r_file_perms;
-+
-+# Read the /sdcard and /mnt/sdcard symlinks
-+allow { appdomain -isolated_app } rootfs:lnk_file r_file_perms;
-+allow { appdomain -isolated_app } tmpfs:lnk_file r_file_perms;
-+
-+# Search /storage/emulated tmpfs mount.
-+allow appdomain tmpfs:dir r_dir_perms;
-+
-+# Notify zygote of the wrapped process PID when using --invoke-with.
-+allow appdomain zygote:fifo_file write;
-+
-+userdebug_or_eng(`
-+  # Allow apps to create and write method traces in /data/misc/trace.
-+  allow appdomain method_trace_data_file:dir w_dir_perms;
-+  allow appdomain method_trace_data_file:file { create w_file_perms };
-+')
-+
-+# Notify shell and adbd of death when spawned via runas for ndk-gdb.
-+allow appdomain shell:process sigchld;
-+allow appdomain adbd:process sigchld;
-+
-+# child shell or gdbserver pty access for runas.
-+allow appdomain devpts:chr_file { getattr read write ioctl };
-+
-+# Use pipes and sockets provided by system_server via binder or local socket.
-+allow appdomain system_server:fd use;
-+allow appdomain system_server:fifo_file rw_file_perms;
-+allow appdomain system_server:unix_stream_socket { read write setopt getattr getopt shutdown };
-+allow appdomain system_server:tcp_socket { read write getattr getopt shutdown };
-+
-+# Communication with other apps via fifos
-+allow appdomain appdomain:fifo_file rw_file_perms;
-+
-+# Communicate with surfaceflinger.
-+allow appdomain surfaceflinger:unix_stream_socket { read write setopt getattr getopt shutdown };
-+
-+# App sandbox file accesses.
-+allow { appdomain -isolated_app } app_data_file:dir create_dir_perms;
-+allow { appdomain -isolated_app } app_data_file:notdevfile_class_set create_file_perms;
-+
-+# Traverse into expanded storage
-+allow appdomain mnt_expand_file:dir r_dir_perms;
-+
-+# Keychain and user-trusted credentials
-+r_dir_file(appdomain, keychain_data_file)
-+allow appdomain misc_user_data_file:dir r_dir_perms;
-+allow appdomain misc_user_data_file:file r_file_perms;
-+
-+# TextClassifier
-+r_dir_file({ appdomain -isolated_app }, textclassifier_data_file)
-+
-+# Access to OEM provided data and apps
-+allow appdomain oemfs:dir r_dir_perms;
-+allow appdomain oemfs:file rx_file_perms;
-+
-+# Execute the shell or other system executables.
-+allow { appdomain -ephemeral_app -untrusted_v2_app } shell_exec:file rx_file_perms;
-+allow { appdomain -ephemeral_app -untrusted_v2_app } toolbox_exec:file rx_file_perms;
-+allow { appdomain -untrusted_v2_app } system_file:file x_file_perms;
-+not_full_treble(`allow { appdomain -ephemeral_app -untrusted_v2_app } vendor_file:file x_file_perms;')
-+
-+# Renderscript needs the ability to read directories on /system
-+allow appdomain system_file:dir r_dir_perms;
-+allow appdomain system_file:lnk_file { getattr open read };
-+# Renderscript specific permissions to open /system/vendor/lib64.
-+not_full_treble(`
-+    allow appdomain vendor_file_type:dir r_dir_perms;
-+    allow appdomain vendor_file_type:lnk_file { getattr open read };
-+')
-+
-+full_treble_only(`
-+    # For looking up Renderscript vendor drivers
-+    allow { appdomain -isolated_app } vendor_file:dir { open read };
-+')
-+
-+# Allow apps access to /vendor/app except for privileged
-+# apps which cannot be in /vendor.
-+r_dir_file({ appdomain -ephemeral_app -untrusted_v2_app }, vendor_app_file)
-+allow { appdomain -ephemeral_app -untrusted_v2_app } vendor_app_file:file execute;
-+
-+# Allow apps access to /vendor/overlay
-+r_dir_file(appdomain, vendor_overlay_file)
-+
-+# Allow apps access to /vendor/framework
-+# for vendor provided libraries.
-+r_dir_file(appdomain, vendor_framework_file)
-+
-+# Execute dex2oat when apps call dexclassloader
-+allow appdomain dex2oat_exec:file rx_file_perms;
-+
-+# Read/write wallpaper file (opened by system).
-+allow appdomain wallpaper_file:file { getattr read write };
-+
-+# Read/write cached ringtones (opened by system).
-+allow appdomain ringtone_file:file { getattr read write };
-+
-+# Read ShortcutManager icon files (opened by system).
-+allow appdomain shortcut_manager_icons:file { getattr read };
-+
-+# Read icon file (opened by system).
-+allow appdomain icon_file:file { getattr read };
-+
-+# Old stack dumping scheme : append to a global trace file (/data/anr/traces.txt).
-+#
-+# TODO: All of these permissions except for anr_data_file:file append can be
-+# withdrawn once we've switched to the new stack dumping mechanism, see b/32064548
-+# and the rules below.
-+allow appdomain anr_data_file:dir search;
-+allow appdomain anr_data_file:file { open append };
-+
-+# New stack dumping scheme : request an output FD from tombstoned via a unix
-+# domain socket.
-+#
-+# Allow apps to connect and write to the tombstoned java trace socket in
-+# order to dump their traces. Also allow them to append traces to pipes
-+# created by dumptrace. (Also see the rules below where they are given
-+# additional permissions to dumpstate pipes for other aspects of bug report
-+# creation).
-+unix_socket_connect(appdomain, tombstoned_java_trace, tombstoned)
-+allow appdomain tombstoned:fd use;
-+allow appdomain dumpstate:fifo_file append;
-+allow appdomain incidentd:fifo_file append;
-+
-+# Allow apps to send dump information to dumpstate
-+allow appdomain dumpstate:fd use;
-+allow appdomain dumpstate:unix_stream_socket { read write getopt getattr shutdown };
-+allow appdomain dumpstate:fifo_file { write getattr };
-+allow appdomain shell_data_file:file { write getattr };
-+
-+# Allow apps to send dump information to incidentd
-+allow appdomain incidentd:fd use;
-+allow appdomain incidentd:fifo_file { write getattr };
-+
-+# Write profiles /data/misc/profiles
-+allow appdomain user_profile_data_file:dir { search write add_name };
-+allow appdomain user_profile_data_file:file create_file_perms;
-+
-+# Send heap dumps to system_server via an already open file descriptor
-+# % adb shell am set-watch-heap com.android.systemui 1048576
-+# % adb shell dumpsys procstats --start-testing
-+# debuggable builds only.
-+userdebug_or_eng(`
-+  allow appdomain heapdump_data_file:file append;
-+')
-+
-+# Write to /proc/net/xt_qtaguid/ctrl file.
-+allow {
-+    untrusted_app_25
-+    untrusted_app_27
-+    priv_app
-+    system_app
-+    platform_app
-+    shell
-+} qtaguid_proc:file rw_file_perms;
-+r_dir_file({ appdomain -ephemeral_app -isolated_app }, proc_net)
-+# read /proc/net/xt_qtguid/*stat* to per-app network data usage.
-+# Exclude isolated app which may not use network sockets.
-+r_dir_file({
-+    untrusted_app_25
-+    untrusted_app_27
-+    priv_app
-+    system_app
-+    platform_app
-+    shell
-+}, proc_qtaguid_stat)
-+# Everybody can read the xt_qtaguid resource tracking misc dev.
-+# So allow all apps to read from /dev/xt_qtaguid.
-+allow {
-+    untrusted_app_25
-+    untrusted_app_27
-+    priv_app
-+    system_app
-+    platform_app
-+    shell
-+} qtaguid_device:chr_file r_file_perms;
-+
-+# Grant GPU access to all processes started by Zygote.
-+# They need that to render the standard UI.
-+allow { appdomain -isolated_app } gpu_device:chr_file rw_file_perms;
-+
-+# Use the Binder.
-+binder_use(appdomain)
-+# Perform binder IPC to binder services.
-+binder_call(appdomain, binderservicedomain)
-+# Perform binder IPC to other apps.
-+binder_call(appdomain, appdomain)
-+# Perform binder IPC to ephemeral apps.
-+binder_call(appdomain, ephemeral_app)
-+
-+# TODO(b/36375899): Replace this with hal_client_domain once mediacodec is properly attributized
-+# as OMX HAL
-+hwbinder_use({ appdomain  -isolated_app })
-+allow { appdomain -isolated_app } hal_codec2_hwservice:hwservice_manager find;
-+allow { appdomain -isolated_app } hal_omx_hwservice:hwservice_manager find;
-+allow { appdomain -isolated_app } hidl_token_hwservice:hwservice_manager find;
-+
-+# Talk with graphics composer fences
-+allow appdomain hal_graphics_composer:fd use;
-+
-+# Already connected, unnamed sockets being passed over some other IPC
-+# hence no sock_file or connectto permission. This appears to be how
-+# Chrome works, may need to be updated as more apps using isolated services
-+# are examined.
-+allow appdomain appdomain:unix_stream_socket { getopt getattr read write shutdown };
-+
-+# Backup ability for every app. BMS opens and passes the fd
-+# to any app that has backup ability. Hence, no open permissions here.
-+allow appdomain backup_data_file:file { read write getattr };
-+allow appdomain cache_backup_file:file { read write getattr };
-+allow appdomain cache_backup_file:dir getattr;
-+# Backup ability using 'adb backup'
-+allow appdomain system_data_file:lnk_file r_file_perms;
-+allow appdomain system_data_file:file { getattr read };
-+
-+# Allow read/stat of /data/media files passed by Binder or local socket IPC.
-+allow { appdomain -isolated_app } media_rw_data_file:file { read getattr };
-+
-+# Read and write /data/data/com.android.providers.telephony files passed over Binder.
-+allow { appdomain -isolated_app } radio_data_file:file { read write getattr };
-+
-+# Allow access to external storage; we have several visible mount points under /storage
-+# and symlinks to primary storage at places like /storage/sdcard0 and /mnt/user/0/primary
-+allow { appdomain -isolated_app -ephemeral_app } storage_file:dir r_dir_perms;
-+allow { appdomain -isolated_app -ephemeral_app } storage_file:lnk_file r_file_perms;
-+allow { appdomain -isolated_app -ephemeral_app } mnt_user_file:dir r_dir_perms;
-+allow { appdomain -isolated_app -ephemeral_app } mnt_user_file:lnk_file r_file_perms;
-+
-+# Read/write visible storage
-+allow { appdomain -isolated_app -ephemeral_app } sdcard_type:dir create_dir_perms;
-+allow { appdomain -isolated_app -ephemeral_app } sdcard_type:file create_file_perms;
-+# This should be removed if sdcardfs is modified to alter the secontext for its
-+# accesses to the underlying FS.
-+allow { appdomain -isolated_app -ephemeral_app } media_rw_data_file:dir create_dir_perms;
-+allow { appdomain -isolated_app -ephemeral_app } media_rw_data_file:file create_file_perms;
-+
-+# Allow apps to use the USB Accessory interface.
-+# http://developer.android.com/guide/topics/connectivity/usb/accessory.html
-+#
-+# USB devices are first opened by the system server (USBDeviceManagerService)
-+# and the file descriptor is passed to the right Activity via binder.
-+allow { appdomain -isolated_app -ephemeral_app } usb_device:chr_file { read write getattr ioctl };
-+allow { appdomain -isolated_app -ephemeral_app } usbaccessory_device:chr_file { read write getattr };
-+
-+# For art.
-+allow appdomain dalvikcache_data_file:file execute;
-+allow appdomain dalvikcache_data_file:lnk_file r_file_perms;
-+
-+# Allow any app to read shared RELRO files.
-+allow appdomain shared_relro_file:dir search;
-+allow appdomain shared_relro_file:file r_file_perms;
-+
-+# Allow apps to read/execute installed binaries
-+allow appdomain apk_data_file:dir r_dir_perms;
-+allow appdomain apk_data_file:file rx_file_perms;
-+
-+# /data/resource-cache
-+allow appdomain resourcecache_data_file:file r_file_perms;
-+allow appdomain resourcecache_data_file:dir r_dir_perms;
-+
-+# logd access
-+read_logd(appdomain)
-+control_logd({ appdomain -ephemeral_app untrusted_v2_app })
-+# application inherit logd write socket (urge is to deprecate this long term)
-+allow appdomain zygote:unix_dgram_socket write;
-+
-+allow { appdomain -isolated_app -ephemeral_app } keystore:keystore_key { get_state get insert delete exist list sign verify };
-+
-+use_keystore({ appdomain -isolated_app -ephemeral_app })
-+
-+allow appdomain console_device:chr_file { read write };
-+
-+# only allow unprivileged socket ioctl commands
-+allowxperm { appdomain -bluetooth } self:{ rawip_socket tcp_socket udp_socket }
-+  ioctl { unpriv_sock_ioctls unpriv_tty_ioctls };
-+
-+allow { appdomain -isolated_app } ion_device:chr_file rw_file_perms;
-+# TODO is write really necessary ?
-+auditallow { appdomain userdebug_or_eng(`-su') } ion_device:chr_file { write append };
-+
-+# TODO(b/36375899) replace with hal_client_domain for mediacodec (hal_omx)
-+get_prop({ appdomain -isolated_app }, hwservicemanager_prop);
-+
-+# Allow app access to mediacodec (IOMX HAL)
-+binder_call({ appdomain -isolated_app }, mediacodec)
-+
-+# Allow AAudio apps to use shared memory file descriptors from the HAL
-+allow { appdomain -isolated_app } hal_audio:fd use;
-+
-+# Allow app to access shared memory created by camera HAL1
-+allow { appdomain -isolated_app } hal_camera:fd use;
-+
-+# RenderScript always-passthrough HAL
-+allow { appdomain -isolated_app } hal_renderscript_hwservice:hwservice_manager find;
-+
-+# TODO: switch to meminfo service
-+allow appdomain proc_meminfo:file r_file_perms;
-+
-+# For app fuse.
-+allow appdomain app_fuse_file:file { getattr read append write };
-+
-+pdx_client({ appdomain -isolated_app -ephemeral_app }, display_client)
-+pdx_client({ appdomain -isolated_app -ephemeral_app }, display_manager)
-+pdx_client({ appdomain -isolated_app -ephemeral_app }, display_vsync)
-+pdx_client({ appdomain -isolated_app -ephemeral_app }, performance_client)
-+# Apps do not directly open the IPC socket for bufferhubd.
-+pdx_use({ appdomain -isolated_app -ephemeral_app }, bufferhub_client)
-+
-+###
-+### CTS-specific rules
-+###
-+
-+# For cts/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java.
-+# testRunAsHasCorrectCapabilities
-+allow appdomain runas_exec:file getattr;
-+# Others are either allowed elsewhere or not desired.
-+
-+# Apps receive an open tun fd from the framework for
-+# device traffic. Do not allow untrusted app to directly open tun_device
-+allow { appdomain -isolated_app -ephemeral_app } tun_device:chr_file { read write getattr ioctl append };
-+
-+# Connect to adbd and use a socket transferred from it.
-+# This is used for e.g. adb backup/restore.
-+allow appdomain adbd:unix_stream_socket connectto;
-+allow appdomain adbd:fd use;
-+allow appdomain adbd:unix_stream_socket { getattr getopt ioctl read write shutdown };
-+
-+allow appdomain cache_file:dir getattr;
-+
-+# Allow apps to run with asanwrapper.
-+with_asan(`allow appdomain asanwrapper_exec:file rx_file_perms;')
-+
-+###
-+### Neverallow rules
-+###
-+### These are things that Android apps should NEVER be able to do
-+###
-+
-+# Superuser capabilities.
-+# bluetooth requires net_admin and wake_alarm.
-+neverallow { appdomain -bluetooth } self:capability_class_set *;
-+
-+# Block device access.
-+neverallow appdomain dev_type:blk_file { read write };
-+
-+# Access to any of the following character devices.
-+neverallow appdomain {
-+    audio_device
-+    camera_device
-+    dm_device
-+    radio_device
-+    rpmsg_device
-+    video_device
-+}:chr_file { read write };
-+
-+# Note: Try expanding list of app domains in the future.
-+neverallow { untrusted_app isolated_app shell } graphics_device:chr_file { read write };
-+
-+neverallow { appdomain -nfc } nfc_device:chr_file
-+    { read write };
-+neverallow { appdomain -bluetooth } hci_attach_dev:chr_file
-+    { read write };
-+neverallow appdomain tee_device:chr_file { read write };
-+
-+# Privileged netlink socket interfaces.
-+neverallow appdomain
-+    domain:{
-+        netlink_tcpdiag_socket
-+        netlink_nflog_socket
-+        netlink_xfrm_socket
-+        netlink_audit_socket
-+        netlink_dnrt_socket
-+    } *;
-+
-+# These messages are broadcast messages from the kernel to userspace.
-+# Do not allow the writing of netlink messages, which has been a source
-+# of rooting vulns in the past.
-+neverallow appdomain domain:netlink_kobject_uevent_socket { write append };
-+
-+# Sockets under /dev/socket that are not specifically typed.
-+neverallow appdomain socket_device:sock_file write;
-+
-+# Unix domain sockets.
-+neverallow appdomain adbd_socket:sock_file write;
-+neverallow { appdomain -radio } rild_socket:sock_file write;
-+neverallow appdomain zygote_socket:sock_file write;
-+
-+# ptrace access to non-app domains.
-+neverallow appdomain { domain -appdomain }:process ptrace;
-+
-+# Read or write access to /proc/pid entries for any non-app domain.
-+# A different form of hidepid=2 like protections
-+neverallow appdomain { domain -appdomain }:file no_w_file_perms;
-+neverallow { appdomain -shell } { domain -appdomain }:file no_rw_file_perms;
-+
-+# signal access to non-app domains.
-+# sigchld allowed for parent death notification.
-+# signull allowed for kill(pid, 0) existence test.
-+# All others prohibited.
-+neverallow appdomain { domain -appdomain }:process
-+    { sigkill sigstop signal };
-+
-+# Transition to a non-app domain.
-+# Exception for the shell and su domains, can transition to runas, etc.
-+# Exception for crash_dump.
-+neverallow { appdomain -shell userdebug_or_eng(`-su') } { domain -appdomain -crash_dump }:process
-+    { transition };
-+neverallow { appdomain -shell userdebug_or_eng(`-su') } { domain -appdomain }:process
-+    { dyntransition };
-+
-+# Write to rootfs.
-+neverallow appdomain rootfs:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+
-+# Write to /system.
-+neverallow appdomain system_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+
-+# Write to entrypoint executables.
-+neverallow appdomain exec_type:file
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+
-+# Write to system-owned parts of /data.
-+# This is the default type for anything under /data not otherwise
-+# specified in file_contexts.  Define a different type for portions
-+# that should be writable by apps.
-+neverallow appdomain system_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+
-+# Write to various other parts of /data.
-+neverallow appdomain drm_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow { appdomain -platform_app }
-+    apk_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow { appdomain -platform_app }
-+    apk_tmp_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow { appdomain -platform_app }
-+    apk_private_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow { appdomain -platform_app }
-+    apk_private_tmp_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow { appdomain -shell }
-+    shell_data_file:dir_file_class_set
-+    { create setattr relabelfrom relabelto append unlink link rename };
-+neverallow { appdomain -bluetooth }
-+    bluetooth_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow appdomain
-+    keystore_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow appdomain
-+    systemkeys_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow appdomain
-+    wifi_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+neverallow appdomain
-+    dhcp_data_file:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+
-+# access tmp apk files
-+neverallow { appdomain -untrusted_app_all -platform_app -priv_app }
-+    { apk_tmp_file apk_private_tmp_file }:dir_file_class_set *;
-+
-+neverallow untrusted_app_all { apk_tmp_file apk_private_tmp_file }:{ devfile_class_set dir fifo_file lnk_file sock_file } *;
-+neverallow untrusted_app_all { apk_tmp_file apk_private_tmp_file }:file ~{ getattr read };
-+
-+# Access to factory files.
-+neverallow appdomain efs_file:dir_file_class_set write;
-+neverallow { appdomain -shell } efs_file:dir_file_class_set read;
-+
-+# Write to various pseudo file systems.
-+neverallow { appdomain -bluetooth -nfc }
-+    sysfs:dir_file_class_set write;
-+neverallow appdomain
-+    proc:dir_file_class_set write;
-+
-+# Access to syslog(2) or /proc/kmsg.
-+neverallow appdomain kernel:system { syslog_read syslog_mod syslog_console };
-+
-+# SELinux is not an API for apps to use
-+neverallow { appdomain -shell } *:security { compute_av check_context };
-+neverallow { appdomain -shell } *:netlink_selinux_socket *;
-+
-+# Ability to perform any filesystem operation other than statfs(2).
-+# i.e. no mount(2), unmount(2), etc.
-+neverallow appdomain fs_type:filesystem ~getattr;
-+
-+# prevent creation/manipulation of globally readable symlinks
-+neverallow appdomain {
-+  apk_data_file
-+  cache_file
-+  cache_recovery_file
-+  dev_type
-+  rootfs
-+  system_file
-+  tmpfs
-+}:lnk_file no_w_file_perms;
-+
-+# Denylist app domains not allowed to execute from /data
-+neverallow {
-+  bluetooth
-+  isolated_app
-+  nfc
-+  radio
-+  shared_relro
-+  system_app
-+} {
-+  data_file_type
-+  -dalvikcache_data_file
-+  -system_data_file # shared libs in apks
-+  -apk_data_file
-+}:file no_x_file_perms;
-+
-+# Applications should use the activity model for receiving events
-+neverallow {
-+  appdomain
-+  -shell # bugreport
-+} input_device:chr_file ~getattr;
-+
-+# Do not allow access to Bluetooth-related system properties except for a few allowlisted domains.
-+# neverallow rules for access to Bluetooth-related data files are above.
-+neverallow {
-+  appdomain
-+  -bluetooth
-+  -system_app
-+} { bluetooth_a2dp_offload_prop bluetooth_prop exported_bluetooth_prop }:file create_file_perms;
-+
-+# Apps cannot access proc_uid_time_in_state
-+neverallow appdomain proc_uid_time_in_state:file *;
-+
-+# Apps cannot access proc_uid_concurrent_active_time
-+neverallow appdomain proc_uid_concurrent_active_time:file *;
-+
-+# Apps cannot access proc_uid_concurrent_policy_time
-+neverallow appdomain proc_uid_concurrent_policy_time:file *;
-+
-+# Apps cannot access proc_uid_cpupower
-+neverallow appdomain proc_uid_cpupower:file *;
-diff --git a/prebuilts/api/28.0/public/asan_extract.te b/prebuilts/api/28.0/public/asan_extract.te
-new file mode 100644
-index 000000000..15c5a09fd
---- /dev/null
-+++ b/prebuilts/api/28.0/public/asan_extract.te
-@@ -0,0 +1,36 @@
-+# asan_extract
-+#
-+# This command set moves the artifact corresponding to the current slot
-+# from /data/ota to /data/dalvik-cache.
-+
-+with_asan(`
-+  type asan_extract, domain, coredomain;
-+  type asan_extract_exec, exec_type, file_type;
-+
-+  # Allow asan_extract to execute itself using #!/system/bin/sh
-+  allow asan_extract shell_exec:file rx_file_perms;
-+
-+  # We execute log, rm, gzip and tar.
-+  allow asan_extract toolbox_exec:file rx_file_perms;
-+  allow asan_extract system_file:file execute_no_trans;
-+
-+  # asan_extract deletes old /data/lib.
-+  allow asan_extract system_file:dir { open read remove_name rmdir write };
-+  allow asan_extract system_file:file unlink;
-+
-+  # asan_extract untars ASAN libraries into /data.
-+  allow asan_extract system_data_file:dir create_dir_perms ;
-+  allow asan_extract system_data_file:{ file lnk_file } create_file_perms ;
-+
-+  # Relabel the libraries with restorecon.
-+  allow asan_extract file_contexts_file:file r_file_perms;
-+  allow asan_extract system_data_file:{ dir file } relabelfrom;
-+  allow asan_extract system_file:dir { relabelto setattr };
-+  allow asan_extract system_file:file relabelto;
-+
-+  # Restorecon will actually already try to run with sanitized libraries (libpackagelistparser).
-+  allow asan_extract system_data_file:file execute;
-+
-+  # We need to signal a reboot when done.
-+  set_prop(asan_extract, powerctl_prop)
-+')
-diff --git a/prebuilts/api/28.0/public/attributes b/prebuilts/api/28.0/public/attributes
-new file mode 100644
-index 000000000..0c7ca2ed7
---- /dev/null
-+++ b/prebuilts/api/28.0/public/attributes
-@@ -0,0 +1,311 @@
-+######################################
-+# Attribute declarations
-+#
-+
-+# All types used for devices.
-+# On change, update CHECK_FC_ASSERT_ATTRS
-+# in tools/checkfc.c
-+attribute dev_type;
-+
-+# All types used for processes.
-+attribute domain;
-+
-+# All types used for filesystems.
-+# On change, update CHECK_FC_ASSERT_ATTRS
-+# definition in tools/checkfc.c.
-+attribute fs_type;
-+
-+# All types used for context= mounts.
-+attribute contextmount_type;
-+
-+# All types used for files that can exist on a labeled fs.
-+# Do not use for pseudo file types.
-+# On change, update CHECK_FC_ASSERT_ATTRS
-+# definition in tools/checkfc.c.
-+attribute file_type;
-+
-+# All types used for domain entry points.
-+attribute exec_type;
-+
-+# All types used for /data files.
-+attribute data_file_type;
-+expandattribute data_file_type false;
-+# All types in /data, not in /data/vendor
-+attribute core_data_file_type;
-+expandattribute core_data_file_type false;
-+# All types in /vendor
-+attribute vendor_file_type;
-+
-+# All types used for procfs files.
-+attribute proc_type;
-+expandattribute proc_type false;
-+
-+# All types used for sysfs files.
-+attribute sysfs_type;
-+
-+# All types use for debugfs files.
-+attribute debugfs_type;
-+
-+# Attribute used for all sdcards
-+attribute sdcard_type;
-+
-+# All types used for nodes/hosts.
-+attribute node_type;
-+
-+# All types used for network interfaces.
-+attribute netif_type;
-+
-+# All types used for network ports.
-+attribute port_type;
-+
-+# All types used for property service
-+# On change, update CHECK_PC_ASSERT_ATTRS
-+# definition in tools/checkfc.c.
-+attribute property_type;
-+
-+# All properties defined in core SELinux policy. Should not be
-+# used by device specific properties
-+attribute core_property_type;
-+
-+# All properties used to configure log filtering.
-+attribute log_property_type;
-+
-+# All properties that are not specific to device but are added from
-+# outside of AOSP. (e.g. OEM-specific properties)
-+# These properties are not accessible from device-specific domains
-+attribute extended_core_property_type;
-+
-+# All service_manager types created by system_server
-+attribute system_server_service;
-+
-+# services which should be available to all but isolated apps
-+attribute app_api_service;
-+
-+# services which should be available to all ephemeral apps
-+attribute ephemeral_app_api_service;
-+
-+# services which export only system_api
-+attribute system_api_service;
-+
-+# All types used for services managed by servicemanager.
-+# On change, update CHECK_SC_ASSERT_ATTRS
-+# definition in tools/checkfc.c.
-+attribute service_manager_type;
-+
-+# All types used for services managed by hwservicemanager
-+attribute hwservice_manager_type;
-+
-+# All HwBinder services guaranteed to be passthrough. These services always run
-+# in the process of their clients, and thus operate with the same access as
-+# their clients.
-+attribute same_process_hwservice;
-+
-+# All HwBinder services guaranteed to be offered only by core domain components
-+attribute coredomain_hwservice;
-+
-+# All types used for services managed by vndservicemanager
-+attribute vndservice_manager_type;
-+
-+
-+# All domains that can override MLS restrictions.
-+# i.e. processes that can read up and write down.
-+attribute mlstrustedsubject;
-+
-+# All types that can override MLS restrictions.
-+# i.e. files that can be read by lower and written by higher
-+attribute mlstrustedobject;
-+
-+# All domains used for apps.
-+attribute appdomain;
-+
-+# All third party apps.
-+attribute untrusted_app_all;
-+
-+# All domains used for apps with network access.
-+attribute netdomain;
-+
-+# All domains used for apps with bluetooth access.
-+attribute bluetoothdomain;
-+
-+# All domains used for binder service domains.
-+attribute binderservicedomain;
-+
-+# update_engine related domains that need to apply an update and run
-+# postinstall. This includes the background daemon and the sideload tool from
-+# recovery for A/B devices.
-+attribute update_engine_common;
-+
-+# All core domains (as opposed to vendor/device-specific domains)
-+attribute coredomain;
-+
-+# All socket devices owned by core domain components
-+attribute coredomain_socket;
-+expandattribute coredomain_socket false;
-+
-+# All vendor domains which violate the requirement of not using Binder
-+# TODO(b/35870313): Remove this once there are no violations
-+attribute binder_in_vendor_violators;
-+expandattribute binder_in_vendor_violators false;
-+
-+# All vendor domains which violate the requirement of not using sockets for
-+# communicating with core components
-+# TODO(b/36577153): Remove this once there are no violations
-+attribute socket_between_core_and_vendor_violators;
-+expandattribute socket_between_core_and_vendor_violators false;
-+
-+# All vendor domains which violate the requirement of not executing
-+# system processes
-+# TODO(b/36463595)
-+attribute vendor_executes_system_violators;
-+expandattribute vendor_executes_system_violators false;
-+
-+# All domains which violate the requirement of not sharing files by path
-+# between between vendor and core domains.
-+# TODO(b/34980020)
-+attribute data_between_core_and_vendor_violators;
-+expandattribute data_between_core_and_vendor_violators false;
-+
-+# All system domains which violate the requirement of not executing vendor
-+# binaries/libraries.
-+# TODO(b/62041836)
-+attribute system_executes_vendor_violators;
-+expandattribute system_executes_vendor_violators false;
-+
-+# All system domains which violate the requirement of not writing vendor
-+# properties.
-+# TODO(b/78598545): Remove this once there are no violations
-+attribute system_writes_vendor_properties_violators;
-+expandattribute system_writes_vendor_properties_violators false;
-+
-+# hwservices that are accessible from untrusted applications
-+# WARNING: Use of this attribute should be avoided unless
-+# absolutely necessary.  It is a temporary allowance to aid the
-+# transition to treble and will be removed in a future platform
-+# version, requiring all hwservices that are labeled with this
-+# attribute to be submitted to AOSP in order to maintain their
-+# app-visibility.
-+attribute untrusted_app_visible_hwservice;
-+expandattribute untrusted_app_visible_hwservice false;
-+
-+# halserver domains that are accessible to untrusted applications.  These
-+# domains are typically those hosting  hwservices attributed by the
-+# untrusted_app_visible_hwservice.
-+# WARNING: Use of this attribute should be avoided unless absolutely necessary.
-+# It is a temporary allowance to aid the transition to treble and will be
-+# removed in the future platform version, requiring all halserver domains that
-+# are labeled with this attribute to be submitted to AOSP in order to maintain
-+# their app-visibility.
-+attribute untrusted_app_visible_halserver;
-+expandattribute untrusted_app_visible_halserver false;
-+
-+# PDX services
-+attribute pdx_endpoint_dir_type;
-+attribute pdx_endpoint_socket_type;
-+expandattribute pdx_endpoint_socket_type false;
-+attribute pdx_channel_socket_type;
-+expandattribute pdx_channel_socket_type false;
-+
-+pdx_service_attributes(display_client)
-+pdx_service_attributes(display_manager)
-+pdx_service_attributes(display_screenshot)
-+pdx_service_attributes(display_vsync)
-+pdx_service_attributes(performance_client)
-+pdx_service_attributes(bufferhub_client)
-+
-+# All HAL servers
-+attribute halserverdomain;
-+# All HAL clients
-+attribute halclientdomain;
-+expandattribute halclientdomain true;
-+
-+# Exempt for halserverdomain to access sockets. Only builds for automotive
-+# device types are allowed to use this attribute (enforced by CTS).
-+# Unlike phone, in a car many modules are external from Android perspective and
-+# HALs should be able to communicate with those devices through sockets.
-+attribute hal_automotive_socket_exemption;
-+
-+# TODO(b/72757373): Use hal_attribute macro once expandattribute value conflicts
-+# can be resolve.
-+attribute hal_audio;
-+attribute hal_audio_client;
-+expandattribute hal_audio_client true;
-+attribute hal_audio_server;
-+expandattribute hal_audio_server false;
-+
-+attribute hal_bootctl;
-+attribute hal_bootctl_client;
-+expandattribute hal_bootctl_client true;
-+attribute hal_bootctl_server;
-+expandattribute hal_bootctl_server false;
-+
-+attribute hal_camera;
-+attribute hal_camera_client;
-+expandattribute hal_camera_client true;
-+attribute hal_camera_server;
-+expandattribute hal_camera_server false;
-+
-+attribute hal_drm;
-+attribute hal_drm_client;
-+expandattribute hal_drm_client true;
-+attribute hal_drm_server;
-+expandattribute hal_drm_server false;
-+
-+attribute hal_cas;
-+attribute hal_cas_client;
-+expandattribute hal_cas_client true;
-+attribute hal_cas_server;
-+expandattribute hal_cas_server false;
-+
-+# HALs
-+hal_attribute(allocator);
-+hal_attribute(audiocontrol);
-+hal_attribute(authsecret);
-+hal_attribute(bluetooth);
-+hal_attribute(broadcastradio);
-+hal_attribute(configstore);
-+hal_attribute(confirmationui);
-+hal_attribute(contexthub);
-+hal_attribute(dumpstate);
-+hal_attribute(evs);
-+hal_attribute(fingerprint);
-+hal_attribute(gatekeeper);
-+hal_attribute(gnss);
-+hal_attribute(graphics_allocator);
-+hal_attribute(graphics_composer);
-+hal_attribute(health);
-+hal_attribute(ir);
-+hal_attribute(keymaster);
-+hal_attribute(light);
-+hal_attribute(lowpan);
-+hal_attribute(memtrack);
-+hal_attribute(neuralnetworks);
-+hal_attribute(nfc);
-+hal_attribute(oemlock);
-+hal_attribute(power);
-+hal_attribute(secure_element);
-+hal_attribute(sensors);
-+hal_attribute(telephony);
-+hal_attribute(tetheroffload);
-+hal_attribute(thermal);
-+hal_attribute(tv_cec);
-+hal_attribute(tv_input);
-+hal_attribute(usb);
-+hal_attribute(usb_gadget);
-+hal_attribute(vehicle);
-+hal_attribute(vibrator);
-+hal_attribute(vr);
-+hal_attribute(weaver);
-+hal_attribute(wifi);
-+hal_attribute(wifi_hostapd);
-+hal_attribute(wifi_offload);
-+hal_attribute(wifi_supplicant);
-+
-+# HwBinder services offered across the core-vendor boundary
-+#
-+# We annotate server domains with x_server  to loosen the coupling between
-+# system and vendor images. For example, it should be possible to move a service
-+# from one core domain to another, without having to update the vendor image
-+# which contains clients of this service.
-+
-+attribute display_service_server;
-+attribute wifi_keystore_service_server;
-diff --git a/prebuilts/api/28.0/public/audioserver.te b/prebuilts/api/28.0/public/audioserver.te
-new file mode 100644
-index 000000000..9a7285821
---- /dev/null
-+++ b/prebuilts/api/28.0/public/audioserver.te
-@@ -0,0 +1,2 @@
-+# audioserver - audio services daemon
-+type audioserver, domain;
-diff --git a/prebuilts/api/28.0/public/blkid.te b/prebuilts/api/28.0/public/blkid.te
-new file mode 100644
-index 000000000..dabe01452
---- /dev/null
-+++ b/prebuilts/api/28.0/public/blkid.te
-@@ -0,0 +1,2 @@
-+# blkid called from vold
-+type blkid, domain;
-diff --git a/prebuilts/api/28.0/public/blkid_untrusted.te b/prebuilts/api/28.0/public/blkid_untrusted.te
-new file mode 100644
-index 000000000..4be4c0cb2
---- /dev/null
-+++ b/prebuilts/api/28.0/public/blkid_untrusted.te
-@@ -0,0 +1,2 @@
-+# blkid for untrusted block devices
-+type blkid_untrusted, domain;
-diff --git a/prebuilts/api/28.0/public/bluetooth.te b/prebuilts/api/28.0/public/bluetooth.te
-new file mode 100644
-index 000000000..9b3442aa5
---- /dev/null
-+++ b/prebuilts/api/28.0/public/bluetooth.te
-@@ -0,0 +1,2 @@
-+# bluetooth subsystem
-+type bluetooth, domain;
-diff --git a/prebuilts/api/28.0/public/bootanim.te b/prebuilts/api/28.0/public/bootanim.te
-new file mode 100644
-index 000000000..5cce7f9e4
---- /dev/null
-+++ b/prebuilts/api/28.0/public/bootanim.te
-@@ -0,0 +1,41 @@
-+# bootanimation oneshot service
-+type bootanim, domain;
-+type bootanim_exec, exec_type, file_type;
-+
-+hal_client_domain(bootanim, hal_configstore)
-+hal_client_domain(bootanim, hal_graphics_allocator)
-+hal_client_domain(bootanim, hal_graphics_composer)
-+
-+binder_use(bootanim)
-+binder_call(bootanim, surfaceflinger)
-+binder_call(bootanim, audioserver)
-+
-+hwbinder_use(bootanim)
-+
-+allow bootanim gpu_device:chr_file rw_file_perms;
-+
-+# /oem access
-+allow bootanim oemfs:dir search;
-+allow bootanim oemfs:file r_file_perms;
-+
-+allow bootanim audio_device:dir r_dir_perms;
-+allow bootanim audio_device:chr_file rw_file_perms;
-+
-+allow bootanim audioserver_service:service_manager find;
-+allow bootanim surfaceflinger_service:service_manager find;
-+
-+# Allow access to ion memory allocation device
-+allow bootanim ion_device:chr_file rw_file_perms;
-+allow bootanim hal_graphics_allocator:fd use;
-+
-+# Fences
-+allow bootanim hal_graphics_composer:fd use;
-+
-+# Read access to pseudo filesystems.
-+allow bootanim proc_meminfo:file r_file_perms;
-+
-+# System file accesses.
-+allow bootanim system_file:dir r_dir_perms;
-+
-+# Read ro.boot.bootreason b/30654343
-+get_prop(bootanim, bootloader_boot_reason_prop)
-diff --git a/prebuilts/api/28.0/public/bootstat.te b/prebuilts/api/28.0/public/bootstat.te
-new file mode 100644
-index 000000000..7ba023815
---- /dev/null
-+++ b/prebuilts/api/28.0/public/bootstat.te
-@@ -0,0 +1,57 @@
-+# bootstat command
-+type bootstat, domain;
-+type bootstat_exec, exec_type, file_type;
-+
-+read_runtime_log_tags(bootstat)
-+
-+# Allow persistent storage in /data/misc/bootstat.
-+allow bootstat bootstat_data_file:dir rw_dir_perms;
-+allow bootstat bootstat_data_file:file create_file_perms;
-+
-+# Collect metrics on boot time created by init
-+get_prop(bootstat, boottime_prop)
-+
-+# Read/Write [persist.]sys.boot.reason and ro.boot.bootreason (write if empty)
-+set_prop(bootstat, bootloader_boot_reason_prop)
-+set_prop(bootstat, system_boot_reason_prop)
-+set_prop(bootstat, last_boot_reason_prop)
-+
-+# ToDo: TBI move access for the following to a system health HAL
-+
-+# Allow access to /sys/fs/pstore/ and syslog
-+allow bootstat pstorefs:dir search;
-+allow bootstat pstorefs:file r_file_perms;
-+allow bootstat kernel:system syslog_read;
-+
-+# Allow access to reading the logs to read aspects of system health
-+read_logd(bootstat)
-+
-+# ToDo: end
-+
-+neverallow {
-+  domain
-+  -bootanim
-+  -bootstat
-+  -dumpstate
-+  -init
-+  -recovery
-+  -shell
-+  -system_server
-+} { bootloader_boot_reason_prop last_boot_reason_prop }:file r_file_perms;
-+# ... and refine, as these components should not set the last boot reason
-+neverallow { bootanim recovery } last_boot_reason_prop:file r_file_perms;
-+
-+neverallow {
-+  domain
-+  -bootstat
-+  -init
-+  -system_server
-+} { bootloader_boot_reason_prop last_boot_reason_prop }:property_service set;
-+# ... and refine ... for a ro propertly no less ... keep this _tight_
-+neverallow system_server bootloader_boot_reason_prop:property_service set;
-+
-+neverallow {
-+  domain
-+  -bootstat
-+  -init
-+} system_boot_reason_prop:property_service set;
-diff --git a/prebuilts/api/28.0/public/bufferhubd.te b/prebuilts/api/28.0/public/bufferhubd.te
-new file mode 100644
-index 000000000..274c2716b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/bufferhubd.te
-@@ -0,0 +1,20 @@
-+# bufferhubd
-+type bufferhubd, domain, mlstrustedsubject;
-+type bufferhubd_exec, exec_type, file_type;
-+
-+hal_client_domain(bufferhubd, hal_graphics_allocator)
-+
-+pdx_server(bufferhubd, bufferhub_client)
-+pdx_client(bufferhubd, performance_client)
-+
-+# Access the GPU.
-+allow bufferhubd gpu_device:chr_file rw_file_perms;
-+
-+# Access /dev/ion
-+allow bufferhubd ion_device:chr_file r_file_perms;
-+
-+# Receive sync fence FDs from mediacodec. Note that mediacodec never directly
-+# connects to bufferhubd via PDX. Instead, a VR app acts as a bridge between
-+# those two: it talks to mediacodec via Binder and talks to bufferhubd via PDX.
-+# Thus, there is no need to use pdx_client macro.
-+allow bufferhubd mediacodec:fd use;
-diff --git a/prebuilts/api/28.0/public/cameraserver.te b/prebuilts/api/28.0/public/cameraserver.te
-new file mode 100644
-index 000000000..3fdca537e
---- /dev/null
-+++ b/prebuilts/api/28.0/public/cameraserver.te
-@@ -0,0 +1,65 @@
-+# cameraserver - camera daemon
-+type cameraserver, domain;
-+type cameraserver_exec, exec_type, file_type;
-+
-+binder_use(cameraserver)
-+binder_call(cameraserver, binderservicedomain)
-+binder_call(cameraserver, appdomain)
-+binder_service(cameraserver)
-+
-+hal_client_domain(cameraserver, hal_camera)
-+
-+hal_client_domain(cameraserver, hal_graphics_allocator)
-+
-+allow cameraserver ion_device:chr_file rw_file_perms;
-+
-+# Talk with graphics composer fences
-+allow cameraserver hal_graphics_composer:fd use;
-+
-+add_service(cameraserver, cameraserver_service)
-+
-+allow cameraserver activity_service:service_manager find;
-+allow cameraserver appops_service:service_manager find;
-+allow cameraserver audioserver_service:service_manager find;
-+allow cameraserver batterystats_service:service_manager find;
-+allow cameraserver cameraproxy_service:service_manager find;
-+allow cameraserver mediaserver_service:service_manager find;
-+allow cameraserver processinfo_service:service_manager find;
-+allow cameraserver scheduling_policy_service:service_manager find;
-+allow cameraserver surfaceflinger_service:service_manager find;
-+
-+allow cameraserver hidl_token_hwservice:hwservice_manager find;
-+
-+###
-+### neverallow rules
-+###
-+
-+# cameraserver should never execute any executable without a
-+# domain transition
-+neverallow cameraserver { file_type fs_type }:file execute_no_trans;
-+
-+# The goal of the mediaserver split is to place media processing code into
-+# restrictive sandboxes with limited responsibilities and thus limited
-+# permissions. Example: Audioserver is only responsible for controlling audio
-+# hardware and processing audio content. Cameraserver does the same for camera
-+# hardware/content. Etc.
-+#
-+# Media processing code is inherently risky and thus should have limited
-+# permissions and be isolated from the rest of the system and network.
-+# Lengthier explanation here:
-+# https://android-developers.googleblog.com/2016/05/hardening-media-stack.html
-+neverallow cameraserver domain:{ tcp_socket udp_socket rawip_socket } *;
-+
-+# Allow shell commands from ADB for CTS testing/dumping
-+allow cameraserver adbd:fd use;
-+allow cameraserver adbd:unix_stream_socket { read write };
-+allow cameraserver shell:fd use;
-+allow cameraserver shell:unix_stream_socket { read write };
-+allow cameraserver shell:fifo_file { read write };
-+
-+# Allow shell commands from ADB for CTS testing/dumping
-+userdebug_or_eng(`
-+  allow cameraserver su:fd use;
-+  allow cameraserver su:fifo_file { read write };
-+  allow cameraserver su:unix_stream_socket { read write };
-+')
-diff --git a/prebuilts/api/28.0/public/charger.te b/prebuilts/api/28.0/public/charger.te
-new file mode 100644
-index 000000000..7145548a5
---- /dev/null
-+++ b/prebuilts/api/28.0/public/charger.te
-@@ -0,0 +1,45 @@
-+# charger seclabel is specified in init.rc since
-+# it lives in the rootfs and has no unique file type.
-+type charger, domain;
-+
-+# Write to /dev/kmsg
-+allow charger kmsg_device:chr_file rw_file_perms;
-+
-+# Read access to pseudo filesystems.
-+r_dir_file(charger, rootfs)
-+r_dir_file(charger, cgroup)
-+
-+# Allow to read /sys/class/power_supply directory
-+allow charger sysfs_type:dir r_dir_perms;
-+
-+allow charger self:global_capability_class_set { sys_tty_config };
-+allow charger self:global_capability_class_set sys_boot;
-+
-+wakelock_use(charger)
-+
-+allow charger self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+
-+# Read/write to /sys/power/state
-+allow charger sysfs_power:file rw_file_perms;
-+
-+r_dir_file(charger, sysfs_batteryinfo)
-+
-+# Read /sys/fs/pstore/console-ramoops
-+# Don't worry about overly broad permissions for now, as there's
-+# only one file in /sys/fs/pstore
-+allow charger pstorefs:dir r_dir_perms;
-+allow charger pstorefs:file r_file_perms;
-+
-+allow charger graphics_device:dir r_dir_perms;
-+allow charger graphics_device:chr_file rw_file_perms;
-+allow charger input_device:dir r_dir_perms;
-+allow charger input_device:chr_file r_file_perms;
-+allow charger tty_device:chr_file rw_file_perms;
-+allow charger proc_sysrq:file rw_file_perms;
-+
-+# charger needs to tell init to continue the boot
-+# process when running in charger mode.
-+set_prop(charger, system_prop)
-+set_prop(charger, exported_system_prop)
-+set_prop(charger, exported2_system_prop)
-+set_prop(charger, exported3_system_prop)
-diff --git a/prebuilts/api/28.0/public/clatd.te b/prebuilts/api/28.0/public/clatd.te
-new file mode 100644
-index 000000000..ee44abf7c
---- /dev/null
-+++ b/prebuilts/api/28.0/public/clatd.te
-@@ -0,0 +1,33 @@
-+# 464xlat daemon
-+type clatd, domain;
-+type clatd_exec, exec_type, file_type;
-+
-+net_domain(clatd)
-+
-+r_dir_file(clatd, proc_net)
-+
-+# Access objects inherited from netd.
-+allow clatd netd:fd use;
-+allow clatd netd:fifo_file { read write };
-+# TODO: Check whether some or all of these sockets should be close-on-exec.
-+allow clatd netd:netlink_kobject_uevent_socket { read write };
-+allow clatd netd:netlink_nflog_socket { read write };
-+allow clatd netd:netlink_route_socket { read write };
-+allow clatd netd:udp_socket { read write };
-+allow clatd netd:unix_stream_socket { read write };
-+allow clatd netd:unix_dgram_socket { read write };
-+
-+allow clatd self:global_capability_class_set { net_admin net_raw setuid setgid };
-+
-+# clatd calls mmap(MAP_LOCKED) with a 1M buffer. MAP_LOCKED first checks
-+# capable(CAP_IPC_LOCK), and then checks to see the requested amount is
-+# under RLIMIT_MEMLOCK. If the latter check succeeds clatd won't have
-+# needed CAP_IPC_LOCK. But this is not guaranteed to succeed on all devices
-+# so we permit any requests we see from clatd asking for this capability.
-+# See https://android-review.googlesource.com/127940 and
-+# https://b.corp.google.com/issues/21736319
-+allow clatd self:global_capability_class_set ipc_lock;
-+
-+allow clatd self:netlink_route_socket nlmsg_write;
-+allow clatd self:{ packet_socket rawip_socket tun_socket } create_socket_perms_no_ioctl;
-+allow clatd tun_device:chr_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/public/cppreopts.te b/prebuilts/api/28.0/public/cppreopts.te
-new file mode 100644
-index 000000000..fb9855eea
---- /dev/null
-+++ b/prebuilts/api/28.0/public/cppreopts.te
-@@ -0,0 +1,22 @@
-+# cppreopts
-+#
-+# This command copies preopted files from the system_b partition to the data
-+# partition. This domain ensures that we are only copying into specific
-+# directories.
-+
-+type cppreopts, domain, mlstrustedsubject;
-+type cppreopts_exec, exec_type, file_type;
-+
-+# Allow cppreopts copy files into the dalvik-cache
-+allow cppreopts dalvikcache_data_file:dir { add_name remove_name search write };
-+allow cppreopts dalvikcache_data_file:file { create getattr open read rename write unlink };
-+
-+# Allow cppreopts to execute itself using #!/system/bin/sh
-+allow cppreopts shell_exec:file rx_file_perms;
-+
-+# Allow us to run find on /postinstall
-+allow cppreopts system_file:dir { open read };
-+
-+# Allow running the cp command using cppreopts permissions. Needed so we can
-+# write into dalvik-cache
-+allow cppreopts toolbox_exec:file rx_file_perms;
-diff --git a/prebuilts/api/28.0/public/crash_dump.te b/prebuilts/api/28.0/public/crash_dump.te
-new file mode 100644
-index 000000000..cd1e5a8e4
---- /dev/null
-+++ b/prebuilts/api/28.0/public/crash_dump.te
-@@ -0,0 +1,65 @@
-+type crash_dump, domain;
-+type crash_dump_exec, exec_type, file_type;
-+
-+# crash_dump might inherit CAP_SYS_PTRACE from a privileged process,
-+# which will result in an audit log even when it's allowed to trace.
-+dontaudit crash_dump self:global_capability_class_set { sys_ptrace };
-+
-+userdebug_or_eng(`
-+  allow crash_dump logd:process { ptrace signal sigchld sigstop sigkill };
-+
-+  # Let crash_dump write to /dev/kmsg_debug crashes that happen before logd comes up.
-+  allow crash_dump kmsg_debug_device:chr_file { open append };
-+')
-+
-+# Use inherited file descriptors
-+allow crash_dump domain:fd use;
-+
-+# Read/write IPC pipes inherited from crashing processes.
-+allow crash_dump domain:fifo_file { read write };
-+
-+# Append to pipes given to us by processes requesting dumps (e.g. dumpstate)
-+allow crash_dump domain:fifo_file { append };
-+
-+r_dir_file(crash_dump, domain)
-+allow crash_dump exec_type:file r_file_perms;
-+
-+# Read /data/dalvik-cache.
-+allow crash_dump dalvikcache_data_file:dir { search getattr };
-+allow crash_dump dalvikcache_data_file:file r_file_perms;
-+
-+# Read APK files.
-+r_dir_file(crash_dump, apk_data_file);
-+
-+# Read all /vendor
-+r_dir_file(crash_dump, { vendor_file same_process_hal_file })
-+
-+# Talk to tombstoned
-+unix_socket_connect(crash_dump, tombstoned_crash, tombstoned)
-+
-+# Talk to ActivityManager.
-+unix_socket_connect(crash_dump, system_ndebug, system_server)
-+
-+# Append to ANR files.
-+allow crash_dump anr_data_file:file { append getattr };
-+
-+# Append to tombstone files.
-+allow crash_dump tombstone_data_file:file { append getattr };
-+
-+read_logd(crash_dump)
-+
-+# Crash dump is not intended to access the following data types. Since these
-+# are WAI, suppress the denials to clean up the logs.
-+dontaudit crash_dump {
-+  core_data_file_type
-+  vendor_file_type
-+}:dir search;
-+dontaudit crash_dump system_data_file:file read;
-+
-+###
-+### neverallow assertions
-+###
-+
-+# A domain transition must occur for crash_dump to get the privileges needed to trace the process.
-+# Do not allow the execution of crash_dump without a domain transition.
-+neverallow domain crash_dump_exec:file execute_no_trans;
-diff --git a/prebuilts/api/28.0/public/device.te b/prebuilts/api/28.0/public/device.te
-new file mode 100644
-index 000000000..231c83938
---- /dev/null
-+++ b/prebuilts/api/28.0/public/device.te
-@@ -0,0 +1,106 @@
-+# Device types
-+type device, dev_type, fs_type;
-+type alarm_device, dev_type, mlstrustedobject;
-+type ashmem_device, dev_type, mlstrustedobject;
-+type audio_device, dev_type;
-+type audio_timer_device, dev_type;
-+type audio_seq_device, dev_type;
-+type binder_device, dev_type, mlstrustedobject;
-+type hwbinder_device, dev_type, mlstrustedobject;
-+type vndbinder_device, dev_type;
-+type block_device, dev_type;
-+type camera_device, dev_type;
-+type dm_device, dev_type;
-+type keychord_device, dev_type;
-+type loop_control_device, dev_type;
-+type loop_device, dev_type;
-+type pmsg_device, dev_type, mlstrustedobject;
-+type radio_device, dev_type;
-+type ram_device, dev_type;
-+type rtc_device, dev_type;
-+type vold_device, dev_type;
-+type console_device, dev_type;
-+type cpuctl_device, dev_type;
-+type fscklogs, dev_type;
-+type full_device, dev_type;
-+# GPU (used by most UI apps)
-+type gpu_device, dev_type, mlstrustedobject;
-+type graphics_device, dev_type;
-+type hw_random_device, dev_type;
-+type input_device, dev_type;
-+type kmem_device, dev_type;
-+type port_device, dev_type;
-+type lowpan_device, dev_type;
-+type mtd_device, dev_type;
-+type mtp_device, dev_type, mlstrustedobject;
-+type nfc_device, dev_type;
-+type ptmx_device, dev_type, mlstrustedobject;
-+type kmsg_device, dev_type;
-+type kmsg_debug_device, dev_type;
-+type null_device, dev_type, mlstrustedobject;
-+type random_device, dev_type, mlstrustedobject;
-+type secure_element_device, dev_type;
-+type sensors_device, dev_type;
-+type serial_device, dev_type;
-+type socket_device, dev_type;
-+type owntty_device, dev_type, mlstrustedobject;
-+type tty_device, dev_type;
-+type video_device, dev_type;
-+type vcs_device, dev_type;
-+type zero_device, dev_type, mlstrustedobject;
-+type fuse_device, dev_type, mlstrustedobject;
-+type iio_device, dev_type;
-+type ion_device, dev_type, mlstrustedobject;
-+type qtaguid_device, dev_type;
-+type watchdog_device, dev_type;
-+type uhid_device, dev_type;
-+type uio_device, dev_type;
-+type tun_device, dev_type, mlstrustedobject;
-+type usbaccessory_device, dev_type, mlstrustedobject;
-+type usb_device, dev_type, mlstrustedobject;
-+type properties_device, dev_type;
-+type properties_serial, dev_type;
-+type property_info, dev_type;
-+type i2c_device, dev_type;
-+
-+# All devices have a uart for the hci
-+# attach service. The uart dev node
-+# varies per device. This type
-+# is used in per device policy
-+type hci_attach_dev, dev_type;
-+
-+# All devices have a rpmsg device for
-+# achieving remoteproc and rpmsg modules
-+type rpmsg_device, dev_type;
-+
-+# Partition layout block device
-+type root_block_device, dev_type;
-+
-+# factory reset protection block device
-+type frp_block_device, dev_type;
-+
-+# System block device mounted on /system.
-+type system_block_device, dev_type;
-+
-+# Recovery block device.
-+type recovery_block_device, dev_type;
-+
-+# boot block device.
-+type boot_block_device, dev_type;
-+
-+# Userdata block device mounted on /data.
-+type userdata_block_device, dev_type;
-+
-+# Cache block device mounted on /cache.
-+type cache_block_device, dev_type;
-+
-+# Block device for any swap partition.
-+type swap_block_device, dev_type;
-+
-+# Metadata block device used for encryption metadata.
-+# Assign this type to the partition specified by the encryptable=
-+# mount option in your fstab file in the entry for userdata.
-+type metadata_block_device, dev_type;
-+
-+# The 'misc' partition used by recovery and A/B.
-+type misc_block_device, dev_type;
-diff --git a/prebuilts/api/28.0/public/dex2oat.te b/prebuilts/api/28.0/public/dex2oat.te
-new file mode 100644
-index 000000000..608ba7987
---- /dev/null
-+++ b/prebuilts/api/28.0/public/dex2oat.te
-@@ -0,0 +1,66 @@
-+# dex2oat
-+type dex2oat, domain;
-+type dex2oat_exec, exec_type, file_type;
-+
-+r_dir_file(dex2oat, apk_data_file)
-+# Access to /vendor/app
-+r_dir_file(dex2oat, vendor_app_file)
-+# Access /vendor/framework
-+allow dex2oat vendor_framework_file:dir { getattr search };
-+allow dex2oat vendor_framework_file:file { getattr open read };
-+
-+allow dex2oat tmpfs:file { read getattr };
-+
-+r_dir_file(dex2oat, dalvikcache_data_file)
-+allow dex2oat dalvikcache_data_file:file write;
-+# Read symlinks in /data/dalvik-cache. This is required for PIC mode boot images, where
-+# the oat file is symlinked to the original file in /system.
-+allow dex2oat dalvikcache_data_file:lnk_file read;
-+allow dex2oat installd:fd use;
-+
-+# Acquire advisory lock on /system/framework/arm/*
-+allow dex2oat system_file:file lock;
-+
-+# Read already open asec_apk_file file descriptors passed by installd.
-+# Also allow reading unlabeled files, to allow for upgrading forward
-+# locked APKs.
-+allow dex2oat asec_apk_file:file read;
-+allow dex2oat unlabeled:file read;
-+allow dex2oat oemfs:file read;
-+allow dex2oat apk_tmp_file:dir search;
-+allow dex2oat apk_tmp_file:file r_file_perms;
-+allow dex2oat user_profile_data_file:file { getattr read lock };
-+
-+# Allow dex2oat to compile app's secondary dex files which were reported back to
-+# the framework.
-+allow dex2oat app_data_file:file { getattr read write lock };
-+
-+##################
-+# A/B OTA Dexopt #
-+##################
-+
-+# Allow dex2oat to use file descriptors from otapreopt.
-+allow dex2oat postinstall_dexopt:fd use;
-+
-+allow dex2oat postinstall_file:dir { getattr search };
-+allow dex2oat postinstall_file:filesystem getattr;
-+allow dex2oat postinstall_file:lnk_file { getattr read };
-+
-+# Allow dex2oat access to files in /data/ota.
-+allow dex2oat ota_data_file:dir ra_dir_perms;
-+allow dex2oat ota_data_file:file r_file_perms;
-+
-+# Create and read symlinks in /data/ota/dalvik-cache. This is required for PIC mode boot images,
-+# where the oat file is symlinked to the original file in /system.
-+allow dex2oat ota_data_file:lnk_file { create read };
-+
-+# It would be nice to tie this down, but currently, because of how images are written, we can't
-+# pass file descriptors for the preopted boot image to dex2oat. So dex2oat needs to be able to
-+# create them itself (and make them world-readable).
-+allow dex2oat ota_data_file:file { create w_file_perms setattr };
-+
-+##############
-+# Neverallow #
-+##############
-+
-+neverallow dex2oat app_data_file:notdevfile_class_set open;
-diff --git a/prebuilts/api/28.0/public/dhcp.te b/prebuilts/api/28.0/public/dhcp.te
-new file mode 100644
-index 000000000..1f1ef2b48
---- /dev/null
-+++ b/prebuilts/api/28.0/public/dhcp.te
-@@ -0,0 +1,30 @@
-+type dhcp, domain;
-+type dhcp_exec, exec_type, file_type;
-+
-+net_domain(dhcp)
-+
-+allow dhcp cgroup:dir { create write add_name };
-+allow dhcp self:global_capability_class_set { setgid setuid net_admin net_raw net_bind_service };
-+allow dhcp self:packet_socket create_socket_perms_no_ioctl;
-+allow dhcp self:netlink_route_socket nlmsg_write;
-+allow dhcp shell_exec:file rx_file_perms;
-+allow dhcp system_file:file rx_file_perms;
-+not_full_treble(`allow dhcp vendor_file:file rx_file_perms;')
-+
-+# dhcpcd runs dhcpcd-hooks/*, which runs getprop / setprop (toolbox_exec)
-+allow dhcp toolbox_exec:file rx_file_perms;
-+
-+# For /proc/sys/net/ipv4/conf/*/promote_secondaries
-+allow dhcp proc_net:file write;
-+
-+set_prop(dhcp, dhcp_prop)
-+set_prop(dhcp, pan_result_prop)
-+
-+allow dhcp dhcp_data_file:dir create_dir_perms;
-+allow dhcp dhcp_data_file:file create_file_perms;
-+
-+# PAN connections
-+allow dhcp netd:fd use;
-+allow dhcp netd:fifo_file rw_file_perms;
-+allow dhcp netd:{ dgram_socket_class_set unix_stream_socket } { read write };
-+allow dhcp netd:{ netlink_kobject_uevent_socket netlink_route_socket netlink_nflog_socket } { read write };
-diff --git a/prebuilts/api/28.0/public/display_service_server.te b/prebuilts/api/28.0/public/display_service_server.te
-new file mode 100644
-index 000000000..c5839fa54
---- /dev/null
-+++ b/prebuilts/api/28.0/public/display_service_server.te
-@@ -0,0 +1 @@
-+add_hwservice(display_service_server, fwk_display_hwservice)
-diff --git a/prebuilts/api/28.0/public/dnsmasq.te b/prebuilts/api/28.0/public/dnsmasq.te
-new file mode 100644
-index 000000000..3aaefd3e6
---- /dev/null
-+++ b/prebuilts/api/28.0/public/dnsmasq.te
-@@ -0,0 +1,25 @@
-+# DNS, DHCP services
-+type dnsmasq, domain;
-+type dnsmasq_exec, exec_type, file_type;
-+
-+net_domain(dnsmasq)
-+allowxperm dnsmasq self:udp_socket ioctl priv_sock_ioctls;
-+
-+# TODO:  Run with dhcp group to avoid need for dac_override.
-+allow dnsmasq self:global_capability_class_set dac_override;
-+
-+allow dnsmasq self:global_capability_class_set { net_admin net_raw net_bind_service setgid setuid };
-+
-+allow dnsmasq dhcp_data_file:dir w_dir_perms;
-+allow dnsmasq dhcp_data_file:file create_file_perms;
-+
-+# Inherit and use open files from netd.
-+allow dnsmasq netd:fd use;
-+allow dnsmasq netd:fifo_file { read write };
-+# TODO: Investigate whether these inherited sockets should be closed on exec.
-+allow dnsmasq netd:netlink_kobject_uevent_socket { read write };
-+allow dnsmasq netd:netlink_nflog_socket { read write };
-+allow dnsmasq netd:netlink_route_socket { read write };
-+allow dnsmasq netd:unix_stream_socket { read write };
-+allow dnsmasq netd:unix_dgram_socket { read write };
-+allow dnsmasq netd:udp_socket { read write };
-diff --git a/prebuilts/api/28.0/public/domain.te b/prebuilts/api/28.0/public/domain.te
-new file mode 100644
-index 000000000..2533aecbd
---- /dev/null
-+++ b/prebuilts/api/28.0/public/domain.te
-@@ -0,0 +1,1399 @@
-+# Rules for all domains.
-+
-+# Allow reaping by init.
-+allow domain init:process sigchld;
-+
-+# Intra-domain accesses.
-+allow domain self:process {
-+    fork
-+    sigchld
-+    sigkill
-+    sigstop
-+    signull
-+    signal
-+    getsched
-+    setsched
-+    getsession
-+    getpgid
-+    setpgid
-+    getcap
-+    setcap
-+    getattr
-+    setrlimit
-+};
-+allow domain self:fd use;
-+allow domain proc:dir r_dir_perms;
-+allow domain proc_net:dir search;
-+r_dir_file(domain, self)
-+allow domain self:{ fifo_file file } rw_file_perms;
-+allow domain self:unix_dgram_socket { create_socket_perms sendto };
-+allow domain self:unix_stream_socket { create_stream_socket_perms connectto };
-+
-+# Inherit or receive open files from others.
-+allow domain init:fd use;
-+
-+userdebug_or_eng(`
-+  allow domain su:fd use;
-+  allow domain su:unix_stream_socket { connectto getattr getopt read write shutdown };
-+  allow domain su:unix_dgram_socket sendto;
-+
-+  allow { domain -init } su:binder { call transfer };
-+
-+  # Running something like "pm dump com.android.bluetooth" requires
-+  # fifo writes
-+  allow domain su:fifo_file { write getattr };
-+
-+  # allow "gdbserver --attach" to work for su.
-+  allow domain su:process sigchld;
-+
-+  # Allow writing coredumps to /cores/*
-+  allow domain coredump_file:file create_file_perms;
-+  allow domain coredump_file:dir ra_dir_perms;
-+')
-+
-+# Root fs.
-+allow domain rootfs:dir search;
-+allow domain rootfs:lnk_file { read getattr };
-+
-+# Device accesses.
-+allow domain device:dir search;
-+allow domain dev_type:lnk_file r_file_perms;
-+allow domain devpts:dir search;
-+allow domain socket_device:dir r_dir_perms;
-+allow domain owntty_device:chr_file rw_file_perms;
-+allow domain null_device:chr_file rw_file_perms;
-+allow domain zero_device:chr_file rw_file_perms;
-+allow domain ashmem_device:chr_file rw_file_perms;
-+# /dev/binder can be accessed by non-vendor domains and by apps
-+allow {
-+  coredomain
-+  appdomain
-+  binder_in_vendor_violators # TODO(b/35870313): Remove once all violations are gone
-+  -hwservicemanager
-+} binder_device:chr_file rw_file_perms;
-+# Devices which are not full TREBLE have fewer restrictions on access to /dev/binder
-+not_full_treble(`allow { domain -hwservicemanager -vndservicemanager } binder_device:chr_file rw_file_perms;')
-+allow { domain -servicemanager -vndservicemanager -isolated_app } hwbinder_device:chr_file rw_file_perms;
-+allow domain ptmx_device:chr_file rw_file_perms;
-+allow domain alarm_device:chr_file r_file_perms;
-+allow domain random_device:chr_file rw_file_perms;
-+allow domain proc_random:dir r_dir_perms;
-+allow domain proc_random:file r_file_perms;
-+allow domain properties_device:dir { search getattr };
-+allow domain properties_serial:file r_file_perms;
-+allow domain property_info:file r_file_perms;
-+
-+# For now, everyone can access core property files
-+# Device specific properties are not granted by default
-+not_compatible_property(`
-+    get_prop(domain, core_property_type)
-+    get_prop(domain, exported_dalvik_prop)
-+    get_prop(domain, exported_ffs_prop)
-+    get_prop(domain, exported_system_radio_prop)
-+    get_prop(domain, exported2_config_prop)
-+    get_prop(domain, exported2_radio_prop)
-+    get_prop(domain, exported2_system_prop)
-+    get_prop(domain, exported2_vold_prop)
-+    get_prop(domain, exported3_default_prop)
-+    get_prop(domain, exported3_radio_prop)
-+    get_prop(domain, exported3_system_prop)
-+    get_prop(domain, vendor_default_prop)
-+')
-+compatible_property_only(`
-+    get_prop({coredomain appdomain shell}, core_property_type)
-+    get_prop({coredomain appdomain shell}, exported_dalvik_prop)
-+    get_prop({coredomain appdomain shell}, exported_ffs_prop)
-+    get_prop({coredomain appdomain shell}, exported_system_radio_prop)
-+    get_prop({coredomain appdomain shell}, exported2_config_prop)
-+    get_prop({coredomain appdomain shell}, exported2_radio_prop)
-+    get_prop({coredomain appdomain shell}, exported2_system_prop)
-+    get_prop({coredomain appdomain shell}, exported2_vold_prop)
-+    get_prop({coredomain appdomain shell}, exported3_default_prop)
-+    get_prop({coredomain appdomain shell}, exported3_radio_prop)
-+    get_prop({coredomain appdomain shell}, exported3_system_prop)
-+    userdebug_or_eng(`
-+        get_prop(su, core_property_type)
-+        get_prop(su, exported_dalvik_prop)
-+        get_prop(su, exported_ffs_prop)
-+        get_prop(su, exported_system_radio_prop)
-+        get_prop(su, exported2_config_prop)
-+        get_prop(su, exported2_radio_prop)
-+        get_prop(su, exported2_system_prop)
-+        get_prop(su, exported2_vold_prop)
-+        get_prop(su, exported3_default_prop)
-+        get_prop(su, exported3_radio_prop)
-+        get_prop(su, exported3_system_prop)
-+    ')
-+    get_prop({domain -coredomain -appdomain}, vendor_default_prop)
-+')
-+
-+# Public readable properties
-+get_prop(domain, debug_prop)
-+get_prop(domain, exported_config_prop)
-+get_prop(domain, exported_default_prop)
-+get_prop(domain, exported_dumpstate_prop)
-+get_prop(domain, exported_fingerprint_prop)
-+get_prop(domain, exported_radio_prop)
-+get_prop(domain, exported_secure_prop)
-+get_prop(domain, exported_system_prop)
-+get_prop(domain, exported_vold_prop)
-+get_prop(domain, exported2_default_prop)
-+get_prop(domain, logd_prop)
-+
-+# Let everyone read log properties, so that liblog can avoid sending unloggable
-+# messages to logd.
-+get_prop(domain, log_property_type)
-+dontaudit domain property_type:file audit_access;
-+allow domain property_contexts_file:file r_file_perms;
-+
-+allow domain init:key search;
-+allow domain vold:key search;
-+
-+# logd access
-+write_logd(domain)
-+
-+# System file accesses.
-+allow domain system_file:dir { search getattr };
-+allow domain system_file:file { execute read open getattr map };
-+allow domain system_file:lnk_file { getattr read };
-+
-+# Make sure system/vendor split doesn not affect non-treble
-+# devices
-+not_full_treble(`
-+    allow domain vendor_file_type:dir { search getattr };
-+    allow domain vendor_file_type:file { execute read open getattr map };
-+    allow domain vendor_file_type:lnk_file { getattr read };
-+')
-+
-+# All domains are allowed to open and read directories
-+# that contain HAL implementations (e.g. passthrough
-+# HALs require clients to have these permissions)
-+allow domain vendor_hal_file:dir r_dir_perms;
-+
-+# Everyone can read and execute all same process HALs
-+allow domain same_process_hal_file:dir r_dir_perms;
-+allow domain same_process_hal_file:file { execute read open getattr map };
-+
-+# Any process can load vndk-sp libraries, which are system libraries
-+# used by same process HALs
-+allow domain vndk_sp_file:dir r_dir_perms;
-+allow domain vndk_sp_file:file { execute read open getattr map };
-+
-+# All domains get access to /vendor/etc
-+allow domain vendor_configs_file:dir r_dir_perms;
-+allow domain vendor_configs_file:file { read open getattr };
-+
-+full_treble_only(`
-+    # Allow all domains to be able to follow /system/vendor and/or
-+    # /vendor/odm symlinks.
-+    allow domain vendor_file_type:lnk_file { getattr open read };
-+
-+    # This is required to be able to search & read /vendor/lib64
-+    # in order to lookup vendor libraries. The execute permission
-+    # for coredomains is granted *only* for same process HALs
-+    allow domain vendor_file:dir { getattr search };
-+
-+    # Allow reading and executing out of /vendor to all vendor domains
-+    allow { domain -coredomain } vendor_file_type:dir r_dir_perms;
-+    allow { domain -coredomain } vendor_file_type:file { read open getattr execute map };
-+    allow { domain -coredomain } vendor_file_type:lnk_file { getattr read };
-+')
-+
-+# read and stat any sysfs symlinks
-+allow domain sysfs:lnk_file { getattr read };
-+
-+# libc references /data/misc/zoneinfo for timezone related information
-+# This directory is considered to be a VNDK-stable
-+allow domain zoneinfo_data_file:file r_file_perms;
-+allow domain zoneinfo_data_file:dir r_dir_perms;
-+
-+# Lots of processes access current CPU information
-+r_dir_file(domain, sysfs_devices_system_cpu)
-+
-+r_dir_file(domain, sysfs_usb);
-+
-+# files under /data.
-+not_full_treble(`
-+  allow domain system_data_file:dir getattr;
-+')
-+allow { coredomain appdomain } system_data_file:dir getattr;
-+# /data has the label system_data_file. Vendor components need the search
-+# permission on system_data_file for path traversal to /data/vendor.
-+allow domain system_data_file:dir search;
-+# TODO restrict this to non-coredomain
-+allow domain vendor_data_file:dir { getattr search };
-+
-+# required by the dynamic linker
-+allow domain proc:lnk_file { getattr read };
-+
-+# /proc/cpuinfo
-+allow domain proc_cpuinfo:file r_file_perms;
-+
-+# jemalloc needs to read /proc/sys/vm/overcommit_memory
-+allow domain proc_overcommit_memory:file r_file_perms;
-+
-+# profiling needs to read /proc/sys/kernel/perf_event_max_sample_rate
-+allow domain proc_perf:file r_file_perms;
-+
-+# toybox loads libselinux which stats /sys/fs/selinux/
-+allow domain selinuxfs:dir search;
-+allow domain selinuxfs:file getattr;
-+allow domain sysfs:dir search;
-+allow domain selinuxfs:filesystem getattr;
-+
-+# For /acct/uid/*/tasks.
-+allow domain cgroup:dir { search write };
-+allow domain cgroup:file w_file_perms;
-+
-+# Almost all processes log tracing information to
-+# /sys/kernel/debug/tracing/trace_marker
-+# The reason behind this is documented in b/6513400
-+allow domain debugfs:dir search;
-+allow domain debugfs_tracing:dir search;
-+allow domain debugfs_tracing_debug:dir search;
-+allow domain debugfs_trace_marker:file w_file_perms;
-+
-+# Filesystem access.
-+allow domain fs_type:filesystem getattr;
-+allow domain fs_type:dir getattr;
-+
-+# Restrict all domains to a allowlist for common socket types. Additional
-+# ioctl commands may be added to individual domains, but this sets safe
-+# defaults for all processes. Note that granting this allowlist to domain does
-+# not grant the ioctl permission on these socket types. That must be granted
-+# separately.
-+allowxperm domain domain:{ rawip_socket tcp_socket udp_socket }
-+  ioctl { unpriv_sock_ioctls unpriv_tty_ioctls };
-+# default allowlist for unix sockets.
-+allowxperm domain domain:{ unix_dgram_socket unix_stream_socket }
-+  ioctl unpriv_unix_sock_ioctls;
-+
-+# Restrict PTYs to only allowlisted ioctls.
-+# Note that granting this allowlist to domain does
-+# not grant the wider ioctl permission. That must be granted
-+# separately.
-+allowxperm domain devpts:chr_file ioctl unpriv_tty_ioctls;
-+
-+# Workaround for policy compiler being too aggressive and removing hwservice_manager_type
-+# when it's not explicitly used in allow rules
-+allow { domain -domain } hwservice_manager_type:hwservice_manager { add find };
-+# Workaround for policy compiler being too aggressive and removing vndservice_manager_type
-+# when it's not explicitly used in allow rules
-+allow { domain -domain } vndservice_manager_type:service_manager { add find };
-+
-+# Under ASAN, processes will try to read /data, as the sanitized libraries are there.
-+with_asan(`allow domain system_data_file:dir getattr;')
-+
-+###
-+### neverallow rules
-+###
-+
-+# All socket ioctls must be restricted to a allowlist.
-+neverallowxperm domain domain:socket_class_set ioctl { 0 };
-+
-+# b/68014825 and https://android-review.googlesource.com/516535
-+# rfc6093 says that processes should not use the TCP urgent mechanism
-+neverallowxperm domain domain:socket_class_set ioctl { SIOCATMARK };
-+
-+# TIOCSTI is only ever used for exploits. Block it.
-+# b/33073072, b/7530569
-+# http://www.openwall.com/lists/oss-security/2016/09/26/14
-+neverallowxperm * devpts:chr_file ioctl TIOCSTI;
-+
-+# Do not allow any domain other than init to create unlabeled files.
-+neverallow { domain -init -recovery } unlabeled:dir_file_class_set create;
-+
-+# Limit device node creation to these allowlisted domains.
-+neverallow {
-+  domain
-+  -kernel
-+  -init
-+  -ueventd
-+  -vold
-+} self:global_capability_class_set mknod;
-+
-+# Limit raw I/O to these allowlisted domains. Do not apply to debug builds.
-+neverallow {
-+  domain
-+  userdebug_or_eng(`-domain')
-+  -kernel
-+  -init
-+  -recovery
-+  -ueventd
-+  -healthd
-+  -uncrypt
-+  -tee
-+} self:global_capability_class_set sys_rawio;
-+
-+# No process can map low memory (< CONFIG_LSM_MMAP_MIN_ADDR).
-+neverallow * self:memprotect mmap_zero;
-+
-+# No domain needs mac_override as it is unused by SELinux.
-+neverallow * self:global_capability2_class_set mac_override;
-+
-+# Disallow attempts to set contexts not defined in current policy
-+# This helps guarantee that unknown or dangerous contents will not ever
-+# be set.
-+neverallow * self:global_capability2_class_set mac_admin;
-+
-+# Once the policy has been loaded there shall be none to modify the policy.
-+# It is sealed.
-+neverallow * kernel:security load_policy;
-+
-+# Only init prior to switching context should be able to set enforcing mode.
-+# init starts in kernel domain and switches to init domain via setcon in
-+# the init.rc, so the setenforce occurs while still in kernel. After
-+# switching domains, there is never any need to setenforce again by init.
-+neverallow * kernel:security setenforce;
-+neverallow { domain -kernel } kernel:security setcheckreqprot;
-+
-+# No booleans in AOSP policy, so no need to ever set them.
-+neverallow * kernel:security setbool;
-+
-+# Adjusting the AVC cache threshold.
-+# Not presently allowed to anything in policy, but possibly something
-+# that could be set from init.rc.
-+neverallow { domain -init } kernel:security setsecparam;
-+
-+# Only init, ueventd, shell and system_server should be able to access HW RNG
-+neverallow {
-+  domain
-+  -init
-+  -shell # For CTS and is restricted to getattr in shell.te
-+  -system_server
-+  -ueventd
-+} hw_random_device:chr_file *;
-+# b/78174219 b/64114943
-+neverallow {
-+  domain
-+  -init
-+  -shell # stat of /dev, getattr only
-+  -vendor_init
-+  -ueventd
-+} keychord_device:chr_file *;
-+
-+# Ensure that all entrypoint executables are in exec_type or postinstall_file.
-+neverallow * { file_type -exec_type -postinstall_file }:file entrypoint;
-+
-+# Ensure that nothing in userspace can access /dev/mem or /dev/kmem
-+neverallow {
-+  domain
-+  -shell # For CTS and is restricted to getattr in shell.te
-+  -ueventd # Further restricted in ueventd.te
-+} kmem_device:chr_file *;
-+neverallow * kmem_device:chr_file ~{ create relabelto unlink setattr getattr };
-+
-+#Ensure that nothing in userspace can access /dev/port
-+neverallow {
-+  domain
-+  -shell # Shell user should not have any abilities outside of getattr
-+  -ueventd
-+} port_device:chr_file *;
-+neverallow * port_device:chr_file ~{ create relabelto unlink setattr getattr };
-+# Only init should be able to configure kernel usermodehelpers or
-+# security-sensitive proc settings.
-+neverallow { domain -init } usermodehelper:file { append write };
-+neverallow { domain -init -ueventd } sysfs_usermodehelper:file { append write };
-+neverallow { domain -init -vendor_init } proc_security:file { append open read write };
-+
-+# No domain should be allowed to ptrace init.
-+neverallow * init:process ptrace;
-+
-+# Init can't do anything with binder calls. If this neverallow rule is being
-+# triggered, it's probably due to a service with no SELinux domain.
-+neverallow * init:binder *;
-+neverallow * vendor_init:binder *;
-+
-+# Don't allow raw read/write/open access to block_device
-+# Rather force a relabel to a more specific type
-+neverallow { domain -kernel -init -recovery } block_device:blk_file { open read write };
-+
-+# Do not allow renaming of block files or character files
-+# Ability to do so can lead to possible use in an exploit chain
-+# e.g. https://googleprojectzero.blogspot.com/2016/12/chrome-os-exploit-one-byte-overflow-and.html
-+neverallow * *:{ blk_file chr_file } rename;
-+
-+# Don't allow raw read/write/open access to generic devices.
-+# Rather force a relabel to a more specific type.
-+neverallow domain device:chr_file { open read write };
-+
-+# Limit what domains can mount filesystems or change their mount flags.
-+# sdcard_type / vfat is exempt as a larger set of domains need
-+# this capability, including device-specific domains.
-+neverallow { domain -kernel -init -recovery -vold -zygote -update_engine -otapreopt_chroot } { fs_type -sdcard_type }:filesystem { mount remount relabelfrom relabelto };
-+
-+#
-+# Assert that, to the extent possible, we're not loading executable content from
-+# outside the rootfs or /system partition except for a few allowlisted domains.
-+#
-+neverallow {
-+    domain
-+    -appdomain
-+    with_asan(`-asan_extract')
-+    -dumpstate
-+    -shell
-+    userdebug_or_eng(`-su')
-+    -webview_zygote
-+    -zygote
-+    userdebug_or_eng(`-mediaextractor')
-+} {
-+    file_type
-+    -system_file
-+    -vendor_file_type
-+    -exec_type
-+    -postinstall_file
-+}:file execute;
-+
-+neverallow {
-+    domain
-+    -appdomain # for oemfs
-+    -bootanim # for oemfs
-+    -recovery # for /tmp/update_binary in tmpfs
-+} { fs_type -rootfs }:file execute;
-+
-+# Files from cache should never be executed
-+neverallow domain { cache_file cache_backup_file cache_private_backup_file cache_recovery_file }:file execute;
-+
-+# Protect most domains from executing arbitrary content from /data.
-+neverallow {
-+  domain
-+  -appdomain
-+} {
-+  data_file_type
-+  -dalvikcache_data_file
-+  -system_data_file # shared libs in apks
-+  -apk_data_file
-+}:file no_x_file_perms;
-+
-+# The test files and executables MUST not be accessible to any domain
-+neverallow { domain userdebug_or_eng(`-kernel') } nativetest_data_file:file_class_set no_w_file_perms;
-+neverallow domain nativetest_data_file:dir no_w_dir_perms;
-+neverallow { domain userdebug_or_eng(`-shell') } nativetest_data_file:file no_x_file_perms;
-+
-+# Only the init property service should write to /data/property and /dev/__properties__
-+neverallow { domain -init } property_data_file:dir no_w_dir_perms;
-+neverallow { domain -init } property_data_file:file { no_w_file_perms no_x_file_perms };
-+neverallow { domain -init } property_type:file { no_w_file_perms no_x_file_perms };
-+neverallow { domain -init } properties_device:file { no_w_file_perms no_x_file_perms };
-+neverallow { domain -init } properties_serial:file { no_w_file_perms no_x_file_perms };
-+
-+# Nobody should be doing writes to /system & /vendor
-+# These partitions are intended to be read-only and must never be
-+# modified. Doing so would violate important Android security guarantees
-+# and invalidate dm-verity signatures.
-+neverallow {
-+    domain
-+    with_asan(`-asan_extract')
-+} {
-+    system_file
-+    vendor_file_type
-+    exec_type
-+}:dir_file_class_set { create write setattr relabelfrom append unlink link rename };
-+
-+neverallow { domain -kernel with_asan(`-asan_extract') } { system_file vendor_file_type exec_type }:dir_file_class_set relabelto;
-+
-+# Don't allow mounting on top of /system files or directories
-+neverallow * exec_type:dir_file_class_set mounton;
-+neverallow { domain -init } { system_file vendor_file_type }:dir_file_class_set mounton;
-+
-+# Nothing should be writing to files in the rootfs.
-+neverallow * rootfs:file { create write setattr relabelto append unlink link rename };
-+
-+# Restrict context mounts to specific types marked with
-+# the contextmount_type attribute.
-+neverallow * {fs_type -contextmount_type}:filesystem relabelto;
-+
-+# Ensure that context mount types are not writable, to ensure that
-+# the write to /system restriction above is not bypassed via context=
-+# mount to another type.
-+neverallow * contextmount_type:dir_file_class_set
-+    { create write setattr relabelfrom relabelto append unlink link rename };
-+
-+# Do not allow service_manager add for default service labels.
-+# Instead domains should use a more specific type such as
-+# system_app_service rather than the generic type.
-+# New service_types are defined in {,hw,vnd}service.te and new mappings
-+# from service name to service_type are defined in {,hw,vnd}service_contexts.
-+neverallow * default_android_service:service_manager add;
-+neverallow * default_android_vndservice:service_manager { add find };
-+neverallow * default_android_hwservice:hwservice_manager { add find };
-+
-+# Looking up the base class/interface of all HwBinder services is a bad idea.
-+# hwservicemanager currently offer such lookups only to make it so that security
-+# decisions are expressed in SELinux policy. However, it's unclear whether this
-+# lookup has security implications. If it doesn't, hwservicemanager should be
-+# modified to not offer this lookup.
-+# This rule can be removed if hwservicemanager is modified to not permit these
-+# lookups.
-+neverallow * hidl_base_hwservice:hwservice_manager find;
-+
-+# Require that domains explicitly label unknown properties, and do not allow
-+# anyone but init to modify unknown properties.
-+neverallow { domain -init -vendor_init } default_prop:property_service set;
-+neverallow { domain -init -vendor_init } mmc_prop:property_service set;
-+
-+compatible_property_only(`
-+    neverallow { domain -init } default_prop:property_service set;
-+    neverallow { domain -init } mmc_prop:property_service set;
-+    neverallow { domain -init -vendor_init } exported_default_prop:property_service set;
-+    neverallow { domain -init } exported_secure_prop:property_service set;
-+    neverallow { domain -init } exported2_default_prop:property_service set;
-+    neverallow { domain -init -vendor_init } exported3_default_prop:property_service set;
-+    neverallow { domain -init -vendor_init } vendor_default_prop:property_service set;
-+')
-+
-+# Only core domains are allowed to access package_manager properties
-+neverallow { domain -init -system_server } pm_prop:property_service set;
-+neverallow { domain -coredomain } pm_prop:file no_rw_file_perms;
-+
-+compatible_property_only(`
-+    neverallow { domain -init -system_server -vendor_init } exported_pm_prop:property_service set;
-+    neverallow { domain -coredomain -vendor_init } exported_pm_prop:file no_rw_file_perms;
-+')
-+
-+# Do not allow reading device's serial number from system properties except form
-+# a few allowlisted domains.
-+neverallow {
-+  domain
-+  -adbd
-+  -dumpstate
-+  -hal_drm_server
-+  -hal_cas_server
-+  -init
-+  -mediadrmserver
-+  -recovery
-+  -shell
-+  -system_server
-+  -vendor_init
-+} serialno_prop:file r_file_perms;
-+
-+# Do not allow reading the last boot timestamp from system properties
-+neverallow { domain -init -system_server -dumpstate } firstboot_prop:file r_file_perms;
-+
-+neverallow {
-+  domain
-+  -init
-+  -recovery
-+  -system_server
-+  -shell # Shell is further restricted in shell.te
-+  -ueventd # Further restricted in ueventd.te
-+} frp_block_device:blk_file no_rw_file_perms;
-+
-+# The metadata block device is set aside for device encryption and
-+# verified boot metadata. It may be reset at will and should not
-+# be used by other domains.
-+neverallow {
-+  domain
-+  -init
-+  -recovery
-+  -vold
-+  -e2fs
-+  -fsck
-+} metadata_block_device:blk_file { append link rename write open read ioctl lock };
-+
-+# No domain other than recovery and update_engine can write to system partition(s).
-+neverallow { domain -recovery -update_engine } system_block_device:blk_file { write append };
-+
-+# No domains other than install_recovery or recovery can write to recovery.
-+neverallow { domain -install_recovery -recovery } recovery_block_device:blk_file { write append };
-+
-+# No domains other than a select few can access the misc_block_device. This
-+# block device is reserved for OTA use.
-+# Do not assert this rule on userdebug/eng builds, due to some devices using
-+# this partition for testing purposes.
-+neverallow {
-+  domain
-+  userdebug_or_eng(`-domain') # exclude debuggable builds
-+  -hal_bootctl_server
-+  -init
-+  -uncrypt
-+  -update_engine
-+  -vendor_init
-+  -vold
-+  -recovery
-+  -ueventd
-+} misc_block_device:blk_file { append link relabelfrom rename write open read ioctl lock };
-+
-+# Only (hw|vnd|)servicemanager should be able to register with binder as the context manager
-+neverallow { domain -servicemanager -hwservicemanager -vndservicemanager } *:binder set_context_mgr;
-+# The service managers are only allowed to access their own device node
-+neverallow servicemanager hwbinder_device:chr_file no_rw_file_perms;
-+neverallow servicemanager vndbinder_device:chr_file no_rw_file_perms;
-+neverallow hwservicemanager binder_device:chr_file no_rw_file_perms;
-+neverallow hwservicemanager vndbinder_device:chr_file no_rw_file_perms;
-+neverallow vndservicemanager binder_device:chr_file no_rw_file_perms;
-+neverallow vndservicemanager hwbinder_device:chr_file no_rw_file_perms;
-+
-+# On full TREBLE devices, only core components and apps can use Binder and servicemanager. Non-core
-+# domain apps need this because Android framework offers many of its services to apps as Binder
-+# services.
-+full_treble_only(`
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -binder_in_vendor_violators # TODO(b/35870313): Remove once all violations are gone
-+  } binder_device:chr_file rw_file_perms;
-+')
-+full_treble_only(`
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain # restrictions for vendor apps are declared lower down
-+    -binder_in_vendor_violators # TODO(b/35870313): Remove once all violations are gone
-+  } service_manager_type:service_manager find;
-+')
-+full_treble_only(`
-+  # Vendor apps are permited to use only stable public services. If they were to use arbitrary
-+  # services which can change any time framework/core is updated, breakage is likely.
-+  neverallow {
-+    appdomain
-+    -coredomain
-+  } {
-+    service_manager_type
-+    -app_api_service
-+    -ephemeral_app_api_service
-+    -audioserver_service # TODO(b/36783122) remove exemptions below once app_api_service is fixed
-+    -cameraserver_service
-+    -drmserver_service
-+    -keystore_service
-+    -mediadrmserver_service
-+    -mediaextractor_service
-+    -mediametrics_service
-+    -mediaserver_service
-+    -nfc_service
-+    -radio_service
-+    -virtual_touchpad_service
-+    -vr_hwc_service
-+    -vr_manager_service
-+  }:service_manager find;
-+')
-+full_treble_only(`
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -binder_in_vendor_violators # TODO(b/35870313): Remove once all violations are gone
-+  } servicemanager:binder { call transfer };
-+')
-+
-+# On full TREBLE devices, only vendor components, shell, and su can use VendorBinder.
-+full_treble_only(`
-+  neverallow {
-+    coredomain
-+    -shell
-+    userdebug_or_eng(`-su')
-+    -ueventd # uevent is granted create for this device, but we still neverallow I/O below
-+  } vndbinder_device:chr_file rw_file_perms;
-+')
-+full_treble_only(`
-+  neverallow ueventd vndbinder_device:chr_file { read write append ioctl };
-+')
-+full_treble_only(`
-+  neverallow {
-+    coredomain
-+    -shell
-+    userdebug_or_eng(`-su')
-+  } vndservice_manager_type:service_manager *;
-+')
-+full_treble_only(`
-+  neverallow {
-+    coredomain
-+    -shell
-+    userdebug_or_eng(`-su')
-+  } vndservicemanager:binder *;
-+')
-+
-+# On full TREBLE devices, socket communications between core components and vendor components are
-+# not permitted.
-+  # Most general rules first, more specific rules below.
-+
-+  # Core domains are not permitted to initiate communications to vendor domain sockets.
-+  # We are not restricting the use of already established sockets because it is fine for a process
-+  # to obtain an already established socket via some public/official/stable API and then exchange
-+  # data with its peer over that socket. The wire format in this scenario is dicatated by the API
-+  # and thus does not break the core-vendor separation.
-+full_treble_only(`
-+  neverallow_establish_socket_comms({
-+    coredomain
-+    -init
-+    -adbd
-+  }, {
-+    domain
-+    -coredomain
-+    -socket_between_core_and_vendor_violators
-+  });
-+')
-+  # Vendor domains are not permitted to initiate communications to core domain sockets
-+full_treble_only(`
-+  neverallow_establish_socket_comms({
-+    domain
-+    -coredomain
-+    -appdomain
-+    -socket_between_core_and_vendor_violators
-+  }, {
-+    coredomain
-+    -logd # Logging by writing to logd Unix domain socket is public API
-+    -netd # netdomain needs this
-+    -mdnsd # netdomain needs this
-+    userdebug_or_eng(`-su') # communications with su are permitted only on userdebug or eng builds
-+    -init
-+    -incidentd # TODO(b/35870313): Remove incidentd from this list once vendor domains no longer declare Binder services
-+    -tombstoned # TODO(b/36604251): Remove tombstoned from this list once mediacodec (OMX HAL) no longer declares Binder services
-+  });
-+')
-+
-+  # Vendor domains (except netdomain) are not permitted to initiate communications to netd sockets
-+full_treble_only(`
-+  neverallow_establish_socket_comms({
-+    domain
-+    -coredomain
-+    -netdomain
-+    -socket_between_core_and_vendor_violators
-+  }, netd);
-+')
-+
-+  # Vendor domains are not permitted to initiate create/open sockets owned by core domains
-+full_treble_only(`
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain # appdomain restrictions below
-+    -data_between_core_and_vendor_violators # b/70393317
-+    -socket_between_core_and_vendor_violators
-+    -vendor_init
-+  } {
-+    coredomain_socket
-+    core_data_file_type
-+    unlabeled # used only by core domains
-+  }:sock_file ~{ append getattr ioctl read write };
-+')
-+full_treble_only(`
-+  neverallow {
-+    appdomain
-+    -coredomain
-+  } {
-+    coredomain_socket
-+    unlabeled # used only by core domains
-+    core_data_file_type
-+    -app_data_file
-+    -pdx_endpoint_socket_type # used by VR layer
-+    -pdx_channel_socket_type # used by VR layer
-+  }:sock_file ~{ append getattr ioctl read write };
-+')
-+
-+  # Core domains are not permitted to create/open sockets owned by vendor domains
-+full_treble_only(`
-+  neverallow {
-+    coredomain
-+    -init
-+    -ueventd
-+    -socket_between_core_and_vendor_violators
-+  } {
-+    file_type
-+    dev_type
-+    -coredomain_socket
-+    -core_data_file_type
-+    -unlabeled
-+  }:sock_file ~{ append getattr ioctl read write };
-+')
-+
-+# On TREBLE devices, vendor and system components are only allowed to share
-+# files by passing open FDs over hwbinder. Ban all directory access and all file
-+# accesses other than what can be applied to an open FD such as
-+# ioctl/stat/read/write/append. This is enforced by segregating /data.
-+# Vendor domains may directly access file in /data/vendor by path, but may only
-+# access files outside of /data/vendor via an open FD passed over hwbinder.
-+# Likewise, core domains may only directly access files outside /data/vendor by
-+# path and files in /data/vendor by open FD.
-+full_treble_only(`
-+  # only coredomains may only access core_data_file_type, particularly not
-+  # /data/vendor
-+  neverallow {
-+    coredomain
-+    -appdomain # TODO(b/34980020) remove exemption for appdomain
-+    -data_between_core_and_vendor_violators
-+    -init
-+    -vold_prepare_subdirs
-+  } {
-+    data_file_type
-+    -core_data_file_type
-+  }:file_class_set ~{ append getattr ioctl read write };
-+')
-+full_treble_only(`
-+  neverallow {
-+    coredomain
-+    -appdomain # TODO(b/34980020) remove exemption for appdomain
-+    -data_between_core_and_vendor_violators
-+    -init
-+    -vold_prepare_subdirs
-+    } {
-+      data_file_type
-+      -core_data_file_type
-+      # TODO(b/72998741) Remove exemption. Further restricted in a subsequent
-+      # neverallow. Currently only getattr and search are allowed.
-+      -vendor_data_file
-+    }:dir *;
-+
-+')
-+full_treble_only(`
-+  # vendor domains may only access files in /data/vendor, never core_data_file_types
-+  neverallow {
-+    domain
-+    -appdomain # TODO(b/34980020) remove exemption for appdomain
-+    -coredomain
-+    -data_between_core_and_vendor_violators # TODO(b/34980020) Remove once all violators have been cleaned up
-+    -vendor_init
-+  } {
-+    core_data_file_type
-+    # libc includes functions like mktime and localtime which attempt to access
-+    # files in /data/misc/zoneinfo/tzdata file. These functions are considered
-+    # vndk-stable and thus must be allowed for all processes.
-+    -zoneinfo_data_file
-+  }:file_class_set ~{ append getattr ioctl read write };
-+  neverallow {
-+    vendor_init
-+    -data_between_core_and_vendor_violators
-+  } {
-+    core_data_file_type
-+    -unencrypted_data_file
-+    -zoneinfo_data_file
-+  }:file_class_set ~{ append getattr ioctl read write };
-+  # vendor init needs to be able to read unencrypted_data_file to create directories with FBE.
-+  # The vendor init binary lives on the system partition so there is not a concern with stability.
-+  neverallow vendor_init unencrypted_data_file:file ~r_file_perms;
-+')
-+full_treble_only(`
-+  # vendor domains may only access dirs in /data/vendor, never core_data_file_types
-+  neverallow {
-+    domain
-+    -appdomain # TODO(b/34980020) remove exemption for appdomain
-+    -coredomain
-+    -data_between_core_and_vendor_violators
-+    -vendor_init
-+  } {
-+    core_data_file_type
-+    -system_data_file # default label for files on /data. Covered below...
-+    -vendor_data_file
-+    -zoneinfo_data_file
-+  }:dir *;
-+  neverallow {
-+    vendor_init
-+    -data_between_core_and_vendor_violators
-+  } {
-+    core_data_file_type
-+    -unencrypted_data_file
-+    -system_data_file
-+    -vendor_data_file
-+    -zoneinfo_data_file
-+  }:dir *;
-+  # vendor init needs to be able to read unencrypted_data_file to create directories with FBE.
-+  # The vendor init binary lives on the system partition so there is not a concern with stability.
-+  neverallow vendor_init unencrypted_data_file:dir ~search;
-+')
-+full_treble_only(`
-+  # vendor domains may only access dirs in /data/vendor, never core_data_file_types
-+  neverallow {
-+    domain
-+    -appdomain # TODO(b/34980020) remove exemption for appdomain
-+    -coredomain
-+    -data_between_core_and_vendor_violators # TODO(b/34980020) Remove once all violators have been cleaned up
-+    } {
-+      system_data_file # default label for files on /data. Covered below
-+    }:dir ~{ getattr search };
-+')
-+
-+full_treble_only(`
-+  #  coredomains may not access dirs in /data/vendor.
-+  neverallow {
-+    coredomain
-+    -data_between_core_and_vendor_violators # TODO(b/34980020) Remove once all violators have been cleaned up
-+    -init
-+    -vold # vold creates per-user storage for both system and vendor
-+    -vold_prepare_subdirs
-+    } {
-+      vendor_data_file # default label for files on /data. Covered below
-+    }:dir ~{ getattr search };
-+')
-+
-+full_treble_only(`
-+  #  coredomains may not access dirs in /data/vendor.
-+  neverallow {
-+    coredomain
-+    -data_between_core_and_vendor_violators # TODO(b/34980020) Remove once all violators have been cleaned up
-+    -init
-+    } {
-+      vendor_data_file # default label for files on /data/vendor{,_ce,_de}.
-+    }:file_class_set ~{ append getattr ioctl read write };
-+')
-+
-+# On TREBLE devices, a limited set of files in /vendor are accessible to
-+# only a few allowlisted coredomains to keep system/vendor separation.
-+full_treble_only(`
-+    # Limit access to /vendor/app
-+    neverallow {
-+        coredomain
-+        -appdomain
-+        -dex2oat
-+        -idmap
-+        -init
-+        -installd
-+        userdebug_or_eng(`-perfprofd')
-+        -postinstall_dexopt
-+        -system_server
-+    } vendor_app_file:dir { open read getattr search };
-+')
-+
-+full_treble_only(`
-+    neverallow {
-+        coredomain
-+        -appdomain
-+        -dex2oat
-+        -idmap
-+        -init
-+        -installd
-+        userdebug_or_eng(`-perfprofd')
-+        -postinstall_dexopt
-+        -system_server
-+    } vendor_app_file:file r_file_perms;
-+')
-+
-+full_treble_only(`
-+    # Limit access to /vendor/overlay
-+    neverallow {
-+        coredomain
-+        -appdomain
-+        -idmap
-+        -init
-+        -installd
-+        -system_server
-+        -webview_zygote
-+        -zygote
-+    } vendor_overlay_file:dir { getattr open read search };
-+')
-+
-+full_treble_only(`
-+    neverallow {
-+        coredomain
-+        -appdomain
-+        -idmap
-+        -init
-+        -installd
-+        -system_server
-+        -webview_zygote
-+        -zygote
-+    } vendor_overlay_file:file r_file_perms;
-+')
-+
-+full_treble_only(`
-+    # Non-vendor domains are not allowed to file execute shell
-+    # from vendor
-+    neverallow {
-+        coredomain
-+        -init
-+        -shell
-+    } vendor_shell_exec:file { execute execute_no_trans };
-+')
-+
-+full_treble_only(`
-+    # Do not allow vendor components to execute files from system
-+    # except for the ones allowlist here.
-+    neverallow {
-+        domain
-+        -coredomain
-+        -appdomain
-+        -vendor_executes_system_violators
-+        -vendor_init
-+    } {
-+        exec_type
-+        -vendor_file_type
-+        -crash_dump_exec
-+        -netutils_wrapper_exec
-+    }:file { entrypoint execute execute_no_trans };
-+')
-+
-+full_treble_only(`
-+    # Do not allow system components to execute files from vendor
-+    # except for the ones allowlisted here.
-+    neverallow {
-+      coredomain
-+      -init
-+      -shell
-+      -system_executes_vendor_violators
-+    } {
-+      vendor_file_type
-+      -same_process_hal_file
-+      -vndk_sp_file
-+      -vendor_app_file
-+    }:file execute;
-+')
-+
-+full_treble_only(`
-+    neverallow {
-+      coredomain
-+      -shell
-+      -system_executes_vendor_violators
-+    } vendor_file_type:file execute_no_trans;
-+')
-+
-+# Only authorized processes should be writing to files in /data/dalvik-cache
-+neverallow {
-+  domain
-+  -init # TODO: limit init to relabelfrom for files
-+  -zygote
-+  -installd
-+  -postinstall_dexopt
-+  -cppreopts
-+  -dex2oat
-+  -otapreopt_slot
-+} dalvikcache_data_file:file no_w_file_perms;
-+
-+neverallow {
-+  domain
-+  -init
-+  -installd
-+  -postinstall_dexopt
-+  -cppreopts
-+  -dex2oat
-+  -zygote
-+  -otapreopt_slot
-+} dalvikcache_data_file:dir no_w_dir_perms;
-+
-+# Only system_server should be able to send commands via the zygote socket
-+neverallow { domain -zygote -system_server } zygote:unix_stream_socket connectto;
-+neverallow { domain -system_server } zygote_socket:sock_file write;
-+
-+neverallow { domain -system_server -webview_zygote } webview_zygote:unix_stream_socket connectto;
-+neverallow { domain -system_server } webview_zygote:sock_file write;
-+
-+neverallow {
-+  domain
-+  -tombstoned
-+  -crash_dump
-+  -dumpstate
-+  -incidentd
-+  -system_server
-+
-+  # Processes that can't exec crash_dump
-+  -mediacodec
-+  -mediaextractor
-+} tombstoned_crash_socket:unix_stream_socket connectto;
-+
-+# Never allow anyone except dumpstate, incidentd, or the system server to connect or write to
-+# the tombstoned intercept socket.
-+neverallow { domain -dumpstate -incidentd -system_server } tombstoned_intercept_socket:sock_file write;
-+neverallow { domain -dumpstate -incidentd -system_server } tombstoned_intercept_socket:unix_stream_socket connectto;
-+
-+# Android does not support System V IPCs.
-+#
-+# The reason for this is due to the fact that, by design, they lead to global
-+# kernel resource leakage.
-+#
-+# For example, there is no way to automatically release a SysV semaphore
-+# allocated in the kernel when:
-+#
-+# - a buggy or malicious process exits
-+# - a non-buggy and non-malicious process crashes or is explicitly killed.
-+#
-+# Killing processes automatically to make room for new ones is an
-+# important part of Android's application lifecycle implementation. This means
-+# that, even assuming only non-buggy and non-malicious code, it is very likely
-+# that over time, the kernel global tables used to implement SysV IPCs will fill
-+# up.
-+neverallow * *:{ shm sem msg msgq } *;
-+
-+# Do not mount on top of symlinks, fifos, or sockets.
-+# Feature parity with Chromium LSM.
-+neverallow * { file_type fs_type dev_type }:{ lnk_file fifo_file sock_file } mounton;
-+
-+# Nobody should be able to execute su on user builds.
-+# On userdebug/eng builds, only dumpstate, shell, and
-+# su itself execute su.
-+neverallow { domain userdebug_or_eng(`-dumpstate -shell -su') } su_exec:file no_x_file_perms;
-+
-+# Do not allow the introduction of new execmod rules. Text relocations
-+# and modification of executable pages are unsafe.
-+# The only exceptions are for NDK text relocations associated with
-+# https://code.google.com/p/android/issues/detail?id=23203
-+# which, long term, need to go away.
-+neverallow * {
-+  file_type
-+  -apk_data_file
-+  -app_data_file
-+  -asec_public_file
-+}:file execmod;
-+
-+# Do not allow making the stack or heap executable.
-+# We would also like to minimize execmem but it seems to be
-+# required by some device-specific service domains.
-+neverallow * self:process { execstack execheap };
-+
-+# prohibit non-zygote spawned processes from using shared libraries
-+# with text relocations. b/20013628 .
-+neverallow { domain -untrusted_app_all } file_type:file execmod;
-+
-+neverallow { domain -init } proc:{ file dir } mounton;
-+
-+# Ensure that all types assigned to processes are included
-+# in the domain attribute, so that all allow and neverallow rules
-+# written on domain are applied to all processes.
-+# This is achieved by ensuring that it is impossible to transition
-+# from a domain to a non-domain type and vice versa.
-+# TODO - rework this: neverallow domain ~domain:process { transition dyntransition };
-+neverallow ~domain domain:process { transition dyntransition };
-+
-+#
-+# Only system_app and system_server should be creating or writing
-+# their files. The proper way to share files is to setup
-+# type transitions to a more specific type or assigning a type
-+# to its parent directory via a file_contexts entry.
-+# Example type transition:
-+#  mydomain.te:file_type_auto_trans(mydomain, system_data_file, new_file_type)
-+#
-+neverallow {
-+  domain
-+  -system_server
-+  -system_app
-+  -init
-+  -installd # for relabelfrom and unlink, check for this in explicit neverallow
-+  -vold_prepare_subdirs # For unlink
-+  with_asan(`-asan_extract')
-+} system_data_file:file no_w_file_perms;
-+# do not grant anything greater than r_file_perms and relabelfrom unlink
-+# to installd
-+neverallow installd system_data_file:file ~{ r_file_perms relabelfrom unlink };
-+
-+# respect system_app sandboxes
-+neverallow {
-+  domain
-+  -appdomain # finer-grained rules for appdomain are listed below
-+  -system_server #populate com.android.providers.settings/databases/settings.db.
-+  -installd # creation of app sandbox
-+  -traced_probes # resolve inodes for i/o tracing.
-+                 # only needs open and read, the rest is neverallow in
-+                 # traced_probes.te.
-+} system_app_data_file:dir_file_class_set { create unlink open };
-+neverallow {
-+  isolated_app
-+  untrusted_app_all # finer-grained rules for appdomain are listed below
-+  ephemeral_app
-+  priv_app
-+} system_app_data_file:dir_file_class_set { create unlink open };
-+
-+
-+# Services should respect app sandboxes
-+neverallow {
-+  domain
-+  -appdomain
-+  -installd # creation of sandbox
-+} app_data_file:dir_file_class_set { create unlink };
-+
-+#
-+# Only these domains should transition to shell domain. This domain is
-+# permissible for the "shell user". If you need a process to exec a shell
-+# script with differing privilege, define a domain and set up a transition.
-+#
-+neverallow {
-+  domain
-+  -adbd
-+  -init
-+  -runas
-+  -zygote
-+} shell:process { transition dyntransition };
-+
-+# Only domains spawned from zygote and runas may have the appdomain attribute.
-+neverallow { domain -runas -webview_zygote -zygote } {
-+  appdomain -shell userdebug_or_eng(`-su')
-+}:process { transition dyntransition };
-+
-+# Minimize read access to shell- or app-writable symlinks.
-+# This is to prevent malicious symlink attacks.
-+neverallow {
-+  domain
-+  -appdomain
-+  -installd
-+  -uncrypt  # TODO: see if we can remove
-+} app_data_file:lnk_file read;
-+
-+neverallow {
-+  domain
-+  -shell
-+  userdebug_or_eng(`-uncrypt')
-+  -installd
-+} shell_data_file:lnk_file read;
-+
-+# In addition to the symlink reading restrictions above, restrict
-+# write access to shell owned directories. The /data/local/tmp
-+# directory is untrustworthy, and non-allowlisted domains should
-+# not be trusting any content in those directories.
-+neverallow {
-+  domain
-+  -adbd
-+  -dumpstate
-+  -installd
-+  -init
-+  -shell
-+  -vold
-+} shell_data_file:dir no_w_dir_perms;
-+
-+neverallow {
-+  domain
-+  -adbd
-+  -appdomain
-+  -dumpstate
-+  -init
-+  -installd
-+  -system_server # why?
-+  userdebug_or_eng(`-uncrypt')
-+} shell_data_file:dir { open search };
-+
-+# Same as above for /data/local/tmp files. We allow shell files
-+# to be passed around by file descriptor, but not directly opened.
-+neverallow {
-+  domain
-+  -adbd
-+  -appdomain
-+  -dumpstate
-+  -installd
-+  userdebug_or_eng(`-uncrypt')
-+} shell_data_file:file open;
-+
-+# servicemanager and vndservicemanager are the only processes which handle the
-+# service_manager list request
-+neverallow * ~{
-+    servicemanager
-+    vndservicemanager
-+    }:service_manager list;
-+
-+# hwservicemanager is the only process which handles hw list requests
-+neverallow * ~{
-+    hwservicemanager
-+    }:hwservice_manager list;
-+
-+# only service_manager_types can be added to service_manager
-+# TODO - rework this: neverallow * ~service_manager_type:service_manager { add find };
-+
-+# Prevent assigning non property types to properties
-+# TODO - rework this: neverallow * ~property_type:property_service set;
-+
-+# Domain types should never be assigned to any files other
-+# than the /proc/pid files associated with a process. The
-+# executable file used to enter a domain should be labeled
-+# with its own _exec type, not with the domain type.
-+# Conventionally, this looks something like:
-+# $ cat mydaemon.te
-+# type mydaemon, domain;
-+# type mydaemon_exec, exec_type, file_type;
-+# init_daemon_domain(mydaemon)
-+# $ grep mydaemon file_contexts
-+# /system/bin/mydaemon -- u:object_r:mydaemon_exec:s0
-+neverallow * domain:file { execute execute_no_trans entrypoint };
-+
-+# Do not allow access to the generic debugfs label. This is too broad.
-+# Instead, if access to part of debugfs is desired, it should have a
-+# more specific label.
-+# TODO: fix system_server and dumpstate
-+neverallow { domain -init -vendor_init -system_server -dumpstate } debugfs:file no_rw_file_perms;
-+
-+# Profiles contain untrusted data and profman parses that. We should only run
-+# in from installd forked processes.
-+neverallow {
-+  domain
-+  -installd
-+  -profman
-+} profman_exec:file no_x_file_perms;
-+
-+# Enforce restrictions on kernel module origin.
-+# Do not allow kernel module loading except from system,
-+# vendor, and boot partitions.
-+neverallow * ~{ system_file vendor_file rootfs }:system module_load;
-+
-+# Only allow filesystem caps to be set at build time. Runtime changes
-+# to filesystem capabilities are not permitted.
-+neverallow * self:global_capability_class_set setfcap;
-+
-+# Enforce AT_SECURE for executing crash_dump.
-+neverallow domain crash_dump:process noatsecure;
-+
-+# Do not permit non-core domains to register HwBinder services which are
-+# guaranteed to be provided by core domains only.
-+neverallow ~coredomain coredomain_hwservice:hwservice_manager add;
-+
-+# Do not permit the registeration of HwBinder services which are guaranteed to
-+# be passthrough only (i.e., run in the process of their clients instead of a
-+# separate server process).
-+neverallow * same_process_hwservice:hwservice_manager add;
-+
-+# On TREBLE devices, most coredomains should not access vendor_files.
-+# TODO(b/71553434): Remove exceptions here.
-+full_treble_only(`
-+  neverallow {
-+    coredomain
-+    -appdomain
-+    -bootanim
-+    -crash_dump
-+    -init
-+    -kernel
-+    -perfprofd
-+    -ueventd
-+  } vendor_file:file { no_w_file_perms no_x_file_perms open };
-+')
-+
-+# Minimize dac_override and dac_read_search.
-+# Instead of granting them it is usually better to add the domain to
-+# a Unix group or change the permissions of a file.
-+neverallow {
-+  domain
-+  -dnsmasq
-+  -dumpstate
-+  -init
-+  -installd
-+  -install_recovery
-+  -lmkd
-+  -netd
-+  -perfprofd
-+  -postinstall_dexopt
-+  -recovery
-+  -sdcardd
-+  -tee
-+  -ueventd
-+  -uncrypt
-+  -vendor_init
-+  -vold
-+  -vold_prepare_subdirs
-+  -zygote
-+} self:capability dac_override;
-+neverallow { domain -traced_probes } self:capability dac_read_search;
-+
-+# If an already existing file is opened with O_CREAT, the kernel might generate
-+# a false report of a create denial. Silence these denials and make sure that
-+# inappropriate permissions are not granted.
-+
-+# These filesystems don't allow files or directories to be created, so the permission
-+# to do so should never be granted.
-+neverallow domain {
-+  proc_type
-+  sysfs_type
-+}:dir { add_name create link remove_name rename reparent rmdir write };
-+
-+# cgroupfs directories can be created, but not files within them.
-+neverallow domain cgroup:file create;
-+
-+dontaudit domain proc_type:dir write;
-+dontaudit domain sysfs_type:dir write;
-+dontaudit domain cgroup:file create;
-+
-+# These are only needed in permissive mode - in enforcing mode the
-+# directory write check fails and so these are never attempted.
-+userdebug_or_eng(`
-+  dontaudit domain proc_type:dir add_name;
-+  dontaudit domain sysfs_type:dir add_name;
-+  dontaudit domain proc_type:file create;
-+  dontaudit domain sysfs_type:file create;
-+')
-+
-+# Platform must not have access to /mnt/vendor.
-+neverallow {
-+  coredomain
-+  -init
-+} mnt_vendor_file:dir *;
-diff --git a/prebuilts/api/28.0/public/drmserver.te b/prebuilts/api/28.0/public/drmserver.te
-new file mode 100644
-index 000000000..f752c13ee
---- /dev/null
-+++ b/prebuilts/api/28.0/public/drmserver.te
-@@ -0,0 +1,58 @@
-+# drmserver - DRM service
-+type drmserver, domain;
-+type drmserver_exec, exec_type, file_type;
-+
-+typeattribute drmserver mlstrustedsubject;
-+
-+net_domain(drmserver)
-+
-+# Perform Binder IPC to system server.
-+binder_use(drmserver)
-+binder_call(drmserver, system_server)
-+binder_call(drmserver, appdomain)
-+binder_service(drmserver)
-+# Inherit or receive open files from system_server.
-+allow drmserver system_server:fd use;
-+
-+# Perform Binder IPC to mediaserver
-+binder_call(drmserver, mediaserver)
-+
-+allow drmserver sdcard_type:dir search;
-+allow drmserver drm_data_file:dir create_dir_perms;
-+allow drmserver drm_data_file:file create_file_perms;
-+allow drmserver tee_device:chr_file rw_file_perms;
-+allow drmserver app_data_file:file { read write getattr };
-+allow drmserver sdcard_type:file { read write getattr };
-+r_dir_file(drmserver, efs_file)
-+
-+type drmserver_socket, file_type;
-+
-+# /data/app/tlcd_sock socket file.
-+# Clearly, /data/app is the most logical place to create a socket.  Not.
-+allow drmserver apk_data_file:dir rw_dir_perms;
-+allow drmserver drmserver_socket:sock_file create_file_perms;
-+# Delete old socket file if present.
-+allow drmserver apk_data_file:sock_file unlink;
-+
-+# After taking a video, drmserver looks at the video file.
-+r_dir_file(drmserver, media_rw_data_file)
-+
-+# Read resources from open apk files passed over Binder.
-+allow drmserver apk_data_file:file { read getattr };
-+allow drmserver asec_apk_file:file { read getattr };
-+allow drmserver ringtone_file:file { read getattr };
-+
-+# Read /data/data/com.android.providers.telephony files passed over Binder.
-+allow drmserver radio_data_file:file { read getattr };
-+
-+# /oem access
-+allow drmserver oemfs:dir search;
-+allow drmserver oemfs:file r_file_perms;
-+
-+add_service(drmserver, drmserver_service)
-+allow drmserver permission_service:service_manager find;
-+
-+selinux_check_access(drmserver)
-+
-+r_dir_file(drmserver, cgroup)
-+r_dir_file(drmserver, system_file)
-diff --git a/prebuilts/api/28.0/public/dumpstate.te b/prebuilts/api/28.0/public/dumpstate.te
-new file mode 100644
-index 000000000..03fc737eb
---- /dev/null
-+++ b/prebuilts/api/28.0/public/dumpstate.te
-@@ -0,0 +1,289 @@
-+# dumpstate
-+type dumpstate, domain, mlstrustedsubject;
-+type dumpstate_exec, exec_type, file_type;
-+
-+net_domain(dumpstate)
-+binder_use(dumpstate)
-+wakelock_use(dumpstate)
-+
-+# Allow setting process priority, protect from OOM killer, and dropping
-+# privileges by switching UID / GID
-+allow dumpstate self:global_capability_class_set { setuid setgid sys_resource };
-+
-+# Allow dumpstate to scan through /proc/pid for all processes
-+r_dir_file(dumpstate, domain)
-+
-+allow dumpstate self:global_capability_class_set {
-+    # Send signals to processes
-+    kill
-+    # Run iptables
-+    net_raw
-+    net_admin
-+};
-+
-+# Allow executing files on system, such as:
-+#   /system/bin/toolbox
-+#   /system/bin/logcat
-+#   /system/bin/dumpsys
-+allow dumpstate system_file:file execute_no_trans;
-+not_full_treble(`allow dumpstate vendor_file:file execute_no_trans;')
-+allow dumpstate toolbox_exec:file rx_file_perms;
-+
-+# hidl searches for files in /system/lib(64)/hw/
-+allow dumpstate system_file:dir r_dir_perms;
-+
-+# Create and write into /data/anr/
-+allow dumpstate self:global_capability_class_set { dac_override chown fowner fsetid };
-+allow dumpstate anr_data_file:dir rw_dir_perms;
-+allow dumpstate anr_data_file:file create_file_perms;
-+
-+# Allow reading /data/system/uiderrors.txt
-+# TODO: scope this down.
-+allow dumpstate system_data_file:file r_file_perms;
-+
-+# Read dmesg
-+allow dumpstate self:global_capability2_class_set syslog;
-+allow dumpstate kernel:system syslog_read;
-+
-+# Read /sys/fs/pstore/console-ramoops
-+allow dumpstate pstorefs:dir r_dir_perms;
-+allow dumpstate pstorefs:file r_file_perms;
-+
-+# Get process attributes
-+allow dumpstate domain:process getattr;
-+
-+# Signal java processes to dump their stack
-+allow dumpstate { appdomain system_server }:process signal;
-+
-+# Signal native processes to dump their stack.
-+allow dumpstate {
-+  # This list comes from native_processes_to_dump in dumputils/dump_utils.c
-+  audioserver
-+  cameraserver
-+  drmserver
-+  inputflinger
-+  mediadrmserver
-+  mediaextractor
-+  mediametrics
-+  mediaserver
-+  sdcardd
-+  surfaceflinger
-+
-+  # This list comes from hal_interfaces_to_dump in dumputils/dump_utils.c
-+  hal_audio_server
-+  hal_bluetooth_server
-+  hal_camera_server
-+  hal_drm_server
-+  hal_graphics_composer_server
-+  hal_sensors_server
-+  hal_vr_server
-+  mediacodec # TODO(b/36375899): hal_omx_server
-+}:process signal;
-+
-+# Connect to tombstoned to intercept dumps.
-+unix_socket_connect(dumpstate, tombstoned_intercept, tombstoned)
-+
-+# Access to /sys
-+allow dumpstate sysfs_type:dir r_dir_perms;
-+
-+allow dumpstate {
-+  sysfs_dm
-+  sysfs_usb
-+  sysfs_zram
-+}:file r_file_perms;
-+
-+# Other random bits of data we want to collect
-+allow dumpstate qtaguid_proc:file r_file_perms;
-+allow dumpstate debugfs:file r_file_perms;
-+
-+# df for
-+allow dumpstate {
-+  block_device
-+  cache_file
-+  metadata_file
-+  rootfs
-+  selinuxfs
-+  storage_file
-+  tmpfs
-+}:dir { search getattr };
-+allow dumpstate fuse_device:chr_file getattr;
-+allow dumpstate { dm_device cache_block_device }:blk_file getattr;
-+allow dumpstate { cache_file rootfs }:lnk_file { getattr read };
-+
-+# Read /dev/cpuctl and /dev/cpuset
-+r_dir_file(dumpstate, cgroup)
-+
-+# Allow dumpstate to make binder calls to any binder service
-+binder_call(dumpstate, binderservicedomain)
-+binder_call(dumpstate, { appdomain netd wificond })
-+
-+hal_client_domain(dumpstate, hal_dumpstate)
-+hal_client_domain(dumpstate, hal_graphics_allocator)
-+# Vibrate the device after we are done collecting the bugreport
-+hal_client_domain(dumpstate, hal_vibrator)
-+
-+# Reading /proc/PID/maps of other processes
-+allow dumpstate self:global_capability_class_set sys_ptrace;
-+
-+# Allow the bugreport service to create a file in
-+# /data/data/com.android.shell/files/bugreports/bugreport
-+allow dumpstate shell_data_file:dir create_dir_perms;
-+allow dumpstate shell_data_file:file create_file_perms;
-+
-+# Run a shell.
-+allow dumpstate shell_exec:file rx_file_perms;
-+
-+# For running am and similar framework commands.
-+# Run /system/bin/app_process.
-+allow dumpstate zygote_exec:file rx_file_perms;
-+# Dalvik Compiler JIT.
-+allow dumpstate ashmem_device:chr_file execute;
-+allow dumpstate self:process execmem;
-+# For art.
-+allow dumpstate dalvikcache_data_file:dir { search getattr };
-+allow dumpstate dalvikcache_data_file:file { r_file_perms execute };
-+allow dumpstate dalvikcache_data_file:lnk_file r_file_perms;
-+
-+# For Bluetooth
-+allow dumpstate bluetooth_data_file:dir search;
-+allow dumpstate bluetooth_logs_data_file:dir r_dir_perms;
-+allow dumpstate bluetooth_logs_data_file:file r_file_perms;
-+
-+# Dumpstate calls screencap, which grabs a screenshot. Needs gpu access
-+allow dumpstate gpu_device:chr_file rw_file_perms;
-+
-+# logd access
-+read_logd(dumpstate)
-+control_logd(dumpstate)
-+read_runtime_log_tags(dumpstate)
-+
-+# Read files in /proc
-+allow dumpstate {
-+  proc_buddyinfo
-+  proc_cmdline
-+  proc_meminfo
-+  proc_modules
-+  proc_net
-+  proc_pipe_conf
-+  proc_pagetypeinfo
-+  proc_qtaguid_stat
-+  proc_version
-+  proc_vmallocinfo
-+  proc_vmstat
-+}:file r_file_perms;
-+
-+# Read network state info files.
-+allow dumpstate net_data_file:dir search;
-+allow dumpstate net_data_file:file r_file_perms;
-+
-+# List sockets via ss.
-+allow dumpstate self:netlink_tcpdiag_socket { create_socket_perms_no_ioctl nlmsg_read };
-+
-+# Access /data/tombstones.
-+allow dumpstate tombstone_data_file:dir r_dir_perms;
-+allow dumpstate tombstone_data_file:file r_file_perms;
-+
-+# Access /cache/recovery
-+allow dumpstate cache_recovery_file:dir r_dir_perms;
-+allow dumpstate cache_recovery_file:file r_file_perms;
-+
-+# Access /data/misc/recovery
-+allow dumpstate recovery_data_file:dir r_dir_perms;
-+allow dumpstate recovery_data_file:file r_file_perms;
-+
-+#Access /data/misc/update_engine_log
-+allow dumpstate update_engine_log_data_file:dir r_dir_perms;
-+allow dumpstate update_engine_log_data_file:file r_file_perms;
-+
-+# Access /data/misc/profiles/{cur,ref}/
-+userdebug_or_eng(`
-+  allow dumpstate user_profile_data_file:dir r_dir_perms;
-+  allow dumpstate user_profile_data_file:file r_file_perms;
-+')
-+
-+# Access /data/misc/logd
-+userdebug_or_eng(`
-+  allow dumpstate misc_logd_file:dir r_dir_perms;
-+  allow dumpstate misc_logd_file:file r_file_perms;
-+')
-+
-+allow dumpstate {
-+  service_manager_type
-+  -dumpstate_service
-+  -gatekeeper_service
-+  -incident_service
-+  -virtual_touchpad_service
-+  -vold_service
-+  -vr_hwc_service
-+}:service_manager find;
-+# suppress denials for services dumpstate should not be accessing.
-+dontaudit dumpstate {
-+  dumpstate_service
-+  gatekeeper_service
-+  incident_service
-+  virtual_touchpad_service
-+  vold_service
-+  vr_hwc_service
-+}:service_manager find;
-+
-+allow dumpstate servicemanager:service_manager list;
-+allow dumpstate hwservicemanager:hwservice_manager list;
-+
-+allow dumpstate devpts:chr_file rw_file_perms;
-+
-+# Set properties.
-+# dumpstate_prop is used to share state with the Shell app.
-+set_prop(dumpstate, dumpstate_prop)
-+set_prop(dumpstate, exported_dumpstate_prop)
-+# dumpstate_options_prop is used to pass extra command-line args.
-+set_prop(dumpstate, dumpstate_options_prop)
-+
-+# Read any system properties
-+get_prop(dumpstate, property_type)
-+
-+# Access to /data/media.
-+# This should be removed if sdcardfs is modified to alter the secontext for its
-+# accesses to the underlying FS.
-+allow dumpstate media_rw_data_file:dir getattr;
-+allow dumpstate proc_interrupts:file r_file_perms;
-+allow dumpstate proc_zoneinfo:file r_file_perms;
-+
-+# Create a service for talking back to system_server
-+add_service(dumpstate, dumpstate_service)
-+
-+# use /dev/ion for screen capture
-+allow dumpstate ion_device:chr_file r_file_perms;
-+
-+# Allow dumpstate to run top
-+allow dumpstate proc_stat:file r_file_perms;
-+
-+# Allow dumpstate to talk to installd over binder
-+binder_call(dumpstate, installd);
-+
-+# Allow dumpstate to run ip xfrm policy
-+allow dumpstate self:netlink_xfrm_socket { create_socket_perms_no_ioctl nlmsg_read };
-+
-+# Allow dumpstate to run iotop
-+allow dumpstate self:netlink_socket create_socket_perms_no_ioctl;
-+# newer kernels (e.g. 4.4) have a new class for sockets
-+allow dumpstate self:netlink_generic_socket create_socket_perms_no_ioctl;
-+
-+# Allow dumpstate to kill vendor dumpstate service by init
-+set_prop(dumpstate, ctl_dumpstate_prop)
-+
-+###
-+### neverallow rules
-+###
-+
-+# dumpstate has capability sys_ptrace, but should only use that capability for
-+# accessing sensitive /proc/PID files, never for using ptrace attach.
-+neverallow dumpstate *:process ptrace;
-+
-+# only system_server, dumpstate, traceur_app and shell can find the dumpstate service
-+neverallow {
-+  domain
-+  -system_server
-+  -shell
-+  -traceur_app
-+  -dumpstate
-+} dumpstate_service:service_manager find;
-diff --git a/prebuilts/api/28.0/public/e2fs.te b/prebuilts/api/28.0/public/e2fs.te
-new file mode 100644
-index 000000000..6fcd0c2fb
---- /dev/null
-+++ b/prebuilts/api/28.0/public/e2fs.te
-@@ -0,0 +1,22 @@
-+type e2fs, domain, coredomain;
-+type e2fs_exec, exec_type, file_type;
-+
-+allow e2fs devpts:chr_file { read write getattr ioctl };
-+
-+allow e2fs dev_type:blk_file getattr;
-+allow e2fs block_device:dir search;
-+allow e2fs userdata_block_device:blk_file rw_file_perms;
-+allow e2fs metadata_block_device:blk_file rw_file_perms;
-+
-+allow e2fs {
-+  proc_filesystems
-+  proc_mounts
-+  proc_swaps
-+}:file r_file_perms;
-+
-+# access /sys/fs/ext4/features
-+allow e2fs sysfs_fs_ext4_features:dir search;
-+allow e2fs sysfs_fs_ext4_features:file r_file_perms;
-+
-+# access sselinux context files
-+allow e2fs file_contexts_file:file { getattr open read };
-diff --git a/prebuilts/api/28.0/public/ephemeral_app.te b/prebuilts/api/28.0/public/ephemeral_app.te
-new file mode 100644
-index 000000000..dc39a22b5
---- /dev/null
-+++ b/prebuilts/api/28.0/public/ephemeral_app.te
-@@ -0,0 +1,14 @@
-+###
-+### Ephemeral apps.
-+###
-+### This file defines the security policy for apps with the ephemeral
-+### feature.
-+###
-+### The ephemeral_app domain is a reduced permissions sandbox allowing
-+### ephemeral applications to be safely installed and run. Non ephemeral
-+### applications may also opt-in to ephemeral to take advantage of the
-+### additional security features.
-+###
-+### PackageManager flags an app as ephemeral at install time.
-+
-+type ephemeral_app, domain;
-diff --git a/prebuilts/api/28.0/public/file.te b/prebuilts/api/28.0/public/file.te
-new file mode 100644
-index 000000000..ccfec1529
---- /dev/null
-+++ b/prebuilts/api/28.0/public/file.te
-@@ -0,0 +1,411 @@
-+# Filesystem types
-+type labeledfs, fs_type;
-+type pipefs, fs_type;
-+type sockfs, fs_type;
-+type rootfs, fs_type;
-+type proc, fs_type, proc_type;
-+# Security-sensitive proc nodes that should not be writable to most.
-+type proc_security, fs_type, proc_type;
-+type proc_drop_caches, fs_type, proc_type;
-+type proc_overcommit_memory, fs_type, proc_type;
-+type proc_min_free_order_shift, fs_type, proc_type;
-+# proc, sysfs, or other nodes that permit configuration of kernel usermodehelpers.
-+type usermodehelper, fs_type, proc_type;
-+type sysfs_usermodehelper, fs_type, sysfs_type;
-+type qtaguid_proc, fs_type, mlstrustedobject, proc_type;
-+type proc_qtaguid_stat, fs_type, mlstrustedobject, proc_type;
-+type proc_bluetooth_writable, fs_type, proc_type;
-+type proc_abi, fs_type, proc_type;
-+type proc_asound, fs_type, proc_type;
-+type proc_buddyinfo, fs_type, proc_type;
-+type proc_cmdline, fs_type, proc_type;
-+type proc_cpuinfo, fs_type, proc_type;
-+type proc_dirty, fs_type, proc_type;
-+type proc_diskstats, fs_type, proc_type;
-+type proc_extra_free_kbytes, fs_type, proc_type;
-+type proc_filesystems, fs_type, proc_type;
-+type proc_hostname, fs_type, proc_type;
-+type proc_hung_task, fs_type, proc_type;
-+type proc_interrupts, fs_type, proc_type;
-+type proc_iomem, fs_type, proc_type;
-+type proc_kmsg, fs_type, proc_type;
-+type proc_loadavg, fs_type, proc_type;
-+type proc_max_map_count, fs_type, proc_type;
-+type proc_meminfo, fs_type, proc_type;
-+type proc_misc, fs_type, proc_type;
-+type proc_modules, fs_type, proc_type;
-+type proc_mounts, fs_type, proc_type;
-+type proc_net, fs_type, proc_type;
-+type proc_page_cluster, fs_type, proc_type;
-+type proc_pagetypeinfo, fs_type, proc_type;
-+type proc_panic, fs_type, proc_type;
-+type proc_perf, fs_type, proc_type;
-+type proc_pid_max, fs_type, proc_type;
-+type proc_pipe_conf, fs_type, proc_type;
-+type proc_random, fs_type, proc_type;
-+type proc_sched, fs_type, proc_type;
-+type proc_stat, fs_type, proc_type;
-+type proc_swaps, fs_type, proc_type;
-+type proc_sysrq, fs_type, proc_type;
-+type proc_timer, fs_type, proc_type;
-+type proc_tty_drivers, fs_type, proc_type;
-+type proc_uid_cputime_showstat, fs_type, proc_type;
-+type proc_uid_cputime_removeuid, fs_type, proc_type;
-+type proc_uid_io_stats, fs_type, proc_type;
-+type proc_uid_procstat_set, fs_type, proc_type;
-+type proc_uid_time_in_state, fs_type, proc_type;
-+type proc_uid_concurrent_active_time, fs_type, proc_type;
-+type proc_uid_concurrent_policy_time, fs_type, proc_type;
-+type proc_uid_cpupower, fs_type, proc_type;
-+type proc_uptime, fs_type, proc_type;
-+type proc_version, fs_type, proc_type;
-+type proc_vmallocinfo, fs_type, proc_type;
-+type proc_vmstat, fs_type, proc_type;
-+type proc_zoneinfo, fs_type, proc_type;
-+type selinuxfs, fs_type, mlstrustedobject;
-+type cgroup, fs_type, mlstrustedobject;
-+type cgroup_bpf, fs_type;
-+type sysfs, fs_type, sysfs_type, mlstrustedobject;
-+type sysfs_android_usb, fs_type, sysfs_type;
-+type sysfs_uio, sysfs_type, fs_type;
-+type sysfs_batteryinfo, fs_type, sysfs_type;
-+type sysfs_bluetooth_writable, fs_type, sysfs_type, mlstrustedobject;
-+type sysfs_dm, fs_type, sysfs_type;
-+type sysfs_dt_firmware_android, fs_type, sysfs_type;
-+type sysfs_ipv4, fs_type, sysfs_type;
-+type sysfs_kernel_notes, fs_type, sysfs_type, mlstrustedobject;
-+type sysfs_leds, fs_type, sysfs_type;
-+type sysfs_hwrandom, fs_type, sysfs_type;
-+type sysfs_nfc_power_writable, fs_type, sysfs_type, mlstrustedobject;
-+type sysfs_wake_lock, fs_type, sysfs_type;
-+type sysfs_mac_address, fs_type, sysfs_type;
-+type sysfs_net, fs_type, sysfs_type;
-+type sysfs_power, fs_type, sysfs_type;
-+type sysfs_rtc, fs_type, sysfs_type;
-+type sysfs_switch, fs_type, sysfs_type;
-+type sysfs_usb, fs_type, sysfs_type;
-+type sysfs_wakeup_reasons, fs_type, sysfs_type;
-+type sysfs_fs_ext4_features, sysfs_type, fs_type;
-+type fs_bpf, fs_type;
-+type configfs, fs_type;
-+# /sys/devices/system/cpu
-+type sysfs_devices_system_cpu, fs_type, sysfs_type;
-+# /sys/module/lowmemorykiller
-+type sysfs_lowmemorykiller, fs_type, sysfs_type;
-+# /sys/module/wlan/parameters/fwpath
-+type sysfs_wlan_fwpath, fs_type, sysfs_type;
-+type sysfs_vibrator, fs_type, sysfs_type;
-+
-+type sysfs_thermal, sysfs_type, fs_type;
-+
-+type sysfs_zram, fs_type, sysfs_type;
-+type sysfs_zram_uevent, fs_type, sysfs_type;
-+type inotify, fs_type, mlstrustedobject;
-+type devpts, fs_type, mlstrustedobject;
-+type tmpfs, fs_type;
-+type shm, fs_type;
-+type mqueue, fs_type;
-+type fuse, sdcard_type, fs_type, mlstrustedobject;
-+type sdcardfs, sdcard_type, fs_type, mlstrustedobject;
-+type vfat, sdcard_type, fs_type, mlstrustedobject;
-+type exfat, sdcard_type, fs_type, mlstrustedobject;
-+type debugfs, fs_type, debugfs_type;
-+type debugfs_mmc, fs_type, debugfs_type;
-+type debugfs_trace_marker, fs_type, debugfs_type, mlstrustedobject;
-+type debugfs_tracing, fs_type, debugfs_type, mlstrustedobject;
-+type debugfs_tracing_debug, fs_type, debugfs_type, mlstrustedobject;
-+type debugfs_tracing_instances, fs_type, debugfs_type;
-+type debugfs_wakeup_sources, fs_type, debugfs_type;
-+type debugfs_wifi_tracing, fs_type, debugfs_type;
-+
-+type pstorefs, fs_type;
-+type functionfs, fs_type, mlstrustedobject;
-+type oemfs, fs_type, contextmount_type;
-+type usbfs, fs_type;
-+type binfmt_miscfs, fs_type;
-+type app_fusefs, fs_type, contextmount_type;
-+
-+# File types
-+type unlabeled, file_type;
-+
-+# Default type for anything under /system.
-+type system_file, file_type;
-+
-+# Default type for directories search for
-+# HAL implementations
-+type vendor_hal_file, vendor_file_type, file_type;
-+# Default type for under /vendor or /system/vendor
-+type vendor_file, vendor_file_type, file_type;
-+# Default type for everything in /vendor/app
-+type vendor_app_file, vendor_file_type, file_type;
-+# Default type for everything under /vendor/etc/
-+type vendor_configs_file, vendor_file_type, file_type;
-+# Default type for all *same process* HALs.
-+# e.g. libEGL_xxx.so, android.hardware.graphics.mapper@2.0-impl.so
-+type same_process_hal_file, vendor_file_type, file_type;
-+# Default type for vndk-sp libs. /vendor/lib/vndk-sp
-+type vndk_sp_file, vendor_file_type, file_type;
-+# Default type for everything in /vendor/framework
-+type vendor_framework_file, vendor_file_type, file_type;
-+# Default type for everything in /vendor/overlay
-+type vendor_overlay_file, vendor_file_type, file_type;
-+
-+# /metadata partition itself
-+type metadata_file, file_type;
-+# Vold files within /metadata
-+type vold_metadata_file, file_type;
-+
-+# Speedup access for trusted applications to the runtime event tags
-+type runtime_event_log_tags_file, file_type;
-+# Type for /system/bin/logcat.
-+type logcat_exec, exec_type, file_type;
-+# /cores for coredumps on userdebug / eng builds
-+type coredump_file, file_type;
-+# Default type for anything under /data.
-+type system_data_file, file_type, data_file_type, core_data_file_type;
-+# Default type for anything under /data/vendor{_ce,_de}.
-+type vendor_data_file, file_type, data_file_type;
-+# Unencrypted data
-+type unencrypted_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/.layout_version or other installd-created files that
-+# are created in a system_data_file directory.
-+type install_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/drm - DRM plugin data
-+type drm_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/adb - adb debugging files
-+type adb_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/anr - ANR traces
-+type anr_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/tombstones - core dumps
-+type tombstone_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/vendor/tombstones/wifi - vendor wifi dumps
-+type tombstone_wifi_data_file, file_type, data_file_type;
-+# /data/app - user-installed apps
-+type apk_data_file, file_type, data_file_type, core_data_file_type;
-+type apk_tmp_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/app-private - forward-locked apps
-+type apk_private_data_file, file_type, data_file_type, core_data_file_type;
-+type apk_private_tmp_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/dalvik-cache
-+type dalvikcache_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/ota
-+type ota_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/ota_package
-+type ota_package_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/misc/profiles
-+type user_profile_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/misc/profman
-+type profman_dump_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/resource-cache
-+type resourcecache_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/local - writable by shell
-+type shell_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/property
-+type property_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/bootchart
-+type bootchart_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/system/heapdump
-+type heapdump_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/nativetest
-+type nativetest_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/system_de/0/ringtones
-+type ringtone_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# /data/preloads
-+type preloads_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/preloads/media
-+type preloads_media_file, file_type, data_file_type, core_data_file_type;
-+# /data/misc/dhcp and /data/misc/dhcp-6.8.2
-+type dhcp_data_file, file_type, data_file_type, core_data_file_type;
-+
-+# Mount locations managed by vold
-+type mnt_media_rw_file, file_type;
-+type mnt_user_file, file_type;
-+type mnt_expand_file, file_type;
-+type storage_file, file_type;
-+
-+# Label for storage dirs which are just mount stubs
-+type mnt_media_rw_stub_file, file_type;
-+type storage_stub_file, file_type;
-+
-+# Mount location for read-write vendor partitions.
-+type mnt_vendor_file, file_type;
-+
-+# /postinstall: Mount point used by update_engine to run postinstall.
-+type postinstall_mnt_dir, file_type;
-+# Files inside the /postinstall mountpoint are all labeled as postinstall_file.
-+type postinstall_file, file_type;
-+
-+# /data/misc subdirectories
-+type adb_keys_file, file_type, data_file_type, core_data_file_type;
-+type audio_data_file, file_type, data_file_type, core_data_file_type;
-+type audioserver_data_file, file_type, data_file_type, core_data_file_type;
-+type bluetooth_data_file, file_type, data_file_type, core_data_file_type;
-+type bluetooth_logs_data_file, file_type, data_file_type, core_data_file_type;
-+type bootstat_data_file, file_type, data_file_type, core_data_file_type;
-+type boottrace_data_file, file_type, data_file_type, core_data_file_type;
-+type camera_data_file, file_type, data_file_type, core_data_file_type;
-+type gatekeeper_data_file, file_type, data_file_type, core_data_file_type;
-+type incident_data_file, file_type, data_file_type, core_data_file_type;
-+type keychain_data_file, file_type, data_file_type, core_data_file_type;
-+type keystore_data_file, file_type, data_file_type, core_data_file_type;
-+type media_data_file, file_type, data_file_type, core_data_file_type;
-+type media_rw_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+type misc_user_data_file, file_type, data_file_type, core_data_file_type;
-+type net_data_file, file_type, data_file_type, core_data_file_type;
-+type network_watchlist_data_file, file_type, data_file_type, core_data_file_type;
-+type nfc_data_file, file_type, data_file_type, core_data_file_type;
-+type radio_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+type recovery_data_file, file_type, data_file_type, core_data_file_type;
-+type shared_relro_file, file_type, data_file_type, core_data_file_type;
-+type systemkeys_data_file, file_type, data_file_type, core_data_file_type;
-+type textclassifier_data_file, file_type, data_file_type, core_data_file_type;
-+type trace_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+type vpn_data_file, file_type, data_file_type, core_data_file_type;
-+type wifi_data_file, file_type, data_file_type, core_data_file_type;
-+type zoneinfo_data_file, file_type, data_file_type, core_data_file_type;
-+type vold_data_file, file_type, data_file_type, core_data_file_type;
-+type perfprofd_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+type tee_data_file, file_type, data_file_type;
-+type update_engine_data_file, file_type, data_file_type, core_data_file_type;
-+type update_engine_log_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/misc/trace for method traces on userdebug / eng builds
-+type method_trace_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+
-+# /data/data subdirectories - app sandboxes
-+type app_data_file, file_type, data_file_type, core_data_file_type;
-+# /data/data subdirectory for system UID apps.
-+type system_app_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# Compatibility with type name used in Android 4.3 and 4.4.
-+# Default type for anything under /cache
-+type cache_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# Type for /cache/backup_stage/* (fd interchange with apps)
-+type cache_backup_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# type for anything under /cache/backup (local transport storage)
-+type cache_private_backup_file, file_type, data_file_type, core_data_file_type;
-+# Type for anything under /cache/recovery
-+type cache_recovery_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# Default type for anything under /efs
-+type efs_file, file_type;
-+# Type for wallpaper file.
-+type wallpaper_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# Type for shortcut manager icon file.
-+type shortcut_manager_icons, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# Type for user icon file.
-+type icon_file, file_type, data_file_type, core_data_file_type;
-+# /mnt/asec
-+type asec_apk_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# Elements of asec files (/mnt/asec) that are world readable
-+type asec_public_file, file_type, data_file_type, core_data_file_type;
-+# /data/app-asec
-+type asec_image_file, file_type, data_file_type, core_data_file_type;
-+# /data/backup and /data/secure/backup
-+type backup_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+# All devices have bluetooth efs files. But they
-+# vary per device, so this type is used in per
-+# device policy
-+type bluetooth_efs_file, file_type;
-+# Type for fingerprint template file
-+type fingerprintd_data_file, file_type, data_file_type, core_data_file_type;
-+# Type for _new_ fingerprint template file
-+type fingerprint_vendor_data_file, file_type, data_file_type;
-+# Type for appfuse file.
-+type app_fuse_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-+
-+# Socket types
-+type adbd_socket, file_type, coredomain_socket;
-+type bluetooth_socket, file_type, data_file_type, core_data_file_type, coredomain_socket;
-+type dnsproxyd_socket, file_type, coredomain_socket, mlstrustedobject;
-+type dumpstate_socket, file_type, coredomain_socket;
-+type fwmarkd_socket, file_type, coredomain_socket, mlstrustedobject;
-+type lmkd_socket, file_type, coredomain_socket;
-+type logd_socket, file_type, coredomain_socket, mlstrustedobject;
-+type logdr_socket, file_type, coredomain_socket, mlstrustedobject;
-+type logdw_socket, file_type, coredomain_socket, mlstrustedobject;
-+type mdns_socket, file_type, coredomain_socket;
-+type mdnsd_socket, file_type, coredomain_socket, mlstrustedobject;
-+type misc_logd_file, coredomain_socket, file_type, data_file_type, core_data_file_type;
-+type mtpd_socket, file_type, coredomain_socket;
-+type netd_socket, file_type, coredomain_socket;
-+type property_socket, file_type, coredomain_socket, mlstrustedobject;
-+type racoon_socket, file_type, coredomain_socket;
-+type rild_socket, file_type;
-+type rild_debug_socket, file_type;
-+type system_wpa_socket, file_type, data_file_type, core_data_file_type, coredomain_socket;
-+type system_ndebug_socket, file_type, data_file_type, core_data_file_type, coredomain_socket, mlstrustedobject;
-+type tombstoned_crash_socket, file_type, coredomain_socket, mlstrustedobject;
-+type tombstoned_java_trace_socket, file_type, mlstrustedobject;
-+type tombstoned_intercept_socket, file_type, coredomain_socket;
-+type traced_producer_socket, file_type, coredomain_socket, mlstrustedobject;
-+type traced_consumer_socket, file_type, coredomain_socket;
-+type uncrypt_socket, file_type, coredomain_socket;
-+type wpa_socket, file_type, data_file_type, core_data_file_type;
-+type zygote_socket, file_type, coredomain_socket;
-+# UART (for GPS) control proc file
-+type gps_control, file_type;
-+
-+# PDX endpoint types
-+type pdx_display_dir, pdx_endpoint_dir_type, file_type;
-+type pdx_performance_dir, pdx_endpoint_dir_type, file_type;
-+type pdx_bufferhub_dir, pdx_endpoint_dir_type, file_type;
-+
-+pdx_service_socket_types(display_client, pdx_display_dir)
-+pdx_service_socket_types(display_manager, pdx_display_dir)
-+pdx_service_socket_types(display_screenshot, pdx_display_dir)
-+pdx_service_socket_types(display_vsync, pdx_display_dir)
-+pdx_service_socket_types(performance_client, pdx_performance_dir)
-+pdx_service_socket_types(bufferhub_client, pdx_bufferhub_dir)
-+
-+# file_contexts files
-+type file_contexts_file, file_type;
-+
-+# mac_permissions file
-+type mac_perms_file, file_type;
-+
-+# property_contexts file
-+type property_contexts_file, file_type;
-+
-+# seapp_contexts file
-+type seapp_contexts_file, file_type;
-+
-+# sepolicy files binary and others
-+type sepolicy_file, file_type;
-+
-+# service_contexts file
-+type service_contexts_file, file_type;
-+
-+# nonplat service_contexts file (only accessible on non full-treble devices)
-+type nonplat_service_contexts_file, file_type;
-+
-+# hwservice_contexts file
-+type hwservice_contexts_file, file_type;
-+
-+# vndservice_contexts file
-+type vndservice_contexts_file, file_type;
-+
-+# Allow files to be created in their appropriate filesystems.
-+allow fs_type self:filesystem associate;
-+allow cgroup tmpfs:filesystem associate;
-+allow cgroup_bpf tmpfs:filesystem associate;
-+allow sysfs_type sysfs:filesystem associate;
-+allow debugfs_type { debugfs debugfs_tracing debugfs_tracing_debug }:filesystem associate;
-+allow file_type labeledfs:filesystem associate;
-+allow file_type tmpfs:filesystem associate;
-+allow file_type rootfs:filesystem associate;
-+allow dev_type tmpfs:filesystem associate;
-+allow app_fuse_file app_fusefs:filesystem associate;
-+allow postinstall_file self:filesystem associate;
-+
-+# asanwrapper (run a sanitized app_process, to be used with wrap properties)
-+with_asan(`type asanwrapper_exec, exec_type, file_type;')
-+
-+# Deprecated in SDK version 28
-+type audiohal_data_file, file_type, data_file_type, core_data_file_type;
-+
-+# It's a bug to assign the file_type attribute and fs_type attribute
-+# to any type. Do not allow it.
-+#
-+# For example, the following is a bug:
-+#   type apk_data_file, file_type, data_file_type, fs_type;
-+# Should be:
-+#   type apk_data_file, file_type, data_file_type;
-+neverallow fs_type file_type:filesystem associate;
-diff --git a/prebuilts/api/28.0/public/fingerprintd.te b/prebuilts/api/28.0/public/fingerprintd.te
-new file mode 100644
-index 000000000..2dc110721
---- /dev/null
-+++ b/prebuilts/api/28.0/public/fingerprintd.te
-@@ -0,0 +1,26 @@
-+type fingerprintd, domain;
-+type fingerprintd_exec, exec_type, file_type;
-+
-+binder_use(fingerprintd)
-+
-+# Scan through /system/lib64/hw looking for installed HALs
-+allow fingerprintd system_file:dir r_dir_perms;
-+
-+# need to find KeyStore and add self
-+add_service(fingerprintd, fingerprintd_service)
-+
-+# allow HAL module to read dir contents
-+allow fingerprintd fingerprintd_data_file:file { create_file_perms };
-+
-+# allow HAL module to read/write/unlink contents of this dir
-+allow fingerprintd fingerprintd_data_file:dir rw_dir_perms;
-+
-+# Need to add auth tokens to KeyStore
-+use_keystore(fingerprintd)
-+allow fingerprintd keystore:keystore_key { add_auth };
-+
-+# For permissions checking
-+binder_call(fingerprintd, system_server);
-+allow fingerprintd permission_service:service_manager find;
-+
-+allow fingerprintd ion_device:chr_file r_file_perms;
-diff --git a/prebuilts/api/28.0/public/fsck.te b/prebuilts/api/28.0/public/fsck.te
-new file mode 100644
-index 000000000..c5219d8ab
---- /dev/null
-+++ b/prebuilts/api/28.0/public/fsck.te
-@@ -0,0 +1,57 @@
-+# Any fsck program run by init
-+type fsck, domain;
-+type fsck_exec, exec_type, file_type;
-+
-+# /dev/__null__ created by init prior to policy load,
-+# open fd inherited by fsck.
-+allow fsck tmpfs:chr_file { read write ioctl };
-+
-+# Inherit and use pty created by android_fork_execvp_ext().
-+allow fsck devpts:chr_file { read write ioctl getattr };
-+
-+# Allow stdin/out back to vold
-+allow fsck vold:fd use;
-+allow fsck vold:fifo_file { read write getattr };
-+
-+# Run fsck on certain block devices
-+allow fsck block_device:dir search;
-+allow fsck userdata_block_device:blk_file rw_file_perms;
-+allow fsck cache_block_device:blk_file rw_file_perms;
-+allow fsck dm_device:blk_file rw_file_perms;
-+
-+# To determine if it is safe to run fsck on a filesystem, e2fsck
-+# must first determine if the filesystem is mounted. To do that,
-+# e2fsck scans through /proc/mounts and collects all the mounted
-+# block devices. With that information, it runs stat() on each block
-+# device, comparing the major and minor numbers to the filesystem
-+# passed in on the command line. If there is a match, then the filesystem
-+# is currently mounted and running fsck is dangerous.
-+# Allow stat access to all block devices so that fsck can compare
-+# major/minor values.
-+allow fsck dev_type:blk_file getattr;
-+
-+allow fsck {
-+  proc_mounts
-+  proc_swaps
-+}:file r_file_perms;
-+allow fsck rootfs:dir r_dir_perms;
-+
-+###
-+### neverallow rules
-+###
-+
-+# fsck should never be run on these block devices
-+neverallow fsck {
-+  boot_block_device
-+  frp_block_device
-+  recovery_block_device
-+  root_block_device
-+  swap_block_device
-+  system_block_device
-+  vold_device
-+}:blk_file no_rw_file_perms;
-+
-+# Only allow entry from init or vold via fsck binaries
-+neverallow { domain -init -vold } fsck:process transition;
-+neverallow * fsck:process dyntransition;
-+neverallow fsck { file_type fs_type -fsck_exec }:file entrypoint;
-diff --git a/prebuilts/api/28.0/public/fsck_untrusted.te b/prebuilts/api/28.0/public/fsck_untrusted.te
-new file mode 100644
-index 000000000..8510c9424
---- /dev/null
-+++ b/prebuilts/api/28.0/public/fsck_untrusted.te
-@@ -0,0 +1,49 @@
-+# Any fsck program run on untrusted block devices
-+type fsck_untrusted, domain;
-+
-+# Inherit and use pty created by android_fork_execvp_ext().
-+allow fsck_untrusted devpts:chr_file { read write ioctl getattr };
-+
-+# Allow stdin/out back to vold
-+allow fsck_untrusted vold:fd use;
-+allow fsck_untrusted vold:fifo_file { read write getattr };
-+
-+# Run fsck on vold block devices
-+allow fsck_untrusted block_device:dir search;
-+allow fsck_untrusted vold_device:blk_file rw_file_perms;
-+
-+allow fsck_untrusted proc_mounts:file r_file_perms;
-+
-+# To determine if it is safe to run fsck on a filesystem, e2fsck
-+# must first determine if the filesystem is mounted. To do that,
-+# e2fsck scans through /proc/mounts and collects all the mounted
-+# block devices. With that information, it runs stat() on each block
-+# device, comparing the major and minor numbers to the filesystem
-+# passed in on the command line. If there is a match, then the filesystem
-+# is currently mounted and running fsck is dangerous.
-+# Allow stat access to all block devices so that fsck can compare
-+# major/minor values.
-+allow fsck_untrusted dev_type:blk_file getattr;
-+
-+###
-+### neverallow rules
-+###
-+
-+# Untrusted fsck should never be run on block devices holding sensitive data
-+neverallow fsck_untrusted {
-+  boot_block_device
-+  frp_block_device
-+  metadata_block_device
-+  recovery_block_device
-+  root_block_device
-+  swap_block_device
-+  system_block_device
-+  userdata_block_device
-+  cache_block_device
-+  dm_device
-+}:blk_file no_rw_file_perms;
-+
-+# Only allow entry from vold via fsck binaries
-+neverallow { domain -vold } fsck_untrusted:process transition;
-+neverallow * fsck_untrusted:process dyntransition;
-+neverallow fsck_untrusted { file_type fs_type -fsck_exec }:file entrypoint;
-diff --git a/prebuilts/api/28.0/public/gatekeeperd.te b/prebuilts/api/28.0/public/gatekeeperd.te
-new file mode 100644
-index 000000000..2fc36279d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/gatekeeperd.te
-@@ -0,0 +1,39 @@
-+type gatekeeperd, domain;
-+type gatekeeperd_exec, exec_type, file_type;
-+
-+# gatekeeperd
-+binder_service(gatekeeperd)
-+binder_use(gatekeeperd)
-+
-+### Rules needed when Gatekeeper HAL runs inside gatekeeperd process.
-+### These rules should eventually be granted only when needed.
-+allow gatekeeperd tee_device:chr_file rw_file_perms;
-+allow gatekeeperd ion_device:chr_file r_file_perms;
-+# Load HAL implementation
-+allow gatekeeperd system_file:dir r_dir_perms;
-+###
-+
-+### Rules needed when Gatekeeper HAL runs outside of gatekeeperd process.
-+### These rules should eventually be granted only when needed.
-+hal_client_domain(gatekeeperd, hal_gatekeeper)
-+###
-+
-+# need to find KeyStore and add self
-+add_service(gatekeeperd, gatekeeper_service)
-+
-+# Need to add auth tokens to KeyStore
-+use_keystore(gatekeeperd)
-+allow gatekeeperd keystore:keystore_key { add_auth };
-+
-+# For permissions checking
-+allow gatekeeperd system_server:binder call;
-+allow gatekeeperd permission_service:service_manager find;
-+
-+# for SID file access
-+allow gatekeeperd gatekeeper_data_file:dir rw_dir_perms;
-+allow gatekeeperd gatekeeper_data_file:file create_file_perms;
-+
-+# For hardware properties retrieval
-+allow gatekeeperd hardware_properties_service:service_manager find;
-+
-+r_dir_file(gatekeeperd, cgroup)
-diff --git a/prebuilts/api/28.0/public/global_macros b/prebuilts/api/28.0/public/global_macros
-new file mode 100644
-index 000000000..5dab5ab0c
---- /dev/null
-+++ b/prebuilts/api/28.0/public/global_macros
-@@ -0,0 +1,50 @@
-+#####################################
-+# Common groupings of object classes.
-+#
-+define(`capability_class_set', `{ capability capability2 cap_userns cap2_userns }')
-+define(`global_capability_class_set', `{ capability cap_userns }')
-+define(`global_capability2_class_set', `{ capability2 cap2_userns }')
-+
-+define(`devfile_class_set', `{ chr_file blk_file }')
-+define(`notdevfile_class_set', `{ file lnk_file sock_file fifo_file }')
-+define(`file_class_set', `{ devfile_class_set notdevfile_class_set }')
-+define(`dir_file_class_set', `{ dir file_class_set }')
-+
-+define(`socket_class_set', `{ socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket appletalk_socket netlink_route_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_dnrt_socket netlink_kobject_uevent_socket tun_socket netlink_iscsi_socket netlink_fib_lookup_socket netlink_connector_socket netlink_netfilter_socket netlink_generic_socket netlink_scsitransport_socket netlink_rdma_socket netlink_crypto_socket sctp_socket icmp_socket ax25_socket ipx_socket netrom_socket atmpvc_socket x25_socket rose_socket decnet_socket atmsvc_socket rds_socket irda_socket pppox_socket llc_socket can_socket tipc_socket bluetooth_socket iucv_socket rxrpc_socket isdn_socket phonet_socket ieee802154_socket caif_socket alg_socket nfc_socket vsock_socket kcm_socket qipcrtr_socket smc_socket }')
-+define(`dgram_socket_class_set', `{ udp_socket unix_dgram_socket }')
-+define(`stream_socket_class_set', `{ tcp_socket unix_stream_socket }')
-+define(`unpriv_socket_class_set', `{ tcp_socket udp_socket unix_stream_socket unix_dgram_socket }')
-+
-+define(`ipc_class_set', `{ sem msgq shm ipc }')
-+
-+#####################################
-+# Common groupings of permissions.
-+#
-+define(`x_file_perms', `{ getattr execute execute_no_trans map }')
-+define(`r_file_perms', `{ getattr open read ioctl lock map }')
-+define(`w_file_perms', `{ open append write lock map }')
-+define(`rx_file_perms', `{ r_file_perms x_file_perms }')
-+define(`ra_file_perms', `{ r_file_perms append }')
-+define(`rw_file_perms', `{ r_file_perms w_file_perms }')
-+define(`rwx_file_perms', `{ rw_file_perms x_file_perms }')
-+define(`create_file_perms', `{ create rename setattr unlink rw_file_perms }')
-+
-+define(`r_dir_perms', `{ open getattr read search ioctl lock }')
-+define(`w_dir_perms', `{ open search write add_name remove_name lock }')
-+define(`ra_dir_perms', `{ r_dir_perms add_name write }')
-+define(`rw_dir_perms', `{ r_dir_perms w_dir_perms }')
-+define(`create_dir_perms', `{ create reparent rename rmdir setattr rw_dir_perms }')
-+
-+define(`r_ipc_perms', `{ getattr read associate unix_read }')
-+define(`w_ipc_perms', `{ write unix_write }')
-+define(`rw_ipc_perms', `{ r_ipc_perms w_ipc_perms }')
-+define(`create_ipc_perms', `{ create setattr destroy rw_ipc_perms }')
-+
-+#####################################
-+# Common socket permission sets.
-+define(`rw_socket_perms', `{ ioctl read getattr write setattr lock append bind connect getopt setopt shutdown }')
-+define(`rw_socket_perms_no_ioctl', `{ read getattr write setattr lock append bind connect getopt setopt shutdown }')
-+define(`create_socket_perms', `{ create rw_socket_perms }')
-+define(`create_socket_perms_no_ioctl', `{ create rw_socket_perms_no_ioctl }')
-+define(`rw_stream_socket_perms', `{ rw_socket_perms listen accept }')
-+define(`create_stream_socket_perms', `{ create rw_stream_socket_perms }')
-diff --git a/prebuilts/api/28.0/public/hal_allocator.te b/prebuilts/api/28.0/public/hal_allocator.te
-new file mode 100644
-index 000000000..646cebdeb
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_allocator.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_allocator_client, hal_allocator_server)
-+
-+add_hwservice(hal_allocator_server, hidl_allocator_hwservice)
-+allow hal_allocator_client hidl_allocator_hwservice:hwservice_manager find;
-+allow hal_allocator_client hidl_memory_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_audio.te b/prebuilts/api/28.0/public/hal_audio.te
-new file mode 100644
-index 000000000..037066ea8
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_audio.te
-@@ -0,0 +1,38 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_audio_client, hal_audio_server)
-+binder_call(hal_audio_server, hal_audio_client)
-+
-+add_hwservice(hal_audio_server, hal_audio_hwservice)
-+allow hal_audio_client hal_audio_hwservice:hwservice_manager find;
-+
-+allow hal_audio ion_device:chr_file r_file_perms;
-+
-+r_dir_file(hal_audio, proc)
-+r_dir_file(hal_audio, proc_asound)
-+allow hal_audio_server audio_device:dir r_dir_perms;
-+allow hal_audio_server audio_device:chr_file rw_file_perms;
-+
-+# Needed to provide debug dump output via dumpsys' pipes.
-+allow hal_audio shell:fd use;
-+allow hal_audio shell:fifo_file write;
-+allow hal_audio dumpstate:fd use;
-+allow hal_audio dumpstate:fifo_file write;
-+
-+# allow hal audio to use vnbinder
-+vndbinder_use(hal_audio)
-+
-+###
-+### neverallow rules
-+###
-+
-+# Should never execute any executable without a domain transition
-+neverallow hal_audio_server { file_type fs_type }:file execute_no_trans;
-+
-+# Should never need network access.
-+# Disallow network sockets.
-+neverallow hal_audio_server domain:{ tcp_socket udp_socket rawip_socket } *;
-+
-+# Only audio HAL may directly access the audio hardware
-+neverallow { halserverdomain -hal_audio_server } audio_device:chr_file *;
-+
-+get_prop(hal_audio, bluetooth_a2dp_offload_prop)
-diff --git a/prebuilts/api/28.0/public/hal_audiocontrol.te b/prebuilts/api/28.0/public/hal_audiocontrol.te
-new file mode 100644
-index 000000000..438db531f
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_audiocontrol.te
-@@ -0,0 +1,7 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_audiocontrol_client, hal_audiocontrol_server)
-+binder_call(hal_audiocontrol_server, hal_audiocontrol_client)
-+
-+add_hwservice(hal_audiocontrol_server, hal_audiocontrol_hwservice)
-+
-+allow hal_audiocontrol_client hal_audiocontrol_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_authsecret.te b/prebuilts/api/28.0/public/hal_authsecret.te
-new file mode 100644
-index 000000000..81b0c0445
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_authsecret.te
-@@ -0,0 +1,5 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_authsecret_client, hal_authsecret_server)
-+
-+add_hwservice(hal_authsecret_server, hal_authsecret_hwservice)
-+allow hal_authsecret_client hal_authsecret_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_bluetooth.te b/prebuilts/api/28.0/public/hal_bluetooth.te
-new file mode 100644
-index 000000000..373dbec6b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_bluetooth.te
-@@ -0,0 +1,32 @@
-+# HwBinder IPC from clients into server, and callbacks
-+binder_call(hal_bluetooth_client, hal_bluetooth_server)
-+binder_call(hal_bluetooth_server, hal_bluetooth_client)
-+
-+add_hwservice(hal_bluetooth_server, hal_bluetooth_hwservice)
-+allow hal_bluetooth_client hal_bluetooth_hwservice:hwservice_manager find;
-+
-+wakelock_use(hal_bluetooth);
-+
-+# The HAL toggles rfkill to power the chip off/on.
-+allow hal_bluetooth self:global_capability_class_set net_admin;
-+
-+# bluetooth factory file accesses.
-+r_dir_file(hal_bluetooth, bluetooth_efs_file)
-+
-+allow hal_bluetooth { uhid_device hci_attach_dev }:chr_file rw_file_perms;
-+
-+# sysfs access.
-+r_dir_file(hal_bluetooth, sysfs_type)
-+allow hal_bluetooth sysfs_bluetooth_writable:file rw_file_perms;
-+allow hal_bluetooth self:global_capability2_class_set wake_alarm;
-+
-+# Allow write access to bluetooth-specific properties
-+set_prop(hal_bluetooth, bluetooth_a2dp_offload_prop)
-+set_prop(hal_bluetooth, bluetooth_prop)
-+set_prop(hal_bluetooth, exported_bluetooth_prop)
-+
-+# /proc access (bluesleep etc.).
-+allow hal_bluetooth proc_bluetooth_writable:file rw_file_perms;
-+
-+# allow to run with real-time scheduling policy
-+allow hal_bluetooth self:global_capability_class_set sys_nice;
-diff --git a/prebuilts/api/28.0/public/hal_bootctl.te b/prebuilts/api/28.0/public/hal_bootctl.te
-new file mode 100644
-index 000000000..181de4a9c
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_bootctl.te
-@@ -0,0 +1,8 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_bootctl_client, hal_bootctl_server)
-+binder_call(hal_bootctl_server, hal_bootctl_client)
-+
-+add_hwservice(hal_bootctl_server, hal_bootctl_hwservice)
-+allow hal_bootctl_client hal_bootctl_hwservice:hwservice_manager find;
-+
-+dontaudit hal_bootctl self:capability sys_rawio;
-diff --git a/prebuilts/api/28.0/public/hal_broadcastradio.te b/prebuilts/api/28.0/public/hal_broadcastradio.te
-new file mode 100644
-index 000000000..24d4908e1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_broadcastradio.te
-@@ -0,0 +1,4 @@
-+binder_call(hal_broadcastradio_client, hal_broadcastradio_server)
-+
-+add_hwservice(hal_broadcastradio_server, hal_broadcastradio_hwservice)
-+allow hal_broadcastradio_client hal_broadcastradio_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_camera.te b/prebuilts/api/28.0/public/hal_camera.te
-new file mode 100644
-index 000000000..8fe744214
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_camera.te
-@@ -0,0 +1,33 @@
-+# HwBinder IPC from clients to server and callbacks
-+binder_call(hal_camera_client, hal_camera_server)
-+binder_call(hal_camera_server, hal_camera_client)
-+
-+add_hwservice(hal_camera_server, hal_camera_hwservice)
-+allow hal_camera_client hal_camera_hwservice:hwservice_manager find;
-+
-+allow hal_camera device:dir r_dir_perms;
-+allow hal_camera video_device:dir r_dir_perms;
-+allow hal_camera video_device:chr_file rw_file_perms;
-+allow hal_camera camera_device:chr_file rw_file_perms;
-+allow hal_camera ion_device:chr_file rw_file_perms;
-+# Both the client and the server need to use the graphics allocator
-+allow { hal_camera_client hal_camera_server } hal_graphics_allocator:fd use;
-+
-+# Allow hal_camera to use fd from app,gralloc,and ashmem HAL
-+allow hal_camera { appdomain -isolated_app }:fd use;
-+allow hal_camera surfaceflinger:fd use;
-+allow hal_camera hal_allocator_server:fd use;
-+
-+###
-+### neverallow rules
-+###
-+
-+# hal_camera should never execute any executable without a
-+# domain transition
-+neverallow hal_camera_server { file_type fs_type }:file execute_no_trans;
-+
-+# hal_camera should never need network access. Disallow network sockets.
-+neverallow hal_camera_server domain:{ tcp_socket udp_socket rawip_socket } *;
-+
-+# Only camera HAL may directly access the camera hardware
-+neverallow { halserverdomain -hal_camera_server } camera_device:chr_file *;
-diff --git a/prebuilts/api/28.0/public/hal_cas.te b/prebuilts/api/28.0/public/hal_cas.te
-new file mode 100644
-index 000000000..7f6535858
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_cas.te
-@@ -0,0 +1,35 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_cas_client, hal_cas_server)
-+binder_call(hal_cas_server, hal_cas_client)
-+
-+add_hwservice(hal_cas_server, hal_cas_hwservice)
-+allow hal_cas_client hal_cas_hwservice:hwservice_manager find;
-+allow hal_cas_server hidl_memory_hwservice:hwservice_manager find;
-+
-+# Permit reading device's serial number from system properties
-+get_prop(hal_cas_server, serialno_prop)
-+
-+# Read files already opened under /data
-+allow hal_cas system_data_file:file { getattr read };
-+
-+# Read access to pseudo filesystems
-+r_dir_file(hal_cas, cgroup)
-+allow hal_cas cgroup:dir { search write };
-+allow hal_cas cgroup:file w_file_perms;
-+
-+# Allow access to ion memory allocation device
-+allow hal_cas ion_device:chr_file rw_file_perms;
-+allow hal_cas hal_graphics_allocator:fd use;
-+
-+allow hal_cas tee_device:chr_file rw_file_perms;
-+
-+###
-+### neverallow rules
-+###
-+
-+# hal_cas should never execute any executable without a
-+# domain transition
-+neverallow hal_cas_server { file_type fs_type }:file execute_no_trans;
-+
-+# do not allow privileged socket ioctl commands
-+neverallowxperm hal_cas_server domain:{ rawip_socket tcp_socket udp_socket } ioctl priv_sock_ioctls;
-diff --git a/prebuilts/api/28.0/public/hal_configstore.te b/prebuilts/api/28.0/public/hal_configstore.te
-new file mode 100644
-index 000000000..c8051e142
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_configstore.te
-@@ -0,0 +1,71 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_configstore_client, hal_configstore_server)
-+
-+allow hal_configstore_client hal_configstore_ISurfaceFlingerConfigs:hwservice_manager find;
-+
-+add_hwservice(hal_configstore_server, hal_configstore_ISurfaceFlingerConfigs)
-+# As opposed to the rules of most other HALs, the different services exposed by
-+# this HAL should be restricted to different clients. Thus, the allow rules for
-+# clients are defined in the .te files of the clients.
-+
-+# hal_configstore runs with a strict seccomp filter. Use crash_dump's
-+# fallback path to collect crash data.
-+crash_dump_fallback(hal_configstore_server)
-+
-+###
-+### neverallow rules
-+###
-+
-+# Should never execute an executable without a domain transition
-+neverallow hal_configstore_server { file_type fs_type }:file execute_no_trans;
-+
-+# Should never need network access. Disallow sockets except for
-+# for unix stream/dgram sockets used for logging/debugging.
-+neverallow hal_configstore_server domain:{
-+  rawip_socket tcp_socket udp_socket
-+  netlink_route_socket netlink_selinux_socket
-+  socket netlink_socket packet_socket key_socket appletalk_socket
-+  netlink_tcpdiag_socket netlink_nflog_socket
-+  netlink_xfrm_socket netlink_audit_socket
-+  netlink_dnrt_socket netlink_kobject_uevent_socket tun_socket
-+  netlink_iscsi_socket netlink_fib_lookup_socket netlink_connector_socket
-+  netlink_netfilter_socket netlink_generic_socket netlink_scsitransport_socket
-+  netlink_rdma_socket netlink_crypto_socket
-+} *;
-+neverallow hal_configstore_server {
-+  domain
-+  -hal_configstore_server
-+  -logd
-+  userdebug_or_eng(`-su')
-+  -tombstoned
-+}:{ unix_dgram_socket unix_stream_socket } *;
-+
-+# Should never need access to anything on /data
-+neverallow hal_configstore_server {
-+  data_file_type
-+  -anr_data_file # for crash dump collection
-+  -tombstone_data_file # for crash dump collection
-+  -zoneinfo_data_file # granted to domain
-+}:{ file fifo_file sock_file } *;
-+
-+# Should never need sdcard access
-+neverallow hal_configstore_server {
-+    sdcard_type
-+    fuse sdcardfs vfat exfat        # manual expansion for completeness
-+}:dir ~getattr;
-+neverallow hal_configstore_server {
-+    sdcard_type
-+    fuse sdcardfs vfat exfat        # manual expansion for completeness
-+}:file *;
-+
-+# Do not permit access to service_manager and vndservice_manager
-+neverallow hal_configstore_server *:service_manager *;
-+
-+# No privileged capabilities
-+neverallow hal_configstore_server self:capability_class_set *;
-+
-+# No ptracing other processes
-+neverallow hal_configstore_server *:process ptrace;
-+
-+# no relabeling
-+neverallow hal_configstore_server *:dir_file_class_set { relabelfrom relabelto };
-diff --git a/prebuilts/api/28.0/public/hal_confirmationui.te b/prebuilts/api/28.0/public/hal_confirmationui.te
-new file mode 100644
-index 000000000..228e86496
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_confirmationui.te
-@@ -0,0 +1,5 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_confirmationui_client, hal_confirmationui_server)
-+
-+add_hwservice(hal_confirmationui_server, hal_confirmationui_hwservice)
-+allow hal_confirmationui_client hal_confirmationui_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_contexthub.te b/prebuilts/api/28.0/public/hal_contexthub.te
-new file mode 100644
-index 000000000..f11bfc816
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_contexthub.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_contexthub_client, hal_contexthub_server)
-+binder_call(hal_contexthub_server, hal_contexthub_client)
-+
-+add_hwservice(hal_contexthub_server, hal_contexthub_hwservice)
-+allow hal_contexthub_client hal_contexthub_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_drm.te b/prebuilts/api/28.0/public/hal_drm.te
-new file mode 100644
-index 000000000..a46dd9116
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_drm.te
-@@ -0,0 +1,53 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_drm_client, hal_drm_server)
-+binder_call(hal_drm_server, hal_drm_client)
-+
-+add_hwservice(hal_drm_server, hal_drm_hwservice)
-+allow hal_drm_client hal_drm_hwservice:hwservice_manager find;
-+
-+allow hal_drm hidl_memory_hwservice:hwservice_manager find;
-+
-+# Required by Widevine DRM (b/22990512)
-+allow hal_drm self:process execmem;
-+
-+# Permit reading device's serial number from system properties
-+get_prop(hal_drm, serialno_prop)
-+
-+# System file accesses
-+allow hal_drm system_file:dir r_dir_perms;
-+allow hal_drm system_file:file r_file_perms;
-+allow hal_drm system_file:lnk_file r_file_perms;
-+
-+# Read files already opened under /data
-+allow hal_drm system_data_file:file { getattr read };
-+
-+# Read access to pseudo filesystems
-+r_dir_file(hal_drm, cgroup)
-+allow hal_drm cgroup:dir { search write };
-+allow hal_drm cgroup:file w_file_perms;
-+
-+# Allow access to ion memory allocation device
-+allow hal_drm ion_device:chr_file rw_file_perms;
-+allow hal_drm hal_graphics_allocator:fd use;
-+
-+# Allow access to fds allocated by mediaserver
-+allow hal_drm mediaserver:fd use;
-+
-+allow hal_drm sysfs:file r_file_perms;
-+
-+allow hal_drm tee_device:chr_file rw_file_perms;
-+
-+# only allow unprivileged socket ioctl commands
-+allowxperm hal_drm self:{ rawip_socket tcp_socket udp_socket }
-+  ioctl { unpriv_sock_ioctls unpriv_tty_ioctls };
-+
-+###
-+### neverallow rules
-+###
-+
-+# hal_drm should never execute any executable without a
-+# domain transition
-+neverallow hal_drm_server { file_type fs_type }:file execute_no_trans;
-+
-+# do not allow privileged socket ioctl commands
-+neverallowxperm hal_drm_server domain:{ rawip_socket tcp_socket udp_socket } ioctl priv_sock_ioctls;
-diff --git a/prebuilts/api/28.0/public/hal_dumpstate.te b/prebuilts/api/28.0/public/hal_dumpstate.te
-new file mode 100644
-index 000000000..2853567e0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_dumpstate.te
-@@ -0,0 +1,11 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_dumpstate_client, hal_dumpstate_server)
-+binder_call(hal_dumpstate_server, hal_dumpstate_client)
-+
-+add_hwservice(hal_dumpstate_server, hal_dumpstate_hwservice)
-+allow hal_dumpstate_client hal_dumpstate_hwservice:hwservice_manager find;
-+
-+# write bug reports in /data/data/com.android.shell/files/bugreports/bugreport
-+allow hal_dumpstate shell_data_file:file write;
-+# allow reading /proc/interrupts for all hal impls
-+allow hal_dumpstate proc_interrupts:file r_file_perms;
-diff --git a/prebuilts/api/28.0/public/hal_evs.te b/prebuilts/api/28.0/public/hal_evs.te
-new file mode 100644
-index 000000000..b42a5602c
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_evs.te
-@@ -0,0 +1,4 @@
-+hwbinder_use(hal_evs_client)
-+hwbinder_use(hal_evs_server)
-+binder_call(hal_evs_client, hal_evs_server)
-+binder_call(hal_evs_server, hal_evs_client)
-diff --git a/prebuilts/api/28.0/public/hal_fingerprint.te b/prebuilts/api/28.0/public/hal_fingerprint.te
-new file mode 100644
-index 000000000..d62ccff6f
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_fingerprint.te
-@@ -0,0 +1,15 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_fingerprint_client, hal_fingerprint_server)
-+binder_call(hal_fingerprint_server, hal_fingerprint_client)
-+
-+add_hwservice(hal_fingerprint_server, hal_fingerprint_hwservice)
-+allow hal_fingerprint_client hal_fingerprint_hwservice:hwservice_manager find;
-+
-+# For memory allocation
-+allow hal_fingerprint ion_device:chr_file r_file_perms;
-+
-+allow hal_fingerprint fingerprint_vendor_data_file:file { create_file_perms };
-+allow hal_fingerprint fingerprint_vendor_data_file:dir rw_dir_perms;
-+
-+r_dir_file(hal_fingerprint, cgroup)
-+r_dir_file(hal_fingerprint, sysfs)
-diff --git a/prebuilts/api/28.0/public/hal_gatekeeper.te b/prebuilts/api/28.0/public/hal_gatekeeper.te
-new file mode 100644
-index 000000000..123acf567
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_gatekeeper.te
-@@ -0,0 +1,8 @@
-+binder_call(hal_gatekeeper_client, hal_gatekeeper_server)
-+
-+add_hwservice(hal_gatekeeper_server, hal_gatekeeper_hwservice)
-+allow hal_gatekeeper_client hal_gatekeeper_hwservice:hwservice_manager find;
-+
-+# TEE access.
-+allow hal_gatekeeper tee_device:chr_file rw_file_perms;
-+allow hal_gatekeeper ion_device:chr_file r_file_perms;
-diff --git a/prebuilts/api/28.0/public/hal_gnss.te b/prebuilts/api/28.0/public/hal_gnss.te
-new file mode 100644
-index 000000000..b59cd1d5a
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_gnss.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_gnss_client, hal_gnss_server)
-+binder_call(hal_gnss_server, hal_gnss_client)
-+
-+add_hwservice(hal_gnss_server, hal_gnss_hwservice)
-+allow hal_gnss_client hal_gnss_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_graphics_allocator.te b/prebuilts/api/28.0/public/hal_graphics_allocator.te
-new file mode 100644
-index 000000000..e2b04ae83
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_graphics_allocator.te
-@@ -0,0 +1,13 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_graphics_allocator_client, hal_graphics_allocator_server)
-+
-+add_hwservice(hal_graphics_allocator_server, hal_graphics_allocator_hwservice)
-+allow hal_graphics_allocator_client hal_graphics_allocator_hwservice:hwservice_manager find;
-+allow hal_graphics_allocator_client hal_graphics_mapper_hwservice:hwservice_manager find;
-+
-+# GPU device access
-+allow hal_graphics_allocator gpu_device:chr_file rw_file_perms;
-+allow hal_graphics_allocator ion_device:chr_file r_file_perms;
-+
-+# allow to run with real-time scheduling policy
-+allow hal_graphics_allocator self:global_capability_class_set sys_nice;
-diff --git a/prebuilts/api/28.0/public/hal_graphics_composer.te b/prebuilts/api/28.0/public/hal_graphics_composer.te
-new file mode 100644
-index 000000000..2df461249
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_graphics_composer.te
-@@ -0,0 +1,26 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_graphics_composer_client, hal_graphics_composer_server)
-+binder_call(hal_graphics_composer_server, hal_graphics_composer_client)
-+
-+add_hwservice(hal_graphics_composer_server, hal_graphics_composer_hwservice)
-+allow hal_graphics_composer_client hal_graphics_composer_hwservice:hwservice_manager find;
-+
-+# Coordinate with hal_graphics_mapper
-+allow hal_graphics_composer_server hal_graphics_mapper_hwservice:hwservice_manager find;
-+
-+# GPU device access
-+allow hal_graphics_composer gpu_device:chr_file rw_file_perms;
-+allow hal_graphics_composer ion_device:chr_file r_file_perms;
-+allow hal_graphics_composer hal_graphics_allocator:fd use;
-+
-+# Access /dev/graphics/fb0.
-+allow hal_graphics_composer graphics_device:dir search;
-+allow hal_graphics_composer graphics_device:chr_file rw_file_perms;
-+
-+# Fences
-+allow hal_graphics_composer system_server:fd use;
-+allow hal_graphics_composer bootanim:fd use;
-+allow hal_graphics_composer appdomain:fd use;
-+
-+# allow self to set SCHED_FIFO
-+allow hal_graphics_composer self:global_capability_class_set sys_nice;
-diff --git a/prebuilts/api/28.0/public/hal_health.te b/prebuilts/api/28.0/public/hal_health.te
-new file mode 100644
-index 000000000..c0a0f804c
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_health.te
-@@ -0,0 +1,30 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_health_client, hal_health_server)
-+binder_call(hal_health_server, hal_health_client)
-+
-+add_hwservice(hal_health_server, hal_health_hwservice)
-+allow hal_health_client hal_health_hwservice:hwservice_manager find;
-+
-+# Read access to system files for HALs in
-+# /{system,vendor,odm}/lib[64]/hw/ in order
-+# to be able to open the hal implementation .so files
-+r_dir_file(hal_health, system_file)
-+
-+# Common rules for a health service.
-+
-+# Allow to listen to uevents for updates
-+allow hal_health_server self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+
-+# Allow to read /sys/class/power_supply directory
-+allow hal_health_server sysfs:dir r_dir_perms;
-+
-+# Allow to read files under /sys/class/power_supply. Implementations typically have symlinks
-+# to vendor specific files. Vendors should mark sysfs_batteryinfo on all files read by health
-+# HAL service.
-+r_dir_file(hal_health_server, sysfs_batteryinfo)
-+
-+# Allow to wake up to send periodic events
-+wakelock_use(hal_health_server)
-+
-+# Write to /dev/kmsg
-+allow hal_health_server kmsg_device:chr_file w_file_perms;
-diff --git a/prebuilts/api/28.0/public/hal_ir.te b/prebuilts/api/28.0/public/hal_ir.te
-new file mode 100644
-index 000000000..b1bfdd804
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_ir.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_ir_client, hal_ir_server)
-+binder_call(hal_ir_server, hal_ir_client)
-+
-+add_hwservice(hal_ir_server, hal_ir_hwservice)
-+allow hal_ir_client hal_ir_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_keymaster.te b/prebuilts/api/28.0/public/hal_keymaster.te
-new file mode 100644
-index 000000000..dc5f6d01d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_keymaster.te
-@@ -0,0 +1,8 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_keymaster_client, hal_keymaster_server)
-+
-+add_hwservice(hal_keymaster_server, hal_keymaster_hwservice)
-+allow hal_keymaster_client hal_keymaster_hwservice:hwservice_manager find;
-+
-+allow hal_keymaster tee_device:chr_file rw_file_perms;
-+allow hal_keymaster ion_device:chr_file r_file_perms;
-diff --git a/prebuilts/api/28.0/public/hal_light.te b/prebuilts/api/28.0/public/hal_light.te
-new file mode 100644
-index 000000000..5b93dd115
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_light.te
-@@ -0,0 +1,10 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_light_client, hal_light_server)
-+binder_call(hal_light_server, hal_light_client)
-+
-+add_hwservice(hal_light_server, hal_light_hwservice)
-+allow hal_light_client hal_light_hwservice:hwservice_manager find;
-+
-+allow hal_light sysfs_leds:lnk_file read;
-+allow hal_light sysfs_leds:file rw_file_perms;
-+allow hal_light sysfs_leds:dir r_dir_perms;
-diff --git a/prebuilts/api/28.0/public/hal_lowpan.te b/prebuilts/api/28.0/public/hal_lowpan.te
-new file mode 100644
-index 000000000..af491b159
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_lowpan.te
-@@ -0,0 +1,21 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_lowpan_client, hal_lowpan_server)
-+binder_call(hal_lowpan_server, hal_lowpan_client)
-+
-+add_hwservice(hal_lowpan_server, hal_lowpan_hwservice)
-+
-+# Allow hal_lowpan_client to be able to find the hal_lowpan_server
-+allow hal_lowpan_client hal_lowpan_hwservice:hwservice_manager find;
-+
-+# hal_lowpan domain can write/read to/from lowpan_prop
-+set_prop(hal_lowpan_server, lowpan_prop)
-+
-+# Allow hal_lowpan_server to open lowpan_devices
-+allow hal_lowpan_server lowpan_device:chr_file rw_file_perms;
-+
-+###
-+### neverallow rules
-+###
-+
-+# Only LoWPAN HAL may directly access LoWPAN hardware
-+neverallow { domain -hal_lowpan_server -init -ueventd } lowpan_device:chr_file ~getattr;
-diff --git a/prebuilts/api/28.0/public/hal_memtrack.te b/prebuilts/api/28.0/public/hal_memtrack.te
-new file mode 100644
-index 000000000..b2cc9cd1e
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_memtrack.te
-@@ -0,0 +1,5 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_memtrack_client, hal_memtrack_server)
-+
-+add_hwservice(hal_memtrack_server, hal_memtrack_hwservice)
-+allow hal_memtrack_client hal_memtrack_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_neuralnetworks.te b/prebuilts/api/28.0/public/hal_neuralnetworks.te
-new file mode 100644
-index 000000000..c697ac2f2
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_neuralnetworks.te
-@@ -0,0 +1,8 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_neuralnetworks_client, hal_neuralnetworks_server)
-+binder_call(hal_neuralnetworks_server, hal_neuralnetworks_client)
-+
-+add_hwservice(hal_neuralnetworks_server, hal_neuralnetworks_hwservice)
-+allow hal_neuralnetworks_client hal_neuralnetworks_hwservice:hwservice_manager find;
-+allow hal_neuralnetworks hidl_memory_hwservice:hwservice_manager find;
-+allow hal_neuralnetworks hal_allocator:fd use;
-diff --git a/prebuilts/api/28.0/public/hal_neverallows.te b/prebuilts/api/28.0/public/hal_neverallows.te
-new file mode 100644
-index 000000000..0f05d8ad3
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_neverallows.te
-@@ -0,0 +1,59 @@
-+# only HALs responsible for network hardware should have privileged
-+# network capabilities
-+neverallow {
-+  halserverdomain
-+  -hal_bluetooth_server
-+  -hal_wifi_server
-+  -hal_wifi_hostapd_server
-+  -hal_wifi_supplicant_server
-+  -hal_telephony_server
-+} self:global_capability_class_set { net_admin net_raw };
-+
-+# Unless a HAL's job is to communicate over the network, or control network
-+# hardware, it should not be using network sockets.
-+# NOTE: HALs for automotive devices have an exemption from this rule because in
-+# a car it is common to have external modules and HALs need to communicate to
-+# those modules using network.  Using this exemption for non-automotive builds
-+# will result in CTS failure.
-+neverallow {
-+  halserverdomain
-+  -hal_automotive_socket_exemption
-+  -hal_tetheroffload_server
-+  -hal_wifi_server
-+  -hal_wifi_hostapd_server
-+  -hal_wifi_supplicant_server
-+  -hal_telephony_server
-+} domain:{ tcp_socket udp_socket rawip_socket } *;
-+
-+###
-+# HALs are defined as an attribute and so a given domain could hypothetically
-+# have multiple HALs in it (or even all of them) with the subsequent policy of
-+# the domain comprised of the union of all the HALs.
-+#
-+# This is a problem because
-+# 1) Security sensitive components should only be accessed by specific HALs.
-+# 2) hwbinder_call and the restrictions it provides cannot be reasoned about in
-+#    the platform.
-+# 3) The platform cannot reason about defense in depth if there are
-+#    monolithic domains etc.
-+#
-+# As an example, hal_keymaster and hal_gatekeeper can access the TEE and while
-+# its OK for them to share a process its not OK with them to share processes
-+# with other hals.
-+#
-+# The following neverallow rules, in conjuntion with CTS tests, assert that
-+# these security principles are adhered to.
-+#
-+# Do not allow a hal to exec another process without a domain transition.
-+# TODO remove exemptions.
-+neverallow {
-+  halserverdomain
-+  -hal_dumpstate_server
-+  -hal_telephony_server
-+} { file_type fs_type }:file execute_no_trans;
-+# Do not allow a process other than init to transition into a HAL domain.
-+neverallow { domain -init } halserverdomain:process transition;
-+# Only allow transitioning to a domain by running its executable. Do not
-+# allow transitioning into a HAL domain by use of seclabel in an
-+# init.*.rc script.
-+neverallow * halserverdomain:process dyntransition;
-diff --git a/prebuilts/api/28.0/public/hal_nfc.te b/prebuilts/api/28.0/public/hal_nfc.te
-new file mode 100644
-index 000000000..3bcdf5ee1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_nfc.te
-@@ -0,0 +1,12 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_nfc_client, hal_nfc_server)
-+binder_call(hal_nfc_server, hal_nfc_client)
-+
-+add_hwservice(hal_nfc_server, hal_nfc_hwservice)
-+allow hal_nfc_client hal_nfc_hwservice:hwservice_manager find;
-+
-+# Set NFC properties (used by bcm2079x HAL).
-+set_prop(hal_nfc, nfc_prop)
-+
-+# NFC device access.
-+allow hal_nfc nfc_device:chr_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/public/hal_oemlock.te b/prebuilts/api/28.0/public/hal_oemlock.te
-new file mode 100644
-index 000000000..3fb5a1871
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_oemlock.te
-@@ -0,0 +1,5 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_oemlock_client, hal_oemlock_server)
-+
-+add_hwservice(hal_oemlock_server, hal_oemlock_hwservice)
-+allow hal_oemlock_client hal_oemlock_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_power.te b/prebuilts/api/28.0/public/hal_power.te
-new file mode 100644
-index 000000000..fcba3d25d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_power.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_power_client, hal_power_server)
-+binder_call(hal_power_server, hal_power_client)
-+
-+add_hwservice(hal_power_server, hal_power_hwservice)
-+allow hal_power_client hal_power_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_secure_element.te b/prebuilts/api/28.0/public/hal_secure_element.te
-new file mode 100644
-index 000000000..e3046d12e
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_secure_element.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_secure_element_client, hal_secure_element_server)
-+binder_call(hal_secure_element_server, hal_secure_element_client)
-+
-+add_hwservice(hal_secure_element_server, hal_secure_element_hwservice)
-+allow hal_secure_element_client hal_secure_element_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_sensors.te b/prebuilts/api/28.0/public/hal_sensors.te
-new file mode 100644
-index 000000000..9d7cbe913
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_sensors.te
-@@ -0,0 +1,15 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_sensors_client, hal_sensors_server)
-+
-+add_hwservice(hal_sensors_server, hal_sensors_hwservice)
-+allow hal_sensors_client hal_sensors_hwservice:hwservice_manager find;
-+
-+# Allow sensor hals to access ashmem memory allocated by apps
-+allow hal_sensors { appdomain -isolated_app }:fd use;
-+
-+# Allow sensor hals to access ashmem memory allocated by android.hidl.allocator
-+# fd is passed in from framework sensorservice HAL.
-+allow hal_sensors hal_allocator:fd use;
-+
-+# allow to run with real-time scheduling policy
-+allow hal_sensors self:global_capability_class_set sys_nice;
-diff --git a/prebuilts/api/28.0/public/hal_telephony.te b/prebuilts/api/28.0/public/hal_telephony.te
-new file mode 100644
-index 000000000..5f8cc41ca
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_telephony.te
-@@ -0,0 +1,46 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_telephony_client, hal_telephony_server)
-+binder_call(hal_telephony_server, hal_telephony_client)
-+
-+add_hwservice(hal_telephony_server, hal_telephony_hwservice)
-+allow hal_telephony_client hal_telephony_hwservice:hwservice_manager find;
-+
-+allowxperm hal_telephony_server self:udp_socket ioctl priv_sock_ioctls;
-+
-+allow hal_telephony_server self:netlink_route_socket nlmsg_write;
-+allow hal_telephony_server kernel:system module_request;
-+allow hal_telephony_server self:global_capability_class_set { setpcap setgid setuid net_admin net_raw };
-+allow hal_telephony_server alarm_device:chr_file rw_file_perms;
-+allow hal_telephony_server cgroup:dir create_dir_perms;
-+allow hal_telephony_server cgroup:{ file lnk_file } r_file_perms;
-+allow hal_telephony_server radio_device:chr_file rw_file_perms;
-+allow hal_telephony_server radio_device:blk_file r_file_perms;
-+allow hal_telephony_server mtd_device:dir search;
-+allow hal_telephony_server efs_file:dir create_dir_perms;
-+allow hal_telephony_server efs_file:file create_file_perms;
-+allow hal_telephony_server vendor_shell_exec:file rx_file_perms;
-+allow hal_telephony_server bluetooth_efs_file:file r_file_perms;
-+allow hal_telephony_server bluetooth_efs_file:dir r_dir_perms;
-+
-+# property service
-+set_prop(hal_telephony_server, radio_prop)
-+set_prop(hal_telephony_server, exported_radio_prop)
-+set_prop(hal_telephony_server, exported2_radio_prop)
-+set_prop(hal_telephony_server, exported3_radio_prop)
-+
-+allow hal_telephony_server tty_device:chr_file rw_file_perms;
-+
-+# Allow hal_telephony_server to create and use netlink sockets.
-+allow hal_telephony_server self:netlink_socket create_socket_perms_no_ioctl;
-+allow hal_telephony_server self:netlink_generic_socket create_socket_perms_no_ioctl;
-+allow hal_telephony_server self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+
-+# Access to wake locks
-+wakelock_use(hal_telephony_server)
-+
-+r_dir_file(hal_telephony_server, proc_net)
-+r_dir_file(hal_telephony_server, sysfs_type)
-+r_dir_file(hal_telephony_server, system_file)
-+
-+# granting the ioctl permission for hal_telephony_server should be device specific
-+allow hal_telephony_server self:socket create_socket_perms_no_ioctl;
-diff --git a/prebuilts/api/28.0/public/hal_tetheroffload.te b/prebuilts/api/28.0/public/hal_tetheroffload.te
-new file mode 100644
-index 000000000..48d67a29b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_tetheroffload.te
-@@ -0,0 +1,8 @@
-+## HwBinder IPC from client to server, and callbacks
-+binder_call(hal_tetheroffload_client, hal_tetheroffload_server)
-+binder_call(hal_tetheroffload_server, hal_tetheroffload_client)
-+
-+allow hal_tetheroffload_client hal_tetheroffload_hwservice:hwservice_manager find;
-+
-+# allow the client to pass the server already open netlink sockets
-+allow hal_tetheroffload_server hal_tetheroffload_client:netlink_netfilter_socket { getattr read setopt write };
-diff --git a/prebuilts/api/28.0/public/hal_thermal.te b/prebuilts/api/28.0/public/hal_thermal.te
-new file mode 100644
-index 000000000..b1764f114
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_thermal.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_thermal_client, hal_thermal_server)
-+binder_call(hal_thermal_server, hal_thermal_client)
-+
-+add_hwservice(hal_thermal_server, hal_thermal_hwservice)
-+allow hal_thermal_client hal_thermal_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_tv_cec.te b/prebuilts/api/28.0/public/hal_tv_cec.te
-new file mode 100644
-index 000000000..7719cae92
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_tv_cec.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from clients into server, and callbacks
-+binder_call(hal_tv_cec_client, hal_tv_cec_server)
-+binder_call(hal_tv_cec_server, hal_tv_cec_client)
-+
-+add_hwservice(hal_tv_cec_server, hal_tv_cec_hwservice)
-+allow hal_tv_cec_client hal_tv_cec_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_tv_input.te b/prebuilts/api/28.0/public/hal_tv_input.te
-new file mode 100644
-index 000000000..31a006740
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_tv_input.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from clients into server, and callbacks
-+binder_call(hal_tv_input_client, hal_tv_input_server)
-+binder_call(hal_tv_input_server, hal_tv_input_client)
-+
-+add_hwservice(hal_tv_input_server, hal_tv_input_hwservice)
-+allow hal_tv_input_client hal_tv_input_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_usb.te b/prebuilts/api/28.0/public/hal_usb.te
-new file mode 100644
-index 000000000..f63f156d2
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_usb.te
-@@ -0,0 +1,17 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_usb_client, hal_usb_server)
-+binder_call(hal_usb_server, hal_usb_client)
-+
-+add_hwservice(hal_usb_server, hal_usb_hwservice)
-+allow hal_usb_client hal_usb_hwservice:hwservice_manager find;
-+
-+allow hal_usb self:netlink_kobject_uevent_socket create;
-+allow hal_usb self:netlink_kobject_uevent_socket setopt;
-+allow hal_usb self:netlink_kobject_uevent_socket bind;
-+allow hal_usb self:netlink_kobject_uevent_socket read;
-+allow hal_usb sysfs:dir open;
-+allow hal_usb sysfs:dir read;
-+allow hal_usb sysfs:file read;
-+allow hal_usb sysfs:file open;
-+allow hal_usb sysfs:file write;
-+allow hal_usb sysfs:file getattr;
-diff --git a/prebuilts/api/28.0/public/hal_usb_gadget.te b/prebuilts/api/28.0/public/hal_usb_gadget.te
-new file mode 100644
-index 000000000..dcee9837b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_usb_gadget.te
-@@ -0,0 +1,13 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_usb_gadget_client, hal_usb_gadget_server)
-+binder_call(hal_usb_gadget_server, hal_usb_gadget_client)
-+
-+add_hwservice(hal_usb_gadget_server, hal_usb_gadget_hwservice)
-+allow hal_usb_gadget_client hal_usb_gadget_hwservice:hwservice_manager find;
-+
-+# Configuring usb gadget functions
-+allow hal_usb_gadget_server configfs:lnk_file { read create unlink};
-+allow hal_usb_gadget_server configfs:dir rw_dir_perms;
-+allow hal_usb_gadget_server configfs:file rw_file_perms;
-+allow hal_usb_gadget_server functionfs:dir { read search };
-+allow hal_usb_gadget_server functionfs:file read;
-diff --git a/prebuilts/api/28.0/public/hal_vehicle.te b/prebuilts/api/28.0/public/hal_vehicle.te
-new file mode 100644
-index 000000000..a59f8d2bd
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_vehicle.te
-@@ -0,0 +1,7 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_vehicle_client, hal_vehicle_server)
-+binder_call(hal_vehicle_server, hal_vehicle_client)
-+
-+add_hwservice(hal_vehicle_server, hal_vehicle_hwservice)
-+
-+allow hal_vehicle_client hal_vehicle_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_vibrator.te b/prebuilts/api/28.0/public/hal_vibrator.te
-new file mode 100644
-index 000000000..9ce34cac2
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_vibrator.te
-@@ -0,0 +1,9 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_vibrator_client, hal_vibrator_server)
-+
-+add_hwservice(hal_vibrator_server, hal_vibrator_hwservice)
-+allow hal_vibrator_client hal_vibrator_hwservice:hwservice_manager find;
-+
-+# vibrator sysfs rw access
-+allow hal_vibrator sysfs_vibrator:file rw_file_perms;
-+allow hal_vibrator sysfs_vibrator:dir search;
-diff --git a/prebuilts/api/28.0/public/hal_vr.te b/prebuilts/api/28.0/public/hal_vr.te
-new file mode 100644
-index 000000000..3cb392d14
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_vr.te
-@@ -0,0 +1,6 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_vr_client, hal_vr_server)
-+binder_call(hal_vr_server, hal_vr_client)
-+
-+add_hwservice(hal_vr_server, hal_vr_hwservice)
-+allow hal_vr_client hal_vr_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_weaver.te b/prebuilts/api/28.0/public/hal_weaver.te
-new file mode 100644
-index 000000000..b80ba292c
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_weaver.te
-@@ -0,0 +1,5 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_weaver_client, hal_weaver_server)
-+
-+add_hwservice(hal_weaver_server, hal_weaver_hwservice)
-+allow hal_weaver_client hal_weaver_hwservice:hwservice_manager find;
-diff --git a/prebuilts/api/28.0/public/hal_wifi.te b/prebuilts/api/28.0/public/hal_wifi.te
-new file mode 100644
-index 000000000..7cea7c740
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_wifi.te
-@@ -0,0 +1,32 @@
-+# HwBinder IPC from client to server, and callbacks
-+binder_call(hal_wifi_client, hal_wifi_server)
-+binder_call(hal_wifi_server, hal_wifi_client)
-+
-+add_hwservice(hal_wifi_server, hal_wifi_hwservice)
-+allow hal_wifi_client hal_wifi_hwservice:hwservice_manager find;
-+
-+r_dir_file(hal_wifi, proc_net)
-+r_dir_file(hal_wifi, sysfs_type)
-+
-+set_prop(hal_wifi, exported_wifi_prop)
-+set_prop(hal_wifi, wifi_prop)
-+
-+# allow hal wifi set interfaces up and down
-+allow hal_wifi self:udp_socket create_socket_perms;
-+allowxperm hal_wifi self:udp_socket ioctl { SIOCSIFFLAGS SIOCSIFHWADDR };
-+
-+allow hal_wifi self:global_capability_class_set { net_admin net_raw };
-+# allow hal_wifi to speak to nl80211 in the kernel
-+allow hal_wifi self:netlink_socket create_socket_perms_no_ioctl;
-+# newer kernels (e.g. 4.4 but not 4.1) have a new class for sockets
-+allow hal_wifi self:netlink_generic_socket create_socket_perms_no_ioctl;
-+# hal_wifi writes firmware paths to this file.
-+allow hal_wifi sysfs_wlan_fwpath:file { w_file_perms };
-+# allow hal_wifi to access /proc/modules to check if Wi-Fi driver is loaded
-+allow hal_wifi proc_modules:file { getattr open read };
-+
-+# allow hal_wifi to write into /data/vendor/tombstones/wifi
-+userdebug_or_eng(`
-+  allow hal_wifi_server tombstone_wifi_data_file:dir rw_dir_perms;
-+  allow hal_wifi_server tombstone_wifi_data_file:file create_file_perms;
-+')
-diff --git a/prebuilts/api/28.0/public/hal_wifi_hostapd.te b/prebuilts/api/28.0/public/hal_wifi_hostapd.te
-new file mode 100644
-index 000000000..03a554674
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_wifi_hostapd.te
-@@ -0,0 +1,28 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_wifi_hostapd_client, hal_wifi_hostapd_server)
-+binder_call(hal_wifi_hostapd_server, hal_wifi_hostapd_client)
-+
-+add_hwservice(hal_wifi_hostapd_server, hal_wifi_hostapd_hwservice)
-+allow hal_wifi_hostapd_client hal_wifi_hostapd_hwservice:hwservice_manager find;
-+
-+allow hal_wifi_hostapd_server self:global_capability_class_set { net_admin net_raw };
-+
-+allow hal_wifi_hostapd_server sysfs_net:dir search;
-+
-+# Allow hal_wifi_hostapd to access /proc/net/psched
-+allow hal_wifi_hostapd_server proc_net:file { getattr open read };
-+
-+# Various socket permissions.
-+allowxperm hal_wifi_hostapd_server self:udp_socket ioctl priv_sock_ioctls;
-+allow hal_wifi_hostapd_server self:netlink_socket create_socket_perms_no_ioctl;
-+allow hal_wifi_hostapd_server self:netlink_generic_socket create_socket_perms_no_ioctl;
-+allow hal_wifi_hostapd_server self:packet_socket create_socket_perms_no_ioctl;
-+allow hal_wifi_hostapd_server self:netlink_route_socket nlmsg_write;
-+
-+###
-+### neverallow rules
-+###
-+
-+# hal_wifi_hostapd should not trust any data from sdcards
-+neverallow hal_wifi_hostapd_server sdcard_type:dir ~getattr;
-+neverallow hal_wifi_hostapd_server sdcard_type:file *;
-diff --git a/prebuilts/api/28.0/public/hal_wifi_offload.te b/prebuilts/api/28.0/public/hal_wifi_offload.te
-new file mode 100644
-index 000000000..dc0cf5a73
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_wifi_offload.te
-@@ -0,0 +1,9 @@
-+## HwBinder IPC from client to server, and callbacks
-+binder_call(hal_wifi_offload_client, hal_wifi_offload_server)
-+binder_call(hal_wifi_offload_server, hal_wifi_offload_client)
-+
-+add_hwservice(hal_wifi_offload_server, hal_wifi_offload_hwservice)
-+allow hal_wifi_offload_client hal_wifi_offload_hwservice:hwservice_manager find;
-+
-+r_dir_file(hal_wifi_offload, proc_net)
-+r_dir_file(hal_wifi_offload, sysfs_type)
-diff --git a/prebuilts/api/28.0/public/hal_wifi_supplicant.te b/prebuilts/api/28.0/public/hal_wifi_supplicant.te
-new file mode 100644
-index 000000000..377851543
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hal_wifi_supplicant.te
-@@ -0,0 +1,29 @@
-+# HwBinder IPC from client to server
-+binder_call(hal_wifi_supplicant_client, hal_wifi_supplicant_server)
-+binder_call(hal_wifi_supplicant_server, hal_wifi_supplicant_client)
-+
-+add_hwservice(hal_wifi_supplicant_server, hal_wifi_supplicant_hwservice)
-+allow hal_wifi_supplicant_client hal_wifi_supplicant_hwservice:hwservice_manager find;
-+
-+# in addition to ioctls allowlisted for all domains, grant hal_wifi_supplicant priv_sock_ioctls.
-+allowxperm hal_wifi_supplicant self:udp_socket ioctl priv_sock_ioctls;
-+
-+r_dir_file(hal_wifi_supplicant, sysfs_type)
-+r_dir_file(hal_wifi_supplicant, proc_net)
-+
-+allow hal_wifi_supplicant kernel:system module_request;
-+allow hal_wifi_supplicant self:global_capability_class_set { setuid net_admin setgid net_raw };
-+allow hal_wifi_supplicant cgroup:dir create_dir_perms;
-+allow hal_wifi_supplicant self:netlink_route_socket nlmsg_write;
-+allow hal_wifi_supplicant self:netlink_socket create_socket_perms_no_ioctl;
-+allow hal_wifi_supplicant self:netlink_generic_socket create_socket_perms_no_ioctl;
-+allow hal_wifi_supplicant self:packet_socket create_socket_perms;
-+allowxperm hal_wifi_supplicant self:packet_socket ioctl { unpriv_sock_ioctls priv_sock_ioctls unpriv_tty_ioctls };
-+
-+###
-+### neverallow rules
-+###
-+
-+# wpa_supplicant should not trust any data from sdcards
-+neverallow hal_wifi_supplicant_server sdcard_type:dir ~getattr;
-+neverallow hal_wifi_supplicant_server sdcard_type:file *;
-diff --git a/prebuilts/api/28.0/public/healthd.te b/prebuilts/api/28.0/public/healthd.te
-new file mode 100644
-index 000000000..8a1d3ec29
---- /dev/null
-+++ b/prebuilts/api/28.0/public/healthd.te
-@@ -0,0 +1,58 @@
-+# healthd - battery/charger monitoring service daemon
-+type healthd, domain;
-+type healthd_exec, exec_type, file_type;
-+
-+# Write to /dev/kmsg
-+allow healthd kmsg_device:chr_file rw_file_perms;
-+
-+# Read access to pseudo filesystems.
-+allow healthd sysfs_type:dir search;
-+r_dir_file(healthd, rootfs)
-+r_dir_file(healthd, cgroup)
-+
-+# Read access to system files for passthrough HALs in
-+# /{system,vendor,odm}/lib[64]/hw/
-+r_dir_file(healthd, system_file)
-+
-+allow healthd self:global_capability_class_set { sys_tty_config };
-+allow healthd self:global_capability_class_set sys_boot;
-+
-+allow healthd self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+
-+wakelock_use(healthd)
-+
-+hal_client_domain(healthd, hal_health)
-+
-+# Read/write to /sys/power/state
-+allow healthd sysfs_power:file rw_file_perms;
-+
-+# TODO: added to match above sysfs rule. Remove me?
-+allow healthd sysfs_usb:file write;
-+
-+r_dir_file(healthd, sysfs_batteryinfo)
-+
-+###
-+### healthd: charger mode
-+###
-+
-+# Read /sys/fs/pstore/console-ramoops
-+# Don't worry about overly broad permissions for now, as there's
-+# only one file in /sys/fs/pstore
-+allow healthd pstorefs:dir r_dir_perms;
-+allow healthd pstorefs:file r_file_perms;
-+
-+allow healthd graphics_device:dir r_dir_perms;
-+allow healthd graphics_device:chr_file rw_file_perms;
-+allow healthd input_device:dir r_dir_perms;
-+allow healthd input_device:chr_file r_file_perms;
-+allow healthd tty_device:chr_file rw_file_perms;
-+allow healthd ashmem_device:chr_file execute;
-+allow healthd self:process execmem;
-+allow healthd proc_sysrq:file rw_file_perms;
-+
-+# Healthd needs to tell init to continue the boot
-+# process when running in charger mode.
-+set_prop(healthd, system_prop)
-+set_prop(healthd, exported_system_prop)
-+set_prop(healthd, exported2_system_prop)
-+set_prop(healthd, exported3_system_prop)
-diff --git a/prebuilts/api/28.0/public/hwservice.te b/prebuilts/api/28.0/public/hwservice.te
-new file mode 100644
-index 000000000..5fba86ac3
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hwservice.te
-@@ -0,0 +1,62 @@
-+type default_android_hwservice, hwservice_manager_type;
-+type fwk_display_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type fwk_scheduler_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type fwk_sensor_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type hal_audiocontrol_hwservice, hwservice_manager_type;
-+type hal_audio_hwservice, hwservice_manager_type;
-+type hal_authsecret_hwservice, hwservice_manager_type;
-+type hal_bluetooth_hwservice, hwservice_manager_type;
-+type hal_bootctl_hwservice, hwservice_manager_type;
-+type hal_broadcastradio_hwservice, hwservice_manager_type;
-+type hal_camera_hwservice, hwservice_manager_type;
-+type hal_codec2_hwservice, hwservice_manager_type;
-+type hal_configstore_ISurfaceFlingerConfigs, hwservice_manager_type;
-+type hal_confirmationui_hwservice, hwservice_manager_type;
-+type hal_contexthub_hwservice, hwservice_manager_type;
-+type hal_drm_hwservice, hwservice_manager_type;
-+type hal_cas_hwservice, hwservice_manager_type;
-+type hal_dumpstate_hwservice, hwservice_manager_type;
-+type hal_evs_hwservice, hwservice_manager_type;
-+type hal_fingerprint_hwservice, hwservice_manager_type;
-+type hal_gatekeeper_hwservice, hwservice_manager_type;
-+type hal_gnss_hwservice, hwservice_manager_type;
-+type hal_graphics_allocator_hwservice, hwservice_manager_type;
-+type hal_graphics_composer_hwservice, hwservice_manager_type;
-+type hal_graphics_mapper_hwservice, hwservice_manager_type, same_process_hwservice;
-+type hal_health_hwservice, hwservice_manager_type;
-+type hal_ir_hwservice, hwservice_manager_type;
-+type hal_keymaster_hwservice, hwservice_manager_type;
-+type hal_light_hwservice, hwservice_manager_type;
-+type hal_lowpan_hwservice, hwservice_manager_type;
-+type hal_memtrack_hwservice, hwservice_manager_type;
-+type hal_neuralnetworks_hwservice, hwservice_manager_type;
-+type hal_nfc_hwservice, hwservice_manager_type;
-+type hal_oemlock_hwservice, hwservice_manager_type;
-+type hal_omx_hwservice, hwservice_manager_type;
-+type hal_power_hwservice, hwservice_manager_type;
-+type hal_renderscript_hwservice, hwservice_manager_type, same_process_hwservice;
-+type hal_secure_element_hwservice, hwservice_manager_type;
-+type hal_sensors_hwservice, hwservice_manager_type;
-+type hal_telephony_hwservice, hwservice_manager_type;
-+type hal_tetheroffload_hwservice, hwservice_manager_type;
-+type hal_thermal_hwservice, hwservice_manager_type;
-+type hal_tv_cec_hwservice, hwservice_manager_type;
-+type hal_tv_input_hwservice, hwservice_manager_type;
-+type hal_usb_hwservice, hwservice_manager_type;
-+type hal_usb_gadget_hwservice, hwservice_manager_type;
-+type hal_vehicle_hwservice, hwservice_manager_type;
-+type hal_vibrator_hwservice, hwservice_manager_type;
-+type hal_vr_hwservice, hwservice_manager_type;
-+type hal_weaver_hwservice, hwservice_manager_type;
-+type hal_wifi_hwservice, hwservice_manager_type;
-+type hal_wifi_hostapd_hwservice, hwservice_manager_type;
-+type hal_wifi_offload_hwservice, hwservice_manager_type;
-+type hal_wifi_supplicant_hwservice, hwservice_manager_type;
-+type hidl_allocator_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type hidl_base_hwservice, hwservice_manager_type;
-+type hidl_manager_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type hidl_memory_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type hidl_token_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type system_net_netd_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type system_wifi_keystore_hwservice, hwservice_manager_type, coredomain_hwservice;
-+type thermalcallback_hwservice, hwservice_manager_type;
-diff --git a/prebuilts/api/28.0/public/hwservicemanager.te b/prebuilts/api/28.0/public/hwservicemanager.te
-new file mode 100644
-index 000000000..1ffd2a67e
---- /dev/null
-+++ b/prebuilts/api/28.0/public/hwservicemanager.te
-@@ -0,0 +1,22 @@
-+# hwservicemanager - the Binder context manager for HAL services
-+type hwservicemanager, domain, mlstrustedsubject;
-+type hwservicemanager_exec, exec_type, file_type;
-+
-+# Note that we do not use the binder_* macros here.
-+# hwservicemanager provides name service (aka context manager)
-+# for hwbinder.
-+# Additionally, it initiates binder IPC calls to
-+# clients who request service notifications. The permission
-+# to do this is granted in the hwbinder_use macro.
-+allow hwservicemanager self:binder set_context_mgr;
-+
-+set_prop(hwservicemanager, hwservicemanager_prop)
-+
-+# Scan through /system/lib64/hw looking for installed HALs
-+allow hwservicemanager system_file:dir r_dir_perms;
-+
-+# Read hwservice_contexts
-+allow hwservicemanager hwservice_contexts_file:file r_file_perms;
-+
-+# Check SELinux permissions.
-+selinux_check_access(hwservicemanager)
-diff --git a/prebuilts/api/28.0/public/idmap.te b/prebuilts/api/28.0/public/idmap.te
-new file mode 100644
-index 000000000..3f336a32d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/idmap.te
-@@ -0,0 +1,20 @@
-+# idmap, when executed by installd
-+type idmap, domain;
-+type idmap_exec, exec_type, file_type;
-+
-+# Use open file to /data/resource-cache file inherited from installd.
-+allow idmap installd:fd use;
-+allow idmap resourcecache_data_file:file { getattr read write };
-+
-+# Ignore reading /proc/<pid>/maps after a fork.
-+dontaudit idmap installd:file read;
-+
-+# Open and read from target and overlay apk files passed by argument.
-+allow idmap apk_data_file:file r_file_perms;
-+allow idmap apk_data_file:dir search;
-+
-+# Allow apps access to /vendor/app
-+r_dir_file(idmap, vendor_app_file)
-+
-+# Allow apps access to /vendor/overlay
-+r_dir_file(idmap, vendor_overlay_file)
-diff --git a/prebuilts/api/28.0/public/incident.te b/prebuilts/api/28.0/public/incident.te
-new file mode 100644
-index 000000000..5c41dcebf
---- /dev/null
-+++ b/prebuilts/api/28.0/public/incident.te
-@@ -0,0 +1,7 @@
-+# The incident command is used to call into the incidentd service to
-+# take an incident report (binary, shared bugreport), download incident
-+# reports that have already been taken, and monitor for new ones.
-+# It doesn't do anything else.
-+
-+# incident
-+type incident, domain;
-diff --git a/prebuilts/api/28.0/public/incident_helper.te b/prebuilts/api/28.0/public/incident_helper.te
-new file mode 100644
-index 000000000..bca101869
---- /dev/null
-+++ b/prebuilts/api/28.0/public/incident_helper.te
-@@ -0,0 +1,5 @@
-+# The incident_helper is called by incidentd and
-+# can only read/write data from/to incidentd
-+
-+# incident_helper
-+type incident_helper, domain;
-diff --git a/prebuilts/api/28.0/public/incidentd.te b/prebuilts/api/28.0/public/incidentd.te
-new file mode 100644
-index 000000000..00b710a48
---- /dev/null
-+++ b/prebuilts/api/28.0/public/incidentd.te
-@@ -0,0 +1,2 @@
-+# incidentd
-+type incidentd, domain;
-diff --git a/prebuilts/api/28.0/public/init.te b/prebuilts/api/28.0/public/init.te
-new file mode 100644
-index 000000000..dafc06f99
---- /dev/null
-+++ b/prebuilts/api/28.0/public/init.te
-@@ -0,0 +1,509 @@
-+# init is its own domain.
-+type init, domain, mlstrustedsubject;
-+
-+# The init domain is entered by execing init.
-+type init_exec, exec_type, file_type;
-+
-+# /dev/__null__ node created by init.
-+allow init tmpfs:chr_file { create setattr unlink rw_file_perms };
-+
-+#
-+# init direct restorecon calls.
-+#
-+# /dev/kmsg
-+allow init tmpfs:chr_file relabelfrom;
-+allow init kmsg_device:chr_file { write relabelto };
-+# /dev/kmsg_debug
-+userdebug_or_eng(`
-+  allow init kmsg_debug_device:chr_file { write relabelto };
-+')
-+# /dev/__properties__
-+allow init properties_device:dir relabelto;
-+allow init properties_serial:file { write relabelto };
-+allow init property_type:file { create_file_perms relabelto };
-+# /dev/__properties__/property_info
-+allow init properties_device:file create_file_perms;
-+allow init property_info:file relabelto;
-+# /dev/event-log-tags
-+allow init device:file relabelfrom;
-+allow init runtime_event_log_tags_file:file { open write setattr relabelto create };
-+# /dev/socket
-+allow init { device socket_device }:dir relabelto;
-+# /dev/random, /dev/urandom
-+allow init random_device:chr_file relabelto;
-+# /dev/device-mapper, /dev/block(/.*)?
-+allow init tmpfs:{ chr_file blk_file } relabelfrom;
-+allow init tmpfs:blk_file getattr;
-+allow init block_device:{ dir blk_file lnk_file } relabelto;
-+allow init dm_device:{ chr_file blk_file } relabelto;
-+allow init kernel:fd use;
-+# restorecon for early mount device symlinks
-+allow init tmpfs:lnk_file { getattr read relabelfrom };
-+allow init {
-+  misc_block_device
-+  recovery_block_device
-+  system_block_device
-+}:{ blk_file lnk_file } relabelto;
-+
-+# setrlimit
-+allow init self:global_capability_class_set sys_resource;
-+
-+# Remove /dev/.booting, created before initial policy load or restorecon /dev.
-+allow init tmpfs:file unlink;
-+
-+# Access pty created for fsck.
-+allow init devpts:chr_file { read write open };
-+
-+# Create /dev/fscklogs files.
-+allow init fscklogs:file create_file_perms;
-+
-+# Access /dev/__null__ node created prior to initial policy load.
-+allow init tmpfs:chr_file write;
-+
-+# Access /dev/console.
-+allow init console_device:chr_file rw_file_perms;
-+
-+# Access /dev/tty0.
-+allow init tty_device:chr_file rw_file_perms;
-+
-+# Call mount(2).
-+allow init self:global_capability_class_set sys_admin;
-+
-+# Create and mount on directories in /.
-+allow init rootfs:dir create_dir_perms;
-+allow init { rootfs cache_file cgroup storage_file system_data_file system_file vendor_file postinstall_mnt_dir }:dir mounton;
-+allow init cgroup_bpf:dir { create mounton };
-+
-+# Mount bpf fs on sys/fs/bpf
-+allow init fs_bpf:dir mounton;
-+
-+# Mount on /dev/usb-ffs/adb.
-+allow init device:dir mounton;
-+
-+# Create and remove symlinks in /.
-+allow init rootfs:lnk_file { create unlink };
-+
-+# Mount debugfs on /sys/kernel/debug.
-+allow init sysfs:dir mounton;
-+
-+# Create cgroups mount points in tmpfs and mount cgroups on them.
-+allow init tmpfs:dir create_dir_perms;
-+allow init tmpfs:dir mounton;
-+allow init cgroup:dir create_dir_perms;
-+r_dir_file(init, cgroup)
-+allow init cpuctl_device:dir { create mounton };
-+
-+# /config
-+allow init configfs:dir mounton;
-+allow init configfs:dir create_dir_perms;
-+allow init configfs:{ file lnk_file } create_file_perms;
-+
-+# /metadata
-+allow init metadata_file:dir mounton;
-+
-+# Use tmpfs as /data, used for booting when /data is encrypted
-+allow init tmpfs:dir relabelfrom;
-+
-+# Create directories under /dev/cpuctl after chowning it to system.
-+allow init self:global_capability_class_set dac_override;
-+
-+# Set system clock.
-+allow init self:global_capability_class_set sys_time;
-+
-+allow init self:global_capability_class_set { sys_rawio mknod };
-+
-+# Mounting filesystems from block devices.
-+allow init dev_type:blk_file r_file_perms;
-+
-+# Mounting filesystems.
-+# Only allow relabelto for types used in context= mount options,
-+# which should all be assigned the contextmount_type attribute.
-+# This can be done in device-specific policy via type or typeattribute
-+# declarations.
-+allow init fs_type:filesystem ~relabelto;
-+allow init unlabeled:filesystem ~relabelto;
-+allow init contextmount_type:filesystem relabelto;
-+
-+# Allow read-only access to context= mounted filesystems.
-+allow init contextmount_type:dir r_dir_perms;
-+allow init contextmount_type:notdevfile_class_set r_file_perms;
-+
-+# restorecon /adb_keys or any other rootfs files and directories to a more
-+# specific type.
-+allow init rootfs:{ dir file } relabelfrom;
-+
-+# mkdir, symlink, write, rm/rmdir, chown/chmod, restorecon/restorecon_recursive from init.rc files.
-+# chown/chmod require open+read+setattr required for open()+fchown/fchmod().
-+# system/core/init.rc requires at least cache_file and data_file_type.
-+# init.<board>.rc files often include device-specific types, so
-+# we just allow all file types except /system files here.
-+allow init self:global_capability_class_set { chown fowner fsetid };
-+
-+allow init {
-+  file_type
-+  -app_data_file
-+  -exec_type
-+  -misc_logd_file
-+  -nativetest_data_file
-+  -system_app_data_file
-+  -system_file
-+  -vendor_file_type
-+}:dir { create search getattr open read setattr ioctl };
-+
-+allow init {
-+  file_type
-+  -app_data_file
-+  -exec_type
-+  -keystore_data_file
-+  -misc_logd_file
-+  -nativetest_data_file
-+  -shell_data_file
-+  -system_app_data_file
-+  -system_file
-+  -vendor_file_type
-+  -vold_data_file
-+}:dir { write add_name remove_name rmdir relabelfrom };
-+
-+allow init {
-+  file_type
-+  -app_data_file
-+  -runtime_event_log_tags_file
-+  -exec_type
-+  -keystore_data_file
-+  -misc_logd_file
-+  -nativetest_data_file
-+  -shell_data_file
-+  -system_app_data_file
-+  -system_file
-+  -vendor_file_type
-+  -vold_data_file
-+}:file { create getattr open read write setattr relabelfrom unlink };
-+
-+allow init {
-+  file_type
-+  -app_data_file
-+  -exec_type
-+  -keystore_data_file
-+  -misc_logd_file
-+  -nativetest_data_file
-+  -shell_data_file
-+  -system_app_data_file
-+  -system_file
-+  -vendor_file_type
-+  -vold_data_file
-+}:{ sock_file fifo_file } { create getattr open read setattr relabelfrom unlink };
-+
-+allow init {
-+  file_type
-+  -app_data_file
-+  -exec_type
-+  -keystore_data_file
-+  -misc_logd_file
-+  -nativetest_data_file
-+  -shell_data_file
-+  -system_app_data_file
-+  -system_file
-+  -vendor_file_type
-+  -vold_data_file
-+}:lnk_file { create getattr setattr relabelfrom unlink };
-+
-+allow init cache_file:lnk_file r_file_perms;
-+
-+allow init { file_type -system_file -vendor_file_type -exec_type }:dir_file_class_set relabelto;
-+allow init { sysfs debugfs debugfs_tracing debugfs_tracing_debug }:{ dir file lnk_file } { getattr relabelfrom };
-+allow init { sysfs_type debugfs_type }:{ dir file lnk_file } { relabelto getattr };
-+allow init dev_type:dir create_dir_perms;
-+allow init dev_type:lnk_file create;
-+
-+# Disable tracing by writing to /sys/kernel/debug/tracing/tracing_on
-+allow init debugfs_tracing:file w_file_perms;
-+
-+# Setup and control wifi event tracing (see wifi-events.rc)
-+allow init debugfs_tracing_instances:dir create_dir_perms;
-+allow init debugfs_tracing_instances:file w_file_perms;
-+allow init debugfs_wifi_tracing:file w_file_perms;
-+
-+# chown/chmod on pseudo files.
-+allow init {
-+  fs_type
-+  -contextmount_type
-+  -proc
-+  -sdcard_type
-+  -sysfs_type
-+  -rootfs
-+}:file { open read setattr };
-+allow init { fs_type -contextmount_type -sdcard_type -rootfs }:dir  { open read setattr search };
-+
-+# init should not be able to read or open generic devices
-+# TODO: auditing to see if this can be deleted entirely
-+allow init {
-+  dev_type
-+  -kmem_device
-+  -port_device
-+  -device
-+  -vndbinder_device
-+  }:chr_file { read open };
-+auditallow init {
-+  dev_type
-+  -alarm_device
-+  -ashmem_device
-+  -binder_device
-+  -console_device
-+  -device
-+  -devpts
-+  -dm_device
-+  -hwbinder_device
-+  -hw_random_device
-+  -keychord_device
-+  -kmem_device
-+  -kmsg_device
-+  -null_device
-+  -owntty_device
-+  -port_device
-+  -ptmx_device
-+  -random_device
-+  -zero_device
-+}:chr_file { read open };
-+
-+# chown/chmod on devices.
-+allow init { dev_type -kmem_device -port_device }:chr_file setattr;
-+
-+# Unlabeled file access for upgrades from 4.2.
-+allow init unlabeled:dir { create_dir_perms relabelfrom };
-+allow init unlabeled:notdevfile_class_set { create_file_perms relabelfrom };
-+
-+# Any operation that can modify the kernel ring buffer, e.g. clear
-+# or a read that consumes the messages that were read.
-+allow init kernel:system syslog_mod;
-+allow init self:global_capability2_class_set syslog;
-+
-+# init access to /proc.
-+r_dir_file(init, proc_net)
-+
-+allow init {
-+  proc_cmdline
-+  proc_diskstats
-+  proc_kmsg # Open /proc/kmsg for logd service.
-+  proc_meminfo
-+  proc_stat # Read /proc/stat for bootchart.
-+  proc_uptime
-+  proc_version
-+}:file r_file_perms;
-+
-+allow init {
-+  proc_abi
-+  proc_dirty
-+  proc_hostname
-+  proc_hung_task
-+  proc_extra_free_kbytes
-+  proc_net
-+  proc_max_map_count
-+  proc_min_free_order_shift
-+  proc_overcommit_memory
-+  proc_panic
-+  proc_page_cluster
-+  proc_perf
-+  proc_sched
-+  proc_sysrq
-+}:file w_file_perms;
-+
-+allow init {
-+  proc_security
-+}:file rw_file_perms;
-+
-+# init access to /sys files.
-+allow init {
-+  sysfs_android_usb
-+  sysfs_leds
-+  sysfs_power
-+}:file w_file_perms;
-+
-+allow init {
-+  sysfs_dt_firmware_android
-+}:file r_file_perms;
-+
-+allow init {
-+  sysfs_zram
-+}:file rw_file_perms;
-+
-+# Allow init to write to vibrator/trigger
-+allow init sysfs_vibrator:file w_file_perms;
-+
-+# init chmod/chown access to /sys files.
-+allow init {
-+  sysfs_android_usb
-+  sysfs_devices_system_cpu
-+  sysfs_ipv4
-+  sysfs_leds
-+  sysfs_lowmemorykiller
-+  sysfs_power
-+  sysfs_vibrator
-+  sysfs_wake_lock
-+}:file setattr;
-+
-+# Set usermodehelpers.
-+allow init { usermodehelper sysfs_usermodehelper }:file rw_file_perms;
-+
-+allow init self:global_capability_class_set net_admin;
-+
-+# Reboot.
-+allow init self:global_capability_class_set sys_boot;
-+
-+# Init will create /data/misc/logd when the property persist.logd.logpersistd is "logcatd".
-+# Init will also walk through the directory as part of a recursive restorecon.
-+allow init misc_logd_file:dir { add_name open create read getattr setattr search write };
-+allow init misc_logd_file:file { open create getattr setattr write };
-+
-+# Support "adb shell stop"
-+allow init self:global_capability_class_set kill;
-+allow init domain:process { getpgid sigkill signal };
-+
-+# Init creates keystore's directory on boot, and walks through
-+# the directory as part of a recursive restorecon.
-+allow init keystore_data_file:dir { open create read getattr setattr search };
-+allow init keystore_data_file:file { getattr };
-+
-+# Init creates vold's directory on boot, and walks through
-+# the directory as part of a recursive restorecon.
-+allow init vold_data_file:dir { open create read getattr setattr search };
-+allow init vold_data_file:file { getattr };
-+
-+# Init creates /data/local/tmp at boot
-+allow init shell_data_file:dir { open create read getattr setattr search };
-+allow init shell_data_file:file { getattr };
-+
-+# Set UID, GID, and adjust capability bounding set for services.
-+allow init self:global_capability_class_set { setuid setgid setpcap };
-+
-+# For bootchart to read the /proc/$pid/cmdline file of each process,
-+# we need to have following line to allow init to have access
-+# to different domains.
-+r_dir_file(init, domain)
-+
-+# Use setexeccon(), setfscreatecon(), and setsockcreatecon().
-+# setexec is for services with seclabel options.
-+# setfscreate is for labeling directories and socket files.
-+# setsockcreate is for labeling local/unix domain sockets.
-+allow init self:process { setexec setfscreate setsockcreate };
-+
-+# Get file context
-+allow init file_contexts_file:file r_file_perms;
-+
-+# sepolicy access
-+allow init sepolicy_file:file r_file_perms;
-+
-+# Perform SELinux access checks on setting properties.
-+selinux_check_access(init)
-+
-+# Ask the kernel for the new context on services to label their sockets.
-+allow init kernel:security compute_create;
-+
-+# Create sockets for the services.
-+allow init domain:unix_stream_socket { create bind setopt };
-+allow init domain:unix_dgram_socket { create bind setopt };
-+
-+# Create /data/property and files within it.
-+allow init property_data_file:dir create_dir_perms;
-+allow init property_data_file:file create_file_perms;
-+
-+# Set any property.
-+allow init property_type:property_service set;
-+
-+# Send an SELinux userspace denial to the kernel audit subsystem,
-+# so it can be picked up and processed by logd. These denials are
-+# generated when an attempt to set a property is denied by policy.
-+allow init self:netlink_audit_socket { create_socket_perms_no_ioctl nlmsg_relay };
-+allow init self:global_capability_class_set audit_write;
-+
-+# Run "ifup lo" to bring up the localhost interface
-+allow init self:udp_socket { create ioctl };
-+# in addition to unpriv ioctls granted to all domains, init also needs:
-+allowxperm init self:udp_socket ioctl SIOCSIFFLAGS;
-+allow init self:global_capability_class_set net_raw;
-+
-+# This line seems suspect, as it should not really need to
-+# set scheduling parameters for a kernel domain task.
-+allow init kernel:process setsched;
-+
-+# swapon() needs write access to swap device
-+# system/core/fs_mgr/fs_mgr.c - fs_mgr_swapon_all
-+allow init swap_block_device:blk_file rw_file_perms;
-+
-+# Read from /dev/hw_random if present.
-+# system/core/init/init.c - mix_hwrng_into_linux_rng_action
-+allow init hw_random_device:chr_file r_file_perms;
-+
-+# Create and access /dev files without a specific type,
-+# e.g. /dev/.coldboot_done, /dev/.booting
-+# TODO:  Move these files into their own type unless they are
-+# only ever accessed by init.
-+allow init device:file create_file_perms;
-+
-+# keychord configuration
-+allow init self:global_capability_class_set sys_tty_config;
-+allow init keychord_device:chr_file rw_file_perms;
-+
-+# Access device mapper for setting up dm-verity
-+allow init dm_device:chr_file rw_file_perms;
-+allow init dm_device:blk_file rw_file_perms;
-+
-+# Access metadata block device for storing dm-verity state
-+allow init metadata_block_device:blk_file rw_file_perms;
-+
-+# Read /sys/fs/pstore/console-ramoops to detect restarts caused
-+# by dm-verity detecting corrupted blocks
-+allow init pstorefs:dir search;
-+allow init pstorefs:file r_file_perms;
-+allow init kernel:system syslog_read;
-+
-+# linux keyring configuration
-+allow init init:key { write search setattr };
-+
-+# Allow init to create /data/unencrypted
-+allow init unencrypted_data_file:dir create_dir_perms;
-+
-+# Allow init to write to /proc/sys/vm/overcommit_memory
-+allow init proc_overcommit_memory:file { write };
-+
-+# Raw writes to misc block device
-+allow init misc_block_device:blk_file w_file_perms;
-+
-+r_dir_file(init, system_file)
-+r_dir_file(init, vendor_file_type)
-+
-+allow init system_data_file:file { getattr read };
-+allow init system_data_file:lnk_file r_file_perms;
-+
-+# For init to be able to run shell scripts from vendor
-+allow init vendor_shell_exec:file execute;
-+
-+# Metadata setup
-+allow init vold_metadata_file:dir create_dir_perms;
-+allow init vold_metadata_file:file getattr;
-+
-+###
-+### neverallow rules
-+###
-+
-+# The init domain is only entered via an exec based transition from the
-+# kernel domain, never via setcon().
-+neverallow domain init:process dyntransition;
-+neverallow { domain -kernel } init:process transition;
-+neverallow init { file_type fs_type -init_exec }:file entrypoint;
-+
-+# Never read/follow symlinks created by shell or untrusted apps.
-+neverallow init shell_data_file:lnk_file read;
-+neverallow init app_data_file:lnk_file read;
-+
-+# init should never execute a program without changing to another domain.
-+neverallow init { file_type fs_type }:file execute_no_trans;
-+
-+# Init never adds or uses services via service_manager.
-+neverallow init service_manager_type:service_manager { add find };
-+neverallow init servicemanager:service_manager list;
-+
-+# Init should not be creating subdirectories in /data/local/tmp
-+neverallow init shell_data_file:dir { write add_name remove_name };
-+
-+# Init should not access sysfs node that are not explicitly labeled.
-+neverallow init sysfs:file { open read write };
-diff --git a/prebuilts/api/28.0/public/inputflinger.te b/prebuilts/api/28.0/public/inputflinger.te
-new file mode 100644
-index 000000000..e5f12a0c1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/inputflinger.te
-@@ -0,0 +1,16 @@
-+# inputflinger
-+type inputflinger, domain;
-+type inputflinger_exec, exec_type, file_type;
-+
-+binder_use(inputflinger)
-+binder_service(inputflinger)
-+
-+binder_call(inputflinger, system_server)
-+
-+wakelock_use(inputflinger)
-+
-+add_service(inputflinger, inputflinger_service)
-+allow inputflinger input_device:dir r_dir_perms;
-+allow inputflinger input_device:chr_file rw_file_perms;
-+
-+r_dir_file(inputflinger, cgroup)
-diff --git a/prebuilts/api/28.0/public/install_recovery.te b/prebuilts/api/28.0/public/install_recovery.te
-new file mode 100644
-index 000000000..ab688386e
---- /dev/null
-+++ b/prebuilts/api/28.0/public/install_recovery.te
-@@ -0,0 +1,27 @@
-+# service flash_recovery in init.rc
-+type install_recovery, domain;
-+type install_recovery_exec, exec_type, file_type;
-+
-+allow install_recovery self:global_capability_class_set dac_override;
-+
-+# /system/bin/install-recovery.sh is a shell script.
-+# Needs to execute /system/bin/sh
-+allow install_recovery shell_exec:file rx_file_perms;
-+
-+# Execute /system/bin/applypatch
-+allow install_recovery system_file:file rx_file_perms;
-+not_full_treble(`allow install_recovery vendor_file:file rx_file_perms;')
-+
-+allow install_recovery toolbox_exec:file rx_file_perms;
-+
-+# Update the recovery block device based off a diff of the boot block device
-+allow install_recovery block_device:dir search;
-+allow install_recovery boot_block_device:blk_file r_file_perms;
-+allow install_recovery recovery_block_device:blk_file rw_file_perms;
-+
-+# Create and delete /cache/saved.file
-+allow install_recovery cache_file:dir rw_dir_perms;
-+allow install_recovery cache_file:file create_file_perms;
-+
-+# Write to /proc/sys/vm/drop_caches
-+allow install_recovery proc_drop_caches:file w_file_perms;
-diff --git a/prebuilts/api/28.0/public/installd.te b/prebuilts/api/28.0/public/installd.te
-new file mode 100644
-index 000000000..6aba962dd
---- /dev/null
-+++ b/prebuilts/api/28.0/public/installd.te
-@@ -0,0 +1,160 @@
-+# installer daemon
-+type installd, domain;
-+type installd_exec, exec_type, file_type;
-+typeattribute installd mlstrustedsubject;
-+allow installd self:global_capability_class_set { chown dac_override fowner fsetid setgid setuid sys_admin };
-+
-+# Allow labeling of files under /data/app/com.example/oat/
-+allow installd dalvikcache_data_file:dir relabelto;
-+allow installd dalvikcache_data_file:file { relabelto link };
-+
-+# Allow movement of APK files between volumes
-+allow installd apk_data_file:dir { create_dir_perms relabelfrom };
-+allow installd apk_data_file:file { create_file_perms relabelfrom link };
-+allow installd apk_data_file:lnk_file { create r_file_perms unlink };
-+
-+allow installd asec_apk_file:file r_file_perms;
-+allow installd apk_tmp_file:file { r_file_perms unlink };
-+allow installd apk_tmp_file:dir { relabelfrom create_dir_perms };
-+allow installd oemfs:dir r_dir_perms;
-+allow installd oemfs:file r_file_perms;
-+allow installd cgroup:dir create_dir_perms;
-+allow installd mnt_expand_file:dir { search getattr };
-+# Check validity of SELinux context before use.
-+selinux_check_context(installd)
-+
-+r_dir_file(installd, rootfs)
-+# Scan through APKs in /system/app and /system/priv-app
-+r_dir_file(installd, system_file)
-+# Scan through APKs in /vendor/app
-+r_dir_file(installd, vendor_app_file)
-+# Scan through Runtime Resource Overlay APKs in /vendor/overlay
-+r_dir_file(installd, vendor_overlay_file)
-+# Get file context
-+allow installd file_contexts_file:file r_file_perms;
-+# Get seapp_context
-+allow installd seapp_contexts_file:file r_file_perms;
-+
-+# Search /data/app-asec and stat files in it.
-+allow installd asec_image_file:dir search;
-+allow installd asec_image_file:file getattr;
-+
-+# Create /data/user and /data/user/0 if necessary.
-+# Also required to initially create /data/data subdirectories
-+# and lib symlinks before the setfilecon call.  May want to
-+# move symlink creation after setfilecon in installd.
-+allow installd system_data_file:dir create_dir_perms;
-+# Also, allow read for lnk_file so that we can process /data/user/0 links when
-+# optimizing application code.
-+allow installd system_data_file:lnk_file { create getattr read setattr unlink };
-+
-+# Upgrade /data/media for multi-user if necessary.
-+allow installd media_rw_data_file:dir create_dir_perms;
-+allow installd media_rw_data_file:file { getattr unlink };
-+# restorecon new /data/media directory.
-+allow installd system_data_file:dir relabelfrom;
-+allow installd media_rw_data_file:dir relabelto;
-+
-+# Delete /data/media files through sdcardfs, instead of going behind its back
-+allow installd tmpfs:dir r_dir_perms;
-+allow installd storage_file:dir search;
-+allow installd sdcardfs:dir { search open read write remove_name getattr rmdir };
-+allow installd sdcardfs:file { getattr unlink };
-+
-+# Upgrade /data/misc/keychain for multi-user if necessary.
-+allow installd misc_user_data_file:dir create_dir_perms;
-+allow installd misc_user_data_file:file create_file_perms;
-+allow installd keychain_data_file:dir create_dir_perms;
-+allow installd keychain_data_file:file {r_file_perms unlink};
-+
-+# Create /data/.layout_version.* file
-+allow installd install_data_file:file create_file_perms;
-+
-+# Create files under /data/dalvik-cache.
-+allow installd dalvikcache_data_file:dir create_dir_perms;
-+allow installd dalvikcache_data_file:file create_file_perms;
-+allow installd dalvikcache_data_file:lnk_file getattr;
-+
-+# Create files under /data/resource-cache.
-+allow installd resourcecache_data_file:dir rw_dir_perms;
-+allow installd resourcecache_data_file:file create_file_perms;
-+
-+# Upgrade from unlabeled userdata.
-+# Just need enough to remove and/or relabel it.
-+allow installd unlabeled:dir { getattr search relabelfrom rw_dir_perms rmdir };
-+allow installd unlabeled:notdevfile_class_set { getattr relabelfrom rename unlink setattr };
-+# Read pkg.apk file for input during dexopt.
-+allow installd unlabeled:file r_file_perms;
-+
-+# Upgrade from before system_app_data_file was used for system UID apps.
-+# Just need enough to relabel it and to unlink removed package files.
-+# Directory access covered by earlier rule above.
-+allow installd system_data_file:notdevfile_class_set { getattr relabelfrom unlink };
-+
-+# Manage /data/data subdirectories, including initially labeling them
-+# upon creation via setfilecon or running restorecon_recursive,
-+# setting owner/mode, creating symlinks within them, and deleting them
-+# upon package uninstall.
-+# Types extracted from seapp_contexts type= fields.
-+allow installd {
-+    system_app_data_file
-+    bluetooth_data_file
-+    nfc_data_file
-+    radio_data_file
-+    shell_data_file
-+    app_data_file
-+}:dir { create_dir_perms relabelfrom relabelto };
-+
-+allow installd {
-+    system_app_data_file
-+    bluetooth_data_file
-+    nfc_data_file
-+    radio_data_file
-+    shell_data_file
-+    app_data_file
-+}:notdevfile_class_set { create_file_perms relabelfrom relabelto };
-+
-+# Similar for the files under /data/misc/profiles/
-+allow installd user_profile_data_file:dir create_dir_perms;
-+allow installd user_profile_data_file:file create_file_perms;
-+allow installd user_profile_data_file:dir rmdir;
-+allow installd user_profile_data_file:file unlink;
-+
-+# Files created/updated by profman dumps.
-+allow installd profman_dump_data_file:dir { search add_name write };
-+allow installd profman_dump_data_file:file { create setattr open write };
-+
-+# Create and use pty created by android_fork_execvp().
-+allow installd devpts:chr_file rw_file_perms;
-+
-+# execute toybox for app relocation
-+allow installd toolbox_exec:file rx_file_perms;
-+
-+# Allow installd to publish a binder service and make binder calls.
-+binder_use(installd)
-+add_service(installd, installd_service)
-+allow installd dumpstate:fifo_file  { getattr write };
-+
-+# Allow installd to call into the system server so it can check permissions.
-+binder_call(installd, system_server)
-+allow installd permission_service:service_manager find;
-+
-+# Allow installd to read and write quotas
-+allow installd block_device:dir { search };
-+allow installd labeledfs:filesystem { quotaget quotamod };
-+
-+# Allow installd to delete from /data/preloads when trimming data caches
-+# TODO b/34690396 Remove when time-based purge policy for preloads is implemented in system_server
-+allow installd preloads_data_file:file { r_file_perms unlink };
-+allow installd preloads_data_file:dir { r_dir_perms write remove_name rmdir };
-+allow installd preloads_media_file:file { r_file_perms unlink };
-+allow installd preloads_media_file:dir { r_dir_perms write remove_name rmdir };
-+
-+###
-+### Neverallow rules
-+###
-+
-+# only system_server, installd and dumpstate may interact with installd over binder
-+neverallow { domain -system_server -dumpstate -installd } installd_service:service_manager find;
-+neverallow { domain -system_server -dumpstate } installd:binder call;
-+neverallow installd { domain -system_server -servicemanager userdebug_or_eng(`-su') }:binder call;
-diff --git a/prebuilts/api/28.0/public/ioctl_defines b/prebuilts/api/28.0/public/ioctl_defines
-new file mode 100644
-index 000000000..4097fb935
---- /dev/null
-+++ b/prebuilts/api/28.0/public/ioctl_defines
-@@ -0,0 +1,2694 @@
-+define(`FIBMAP', `0x00000001')
-+define(`FIGETBSZ', `0x00000002')
-+define(`FDCLRPRM', `0x00000241')
-+define(`FDMSGON', `0x00000245')
-+define(`FDMSGOFF', `0x00000246')
-+define(`FDFMTBEG', `0x00000247')
-+define(`FDFMTEND', `0x00000249')
-+define(`FDSETEMSGTRESH', `0x0000024a')
-+define(`FDFLUSH', `0x0000024b')
-+define(`FDRESET', `0x00000254')
-+define(`FDWERRORCLR', `0x00000256')
-+define(`FDRAWCMD', `0x00000258')
-+define(`FDTWADDLE', `0x00000259')
-+define(`FDEJECT', `0x0000025a')
-+define(`HDIO_GETGEO', `0x00000301')
-+define(`HDIO_GET_UNMASKINTR', `0x00000302')
-+define(`HDIO_GET_MULTCOUNT', `0x00000304')
-+define(`HDIO_GET_QDMA', `0x00000305')
-+define(`HDIO_SET_XFER', `0x00000306')
-+define(`HDIO_OBSOLETE_IDENTITY', `0x00000307')
-+define(`HDIO_GET_KEEPSETTINGS', `0x00000308')
-+define(`HDIO_GET_32BIT', `0x00000309')
-+define(`HDIO_GET_NOWERR', `0x0000030a')
-+define(`HDIO_GET_DMA', `0x0000030b')
-+define(`HDIO_GET_NICE', `0x0000030c')
-+define(`HDIO_GET_IDENTITY', `0x0000030d')
-+define(`HDIO_GET_WCACHE', `0x0000030e')
-+define(`HDIO_GET_ACOUSTIC', `0x0000030f')
-+define(`HDIO_GET_ADDRESS', `0x00000310')
-+define(`HDIO_GET_BUSSTATE', `0x0000031a')
-+define(`HDIO_TRISTATE_HWIF', `0x0000031b')
-+define(`HDIO_DRIVE_RESET', `0x0000031c')
-+define(`HDIO_DRIVE_TASKFILE', `0x0000031d')
-+define(`HDIO_DRIVE_TASK', `0x0000031e')
-+define(`HDIO_DRIVE_CMD', `0x0000031f')
-+define(`HDIO_SET_MULTCOUNT', `0x00000321')
-+define(`HDIO_SET_UNMASKINTR', `0x00000322')
-+define(`HDIO_SET_KEEPSETTINGS', `0x00000323')
-+define(`HDIO_SET_32BIT', `0x00000324')
-+define(`HDIO_SET_NOWERR', `0x00000325')
-+define(`HDIO_SET_DMA', `0x00000326')
-+define(`HDIO_SET_PIO_MODE', `0x00000327')
-+define(`HDIO_SCAN_HWIF', `0x00000328')
-+define(`HDIO_SET_NICE', `0x00000329')
-+define(`HDIO_UNREGISTER_HWIF', `0x0000032a')
-+define(`HDIO_SET_WCACHE', `0x0000032b')
-+define(`HDIO_SET_ACOUSTIC', `0x0000032c')
-+define(`HDIO_SET_BUSSTATE', `0x0000032d')
-+define(`HDIO_SET_QDMA', `0x0000032e')
-+define(`HDIO_SET_ADDRESS', `0x0000032f')
-+define(`IOCTL_VMCI_VERSION', `0x0000079f')
-+define(`IOCTL_VMCI_INIT_CONTEXT', `0x000007a0')
-+define(`IOCTL_VMCI_QUEUEPAIR_SETVA', `0x000007a4')
-+define(`IOCTL_VMCI_NOTIFY_RESOURCE', `0x000007a5')
-+define(`IOCTL_VMCI_NOTIFICATIONS_RECEIVE', `0x000007a6')
-+define(`IOCTL_VMCI_VERSION2', `0x000007a7')
-+define(`IOCTL_VMCI_QUEUEPAIR_ALLOC', `0x000007a8')
-+define(`IOCTL_VMCI_QUEUEPAIR_SETPAGEFILE', `0x000007a9')
-+define(`IOCTL_VMCI_QUEUEPAIR_DETACH', `0x000007aa')
-+define(`IOCTL_VMCI_DATAGRAM_SEND', `0x000007ab')
-+define(`IOCTL_VMCI_DATAGRAM_RECEIVE', `0x000007ac')
-+define(`IOCTL_VMCI_CTX_ADD_NOTIFICATION', `0x000007af')
-+define(`IOCTL_VMCI_CTX_REMOVE_NOTIFICATION', `0x000007b0')
-+define(`IOCTL_VMCI_CTX_GET_CPT_STATE', `0x000007b1')
-+define(`IOCTL_VMCI_CTX_SET_CPT_STATE', `0x000007b2')
-+define(`IOCTL_VMCI_GET_CONTEXT_ID', `0x000007b3')
-+define(`IOCTL_VMCI_SOCKETS_VERSION', `0x000007b4')
-+define(`IOCTL_VMCI_SOCKETS_GET_AF_VALUE', `0x000007b8')
-+define(`IOCTL_VMCI_SOCKETS_GET_LOCAL_CID', `0x000007b9')
-+define(`IOCTL_VM_SOCKETS_GET_LOCAL_CID', `0x000007b9')
-+define(`IOCTL_VMCI_SET_NOTIFY', `0x000007cb')
-+define(`RAID_AUTORUN', `0x00000914')
-+define(`CLEAR_ARRAY', `0x00000920')
-+define(`HOT_REMOVE_DISK', `0x00000922')
-+define(`SET_DISK_INFO', `0x00000924')
-+define(`WRITE_RAID_INFO', `0x00000925')
-+define(`UNPROTECT_ARRAY', `0x00000926')
-+define(`PROTECT_ARRAY', `0x00000927')
-+define(`HOT_ADD_DISK', `0x00000928')
-+define(`SET_DISK_FAULTY', `0x00000929')
-+define(`HOT_GENERATE_ERROR', `0x0000092a')
-+define(`STOP_ARRAY', `0x00000932')
-+define(`STOP_ARRAY_RO', `0x00000933')
-+define(`RESTART_ARRAY_RW', `0x00000934')
-+define(`BLKROSET', `0x0000125d')
-+define(`BLKROGET', `0x0000125e')
-+define(`BLKRRPART', `0x0000125f')
-+define(`BLKGETSIZE', `0x00001260')
-+define(`BLKFLSBUF', `0x00001261')
-+define(`BLKRASET', `0x00001262')
-+define(`BLKRAGET', `0x00001263')
-+define(`BLKFRASET', `0x00001264')
-+define(`BLKFRAGET', `0x00001265')
-+define(`BLKSECTSET', `0x00001266')
-+define(`BLKSECTGET', `0x00001267')
-+define(`BLKSSZGET', `0x00001268')
-+define(`BLKPG', `0x00001269')
-+define(`BLKTRACESTART', `0x00001274')
-+define(`BLKTRACESTOP', `0x00001275')
-+define(`BLKTRACETEARDOWN', `0x00001276')
-+define(`BLKDISCARD', `0x00001277')
-+define(`BLKIOMIN', `0x00001278')
-+define(`BLKIOOPT', `0x00001279')
-+define(`BLKALIGNOFF', `0x0000127a')
-+define(`BLKPBSZGET', `0x0000127b')
-+define(`BLKDISCARDZEROES', `0x0000127c')
-+define(`BLKSECDISCARD', `0x0000127d')
-+define(`BLKROTATIONAL', `0x0000127e')
-+define(`BLKZEROOUT', `0x0000127f')
-+define(`IB_USER_MAD_ENABLE_PKEY', `0x00001b03')
-+define(`SG_SET_TIMEOUT', `0x00002201')
-+define(`SG_GET_TIMEOUT', `0x00002202')
-+define(`SG_EMULATED_HOST', `0x00002203')
-+define(`SG_SET_TRANSFORM', `0x00002204')
-+define(`SG_GET_TRANSFORM', `0x00002205')
-+define(`SG_GET_COMMAND_Q', `0x00002270')
-+define(`SG_SET_COMMAND_Q', `0x00002271')
-+define(`SG_GET_RESERVED_SIZE', `0x00002272')
-+define(`SG_SET_RESERVED_SIZE', `0x00002275')
-+define(`SG_GET_SCSI_ID', `0x00002276')
-+define(`SG_SET_FORCE_LOW_DMA', `0x00002279')
-+define(`SG_GET_LOW_DMA', `0x0000227a')
-+define(`SG_SET_FORCE_PACK_ID', `0x0000227b')
-+define(`SG_GET_PACK_ID', `0x0000227c')
-+define(`SG_GET_NUM_WAITING', `0x0000227d')
-+define(`SG_SET_DEBUG', `0x0000227e')
-+define(`SG_GET_SG_TABLESIZE', `0x0000227f')
-+define(`SG_GET_VERSION_NUM', `0x00002282')
-+define(`SG_NEXT_CMD_LEN', `0x00002283')
-+define(`SG_SCSI_RESET', `0x00002284')
-+define(`SG_IO', `0x00002285')
-+define(`SG_GET_REQUEST_TABLE', `0x00002286')
-+define(`SG_SET_KEEP_ORPHAN', `0x00002287')
-+define(`SG_GET_KEEP_ORPHAN', `0x00002288')
-+define(`SG_GET_ACCESS_COUNT', `0x00002289')
-+define(`FW_CDEV_IOC_GET_SPEED', `0x00002311')
-+define(`PERF_EVENT_IOC_ENABLE', `0x00002400')
-+define(`PERF_EVENT_IOC_DISABLE', `0x00002401')
-+define(`PERF_EVENT_IOC_REFRESH', `0x00002402')
-+define(`PERF_EVENT_IOC_RESET', `0x00002403')
-+define(`PERF_EVENT_IOC_SET_OUTPUT', `0x00002405')
-+define(`SNAPSHOT_FREEZE', `0x00003301')
-+define(`SNAPSHOT_UNFREEZE', `0x00003302')
-+define(`SNAPSHOT_ATOMIC_RESTORE', `0x00003304')
-+define(`SNAPSHOT_FREE', `0x00003305')
-+define(`SNAPSHOT_FREE_SWAP_PAGES', `0x00003309')
-+define(`SNAPSHOT_S2RAM', `0x0000330b')
-+define(`SNAPSHOT_PLATFORM_SUPPORT', `0x0000330f')
-+define(`SNAPSHOT_POWER_OFF', `0x00003310')
-+define(`SNAPSHOT_PREF_IMAGE_SIZE', `0x00003312')
-+define(`VFIO_GET_API_VERSION', `0x00003b64')
-+define(`VFIO_CHECK_EXTENSION', `0x00003b65')
-+define(`VFIO_SET_IOMMU', `0x00003b66')
-+define(`VFIO_GROUP_GET_STATUS', `0x00003b67')
-+define(`VFIO_GROUP_SET_CONTAINER', `0x00003b68')
-+define(`VFIO_GROUP_UNSET_CONTAINER', `0x00003b69')
-+define(`VFIO_GROUP_GET_DEVICE_FD', `0x00003b6a')
-+define(`VFIO_DEVICE_GET_INFO', `0x00003b6b')
-+define(`VFIO_DEVICE_GET_REGION_INFO', `0x00003b6c')
-+define(`VFIO_DEVICE_GET_IRQ_INFO', `0x00003b6d')
-+define(`VFIO_DEVICE_SET_IRQS', `0x00003b6e')
-+define(`VFIO_DEVICE_RESET', `0x00003b6f')
-+define(`VFIO_DEVICE_GET_PCI_HOT_RESET_INFO', `0x00003b70')
-+define(`VFIO_IOMMU_GET_INFO', `0x00003b70')
-+define(`VFIO_IOMMU_SPAPR_TCE_GET_INFO', `0x00003b70')
-+define(`VFIO_DEVICE_PCI_HOT_RESET', `0x00003b71')
-+define(`VFIO_IOMMU_MAP_DMA', `0x00003b71')
-+define(`VFIO_IOMMU_UNMAP_DMA', `0x00003b72')
-+define(`VFIO_IOMMU_ENABLE', `0x00003b73')
-+define(`VFIO_IOMMU_DISABLE', `0x00003b74')
-+define(`VFIO_EEH_PE_OP', `0x00003b79')
-+define(`AGPIOC_ACQUIRE', `0x00004101')
-+define(`APM_IOC_STANDBY', `0x00004101')
-+define(`AGPIOC_RELEASE', `0x00004102')
-+define(`APM_IOC_SUSPEND', `0x00004102')
-+define(`AGPIOC_CHIPSET_FLUSH', `0x0000410a')
-+define(`SNDRV_PCM_IOCTL_HW_FREE', `0x00004112')
-+define(`SNDRV_PCM_IOCTL_HWSYNC', `0x00004122')
-+define(`SNDRV_PCM_IOCTL_PREPARE', `0x00004140')
-+define(`SNDRV_PCM_IOCTL_RESET', `0x00004141')
-+define(`SNDRV_PCM_IOCTL_START', `0x00004142')
-+define(`SNDRV_PCM_IOCTL_DROP', `0x00004143')
-+define(`SNDRV_PCM_IOCTL_DRAIN', `0x00004144')
-+define(`SNDRV_PCM_IOCTL_RESUME', `0x00004147')
-+define(`SNDRV_PCM_IOCTL_XRUN', `0x00004148')
-+define(`SNDRV_PCM_IOCTL_UNLINK', `0x00004161')
-+define(`IOCTL_XENBUS_BACKEND_EVTCHN', `0x00004200')
-+define(`PMU_IOC_SLEEP', `0x00004200')
-+define(`IOCTL_XENBUS_BACKEND_SETUP', `0x00004201')
-+define(`CCISS_REVALIDVOLS', `0x0000420a')
-+define(`CCISS_DEREGDISK', `0x0000420c')
-+define(`CCISS_REGNEWD', `0x0000420e')
-+define(`CCISS_RESCANDISK', `0x00004210')
-+define(`SNDCTL_COPR_RESET', `0x00004300')
-+define(`SNDRV_COMPRESS_PAUSE', `0x00004330')
-+define(`SNDRV_COMPRESS_RESUME', `0x00004331')
-+define(`SNDRV_COMPRESS_START', `0x00004332')
-+define(`SNDRV_COMPRESS_STOP', `0x00004333')
-+define(`SNDRV_COMPRESS_DRAIN', `0x00004334')
-+define(`SNDRV_COMPRESS_NEXT_TRACK', `0x00004335')
-+define(`SNDRV_COMPRESS_PARTIAL_DRAIN', `0x00004336')
-+define(`IOCTL_EVTCHN_RESET', `0x00004505')
-+define(`FBIOGET_VSCREENINFO', `0x00004600')
-+define(`FBIOPUT_VSCREENINFO', `0x00004601')
-+define(`FBIOGET_FSCREENINFO', `0x00004602')
-+define(`FBIOGETCMAP', `0x00004604')
-+define(`FBIOPUTCMAP', `0x00004605')
-+define(`FBIOPAN_DISPLAY', `0x00004606')
-+define(`FBIOGET_CON2FBMAP', `0x0000460f')
-+define(`FBIOPUT_CON2FBMAP', `0x00004610')
-+define(`FBIOBLANK', `0x00004611')
-+define(`FBIO_ALLOC', `0x00004613')
-+define(`FBIO_FREE', `0x00004614')
-+define(`FBIOGET_GLYPH', `0x00004615')
-+define(`FBIOGET_HWCINFO', `0x00004616')
-+define(`FBIOPUT_MODEINFO', `0x00004617')
-+define(`FBIOGET_DISPINFO', `0x00004618')
-+define(`FBIO_WAITEVENT', `0x00004688')
-+define(`GSMIOC_DISABLE_NET', `0x00004703')
-+define(`HIDIOCAPPLICATION', `0x00004802')
-+define(`HIDIOCINITREPORT', `0x00004805')
-+define(`SNDRV_SB_CSP_IOCTL_UNLOAD_CODE', `0x00004812')
-+define(`SNDRV_SB_CSP_IOCTL_STOP', `0x00004814')
-+define(`SNDRV_SB_CSP_IOCTL_PAUSE', `0x00004815')
-+define(`SNDRV_SB_CSP_IOCTL_RESTART', `0x00004816')
-+define(`SNDRV_DM_FM_IOCTL_RESET', `0x00004821')
-+define(`SNDRV_DM_FM_IOCTL_CLEAR_PATCHES', `0x00004840')
-+define(`SNDRV_EMU10K1_IOCTL_STOP', `0x00004880')
-+define(`SNDRV_EMU10K1_IOCTL_CONTINUE', `0x00004881')
-+define(`SNDRV_EMU10K1_IOCTL_ZERO_TRAM_COUNTER', `0x00004882')
-+define(`SNDRV_EMUX_IOCTL_RESET_SAMPLES', `0x00004882')
-+define(`SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES', `0x00004883')
-+define(`SNDRV_FIREWIRE_IOCTL_LOCK', `0x000048f9')
-+define(`SNDRV_FIREWIRE_IOCTL_UNLOCK', `0x000048fa')
-+define(`IIOCNETAIF', `0x00004901')
-+define(`IIOCNETDIF', `0x00004902')
-+define(`IIOCNETSCF', `0x00004903')
-+define(`IIOCNETGCF', `0x00004904')
-+define(`IIOCNETANM', `0x00004905')
-+define(`IIOCNETDNM', `0x00004906')
-+define(`IIOCNETGNM', `0x00004907')
-+define(`IIOCGETSET', `0x00004908')
-+define(`IIOCSETSET', `0x00004909')
-+define(`IIOCSETVER', `0x0000490a')
-+define(`IIOCNETHUP', `0x0000490b')
-+define(`IIOCSETGST', `0x0000490c')
-+define(`IIOCSETBRJ', `0x0000490d')
-+define(`IIOCSIGPRF', `0x0000490e')
-+define(`IIOCGETPRF', `0x0000490f')
-+define(`IIOCSETPRF', `0x00004910')
-+define(`IIOCGETMAP', `0x00004911')
-+define(`IIOCSETMAP', `0x00004912')
-+define(`IIOCNETASL', `0x00004913')
-+define(`IIOCNETDIL', `0x00004914')
-+define(`IIOCGETCPS', `0x00004915')
-+define(`IIOCGETDVR', `0x00004916')
-+define(`IIOCNETLCR', `0x00004917')
-+define(`IIOCNETDWRSET', `0x00004918')
-+define(`IIOCNETALN', `0x00004920')
-+define(`IIOCNETDLN', `0x00004921')
-+define(`IIOCNETGPN', `0x00004922')
-+define(`IIOCDBGVAR', `0x0000497f')
-+define(`IIOCDRVCTL', `0x00004980')
-+define(`ION_IOC_TEST_SET_FD', `0x000049f0')
-+define(`KIOCSOUND', `0x00004b2f')
-+define(`KDMKTONE', `0x00004b30')
-+define(`KDGETLED', `0x00004b31')
-+define(`KDSETLED', `0x00004b32')
-+define(`KDGKBTYPE', `0x00004b33')
-+define(`KDADDIO', `0x00004b34')
-+define(`KDDELIO', `0x00004b35')
-+define(`KDENABIO', `0x00004b36')
-+define(`KDDISABIO', `0x00004b37')
-+define(`KDSETMODE', `0x00004b3a')
-+define(`KDGETMODE', `0x00004b3b')
-+define(`KDMAPDISP', `0x00004b3c')
-+define(`KDUNMAPDISP', `0x00004b3d')
-+define(`GIO_SCRNMAP', `0x00004b40')
-+define(`PIO_SCRNMAP', `0x00004b41')
-+define(`KDGKBMODE', `0x00004b44')
-+define(`KDSKBMODE', `0x00004b45')
-+define(`KDGKBENT', `0x00004b46')
-+define(`KDSKBENT', `0x00004b47')
-+define(`KDGKBSENT', `0x00004b48')
-+define(`KDSKBSENT', `0x00004b49')
-+define(`KDGKBDIACR', `0x00004b4a')
-+define(`KDSKBDIACR', `0x00004b4b')
-+define(`KDGETKEYCODE', `0x00004b4c')
-+define(`KDSETKEYCODE', `0x00004b4d')
-+define(`KDSIGACCEPT', `0x00004b4e')
-+define(`KDKBDREP', `0x00004b52')
-+define(`GIO_FONT', `0x00004b60')
-+define(`PIO_FONT', `0x00004b61')
-+define(`KDGKBMETA', `0x00004b62')
-+define(`KDSKBMETA', `0x00004b63')
-+define(`KDGKBLED', `0x00004b64')
-+define(`KDSKBLED', `0x00004b65')
-+define(`GIO_UNIMAP', `0x00004b66')
-+define(`PIO_UNIMAP', `0x00004b67')
-+define(`PIO_UNIMAPCLR', `0x00004b68')
-+define(`GIO_UNISCRNMAP', `0x00004b69')
-+define(`PIO_UNISCRNMAP', `0x00004b6a')
-+define(`GIO_FONTX', `0x00004b6b')
-+define(`PIO_FONTX', `0x00004b6c')
-+define(`PIO_FONTRESET', `0x00004b6d')
-+define(`GIO_CMAP', `0x00004b70')
-+define(`PIO_CMAP', `0x00004b71')
-+define(`KDFONTOP', `0x00004b72')
-+define(`KDGKBDIACRUC', `0x00004bfa')
-+define(`KDSKBDIACRUC', `0x00004bfb')
-+define(`LOOP_SET_FD', `0x00004c00')
-+define(`LOOP_CLR_FD', `0x00004c01')
-+define(`LOOP_SET_STATUS', `0x00004c02')
-+define(`LOOP_GET_STATUS', `0x00004c03')
-+define(`LOOP_SET_STATUS64', `0x00004c04')
-+define(`LOOP_GET_STATUS64', `0x00004c05')
-+define(`LOOP_CHANGE_FD', `0x00004c06')
-+define(`LOOP_SET_CAPACITY', `0x00004c07')
-+define(`LOOP_CTL_ADD', `0x00004c80')
-+define(`LOOP_CTL_REMOVE', `0x00004c81')
-+define(`LOOP_CTL_GET_FREE', `0x00004c82')
-+define(`MTDFILEMODE', `0x00004d13')
-+define(`NVME_IOCTL_ID', `0x00004e40')
-+define(`UBI_IOCVOLRMBLK', `0x00004f08')
-+define(`OMAPFB_SYNC_GFX', `0x00004f25')
-+define(`OMAPFB_VSYNC', `0x00004f26')
-+define(`OMAPFB_WAITFORVSYNC', `0x00004f39')
-+define(`OMAPFB_WAITFORGO', `0x00004f3c')
-+define(`SNDCTL_DSP_RESET', `0x00005000')
-+define(`SNDCTL_DSP_SYNC', `0x00005001')
-+define(`SNDCTL_DSP_POST', `0x00005008')
-+define(`SNDCTL_DSP_NONBLOCK', `0x0000500e')
-+define(`SNDCTL_DSP_SETSYNCRO', `0x00005015')
-+define(`SNDCTL_DSP_SETDUPLEX', `0x00005016')
-+define(`SNDCTL_SEQ_RESET', `0x00005100')
-+define(`SNDCTL_SEQ_SYNC', `0x00005101')
-+define(`SNDCTL_SEQ_PANIC', `0x00005111')
-+define(`RFKILL_IOCTL_NOINPUT', `0x00005201')
-+define(`RNDZAPENTCNT', `0x00005204')
-+define(`RNDCLEARPOOL', `0x00005206')
-+define(`CDROMPAUSE', `0x00005301')
-+define(`CDROMRESUME', `0x00005302')
-+define(`CDROMPLAYMSF', `0x00005303')
-+define(`CDROMPLAYTRKIND', `0x00005304')
-+define(`CDROMREADTOCHDR', `0x00005305')
-+define(`CDROMREADTOCENTRY', `0x00005306')
-+define(`CDROMSTOP', `0x00005307')
-+define(`CDROMSTART', `0x00005308')
-+define(`CDROMEJECT', `0x00005309')
-+define(`CDROMVOLCTRL', `0x0000530a')
-+define(`CDROMSUBCHNL', `0x0000530b')
-+define(`CDROMREADMODE2', `0x0000530c')
-+define(`CDROMREADMODE1', `0x0000530d')
-+define(`CDROMREADAUDIO', `0x0000530e')
-+define(`CDROMEJECT_SW', `0x0000530f')
-+define(`CDROMMULTISESSION', `0x00005310')
-+define(`CDROM_GET_MCN', `0x00005311')
-+define(`CDROMRESET', `0x00005312')
-+define(`CDROMVOLREAD', `0x00005313')
-+define(`CDROMREADRAW', `0x00005314')
-+define(`CDROMREADCOOKED', `0x00005315')
-+define(`CDROMSEEK', `0x00005316')
-+define(`CDROMPLAYBLK', `0x00005317')
-+define(`CDROMREADALL', `0x00005318')
-+define(`CDROMCLOSETRAY', `0x00005319')
-+define(`CDROMGETSPINDOWN', `0x0000531d')
-+define(`CDROMSETSPINDOWN', `0x0000531e')
-+define(`CDROM_SET_OPTIONS', `0x00005320')
-+define(`CDROM_CLEAR_OPTIONS', `0x00005321')
-+define(`CDROM_SELECT_SPEED', `0x00005322')
-+define(`CDROM_SELECT_DISC', `0x00005323')
-+define(`CDROM_MEDIA_CHANGED', `0x00005325')
-+define(`CDROM_DRIVE_STATUS', `0x00005326')
-+define(`CDROM_DISC_STATUS', `0x00005327')
-+define(`CDROM_CHANGER_NSLOTS', `0x00005328')
-+define(`CDROM_LOCKDOOR', `0x00005329')
-+define(`CDROM_DEBUG', `0x00005330')
-+define(`CDROM_GET_CAPABILITY', `0x00005331')
-+define(`SCSI_IOCTL_DOORLOCK', `0x00005380')
-+define(`SCSI_IOCTL_DOORUNLOCK', `0x00005381')
-+define(`CDROMAUDIOBUFSIZ', `0x00005382')
-+define(`SCSI_IOCTL_GET_IDLUN', `0x00005382')
-+define(`SCSI_IOCTL_PROBE_HOST', `0x00005385')
-+define(`SCSI_IOCTL_GET_BUS_NUMBER', `0x00005386')
-+define(`SCSI_IOCTL_GET_PCI', `0x00005387')
-+define(`DVD_READ_STRUCT', `0x00005390')
-+define(`DVD_WRITE_STRUCT', `0x00005391')
-+define(`DVD_AUTH', `0x00005392')
-+define(`CDROM_SEND_PACKET', `0x00005393')
-+define(`CDROM_NEXT_WRITABLE', `0x00005394')
-+define(`CDROM_LAST_WRITTEN', `0x00005395')
-+define(`TCGETS', ifelse(target_arch, mips, 0x0000540d, 0x00005401))
-+define(`SNDCTL_TMR_START', `0x00005402')
-+define(`TCSETS', `0x00005402')
-+define(`SNDCTL_TMR_STOP', `0x00005403')
-+define(`TCSETSW', `0x00005403')
-+define(`SNDCTL_TMR_CONTINUE', `0x00005404')
-+define(`TCSETSF', `0x00005404')
-+define(`TCGETA', `0x00005405')
-+define(`TCSETA', `0x00005406')
-+define(`TCSETAW', `0x00005407')
-+define(`TCSETAF', `0x00005408')
-+define(`TCSBRK', `0x00005409')
-+define(`TCXONC', `0x0000540a')
-+define(`TCFLSH', `0x0000540b')
-+define(`TIOCEXCL', `0x0000540c')
-+define(`TIOCNXCL', `0x0000540d')
-+define(`TIOCSCTTY', ifelse(target_arch, mips, 0x00005480, 0x0000540e))
-+define(`TIOCGPGRP', `0x0000540f')
-+define(`TIOCSPGRP', `0x00005410')
-+define(`TIOCOUTQ', ifelse(target_arch, mips, 0x00007472, 0x00005411))
-+define(`TIOCSTI', `0x00005412')
-+define(`TIOCGWINSZ', ifelse(target_arch, mips, 0x80087468, 0x00005413))
-+define(`TIOCSWINSZ', ifelse(target_arch, mips, 0x40087467, 0x00005414))
-+define(`TIOCMGET', `0x00005415')
-+define(`TIOCMBIS', `0x00005416')
-+define(`TIOCMBIC', `0x00005417')
-+define(`TIOCMSET', `0x00005418')
-+define(`TIOCGSOFTCAR', `0x00005419')
-+define(`TIOCSSOFTCAR', `0x0000541a')
-+define(`FIONREAD', ifelse(target_arch, mips, 0x0000467f, 0x0000541b))
-+define(`TIOCLINUX', `0x0000541c')
-+define(`TIOCCONS', `0x0000541d')
-+define(`TIOCGSERIAL', `0x0000541e')
-+define(`TIOCSSERIAL', `0x0000541f')
-+define(`TIOCPKT', `0x00005420')
-+define(`FIONBIO', `0x00005421')
-+define(`TIOCNOTTY', `0x00005422')
-+define(`TIOCSETD', `0x00005423')
-+define(`TIOCGETD', `0x00005424')
-+define(`TCSBRKP', `0x00005425')
-+define(`TIOCSBRK', `0x00005427')
-+define(`TIOCCBRK', `0x00005428')
-+define(`TIOCGSID', `0x00005429')
-+define(`TIOCGRS485', `0x0000542e')
-+define(`TIOCSRS485', `0x0000542f')
-+define(`TCGETX', `0x00005432')
-+define(`TCSETX', `0x00005433')
-+define(`TCSETXF', `0x00005434')
-+define(`TCSETXW', `0x00005435')
-+define(`TIOCVHANGUP', `0x00005437')
-+define(`FIONCLEX', `0x00005450')
-+define(`FIOCLEX', ifelse(target_arch, mips, 0x00006601, 0x00005451))
-+define(`FIOASYNC', `0x00005452')
-+define(`TIOCSERCONFIG', `0x00005453')
-+define(`TIOCSERGWILD', `0x00005454')
-+define(`TIOCSERSWILD', `0x00005455')
-+define(`TIOCGLCKTRMIOS', `0x00005456')
-+define(`TIOCSLCKTRMIOS', `0x00005457')
-+define(`TIOCSERGSTRUCT', `0x00005458')
-+define(`TIOCSERGETLSR', `0x00005459')
-+define(`TIOCSERGETMULTI', `0x0000545a')
-+define(`TIOCSERSETMULTI', `0x0000545b')
-+define(`TIOCMIWAIT', `0x0000545c')
-+define(`TIOCGICOUNT', `0x0000545d')
-+define(`FIOQSIZE', `0x00005460')
-+define(`SNDRV_TIMER_IOCTL_START', `0x000054a0')
-+define(`SNDRV_TIMER_IOCTL_STOP', `0x000054a1')
-+define(`SNDRV_TIMER_IOCTL_CONTINUE', `0x000054a2')
-+define(`SNDRV_TIMER_IOCTL_PAUSE', `0x000054a3')
-+define(`UI_DEV_CREATE', `0x00005501')
-+define(`UI_DEV_DESTROY', `0x00005502')
-+define(`USBDEVFS_DISCARDURB', `0x0000550b')
-+define(`USBDEVFS_RESET', `0x00005514')
-+define(`USBDEVFS_DISCONNECT', `0x00005516')
-+define(`USBDEVFS_CONNECT', `0x00005517')
-+define(`VT_OPENQRY', `0x00005600')
-+define(`VIDIOC_RESERVED', `0x00005601')
-+define(`VT_GETMODE', `0x00005601')
-+define(`VT_SETMODE', `0x00005602')
-+define(`VT_GETSTATE', `0x00005603')
-+define(`VT_SENDSIG', `0x00005604')
-+define(`VT_RELDISP', `0x00005605')
-+define(`VT_ACTIVATE', `0x00005606')
-+define(`VT_WAITACTIVE', `0x00005607')
-+define(`VT_DISALLOCATE', `0x00005608')
-+define(`VT_RESIZE', `0x00005609')
-+define(`VT_RESIZEX', `0x0000560a')
-+define(`VT_LOCKSWITCH', `0x0000560b')
-+define(`VT_UNLOCKSWITCH', `0x0000560c')
-+define(`VT_GETHIFONTMASK', `0x0000560d')
-+define(`VT_WAITEVENT', `0x0000560e')
-+define(`VT_SETACTIVATE', `0x0000560f')
-+define(`VIDIOC_LOG_STATUS', `0x00005646')
-+define(`ADV7842_CMD_RAM_TEST', `0x000056c0')
-+define(`USBTMC_IOCTL_INDICATOR_PULSE', `0x00005b01')
-+define(`USBTMC_IOCTL_CLEAR', `0x00005b02')
-+define(`USBTMC_IOCTL_ABORT_BULK_OUT', `0x00005b03')
-+define(`USBTMC_IOCTL_ABORT_BULK_IN', `0x00005b04')
-+define(`USBTMC_IOCTL_CLEAR_OUT_HALT', `0x00005b06')
-+define(`USBTMC_IOCTL_CLEAR_IN_HALT', `0x00005b07')
-+define(`ANDROID_ALARM_WAIT', `0x00006101')
-+define(`NS_ADJBUFLEV', `0x00006163')
-+define(`SIOCSIFATMTCP', `0x00006180')
-+define(`ATMTCP_CREATE', `0x0000618e')
-+define(`ATMTCP_REMOVE', `0x0000618f')
-+define(`ATMLEC_CTRL', `0x000061d0')
-+define(`ATMLEC_DATA', `0x000061d1')
-+define(`ATMLEC_MCAST', `0x000061d2')
-+define(`ATMMPC_CTRL', `0x000061d8')
-+define(`ATMMPC_DATA', `0x000061d9')
-+define(`SIOCMKCLIP', `0x000061e0')
-+define(`ATMARPD_CTRL', `0x000061e1')
-+define(`ATMARP_MKIP', `0x000061e2')
-+define(`ATMARP_SETENTRY', `0x000061e3')
-+define(`ATMARP_ENCAP', `0x000061e5')
-+define(`ATMSIGD_CTRL', `0x000061f0')
-+define(`BT819_FIFO_RESET_LOW', `0x00006200')
-+define(`BT819_FIFO_RESET_HIGH', `0x00006201')
-+define(`CM_IOCSRDR', `0x00006303')
-+define(`CM_IOCARDOFF', `0x00006304')
-+define(`BC_REGISTER_LOOPER', `0x0000630b')
-+define(`BC_ENTER_LOOPER', `0x0000630c')
-+define(`BC_EXIT_LOOPER', `0x0000630d')
-+define(`CHIOINITELEM', `0x00006311')
-+define(`DRM_IOCTL_SET_MASTER', `0x0000641e')
-+define(`DRM_IOCTL_DROP_MASTER', `0x0000641f')
-+define(`DRM_IOCTL_AGP_ACQUIRE', `0x00006430')
-+define(`DRM_IOCTL_AGP_RELEASE', `0x00006431')
-+define(`DRM_IOCTL_I915_FLUSH', `0x00006441')
-+define(`DRM_IOCTL_R128_CCE_START', `0x00006441')
-+define(`DRM_IOCTL_RADEON_CP_START', `0x00006441')
-+define(`DRM_IOCTL_I915_FLIP', `0x00006442')
-+define(`DRM_IOCTL_MGA_RESET', `0x00006442')
-+define(`DRM_IOCTL_I810_FLUSH', `0x00006443')
-+define(`DRM_IOCTL_MGA_SWAP', `0x00006443')
-+define(`DRM_IOCTL_R128_CCE_RESET', `0x00006443')
-+define(`DRM_IOCTL_RADEON_CP_RESET', `0x00006443')
-+define(`DRM_IOCTL_I810_GETAGE', `0x00006444')
-+define(`DRM_IOCTL_R128_CCE_IDLE', `0x00006444')
-+define(`DRM_IOCTL_RADEON_CP_IDLE', `0x00006444')
-+define(`DRM_IOCTL_RADEON_RESET', `0x00006445')
-+define(`DRM_IOCTL_I810_SWAP', `0x00006446')
-+define(`DRM_IOCTL_R128_RESET', `0x00006446')
-+define(`DRM_IOCTL_R128_SWAP', `0x00006447')
-+define(`DRM_IOCTL_RADEON_SWAP', `0x00006447')
-+define(`DRM_IOCTL_I810_DOCOPY', `0x00006448')
-+define(`DRM_IOCTL_VIA_FLUSH', `0x00006449')
-+define(`DRM_IOCTL_I810_FSTATUS', `0x0000644a')
-+define(`DRM_IOCTL_I810_OV0FLIP', `0x0000644b')
-+define(`DRM_IOCTL_I810_RSTATUS', `0x0000644d')
-+define(`DRM_IOCTL_I810_FLIP', `0x0000644e')
-+define(`DRM_IOCTL_RADEON_FLIP', `0x00006452')
-+define(`DRM_IOCTL_R128_FLIP', `0x00006453')
-+define(`DRM_IOCTL_I915_GEM_THROTTLE', `0x00006458')
-+define(`DRM_IOCTL_RADEON_CP_RESUME', `0x00006458')
-+define(`DRM_IOCTL_I915_GEM_ENTERVT', `0x00006459')
-+define(`DRM_IOCTL_I915_GEM_LEAVEVT', `0x0000645a')
-+define(`S5P_FIMC_TX_END_NOTIFY', `0x00006500')
-+define(`FUNCTIONFS_FIFO_STATUS', `0x00006701')
-+define(`GADGETFS_FIFO_STATUS', `0x00006701')
-+define(`FUNCTIONFS_FIFO_FLUSH', `0x00006702')
-+define(`GADGETFS_FIFO_FLUSH', `0x00006702')
-+define(`FUNCTIONFS_CLEAR_HALT', `0x00006703')
-+define(`GADGETFS_CLEAR_HALT', `0x00006703')
-+define(`FUNCTIONFS_INTERFACE_REVMAP', `0x00006780')
-+define(`FUNCTIONFS_ENDPOINT_REVMAP', `0x00006781')
-+define(`HPET_IE_ON', `0x00006801')
-+define(`HPET_IE_OFF', `0x00006802')
-+define(`HPET_EPI', `0x00006804')
-+define(`HPET_DPI', `0x00006805')
-+define(`LIRC_NOTIFY_DECODE', `0x00006920')
-+define(`LIRC_SETUP_START', `0x00006921')
-+define(`LIRC_SETUP_END', `0x00006922')
-+define(`KYRO_IOCTL_OVERLAY_CREATE', `0x00006b00')
-+define(`KYRO_IOCTL_OVERLAY_VIEWPORT_SET', `0x00006b01')
-+define(`KYRO_IOCTL_SET_VIDEO_MODE', `0x00006b02')
-+define(`KYRO_IOCTL_UVSTRIDE', `0x00006b03')
-+define(`KYRO_IOCTL_OVERLAY_OFFSET', `0x00006b04')
-+define(`KYRO_IOCTL_STRIDE', `0x00006b05')
-+define(`HSC_RESET', `0x00006b10')
-+define(`HSC_SET_PM', `0x00006b11')
-+define(`HSC_SEND_BREAK', `0x00006b12')
-+define(`MMTIMER_GETOFFSET', `0x00006d00')
-+define(`MGSL_IOCSTXIDLE', `0x00006d02')
-+define(`MGSL_IOCGTXIDLE', `0x00006d03')
-+define(`MGSL_IOCTXENABLE', `0x00006d04')
-+define(`MMTIMER_GETBITS', `0x00006d04')
-+define(`MGSL_IOCRXENABLE', `0x00006d05')
-+define(`MGSL_IOCTXABORT', `0x00006d06')
-+define(`MMTIMER_MMAPAVAIL', `0x00006d06')
-+define(`MGSL_IOCGSTATS', `0x00006d07')
-+define(`MGSL_IOCLOOPTXDONE', `0x00006d09')
-+define(`MGSL_IOCSIF', `0x00006d0a')
-+define(`MGSL_IOCGIF', `0x00006d0b')
-+define(`MGSL_IOCCLRMODCOUNT', `0x00006d0f')
-+define(`MGSL_IOCSXSYNC', `0x00006d13')
-+define(`MGSL_IOCGXSYNC', `0x00006d14')
-+define(`MGSL_IOCSXCTRL', `0x00006d15')
-+define(`MGSL_IOCGXCTRL', `0x00006d16')
-+define(`NCP_IOC_CONN_LOGGED_IN', `0x00006e03')
-+define(`AUDIO_STOP', `0x00006f01')
-+define(`AUDIO_PLAY', `0x00006f02')
-+define(`AUDIO_PAUSE', `0x00006f03')
-+define(`AUDIO_CONTINUE', `0x00006f04')
-+define(`AUDIO_SELECT_SOURCE', `0x00006f05')
-+define(`AUDIO_SET_MUTE', `0x00006f06')
-+define(`AUDIO_SET_AV_SYNC', `0x00006f07')
-+define(`AUDIO_SET_BYPASS_MODE', `0x00006f08')
-+define(`AUDIO_CHANNEL_SELECT', `0x00006f09')
-+define(`AUDIO_CLEAR_BUFFER', `0x00006f0c')
-+define(`AUDIO_SET_ID', `0x00006f0d')
-+define(`AUDIO_SET_STREAMTYPE', `0x00006f0f')
-+define(`AUDIO_SET_EXT_ID', `0x00006f10')
-+define(`AUDIO_BILINGUAL_CHANNEL_SELECT', `0x00006f14')
-+define(`VIDEO_STOP', `0x00006f15')
-+define(`VIDEO_PLAY', `0x00006f16')
-+define(`VIDEO_FREEZE', `0x00006f17')
-+define(`VIDEO_CONTINUE', `0x00006f18')
-+define(`VIDEO_SELECT_SOURCE', `0x00006f19')
-+define(`VIDEO_SET_BLANK', `0x00006f1a')
-+define(`VIDEO_SET_DISPLAY_FORMAT', `0x00006f1d')
-+define(`VIDEO_FAST_FORWARD', `0x00006f1f')
-+define(`VIDEO_SLOWMOTION', `0x00006f20')
-+define(`VIDEO_CLEAR_BUFFER', `0x00006f22')
-+define(`VIDEO_SET_ID', `0x00006f23')
-+define(`VIDEO_SET_STREAMTYPE', `0x00006f24')
-+define(`VIDEO_SET_FORMAT', `0x00006f25')
-+define(`VIDEO_SET_SYSTEM', `0x00006f26')
-+define(`DMX_START', `0x00006f29')
-+define(`DMX_STOP', `0x00006f2a')
-+define(`DMX_SET_BUFFER_SIZE', `0x00006f2d')
-+define(`NET_REMOVE_IF', `0x00006f35')
-+define(`VIDEO_SET_ATTRIBUTES', `0x00006f35')
-+define(`FE_DISEQC_RESET_OVERLOAD', `0x00006f3e')
-+define(`FE_DISEQC_SEND_BURST', `0x00006f41')
-+define(`FE_SET_TONE', `0x00006f42')
-+define(`FE_SET_VOLTAGE', `0x00006f43')
-+define(`FE_ENABLE_HIGH_LNB_VOLTAGE', `0x00006f44')
-+define(`FE_DISHNETWORK_SEND_LEGACY_CMD', `0x00006f50')
-+define(`FE_SET_FRONTEND_TUNE_MODE', `0x00006f51')
-+define(`CA_RESET', `0x00006f80')
-+define(`RTC_AIE_ON', `0x00007001')
-+define(`RTC_AIE_OFF', `0x00007002')
-+define(`RTC_UIE_ON', `0x00007003')
-+define(`PHN_NOT_OH', `0x00007004')
-+define(`RTC_UIE_OFF', `0x00007004')
-+define(`RTC_PIE_ON', `0x00007005')
-+define(`RTC_PIE_OFF', `0x00007006')
-+define(`RTC_WIE_ON', `0x0000700f')
-+define(`RTC_WIE_OFF', `0x00007010')
-+define(`RTC_VL_CLR', `0x00007014')
-+define(`NVRAM_INIT', `0x00007040')
-+define(`NVRAM_SETCKS', `0x00007041')
-+define(`PPCLAIM', `0x0000708b')
-+define(`PPRELEASE', `0x0000708c')
-+define(`PPYIELD', `0x0000708d')
-+define(`PPEXCL', `0x0000708f')
-+define(`PHONE_CAPABILITIES', `0x00007180')
-+define(`PHONE_RING', `0x00007183')
-+define(`PHONE_HOOKSTATE', `0x00007184')
-+define(`OLD_PHONE_RING_START', `0x00007187')
-+define(`PHONE_RING_STOP', `0x00007188')
-+define(`PHONE_REC_START', `0x0000718a')
-+define(`PHONE_REC_STOP', `0x0000718b')
-+define(`PHONE_REC_LEVEL', `0x0000718f')
-+define(`PHONE_PLAY_START', `0x00007191')
-+define(`PHONE_PLAY_STOP', `0x00007192')
-+define(`PHONE_PLAY_LEVEL', `0x00007195')
-+define(`PHONE_GET_TONE_ON_TIME', `0x0000719e')
-+define(`PHONE_GET_TONE_OFF_TIME', `0x0000719f')
-+define(`PHONE_GET_TONE_STATE', `0x000071a0')
-+define(`PHONE_BUSY', `0x000071a1')
-+define(`PHONE_RINGBACK', `0x000071a2')
-+define(`PHONE_DIALTONE', `0x000071a3')
-+define(`PHONE_CPT_STOP', `0x000071a4')
-+define(`PHONE_PSTN_GET_STATE', `0x000071a5')
-+define(`PHONE_PSTN_LINETEST', `0x000071a8')
-+define(`IXJCTL_DSP_RESET', `0x000071c0')
-+define(`IXJCTL_DSP_IDLE', `0x000071c5')
-+define(`IXJCTL_TESTRAM', `0x000071c6')
-+define(`IXJCTL_AEC_STOP', `0x000071cc')
-+define(`IXJCTL_AEC_GET_LEVEL', `0x000071cd')
-+define(`IXJCTL_PSTN_LINETEST', `0x000071d3')
-+define(`IXJCTL_PLAY_CID', `0x000071d7')
-+define(`IXJCTL_DRYBUFFER_CLEAR', `0x000071e7')
-+define(`BR_OK', `0x00007201')
-+define(`BR_DEAD_REPLY', `0x00007205')
-+define(`BR_TRANSACTION_COMPLETE', `0x00007206')
-+define(`BR_NOOP', `0x0000720c')
-+define(`BR_SPAWN_LOOPER', `0x0000720d')
-+define(`BR_FINISHED', `0x0000720e')
-+define(`BR_FAILED_REPLY', `0x00007211')
-+define(`MEYEIOC_STILLCAPT', `0x000076c4')
-+define(`ASHMEM_GET_SIZE', `0x00007704')
-+define(`ASHMEM_GET_PROT_MASK', `0x00007706')
-+define(`ASHMEM_GET_PIN_STATUS', `0x00007709')
-+define(`ASHMEM_PURGE_ALL_CACHES', `0x0000770a')
-+define(`FIOSETOWN', `0x00008901')
-+define(`SIOCSPGRP', `0x00008902')
-+define(`FIOGETOWN', `0x00008903')
-+define(`SIOCGPGRP', `0x00008904')
-+define(`SIOCATMARK', `0x00008905')
-+define(`SIOCGSTAMP', `0x00008906')
-+define(`SIOCGSTAMPNS', `0x00008907')
-+define(`SIOCADDRT', `0x0000890b')
-+define(`SIOCDELRT', `0x0000890c')
-+define(`SIOCRTMSG', `0x0000890d')
-+define(`SIOCGIFNAME', `0x00008910')
-+define(`SIOCSIFLINK', `0x00008911')
-+define(`SIOCGIFCONF', `0x00008912')
-+define(`SIOCGIFFLAGS', `0x00008913')
-+define(`SIOCSIFFLAGS', `0x00008914')
-+define(`SIOCGIFADDR', `0x00008915')
-+define(`SIOCSIFADDR', `0x00008916')
-+define(`SIOCGIFDSTADDR', `0x00008917')
-+define(`SIOCSIFDSTADDR', `0x00008918')
-+define(`SIOCGIFBRDADDR', `0x00008919')
-+define(`SIOCSIFBRDADDR', `0x0000891a')
-+define(`SIOCGIFNETMASK', `0x0000891b')
-+define(`SIOCSIFNETMASK', `0x0000891c')
-+define(`SIOCGIFMETRIC', `0x0000891d')
-+define(`SIOCSIFMETRIC', `0x0000891e')
-+define(`SIOCGIFMEM', `0x0000891f')
-+define(`SIOCSIFMEM', `0x00008920')
-+define(`SIOCGIFMTU', `0x00008921')
-+define(`SIOCSIFMTU', `0x00008922')
-+define(`SIOCSIFNAME', `0x00008923')
-+define(`SIOCSIFHWADDR', `0x00008924')
-+define(`SIOCGIFENCAP', `0x00008925')
-+define(`SIOCSIFENCAP', `0x00008926')
-+define(`SIOCGIFHWADDR', `0x00008927')
-+define(`SIOCGIFSLAVE', `0x00008929')
-+define(`SIOCSIFSLAVE', `0x00008930')
-+define(`SIOCADDMULTI', `0x00008931')
-+define(`SIOCDELMULTI', `0x00008932')
-+define(`SIOCGIFINDEX', `0x00008933')
-+define(`SIOCSIFPFLAGS', `0x00008934')
-+define(`SIOCGIFPFLAGS', `0x00008935')
-+define(`SIOCDIFADDR', `0x00008936')
-+define(`SIOCSIFHWBROADCAST', `0x00008937')
-+define(`SIOCGIFCOUNT', `0x00008938')
-+define(`SIOCKILLADDR', `0x00008939')
-+define(`SIOCGIFBR', `0x00008940')
-+define(`SIOCSIFBR', `0x00008941')
-+define(`SIOCGIFTXQLEN', `0x00008942')
-+define(`SIOCSIFTXQLEN', `0x00008943')
-+define(`SIOCETHTOOL', `0x00008946')
-+define(`SIOCGMIIPHY', `0x00008947')
-+define(`SIOCGMIIREG', `0x00008948')
-+define(`SIOCSMIIREG', `0x00008949')
-+define(`SIOCWANDEV', `0x0000894a')
-+define(`SIOCOUTQNSD', `0x0000894b')
-+define(`SIOCDARP', `0x00008953')
-+define(`SIOCGARP', `0x00008954')
-+define(`SIOCSARP', `0x00008955')
-+define(`SIOCDRARP', `0x00008960')
-+define(`SIOCGRARP', `0x00008961')
-+define(`SIOCSRARP', `0x00008962')
-+define(`SIOCGIFMAP', `0x00008970')
-+define(`SIOCSIFMAP', `0x00008971')
-+define(`SIOCADDDLCI', `0x00008980')
-+define(`SIOCDELDLCI', `0x00008981')
-+define(`SIOCGIFVLAN', `0x00008982')
-+define(`SIOCSIFVLAN', `0x00008983')
-+define(`SIOCBONDENSLAVE', `0x00008990')
-+define(`SIOCBONDRELEASE', `0x00008991')
-+define(`SIOCBONDSETHWADDR', `0x00008992')
-+define(`SIOCBONDSLAVEINFOQUERY', `0x00008993')
-+define(`SIOCBONDINFOQUERY', `0x00008994')
-+define(`SIOCBONDCHANGEACTIVE', `0x00008995')
-+define(`SIOCBRADDBR', `0x000089a0')
-+define(`SIOCBRDELBR', `0x000089a1')
-+define(`SIOCBRADDIF', `0x000089a2')
-+define(`SIOCBRDELIF', `0x000089a3')
-+define(`SIOCSHWTSTAMP', `0x000089b0')
-+define(`SIOCGHWTSTAMP', `0x000089b1')
-+define(`SIOCPROTOPRIVATE', `0x000089e0')
-+define(`SIOCPROTOPRIVATE_1', `0x000089e1')
-+define(`SIOCPROTOPRIVATE_2', `0x000089e2')
-+define(`SIOCPROTOPRIVATE_3', `0x000089e3')
-+define(`SIOCPROTOPRIVATE_4', `0x000089e4')
-+define(`SIOCPROTOPRIVATE_5', `0x000089e5')
-+define(`SIOCPROTOPRIVATE_6', `0x000089e6')
-+define(`SIOCPROTOPRIVATE_7', `0x000089e7')
-+define(`SIOCPROTOPRIVATE_8', `0x000089e8')
-+define(`SIOCPROTOPRIVATE_9', `0x000089e9')
-+define(`SIOCPROTOPRIVATE_A', `0x000089ea')
-+define(`SIOCPROTOPRIVATE_B', `0x000089eb')
-+define(`SIOCPROTOPRIVATE_C', `0x000089ec')
-+define(`SIOCPROTOPRIVATE_D', `0x000089ed')
-+define(`SIOCPROTOPRIVATE_E', `0x000089ee')
-+define(`SIOCPROTOPRIVLAST', `0x000089ef')
-+define(`SIOCDEVPRIVATE', `0x000089f0')
-+define(`SIOCDEVPRIVATE_1', `0x000089f1')
-+define(`SIOCDEVPRIVATE_2', `0x000089f2')
-+define(`SIOCDEVPRIVATE_3', `0x000089f3')
-+define(`SIOCDEVPRIVATE_4', `0x000089f4')
-+define(`SIOCDEVPRIVATE_5', `0x000089f5')
-+define(`SIOCDEVPRIVATE_6', `0x000089f6')
-+define(`SIOCDEVPRIVATE_7', `0x000089f7')
-+define(`SIOCDEVPRIVATE_8', `0x000089f8')
-+define(`SIOCDEVPRIVATE_9', `0x000089f9')
-+define(`SIOCDEVPRIVATE_A', `0x000089fa')
-+define(`SIOCDEVPRIVATE_B', `0x000089fb')
-+define(`SIOCDEVPRIVATE_C', `0x000089fc')
-+define(`SIOCDEVPRIVATE_D', `0x000089fd')
-+define(`SIOCDEVPRIVATE_E', `0x000089fe')
-+define(`SIOCDEVPRIVLAST', `0x000089ff')
-+define(`SIOCIWFIRST', `0x00008b00')
-+define(`SIOCSIWCOMMIT', `0x00008b00')
-+define(`SIOCGIWNAME', `0x00008b01')
-+define(`SIOCSIWNWID', `0x00008b02')
-+define(`SIOCGIWNWID', `0x00008b03')
-+define(`SIOCSIWFREQ', `0x00008b04')
-+define(`SIOCGIWFREQ', `0x00008b05')
-+define(`SIOCSIWMODE', `0x00008b06')
-+define(`SIOCGIWMODE', `0x00008b07')
-+define(`SIOCSIWSENS', `0x00008b08')
-+define(`SIOCGIWSENS', `0x00008b09')
-+define(`SIOCSIWRANGE', `0x00008b0a')
-+define(`SIOCGIWRANGE', `0x00008b0b')
-+define(`SIOCSIWPRIV', `0x00008b0c')
-+define(`SIOCGIWPRIV', `0x00008b0d')
-+define(`SIOCSIWSTATS', `0x00008b0e')
-+define(`SIOCGIWSTATS', `0x00008b0f')
-+define(`SIOCSIWSPY', `0x00008b10')
-+define(`SIOCGIWSPY', `0x00008b11')
-+define(`SIOCSIWTHRSPY', `0x00008b12')
-+define(`SIOCGIWTHRSPY', `0x00008b13')
-+define(`SIOCSIWAP', `0x00008b14')
-+define(`SIOCGIWAP', `0x00008b15')
-+define(`SIOCSIWMLME', `0x00008b16')
-+define(`SIOCGIWAPLIST', `0x00008b17')
-+define(`SIOCSIWSCAN', `0x00008b18')
-+define(`SIOCGIWSCAN', `0x00008b19')
-+define(`SIOCSIWESSID', `0x00008b1a')
-+define(`SIOCGIWESSID', `0x00008b1b')
-+define(`SIOCSIWNICKN', `0x00008b1c')
-+define(`SIOCGIWNICKN', `0x00008b1d')
-+define(`SIOCSIWRATE', `0x00008b20')
-+define(`SIOCGIWRATE', `0x00008b21')
-+define(`SIOCSIWRTS', `0x00008b22')
-+define(`SIOCGIWRTS', `0x00008b23')
-+define(`SIOCSIWFRAG', `0x00008b24')
-+define(`SIOCGIWFRAG', `0x00008b25')
-+define(`SIOCSIWTXPOW', `0x00008b26')
-+define(`SIOCGIWTXPOW', `0x00008b27')
-+define(`SIOCSIWRETRY', `0x00008b28')
-+define(`SIOCGIWRETRY', `0x00008b29')
-+define(`SIOCSIWENCODE', `0x00008b2a')
-+define(`SIOCGIWENCODE', `0x00008b2b')
-+define(`SIOCSIWPOWER', `0x00008b2c')
-+define(`SIOCGIWPOWER', `0x00008b2d')
-+define(`SIOCSIWGENIE', `0x00008b30')
-+define(`SIOCGIWGENIE', `0x00008b31')
-+define(`SIOCSIWAUTH', `0x00008b32')
-+define(`SIOCGIWAUTH', `0x00008b33')
-+define(`SIOCSIWENCODEEXT', `0x00008b34')
-+define(`SIOCGIWENCODEEXT', `0x00008b35')
-+define(`SIOCSIWPMKSA', `0x00008b36')
-+define(`SIOCIWFIRSTPRIV', `0x00008be0')
-+define(`SIOCIWFIRSTPRIV_01', `0x00008be1')
-+define(`SIOCIWFIRSTPRIV_02', `0x00008be2')
-+define(`SIOCIWFIRSTPRIV_03', `0x00008be3')
-+define(`SIOCIWFIRSTPRIV_04', `0x00008be4')
-+define(`SIOCIWFIRSTPRIV_05', `0x00008be5')
-+define(`SIOCIWFIRSTPRIV_06', `0x00008be6')
-+define(`SIOCIWFIRSTPRIV_07', `0x00008be7')
-+define(`SIOCIWFIRSTPRIV_08', `0x00008be8')
-+define(`SIOCIWFIRSTPRIV_09', `0x00008be9')
-+define(`SIOCIWFIRSTPRIV_0A', `0x00008bea')
-+define(`SIOCIWFIRSTPRIV_0B', `0x00008beb')
-+define(`SIOCIWFIRSTPRIV_0C', `0x00008bec')
-+define(`SIOCIWFIRSTPRIV_0D', `0x00008bed')
-+define(`SIOCIWFIRSTPRIV_0E', `0x00008bee')
-+define(`SIOCIWFIRSTPRIV_0F', `0x00008bef')
-+define(`SIOCIWFIRSTPRIV_10', `0x00008bf0')
-+define(`SIOCIWFIRSTPRIV_11', `0x00008bf1')
-+define(`SIOCIWFIRSTPRIV_12', `0x00008bf2')
-+define(`SIOCIWFIRSTPRIV_13', `0x00008bf3')
-+define(`SIOCIWFIRSTPRIV_14', `0x00008bf4')
-+define(`SIOCIWFIRSTPRIV_15', `0x00008bf5')
-+define(`SIOCIWFIRSTPRIV_16', `0x00008bf6')
-+define(`SIOCIWFIRSTPRIV_17', `0x00008bf7')
-+define(`SIOCIWFIRSTPRIV_18', `0x00008bf8')
-+define(`SIOCIWFIRSTPRIV_19', `0x00008bf9')
-+define(`SIOCIWFIRSTPRIV_1A', `0x00008bfa')
-+define(`SIOCIWFIRSTPRIV_1B', `0x00008bfb')
-+define(`SIOCIWFIRSTPRIV_1C', `0x00008bfc')
-+define(`SIOCIWFIRSTPRIV_1D', `0x00008bfd')
-+define(`SIOCIWFIRSTPRIV_1E', `0x00008bfe')
-+define(`SIOCIWLASTPRIV', `0x00008bff')
-+define(`AUTOFS_IOC_READY', `0x00009360')
-+define(`AUTOFS_IOC_FAIL', `0x00009361')
-+define(`AUTOFS_IOC_CATATONIC', `0x00009362')
-+define(`BTRFS_IOC_TRANS_START', `0x00009406')
-+define(`BTRFS_IOC_TRANS_END', `0x00009407')
-+define(`BTRFS_IOC_SYNC', `0x00009408')
-+define(`BTRFS_IOC_SCRUB_CANCEL', `0x0000941c')
-+define(`BTRFS_IOC_QUOTA_RESCAN_WAIT', `0x0000942e')
-+define(`NBD_SET_SOCK', `0x0000ab00')
-+define(`NBD_SET_BLKSIZE', `0x0000ab01')
-+define(`NBD_SET_SIZE', `0x0000ab02')
-+define(`NBD_DO_IT', `0x0000ab03')
-+define(`NBD_CLEAR_SOCK', `0x0000ab04')
-+define(`NBD_CLEAR_QUE', `0x0000ab05')
-+define(`NBD_PRINT_DEBUG', `0x0000ab06')
-+define(`NBD_SET_SIZE_BLOCKS', `0x0000ab07')
-+define(`NBD_DISCONNECT', `0x0000ab08')
-+define(`NBD_SET_TIMEOUT', `0x0000ab09')
-+define(`NBD_SET_FLAGS', `0x0000ab0a')
-+define(`RAW_SETBIND', `0x0000ac00')
-+define(`RAW_GETBIND', `0x0000ac01')
-+define(`KVM_GET_API_VERSION', `0x0000ae00')
-+define(`KVM_CREATE_VM', `0x0000ae01')
-+define(`LOGGER_GET_LOG_BUF_SIZE', `0x0000ae01')
-+define(`LOGGER_GET_LOG_LEN', `0x0000ae02')
-+define(`KVM_CHECK_EXTENSION', `0x0000ae03')
-+define(`LOGGER_GET_NEXT_ENTRY_LEN', `0x0000ae03')
-+define(`KVM_GET_VCPU_MMAP_SIZE', `0x0000ae04')
-+define(`LOGGER_FLUSH_LOG', `0x0000ae04')
-+define(`LOGGER_GET_VERSION', `0x0000ae05')
-+define(`KVM_S390_ENABLE_SIE', `0x0000ae06')
-+define(`LOGGER_SET_VERSION', `0x0000ae06')
-+define(`KVM_CREATE_VCPU', `0x0000ae41')
-+define(`KVM_SET_NR_MMU_PAGES', `0x0000ae44')
-+define(`KVM_GET_NR_MMU_PAGES', `0x0000ae45')
-+define(`KVM_SET_TSS_ADDR', `0x0000ae47')
-+define(`KVM_CREATE_IRQCHIP', `0x0000ae60')
-+define(`KVM_CREATE_PIT', `0x0000ae64')
-+define(`KVM_REINJECT_CONTROL', `0x0000ae71')
-+define(`KVM_SET_BOOT_CPU_ID', `0x0000ae78')
-+define(`KVM_RUN', `0x0000ae80')
-+define(`KVM_S390_INITIAL_RESET', `0x0000ae97')
-+define(`KVM_NMI', `0x0000ae9a')
-+define(`KVM_SET_TSC_KHZ', `0x0000aea2')
-+define(`KVM_GET_TSC_KHZ', `0x0000aea3')
-+define(`KVM_KVMCLOCK_CTRL', `0x0000aead')
-+define(`VHOST_SET_OWNER', `0x0000af01')
-+define(`VHOST_RESET_OWNER', `0x0000af02')
-+define(`PPPOEIOCDFWD', `0x0000b101')
-+define(`IOCTL_EVTCHN_BIND_VIRQ', `0x00044500')
-+define(`IOCTL_EVTCHN_BIND_UNBOUND_PORT', `0x00044502')
-+define(`IOCTL_EVTCHN_UNBIND', `0x00044503')
-+define(`IOCTL_EVTCHN_NOTIFY', `0x00044504')
-+define(`IOCTL_EVTCHN_BIND_INTERDOMAIN', `0x00084501')
-+define(`SNDRV_SEQ_IOCTL_SET_QUEUE_OWNER', `0x40005344')
-+define(`MFB_SET_ALPHA', `0x40014d00')
-+define(`MFB_SET_GAMMA', `0x40014d01')
-+define(`MFB_SET_BRIGHTNESS', `0x40014d03')
-+define(`SPI_IOC_WR_MODE', `0x40016b01')
-+define(`SPI_IOC_WR_LSB_FIRST', `0x40016b02')
-+define(`SPI_IOC_WR_BITS_PER_WORD', `0x40016b03')
-+define(`PPWCONTROL', `0x40017084')
-+define(`PPWDATA', `0x40017086')
-+define(`PPWCTLONIRQ', `0x40017092')
-+define(`PHONE_MAXRINGS', `0x40017185')
-+define(`PHONE_PLAY_TONE', `0x4001719b')
-+define(`SONYPI_IOCSBRT', `0x40017600')
-+define(`SONYPI_IOCSBLUE', `0x40017609')
-+define(`SONYPI_IOCSFAN', `0x4001760b')
-+define(`ATM_SETBACKEND', `0x400261f2')
-+define(`ATM_NEWBACKENDIF', `0x400261f3')
-+define(`NCP_IOC_GETMOUNTUID', `0x40026e02')
-+define(`AUDIO_SET_ATTRIBUTES', `0x40026f11')
-+define(`DMX_ADD_PID', `0x40026f33')
-+define(`DMX_REMOVE_PID', `0x40026f34')
-+define(`PPFCONTROL', `0x4002708e')
-+define(`PHONE_RING_CADENCE', `0x40027186')
-+define(`SET_BITMAP_FILE', `0x4004092b')
-+define(`IB_USER_MAD_UNREGISTER_AGENT', `0x40041b02')
-+define(`FW_CDEV_IOC_DEALLOCATE', `0x40042303')
-+define(`FW_CDEV_IOC_INITIATE_BUS_RESET', `0x40042305')
-+define(`FW_CDEV_IOC_REMOVE_DESCRIPTOR', `0x40042307')
-+define(`FW_CDEV_IOC_STOP_ISO', `0x4004230b')
-+define(`FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE', `0x4004230e')
-+define(`FW_CDEV_IOC_FLUSH_ISO', `0x40042318')
-+define(`BLKI2OSRSTRAT', `0x40043203')
-+define(`BLKI2OSWSTRAT', `0x40043204')
-+define(`SNAPSHOT_CREATE_IMAGE', `0x40043311')
-+define(`PTP_ENABLE_PPS', `0x40043d04')
-+define(`SYNC_IOC_WAIT', `0x40043e00')
-+define(`SNDRV_PCM_IOCTL_TSTAMP', `0x40044102')
-+define(`SNDRV_PCM_IOCTL_TTSTAMP', `0x40044103')
-+define(`AGPIOC_DEALLOCATE', `0x40044107')
-+define(`SNDRV_PCM_IOCTL_PAUSE', `0x40044145')
-+define(`SNDRV_PCM_IOCTL_LINK', `0x40044160')
-+define(`CCISS_REGNEWDISK', `0x4004420d')
-+define(`EVIOCRMFF', `0x40044581')
-+define(`EVIOCGRAB', `0x40044590')
-+define(`EVIOCREVOKE', `0x40044591')
-+define(`EVIOCSCLOCKID', `0x400445a0')
-+define(`FBIOPUT_CONTRAST', `0x40044602')
-+define(`FBIPUT_BRIGHTNESS', `0x40044603')
-+define(`FBIPUT_COLOR', `0x40044606')
-+define(`FBIPUT_HSYNC', `0x40044609')
-+define(`FBIPUT_VSYNC', `0x4004460a')
-+define(`FBIO_WAITFORVSYNC', `0x40044620')
-+define(`SSTFB_SET_VGAPASS', `0x400446dd')
-+define(`HIDIOCSFLAG', `0x4004480f')
-+define(`SNDRV_EMU10K1_IOCTL_TRAM_SETUP', `0x40044820')
-+define(`SNDRV_DM_FM_IOCTL_SET_MODE', `0x40044825')
-+define(`SNDRV_DM_FM_IOCTL_SET_CONNECTION', `0x40044826')
-+define(`SNDRV_EMU10K1_IOCTL_SINGLE_STEP', `0x40044883')
-+define(`SNDRV_EMUX_IOCTL_MEM_AVAIL', `0x40044884')
-+define(`HCIDEVUP', `0x400448c9')
-+define(`HCIDEVDOWN', `0x400448ca')
-+define(`HCIDEVRESET', `0x400448cb')
-+define(`HCIDEVRESTAT', `0x400448cc')
-+define(`HCISETRAW', `0x400448dc')
-+define(`HCISETSCAN', `0x400448dd')
-+define(`HCISETAUTH', `0x400448de')
-+define(`HCISETENCRYPT', `0x400448df')
-+define(`HCISETPTYPE', `0x400448e0')
-+define(`HCISETLINKPOL', `0x400448e1')
-+define(`HCISETLINKMODE', `0x400448e2')
-+define(`HCISETACLMTU', `0x400448e3')
-+define(`HCISETSCOMTU', `0x400448e4')
-+define(`HCIBLOCKADDR', `0x400448e6')
-+define(`HCIUNBLOCKADDR', `0x400448e7')
-+define(`MFB_SET_PIXFMT', `0x40044d08')
-+define(`OTPGETREGIONCOUNT', `0x40044d0e')
-+define(`UBI_IOCEBER', `0x40044f01')
-+define(`UBI_IOCEBCH', `0x40044f02')
-+define(`UBI_IOCEBUNMAP', `0x40044f04')
-+define(`OMAPFB_MIRROR', `0x40044f1f')
-+define(`OMAPFB_SET_UPDATE_MODE', `0x40044f28')
-+define(`OMAPFB_GET_UPDATE_MODE', `0x40044f2b')
-+define(`OMAPFB_LCD_TEST', `0x40044f2d')
-+define(`OMAPFB_CTRL_TEST', `0x40044f2e')
-+define(`SNDCTL_DSP_SETTRIGGER', `0x40045010')
-+define(`SNDCTL_DSP_PROFILE', `0x40045017')
-+define(`SNDCTL_DSP_SETSPDIF', `0x40045042')
-+define(`SNDCTL_SEQ_PERCMODE', `0x40045106')
-+define(`SNDCTL_SEQ_TESTMIDI', `0x40045108')
-+define(`SNDCTL_SEQ_RESETSAMPLES', `0x40045109')
-+define(`SNDCTL_SEQ_THRESHOLD', `0x4004510d')
-+define(`SNDCTL_FM_4OP_ENABLE', `0x4004510f')
-+define(`RNDADDTOENTCNT', `0x40045201')
-+define(`SAA6588_CMD_CLOSE', `0x40045202')
-+define(`RFCOMMCREATEDEV', `0x400452c8')
-+define(`RFCOMMRELEASEDEV', `0x400452c9')
-+define(`RFCOMMSTEALDLC', `0x400452dc')
-+define(`SNDRV_TIMER_IOCTL_TREAD', `0x40045402')
-+define(`SNDCTL_TMR_METRONOME', `0x40045407')
-+define(`SNDCTL_TMR_SELECT', `0x40045408')
-+define(`TIOCSPTLCK', `0x40045431')
-+define(`TIOCSIG', `0x40045436')
-+define(`TUNSETNOCSUM', `0x400454c8')
-+define(`TUNSETDEBUG', `0x400454c9')
-+define(`TUNSETIFF', `0x400454ca')
-+define(`TUNSETPERSIST', `0x400454cb')
-+define(`TUNSETOWNER', `0x400454cc')
-+define(`TUNSETLINK', `0x400454cd')
-+define(`TUNSETGROUP', `0x400454ce')
-+define(`TUNSETOFFLOAD', `0x400454d0')
-+define(`TUNSETTXFILTER', `0x400454d1')
-+define(`TUNSETSNDBUF', `0x400454d4')
-+define(`TUNSETVNETHDRSZ', `0x400454d8')
-+define(`TUNSETQUEUE', `0x400454d9')
-+define(`TUNSETIFINDEX', `0x400454da')
-+define(`TUNSETVNETLE', `0x400454dc')
-+define(`USBDEVFS_REAPURB32', `0x4004550c')
-+define(`USBDEVFS_REAPURBNDELAY32', `0x4004550d')
-+define(`SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE', `0x40045532')
-+define(`SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE', `0x40045542')
-+define(`UI_SET_EVBIT', `0x40045564')
-+define(`UI_SET_KEYBIT', `0x40045565')
-+define(`UI_SET_RELBIT', `0x40045566')
-+define(`UI_SET_ABSBIT', `0x40045567')
-+define(`UI_SET_MSCBIT', `0x40045568')
-+define(`UI_SET_LEDBIT', `0x40045569')
-+define(`UI_SET_SNDBIT', `0x4004556a')
-+define(`UI_SET_FFBIT', `0x4004556b')
-+define(`UI_SET_SWBIT', `0x4004556d')
-+define(`UI_SET_PROPBIT', `0x4004556e')
-+define(`VIDIOC_OVERLAY', `0x4004560e')
-+define(`VIDIOC_STREAMON', `0x40045612')
-+define(`VIDIOC_STREAMOFF', `0x40045613')
-+define(`VIDIOC_S_PRIORITY', `0x40045644')
-+define(`IVTV_IOC_PASSTHROUGH_MODE', `0x400456c1')
-+define(`SW_SYNC_IOC_INC', `0x40045701')
-+define(`SNDRV_RAWMIDI_IOCTL_DROP', `0x40045730')
-+define(`SNDRV_RAWMIDI_IOCTL_DRAIN', `0x40045731')
-+define(`SONET_SETFRAMING', `0x40046115')
-+define(`ATM_SETSC', `0x400461f1')
-+define(`ATM_DROPPARTY', `0x400461f5')
-+define(`BINDER_SET_MAX_THREADS', `0x40046205')
-+define(`BINDER_SET_IDLE_PRIORITY', `0x40046206')
-+define(`BINDER_SET_CONTEXT_MGR', `0x40046207')
-+define(`BINDER_THREAD_EXIT', `0x40046208')
-+define(`BC_ACQUIRE_RESULT', `0x40046302')
-+define(`BC_INCREFS', `0x40046304')
-+define(`BC_ACQUIRE', `0x40046305')
-+define(`CHIOSPICKER', `0x40046305')
-+define(`BC_RELEASE', `0x40046306')
-+define(`BC_DECREFS', `0x40046307')
-+define(`DRM_IOCTL_AUTH_MAGIC', `0x40046411')
-+define(`DRM_IOCTL_I915_IRQ_WAIT', `0x40046445')
-+define(`DRM_IOCTL_MSM_GEM_CPU_FINI', `0x40046445')
-+define(`DRM_IOCTL_RADEON_FULLSCREEN', `0x40046446')
-+define(`DRM_IOCTL_MGA_SET_FENCE', `0x4004644a')
-+define(`DRM_IOCTL_I915_DESTROY_HEAP', `0x4004644c')
-+define(`DRM_IOCTL_I915_SET_VBLANK_PIPE', `0x4004644d')
-+define(`DRM_IOCTL_R128_FULLSCREEN', `0x40046450')
-+define(`DRM_IOCTL_RADEON_IRQ_WAIT', `0x40046457')
-+define(`DRM_IOCTL_RADEON_SURF_FREE', `0x4004645b')
-+define(`DRM_IOCTL_I915_GEM_SW_FINISH', `0x40046460')
-+define(`VIDIOC_INT_RESET', `0x40046466')
-+define(`DRM_IOCTL_NOUVEAU_GEM_CPU_FINI', `0x40046483')
-+define(`FS_IOC32_SETFLAGS', `0x40046602')
-+define(`LIRC_SET_SEND_MODE', `0x40046911')
-+define(`LIRC_SET_REC_MODE', `0x40046912')
-+define(`LIRC_SET_SEND_CARRIER', `0x40046913')
-+define(`LIRC_SET_REC_CARRIER', `0x40046914')
-+define(`LIRC_SET_SEND_DUTY_CYCLE', `0x40046915')
-+define(`LIRC_SET_REC_DUTY_CYCLE', `0x40046916')
-+define(`LIRC_SET_TRANSMITTER_MASK', `0x40046917')
-+define(`LIRC_SET_REC_TIMEOUT', `0x40046918')
-+define(`LIRC_SET_REC_TIMEOUT_REPORTS', `0x40046919')
-+define(`LIRC_SET_REC_FILTER_PULSE', `0x4004691a')
-+define(`LIRC_SET_REC_FILTER_SPACE', `0x4004691b')
-+define(`LIRC_SET_REC_FILTER', `0x4004691c')
-+define(`LIRC_SET_MEASURE_CARRIER_MODE', `0x4004691d')
-+define(`LIRC_SET_REC_DUTY_CYCLE_RANGE', `0x4004691e')
-+define(`IPMICTL_SET_MAINTENANCE_MODE_CMD', `0x4004691f')
-+define(`LIRC_SET_REC_CARRIER_RANGE', `0x4004691f')
-+define(`LIRC_SET_WIDEBAND_RECEIVER', `0x40046923')
-+define(`SPI_IOC_WR_MAX_SPEED_HZ', `0x40046b04')
-+define(`SPI_IOC_WR_MODE32', `0x40046b05')
-+define(`MSMFB_GRP_DISP', `0x40046d01')
-+define(`MSMFB_BLIT', `0x40046d02')
-+define(`NCP_IOC_SET_SIGN_WANTED', `0x40046e06')
-+define(`NCP_IOC_GETDENTRYTTL', `0x40046e0c')
-+define(`SISFB_SET_AUTOMAXIMIZE_OLD', `0x40046efa')
-+define(`UBI_IOCRMVOL', `0x40046f01')
-+define(`DMX_SET_SOURCE', `0x40046f31')
-+define(`UBI_IOCDET', `0x40046f41')
-+define(`PPSETMODE', `0x40047080')
-+define(`PPDATADIR', `0x40047090')
-+define(`PPNEGOT', `0x40047091')
-+define(`PPSETPHASE', `0x40047094')
-+define(`PPSETFLAGS', `0x4004709b')
-+define(`PHONE_REC_CODEC', `0x40047189')
-+define(`PHONE_REC_DEPTH', `0x4004718c')
-+define(`PHONE_FRAME', `0x4004718d')
-+define(`PHONE_REC_VOLUME', `0x4004718e')
-+define(`PHONE_PLAY_CODEC', `0x40047190')
-+define(`PHONE_PLAY_DEPTH', `0x40047193')
-+define(`PHONE_PLAY_VOLUME', `0x40047194')
-+define(`PHONE_DTMF_OOB', `0x40047199')
-+define(`PHONE_SET_TONE_ON_TIME', `0x4004719c')
-+define(`PHONE_SET_TONE_OFF_TIME', `0x4004719d')
-+define(`PHONE_PSTN_SET_STATE', `0x400471a4')
-+define(`PHONE_WINK_DURATION', `0x400471a6')
-+define(`PHONE_VAD', `0x400471a9')
-+define(`PHONE_WINK', `0x400471aa')
-+define(`IXJCTL_GET_FILTER_HIST', `0x400471c8')
-+define(`IXJCTL_AEC_START', `0x400471cb')
-+define(`IXJCTL_SET_LED', `0x400471ce')
-+define(`IXJCTL_MIXER', `0x400471cf')
-+define(`IXJCTL_DAA_COEFF_SET', `0x400471d0')
-+define(`IXJCTL_PORT', `0x400471d1')
-+define(`IXJCTL_DAA_AGAIN', `0x400471d2')
-+define(`IXJCTL_POTS_PSTN', `0x400471d5')
-+define(`PHONE_REC_VOLUME_LINEAR', `0x400471db')
-+define(`PHONE_PLAY_VOLUME_LINEAR', `0x400471dc')
-+define(`IXJCTL_HZ', `0x400471e0')
-+define(`IXJCTL_RATE', `0x400471e1')
-+define(`IXJCTL_DTMF_PRESCALE', `0x400471e8')
-+define(`IXJCTL_SC_RXG', `0x400471ea')
-+define(`IXJCTL_SC_TXG', `0x400471eb')
-+define(`IXJCTL_INTERCOM_START', `0x400471fd')
-+define(`IXJCTL_INTERCOM_STOP', `0x400471fe')
-+define(`FAT_IOCTL_SET_ATTRIBUTES', `0x40047211')
-+define(`V4L2_SUBDEV_IR_RX_NOTIFY', `0x40047600')
-+define(`V4L2_SUBDEV_IR_TX_NOTIFY', `0x40047601')
-+define(`FS_IOC32_SETVERSION', `0x40047602')
-+define(`MEYEIOC_QBUF_CAPT', `0x400476c2')
-+define(`OSIOCSNETADDR', `0x400489e0')
-+define(`SIOCSNETADDR', `0x400489e0')
-+define(`AUTOFS_IOC_EXPIRE_MULTI', `0x40049366')
-+define(`BTRFS_IOC_CLONE', `0x40049409')
-+define(`BTRFS_IOC_BALANCE_CTL', `0x40049421')
-+define(`KVM_INTERRUPT', `0x4004ae86')
-+define(`KVM_SET_SIGNAL_MASK', `0x4004ae8b')
-+define(`KVM_SET_MP_STATE', `0x4004ae99')
-+define(`VHOST_SET_LOG_FD', `0x4004af07')
-+define(`VHOST_SCSI_GET_ABI_VERSION', `0x4004af42')
-+define(`VHOST_SCSI_SET_EVENTS_MISSED', `0x4004af43')
-+define(`VHOST_SCSI_GET_EVENTS_MISSED', `0x4004af44')
-+define(`SISFB_SET_AUTOMAXIMIZE', `0x4004f303')
-+define(`SISFB_SET_TVPOSOFFSET', `0x4004f304')
-+define(`SISFB_SET_LOCK', `0x4004f306')
-+define(`GIGASET_BRKCHARS', `0x40064702')
-+define(`MEYEIOC_S_PARAMS', `0x400676c1')
-+define(`FE_DISEQC_SEND_MASTER_CMD', `0x40076f3f')
-+define(`BLKBSZSET', `0x40081271')
-+define(`FW_CDEV_IOC_RECEIVE_PHY_PACKETS', `0x40082316')
-+define(`PERF_EVENT_IOC_PERIOD', `0x40082404')
-+define(`PERF_EVENT_IOC_SET_FILTER', `0x40082406')
-+define(`FBIO_RADEON_SET_MIRROR', `0x40084004')
-+define(`AGPIOC_SETUP', `0x40084103')
-+define(`AGPIOC_RESERVE', `0x40084104')
-+define(`AGPIOC_PROTECT', `0x40084105')
-+define(`AGPIOC_BIND', `0x40084108')
-+define(`AGPIOC_UNBIND', `0x40084109')
-+define(`SNDRV_PCM_IOCTL_REWIND', `0x40084146')
-+define(`SNDRV_PCM_IOCTL_FORWARD', `0x40084149')
-+define(`PMU_IOC_SET_BACKLIGHT', `0x40084202')
-+define(`CCISS_SETINTINFO', `0x40084203')
-+define(`APEI_ERST_CLEAR_RECORD', `0x40084501')
-+define(`EVIOCSREP', `0x40084503')
-+define(`EVIOCSKEYCODE', `0x40084504')
-+define(`SNDRV_SB_CSP_IOCTL_START', `0x40084813')
-+define(`SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE', `0x40084842')
-+define(`MEMERASE', `0x40084d02')
-+define(`MFB_SET_AOID', `0x40084d04')
-+define(`MEMLOCK', `0x40084d05')
-+define(`MEMUNLOCK', `0x40084d06')
-+define(`MEMGETBADBLOCK', `0x40084d0b')
-+define(`MEMSETBADBLOCK', `0x40084d0c')
-+define(`UBI_IOCVOLUP', `0x40084f00')
-+define(`UBI_IOCEBMAP', `0x40084f03')
-+define(`OMAPFB_SETUP_MEM', `0x40084f37')
-+define(`OMAPFB_QUERY_MEM', `0x40084f38')
-+define(`OMAPFB_SET_TEARSYNC', `0x40084f3e')
-+define(`SNDCTL_SEQ_OUTOFBAND', `0x40085112')
-+define(`RNDADDENTROPY', `0x40085203')
-+define(`TFD_IOC_SET_TICKS', `0x40085400')
-+define(`USBDEVFS_REAPURB', `0x4008550c')
-+define(`USBDEVFS_REAPURBNDELAY', `0x4008550d')
-+define(`USBDEVFS_CONNECTINFO', `0x40085511')
-+define(`UI_SET_PHYS', `0x4008556c')
-+define(`VIDIOC_S_STD', `0x40085618')
-+define(`VPFE_CMD_S_CCDC_RAW_PARAMS', `0x400856c1')
-+define(`BINDER_SET_IDLE_TIMEOUT', `0x40086203')
-+define(`CM_IOCSPTS', `0x40086302')
-+define(`BC_FREE_BUFFER', `0x40086303')
-+define(`BC_ATTEMPT_ACQUIRE', `0x4008630a')
-+define(`BC_DEAD_BINDER_DONE', `0x40086310')
-+define(`CM_IOSDBGLVL', `0x400863fa')
-+define(`DRM_IOCTL_MODESET_CTL', `0x40086408')
-+define(`DRM_IOCTL_GEM_CLOSE', `0x40086409')
-+define(`DRM_IOCTL_CONTROL', `0x40086414')
-+define(`DRM_IOCTL_MOD_CTX', `0x40086422')
-+define(`DRM_IOCTL_SWITCH_CTX', `0x40086424')
-+define(`DRM_IOCTL_NEW_CTX', `0x40086425')
-+define(`DRM_IOCTL_LOCK', `0x4008642a')
-+define(`DRM_IOCTL_UNLOCK', `0x4008642b')
-+define(`DRM_IOCTL_FINISH', `0x4008642c')
-+define(`DRM_IOCTL_AGP_ENABLE', `0x40086432')
-+define(`DRM_IOCTL_MGA_FLUSH', `0x40086441')
-+define(`DRM_IOCTL_R128_CCE_STOP', `0x40086442')
-+define(`DRM_IOCTL_RADEON_CP_STOP', `0x40086442')
-+define(`DRM_IOCTL_SAVAGE_BCI_EVENT_WAIT', `0x40086443')
-+define(`DRM_IOCTL_OMAP_GEM_CPU_PREP', `0x40086444')
-+define(`DRM_IOCTL_QXL_CLIENTCAP', `0x40086445')
-+define(`DRM_IOCTL_I915_SETPARAM', `0x40086447')
-+define(`DRM_IOCTL_I915_FREE', `0x40086449')
-+define(`DRM_IOCTL_RADEON_STIPPLE', `0x4008644c')
-+define(`DRM_IOCTL_R128_STIPPLE', `0x4008644d')
-+define(`DRM_IOCTL_VIA_BLIT_SYNC', `0x4008644f')
-+define(`DRM_IOCTL_RADEON_FREE', `0x40086454')
-+define(`DRM_IOCTL_I915_GEM_UNPIN', `0x40086456')
-+define(`DRM_IOCTL_RADEON_GEM_WAIT_IDLE', `0x40086464')
-+define(`DRM_IOCTL_I915_GEM_CONTEXT_DESTROY', `0x4008646e')
-+define(`DRM_IOCTL_I915_GEM_SET_CACHING', `0x4008646f')
-+define(`DRM_IOCTL_NOUVEAU_GEM_CPU_PREP', `0x40086482')
-+define(`FS_IOC_SETFLAGS', `0x40086602')
-+define(`HPET_IRQFREQ', `0x40086806')
-+define(`MTIOCTOP', `0x40086d01')
-+define(`NCP_IOC_GETMOUNTUID2', `0x40086e02')
-+define(`NILFS_IOCTL_DELETE_CHECKPOINT', `0x40086e81')
-+define(`NILFS_IOCTL_RESIZE', `0x40086e8b')
-+define(`MATROXFB_SET_OUTPUT_CONNECTION', `0x40086ef8')
-+define(`MATROXFB_SET_OUTPUT_MODE', `0x40086efa')
-+define(`AUDIO_SET_MIXER', `0x40086f0e')
-+define(`VIDEO_SET_SPU', `0x40086f32')
-+define(`CA_SET_PID', `0x40086f87')
-+define(`PHN_SET_REG', `0x40087001')
-+define(`PHN_SET_REGS', `0x40087003')
-+define(`PHN_SETREG', `0x40087006')
-+define(`RTC_IRQP_SET', `0x4008700c')
-+define(`RTC_EPOCH_SET', `0x4008700e')
-+define(`PPS_SETPARAMS', `0x400870a2')
-+define(`PPS_KC_BIND', `0x400870a5')
-+define(`SPIOCSTYPE', `0x40087101')
-+define(`PHONE_CAPABILITIES_CHECK', `0x40087182')
-+define(`PHONE_RING_START', `0x40087187')
-+define(`IXJCTL_SET_FILTER', `0x400871c7')
-+define(`IXJCTL_INIT_TONE', `0x400871c9')
-+define(`IXJCTL_TONE_CADENCE', `0x400871ca')
-+define(`IXJCTL_FILTER_CADENCE', `0x400871d6')
-+define(`IXJCTL_CIDCW', `0x400871d9')
-+define(`IXJCTL_SET_FILTER_RAW', `0x400871dd')
-+define(`IXJCTL_SIGCTL', `0x400871e9')
-+define(`FS_IOC_SETVERSION', `0x40087602')
-+define(`ASHMEM_SET_SIZE', `0x40087703')
-+define(`ASHMEM_SET_PROT_MASK', `0x40087705')
-+define(`ASHMEM_PIN', `0x40087707')
-+define(`ASHMEM_UNPIN', `0x40087708')
-+define(`BTRFS_IOC_DEFAULT_SUBVOL', `0x40089413')
-+define(`BTRFS_IOC_WAIT_SYNC', `0x40089416')
-+define(`BTRFS_IOC_SUBVOL_SETFLAGS', `0x4008941a')
-+define(`KVM_SET_IDENTITY_MAP_ADDR', `0x4008ae48')
-+define(`KVM_S390_VCPU_FAULT', `0x4008ae52')
-+define(`KVM_IRQ_LINE', `0x4008ae61')
-+define(`KVM_SET_GSI_ROUTING', `0x4008ae6a')
-+define(`KVM_ASSIGN_SET_MSIX_NR', `0x4008ae73')
-+define(`KVM_SET_MSRS', `0x4008ae89')
-+define(`KVM_SET_CPUID', `0x4008ae8a')
-+define(`KVM_SET_CPUID2', `0x4008ae90')
-+define(`KVM_SET_VAPIC_ADDR', `0x4008ae93')
-+define(`KVM_S390_STORE_STATUS', `0x4008ae95')
-+define(`KVM_X86_SETUP_MCE', `0x4008ae9c')
-+define(`VHOST_SET_FEATURES', `0x4008af00')
-+define(`VHOST_SET_MEM_TABLE', `0x4008af03')
-+define(`VHOST_SET_LOG_BASE', `0x4008af04')
-+define(`VHOST_SET_VRING_NUM', `0x4008af10')
-+define(`VHOST_SET_VRING_BASE', `0x4008af12')
-+define(`VHOST_SET_VRING_KICK', `0x4008af20')
-+define(`VHOST_SET_VRING_CALL', `0x4008af21')
-+define(`VHOST_SET_VRING_ERR', `0x4008af22')
-+define(`VHOST_NET_SET_BACKEND', `0x4008af30')
-+define(`PPPOEIOCSFWD', `0x4008b100')
-+define(`IOW_WRITE', `0x4008c001')
-+define(`IOW_READ', `0x4008c002')
-+define(`REISERFS_IOC_UNPACK', `0x4008cd01')
-+define(`SNDRV_DM_FM_IOCTL_SET_PARAMS', `0x40094824')
-+define(`FDFMTTRK', `0x400c0248')
-+define(`RUN_ARRAY', `0x400c0930')
-+define(`SNAPSHOT_SET_SWAP_AREA', `0x400c330d')
-+define(`CAPI_REGISTER', `0x400c4301')
-+define(`HIDIOCGREPORT', `0x400c4807')
-+define(`HIDIOCSREPORT', `0x400c4808')
-+define(`SNDRV_DM_FM_IOCTL_PLAY_NOTE', `0x400c4822')
-+define(`MFB_SET_CHROMA_KEY', `0x400c4d01')
-+define(`OTPGETREGIONINFO', `0x400c4d0f')
-+define(`UI_END_FF_ERASE', `0x400c55cb')
-+define(`CHIOPOSITION', `0x400c6303')
-+define(`BC_REQUEST_DEATH_NOTIFICATION', `0x400c630e')
-+define(`BC_CLEAR_DEATH_NOTIFICATION', `0x400c630f')
-+define(`DRM_IOCTL_I810_VERTEX', `0x400c6441')
-+define(`DRM_IOCTL_I810_CLEAR', `0x400c6442')
-+define(`DRM_IOCTL_MGA_VERTEX', `0x400c6445')
-+define(`DRM_IOCTL_MGA_ILOAD', `0x400c6447')
-+define(`DRM_IOCTL_I915_INIT_HEAP', `0x400c644a')
-+define(`DRM_IOCTL_RADEON_INIT_HEAP', `0x400c6455')
-+define(`DRM_IOCTL_RADEON_SURF_ALLOC', `0x400c645a')
-+define(`DRM_IOCTL_I915_GEM_SET_DOMAIN', `0x400c645f')
-+define(`I2OEVTREG', `0x400c690a')
-+define(`HSC_SET_RX', `0x400c6b13')
-+define(`HSC_GET_RX', `0x400c6b14')
-+define(`NCP_IOC_GETROOT', `0x400c6e08')
-+define(`UBI_IOCRSVOL', `0x400c6f02')
-+define(`AUDIO_SET_KARAOKE', `0x400c6f12')
-+define(`KVM_CREATE_SPAPR_TCE', `0x400caea8')
-+define(`MBXFB_IOCS_REG', `0x400cf404')
-+define(`FW_CDEV_IOC_START_ISO', `0x4010230a')
-+define(`FW_CDEV_IOC_SET_ISO_CHANNELS', `0x40102317')
-+define(`PTP_EXTTS_REQUEST', `0x40103d02')
-+define(`CCISS_SETNODENAME', `0x40104205')
-+define(`SNDRV_EMU10K1_IOCTL_TRAM_POKE', `0x40104821')
-+define(`MTRRIOC_ADD_ENTRY', `0x40104d00')
-+define(`MTRRIOC_SET_ENTRY', `0x40104d01')
-+define(`MTRRIOC_DEL_ENTRY', `0x40104d02')
-+define(`MTRRIOC_KILL_ENTRY', `0x40104d04')
-+define(`MTRRIOC_ADD_PAGE_ENTRY', `0x40104d05')
-+define(`MTRRIOC_SET_PAGE_ENTRY', `0x40104d06')
-+define(`MTRRIOC_DEL_PAGE_ENTRY', `0x40104d07')
-+define(`MTRRIOC_KILL_PAGE_ENTRY', `0x40104d09')
-+define(`MEMERASE64', `0x40104d14')
-+define(`UBI_IOCSETVOLPROP', `0x40104f06')
-+define(`OMAPFB_SET_COLOR_KEY', `0x40104f32')
-+define(`OMAPFB_GET_COLOR_KEY', `0x40104f33')
-+define(`TUNATTACHFILTER', `0x401054d5')
-+define(`TUNDETACHFILTER', `0x401054d6')
-+define(`ANDROID_ALARM_SET_RTC', `0x40106105')
-+define(`IDT77105_GETSTAT', `0x40106132')
-+define(`IDT77105_GETSTATZ', `0x40106133')
-+define(`ATM_GETSTAT', `0x40106150')
-+define(`ATM_GETSTATZ', `0x40106151')
-+define(`ATM_GETLOOP', `0x40106152')
-+define(`ATM_SETLOOP', `0x40106153')
-+define(`ATM_QUERYLOOP', `0x40106154')
-+define(`ENI_MEMDUMP', `0x40106160')
-+define(`HE_GET_REG', `0x40106160')
-+define(`ZATM_GETPOOL', `0x40106161')
-+define(`NS_SETBUFLEV', `0x40106162')
-+define(`ZATM_GETPOOLZ', `0x40106162')
-+define(`ZATM_SETPOOL', `0x40106163')
-+define(`ENI_SETMULT', `0x40106167')
-+define(`ATM_GETLINKRATE', `0x40106181')
-+define(`ATM_GETNAMES', `0x40106183')
-+define(`ATM_GETTYPE', `0x40106184')
-+define(`ATM_GETESI', `0x40106185')
-+define(`ATM_GETADDR', `0x40106186')
-+define(`ATM_RSTADDR', `0x40106187')
-+define(`ATM_ADDADDR', `0x40106188')
-+define(`ATM_DELADDR', `0x40106189')
-+define(`ATM_GETCIRANGE', `0x4010618a')
-+define(`ATM_SETCIRANGE', `0x4010618b')
-+define(`ATM_SETESI', `0x4010618c')
-+define(`ATM_SETESIF', `0x4010618d')
-+define(`ATM_ADDLECSADDR', `0x4010618e')
-+define(`ATM_DELLECSADDR', `0x4010618f')
-+define(`ATM_GETLECSADDR', `0x40106190')
-+define(`ATM_ADDPARTY', `0x401061f4')
-+define(`BC_INCREFS_DONE', `0x40106308')
-+define(`CHIOGSTATUS', `0x40106308')
-+define(`BC_ACQUIRE_DONE', `0x40106309')
-+define(`DRM_IOCTL_SET_CLIENT_CAP', `0x4010640d')
-+define(`DRM_IOCTL_SET_UNIQUE', `0x40106410')
-+define(`DRM_IOCTL_FREE_BUFS', `0x4010641a')
-+define(`DRM_IOCTL_SET_SAREA_CTX', `0x4010641c')
-+define(`DRM_IOCTL_AGP_BIND', `0x40106436')
-+define(`DRM_IOCTL_AGP_UNBIND', `0x40106437')
-+define(`DRM_IOCTL_SG_FREE', `0x40106439')
-+define(`DRM_IOCTL_OMAP_SET_PARAM', `0x40106441')
-+define(`DRM_IOCTL_QXL_EXECBUFFER', `0x40106442')
-+define(`DRM_IOCTL_OMAP_GEM_CPU_FINI', `0x40106445')
-+define(`DRM_IOCTL_VIA_DEC_FUTEX', `0x40106445')
-+define(`DRM_IOCTL_MGA_INDICES', `0x40106446')
-+define(`DRM_IOCTL_I810_COPY', `0x40106447')
-+define(`DRM_IOCTL_VIA_CMDBUFFER', `0x40106448')
-+define(`DRM_IOCTL_R128_VERTEX', `0x40106449')
-+define(`DRM_IOCTL_RADEON_VERTEX', `0x40106449')
-+define(`DRM_IOCTL_VIA_PCICMD', `0x4010644a')
-+define(`DRM_IOCTL_I915_HWS_ADDR', `0x40106451')
-+define(`DRM_IOCTL_I915_GEM_INIT', `0x40106453')
-+define(`DRM_IOCTL_SIS_FB_INIT', `0x40106456')
-+define(`DRM_IOCTL_RADEON_SETPARAM', `0x40106459')
-+define(`TUNER_SET_CONFIG', `0x4010645c')
-+define(`HSC_SET_TX', `0x40106b15')
-+define(`HSC_GET_TX', `0x40106b16')
-+define(`MGSL_IOCSGPIO', `0x40106d10')
-+define(`NILFS_IOCTL_CHANGE_CPMODE', `0x40106e80')
-+define(`NILFS_IOCTL_SET_ALLOC_RANGE', `0x40106e8c')
-+define(`VIDEO_STILLPICTURE', `0x40106f1e')
-+define(`VIDEO_SET_HIGHLIGHT', `0x40106f27')
-+define(`VIDEO_SET_SPU_PALETTE', `0x40106f33')
-+define(`FE_SET_PROPERTY', `0x40106f52')
-+define(`CA_SET_DESCR', `0x40106f86')
-+define(`PPSETTIME', `0x40107096')
-+define(`BTRFS_IOC_QGROUP_CREATE', `0x4010942a')
-+define(`GENWQE_WRITE_REG64', `0x4010a51f')
-+define(`GENWQE_WRITE_REG32', `0x4010a521')
-+define(`GENWQE_WRITE_REG16', `0x4010a523')
-+define(`KVM_GET_DIRTY_LOG', `0x4010ae42')
-+define(`KVM_REGISTER_COALESCED_MMIO', `0x4010ae67')
-+define(`KVM_UNREGISTER_COALESCED_MMIO', `0x4010ae68')
-+define(`KVM_ASSIGN_SET_MSIX_ENTRY', `0x4010ae74')
-+define(`KVM_S390_INTERRUPT', `0x4010ae94')
-+define(`KVM_S390_SET_INITIAL_PSW', `0x4010ae96')
-+define(`KVM_DIRTY_TLB', `0x4010aeaa')
-+define(`KVM_ARM_SET_DEVICE_ADDR', `0x4010aeab')
-+define(`KVM_GET_ONE_REG', `0x4010aeab')
-+define(`KVM_SET_ONE_REG', `0x4010aeac')
-+define(`SNDRV_DM_FM_IOCTL_SET_VOICE', `0x40124823')
-+define(`FDSETMAXERRS', `0x4014024c')
-+define(`ADD_NEW_DISK', `0x40140921')
-+define(`SNDCTL_COPR_WDATA', `0x40144304')
-+define(`SNDCTL_COPR_WCODE', `0x40144305')
-+define(`OMAPFB_UPDATE_WINDOW_OLD', `0x40144f2f')
-+define(`VIDIOC_S_CROP', `0x4014563c')
-+define(`CHIOMOVE', `0x40146301')
-+define(`DRM_IOCTL_MGA_CLEAR', `0x40146444')
-+define(`DRM_IOCTL_R128_CLEAR', `0x40146448')
-+define(`DRM_IOCTL_R128_INDICES', `0x4014644a')
-+define(`DRM_IOCTL_RADEON_INDICES', `0x4014644a')
-+define(`DMX_SET_PES_FILTER', `0x40146f2c')
-+define(`FW_CDEV_IOC_SEND_RESPONSE', `0x40182304')
-+define(`FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE', `0x4018230f')
-+define(`FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE', `0x40182310')
-+define(`SNDRV_PCM_IOCTL_WRITEI_FRAMES', `0x40184150')
-+define(`SNDRV_PCM_IOCTL_WRITEN_FRAMES', `0x40184152')
-+define(`HIDIOCSUSAGE', `0x4018480c')
-+define(`HIDIOCGCOLLECTIONINDEX', `0x40184810')
-+define(`AMDKFD_IOC_UPDATE_QUEUE', `0x40184b07')
-+define(`IVTVFB_IOC_DMA_FRAME', `0x401856c0')
-+define(`DRM_IOCTL_UPDATE_DRAW', `0x4018643f')
-+define(`DRM_IOCTL_QXL_UPDATE_AREA', `0x40186443')
-+define(`DRM_IOCTL_MSM_GEM_CPU_PREP', `0x40186444')
-+define(`DRM_IOCTL_MSM_WAIT_FENCE', `0x40186447')
-+define(`DRM_IOCTL_R128_BLIT', `0x4018644b')
-+define(`NILFS_IOCTL_SET_SUINFO', `0x40186e8d')
-+define(`UBI_IOCATT', `0x40186f40')
-+define(`BTRFS_IOC_QGROUP_ASSIGN', `0x40189429')
-+define(`KVM_SET_MEMORY_REGION', `0x4018ae40')
-+define(`KVM_S390_UCAS_MAP', `0x4018ae50')
-+define(`KVM_S390_UCAS_UNMAP', `0x4018ae51')
-+define(`KVM_SET_DEVICE_ATTR', `0x4018aee1')
-+define(`KVM_GET_DEVICE_ATTR', `0x4018aee2')
-+define(`KVM_HAS_DEVICE_ATTR', `0x4018aee3')
-+define(`MBXFB_IOCS_ALPHA', `0x4018f402')
-+define(`BR2684_SETFILT', `0x401c6190')
-+define(`CHIOEXCHANGE', `0x401c6302')
-+define(`FDSETPRM', `0x40200242')
-+define(`FDDEFPRM', `0x40200243')
-+define(`ION_IOC_TEST_DMA_MAPPING', `0x402049f1')
-+define(`ION_IOC_TEST_KERNEL_MAPPING', `0x402049f2')
-+define(`AMDKFD_IOC_SET_MEMORY_POLICY', `0x40204b04')
-+define(`VIDIOC_SUBSCRIBE_EVENT', `0x4020565a')
-+define(`VIDIOC_UNSUBSCRIBE_EVENT', `0x4020565b')
-+define(`DRM_IOCTL_MARK_BUFS', `0x40206417')
-+define(`DRM_IOCTL_AGP_FREE', `0x40206435')
-+define(`DRM_IOCTL_VIA_FREEMEM', `0x40206441')
-+define(`DRM_IOCTL_I915_BATCHBUFFER', `0x40206443')
-+define(`DRM_IOCTL_SIS_FB_FREE', `0x40206445')
-+define(`DRM_IOCTL_RADEON_CLEAR', `0x40206448')
-+define(`DRM_IOCTL_I915_CMDBUFFER', `0x4020644b')
-+define(`DRM_IOCTL_I810_MC', `0x4020644c')
-+define(`DRM_IOCTL_RADEON_CMDBUF', `0x40206450')
-+define(`DRM_IOCTL_SIS_AGP_FREE', `0x40206455')
-+define(`DRM_IOCTL_I915_GEM_PREAD', `0x4020645c')
-+define(`DRM_IOCTL_I915_GEM_PWRITE', `0x4020645d')
-+define(`OSD_SEND_CMD', `0x40206fa0')
-+define(`RTC_PLL_SET', `0x40207012')
-+define(`BTRFS_IOC_CLONE_RANGE', `0x4020940d')
-+define(`KVM_SET_MEMORY_ALIAS', `0x4020ae43')
-+define(`KVM_SET_USER_MEMORY_REGION', `0x4020ae46')
-+define(`KVM_IRQFD', `0x4020ae76')
-+define(`KVM_SIGNAL_MSI', `0x4020aea5')
-+define(`KVM_PPC_GET_HTAB_FD', `0x4020aeaa')
-+define(`KVM_ARM_VCPU_INIT', `0x4020aeae')
-+define(`SNDRV_COMPRESS_SET_METADATA', `0x40244314')
-+define(`JSIOCSCORR', `0x40246a21')
-+define(`FE_SET_FRONTEND', `0x40246f4c')
-+define(`RTC_ALM_SET', `0x40247007')
-+define(`RTC_SET_TIME', `0x4024700a')
-+define(`FW_CDEV_IOC_SEND_REQUEST', `0x40282301')
-+define(`FW_CDEV_IOC_SEND_BROADCAST_REQUEST', `0x40282312')
-+define(`FW_CDEV_IOC_SEND_STREAM_PACKET', `0x40282313')
-+define(`EVIOCSKEYCODE_V2', `0x40284504')
-+define(`SNDCTL_FM_LOAD_INSTR', `0x40285107')
-+define(`DRM_IOCTL_RM_MAP', `0x4028641b')
-+define(`DRM_IOCTL_R128_DEPTH', `0x4028644c')
-+define(`DRM_IOCTL_RADEON_VERTEX2', `0x4028644f')
-+define(`DRM_IOCTL_I915_GEM_EXECBUFFER', `0x40286454')
-+define(`PHN_SETREGS', `0x40287008')
-+define(`RTC_WKALM_SET', `0x4028700f')
-+define(`VHOST_SET_VRING_ADDR', `0x4028af11')
-+define(`SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO', `0x402c5342')
-+define(`TCSETS2', `0x402c542b')
-+define(`TCSETSW2', `0x402c542c')
-+define(`TCSETSF2', `0x402c542d')
-+define(`VIDIOC_S_FREQUENCY', `0x402c5639')
-+define(`DRM_IOCTL_I915_OVERLAY_PUT_IMAGE', `0x402c6467')
-+define(`EVIOCSFF', `0x40304580')
-+define(`NVME_IOCTL_SUBMIT_IO', `0x40304e42')
-+define(`VIDIOC_S_FBUF', `0x4030560b')
-+define(`VIDIOC_S_HW_FREQ_SEEK', `0x40305652')
-+define(`CHIOSVOLTAG', `0x40306312')
-+define(`DRM_IOCTL_VIA_DMA_BLIT', `0x4030644e')
-+define(`MGSL_IOCSPARAMS', `0x40306d00')
-+define(`BTRFS_IOC_DEFRAG_RANGE', `0x40309410')
-+define(`BTRFS_IOC_SET_FEATURES', `0x40309439')
-+define(`KVM_SET_CLOCK', `0x4030ae7b')
-+define(`GSMIOC_ENABLE_NET', `0x40344702')
-+define(`SNDRV_TIMER_IOCTL_SELECT', `0x40345410')
-+define(`VIDIOC_S_AUDIO', `0x40345622')
-+define(`VIDIOC_S_AUDOUT', `0x40345632')
-+define(`DRM_IOCTL_MGA_BLIT', `0x40346448')
-+define(`PTP_PEROUT_REQUEST', `0x40383d03')
-+define(`VIDIOC_DBG_S_REGISTER', `0x4038564f')
-+define(`DRM_IOCTL_SAVAGE_BCI_CMDBUF', `0x40386441')
-+define(`KVM_XEN_HVM_CONFIG', `0x4038ae7a')
-+define(`DMX_SET_FILTER', `0x403c6f2b')
-+define(`SNDRV_SEQ_IOCTL_REMOVE_EVENTS', `0x4040534e')
-+define(`SNDRV_CTL_IOCTL_ELEM_LOCK', `0x40405514')
-+define(`SNDRV_CTL_IOCTL_ELEM_UNLOCK', `0x40405515')
-+define(`IVTV_IOC_DMA_FRAME', `0x404056c0')
-+define(`BC_TRANSACTION', `0x40406300')
-+define(`BC_REPLY', `0x40406301')
-+define(`DRM_IOCTL_I810_INIT', `0x40406440')
-+define(`DRM_IOCTL_I915_GEM_EXECBUFFER2', `0x40406469')
-+define(`JSIOCSAXMAP', `0x40406a31')
-+define(`BTRFS_IOC_QUOTA_RESCAN', `0x4040942c')
-+define(`KVM_ASSIGN_DEV_IRQ', `0x4040ae70')
-+define(`KVM_DEASSIGN_PCI_DEVICE', `0x4040ae72')
-+define(`KVM_DEASSIGN_DEV_IRQ', `0x4040ae75')
-+define(`KVM_CREATE_PIT2', `0x4040ae77')
-+define(`KVM_IOEVENTFD', `0x4040ae79')
-+define(`KVM_X86_SET_MCE', `0x4040ae9e')
-+define(`KVM_SET_VCPU_EVENTS', `0x4040aea0')
-+define(`KVM_ASSIGN_SET_INTX_MASK', `0x4040aea4')
-+define(`CXL_IOCTL_START_WORK', `0x4040ca00')
-+define(`OMAPFB_SETUP_PLANE', `0x40444f34')
-+define(`OMAPFB_QUERY_PLANE', `0x40444f35')
-+define(`OMAPFB_UPDATE_WINDOW', `0x40444f36')
-+define(`VIDIOC_S_MODULATOR', `0x40445637')
-+define(`DRM_IOCTL_I915_INIT', `0x40446440')
-+define(`SET_ARRAY_INFO', `0x40480923')
-+define(`SNDRV_EMU10K1_IOCTL_PCM_POKE', `0x40484830')
-+define(`SNDRV_TIMER_IOCTL_GPARAMS', `0x40485404')
-+define(`BTRFS_IOC_SEND', `0x40489426')
-+define(`KVM_SET_GUEST_DEBUG', `0x4048ae9b')
-+define(`GSMIOC_SETCONF', `0x404c4701')
-+define(`SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT', `0x404c534a')
-+define(`SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT', `0x40505330')
-+define(`SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT', `0x40505331')
-+define(`SNDRV_TIMER_IOCTL_PARAMS', `0x40505412')
-+define(`VIDIOC_S_TUNER', `0x4054561e')
-+define(`SNDRV_SEQ_IOCTL_SET_CLIENT_POOL', `0x4058534c')
-+define(`PTP_PIN_SETFUNC', `0x40603d07')
-+define(`SNDRV_HWDEP_IOCTL_DSP_LOAD', `0x40604803')
-+define(`SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER', `0x40605346')
-+define(`DRM_IOCTL_SAVAGE_BCI_INIT', `0x40606440')
-+define(`UI_END_FF_UPLOAD', `0x406855c9')
-+define(`KVM_ENABLE_CAP', `0x4068aea3')
-+define(`CHIOGELEM', `0x406c6310')
-+define(`KVM_SET_PIT2', `0x4070aea0')
-+define(`DRM_IOCTL_R128_INIT', `0x40786440')
-+define(`DRM_IOCTL_RADEON_CP_INIT', `0x40786440')
-+define(`NILFS_IOCTL_CLEAN_SEGMENTS', `0x40786e88')
-+define(`FDSETDRVPRM', `0x40800290')
-+define(`UBI_IOCVOLCRBLK', `0x40804f07')
-+define(`DRM_IOCTL_MGA_INIT', `0x40806440')
-+define(`KVM_PPC_GET_PVINFO', `0x4080aea1')
-+define(`KVM_SET_DEBUGREGS', `0x4080aea2')
-+define(`KVM_PPC_RTAS_DEFINE_TOKEN', `0x4080aeac')
-+define(`SNDRV_COMPRESS_SET_PARAMS', `0x40844312')
-+define(`SNDRV_SEQ_IOCTL_DELETE_QUEUE', `0x408c5333')
-+define(`VIDIOC_S_JPEGCOMP', `0x408c563e')
-+define(`KVM_SET_REGS', `0x4090ae82')
-+define(`UBI_IOCMKVOL', `0x40986f00')
-+define(`SNDRV_SEQ_IOCTL_DELETE_PORT', `0x40a85321')
-+define(`SNDRV_SEQ_IOCTL_SET_PORT_INFO', `0x40a85323')
-+define(`SNDRV_SEQ_IOCTL_SET_CLIENT_INFO', `0x40bc5311')
-+define(`VHOST_SCSI_SET_ENDPOINT', `0x40e8af40')
-+define(`VHOST_SCSI_CLEAR_ENDPOINT', `0x40e8af41')
-+define(`ASHMEM_SET_NAME', `0x41007701')
-+define(`BTRFS_IOC_SET_FSLABEL', `0x41009432')
-+define(`USBDEVFS_GETDRIVER', `0x41045508')
-+define(`CA_SEND_MSG', `0x410c6f85')
-+define(`KVM_SET_SREGS', `0x4138ae84')
-+define(`KVM_SET_XCRS', `0x4188aea7')
-+define(`KVM_SET_FPU', `0x41a0ae8d')
-+define(`SNDRV_EMU10K1_IOCTL_CODE_POKE', `0x41b04811')
-+define(`PTP_SYS_OFFSET', `0x43403d05')
-+define(`JSIOCSBTNMAP', `0x44006a33')
-+define(`KVM_SET_LAPIC', `0x4400ae8f')
-+define(`BTRFS_IOC_SNAP_CREATE', `0x50009401')
-+define(`BTRFS_IOC_DEFRAG', `0x50009402')
-+define(`BTRFS_IOC_RESIZE', `0x50009403')
-+define(`BTRFS_IOC_SCAN_DEV', `0x50009404')
-+define(`BTRFS_IOC_ADD_DEV', `0x5000940a')
-+define(`BTRFS_IOC_RM_DEV', `0x5000940b')
-+define(`BTRFS_IOC_BALANCE', `0x5000940c')
-+define(`BTRFS_IOC_SUBVOL_CREATE', `0x5000940e')
-+define(`BTRFS_IOC_SNAP_DESTROY', `0x5000940f')
-+define(`BTRFS_IOC_SNAP_CREATE_V2', `0x50009417')
-+define(`BTRFS_IOC_SUBVOL_CREATE_V2', `0x50009418')
-+define(`KVM_SET_XSAVE', `0x5000aea5')
-+define(`HIDIOCSUSAGES', `0x501c4814')
-+define(`UBI_IOCRNVOL', `0x51106f03')
-+define(`SNDRV_SB_CSP_IOCTL_LOAD_CODE', `0x70124811')
-+define(`MFB_GET_ALPHA', `0x80014d00')
-+define(`MFB_GET_GAMMA', `0x80014d01')
-+define(`GADGET_GET_PRINTER_STATUS', `0x80016721')
-+define(`JSIOCGAXES', `0x80016a11')
-+define(`JSIOCGBUTTONS', `0x80016a12')
-+define(`SPI_IOC_RD_MODE', `0x80016b01')
-+define(`SPI_IOC_RD_LSB_FIRST', `0x80016b02')
-+define(`SPI_IOC_RD_BITS_PER_WORD', `0x80016b03')
-+define(`PPRSTATUS', `0x80017081')
-+define(`PPRCONTROL', `0x80017083')
-+define(`PPRDATA', `0x80017085')
-+define(`SONYPI_IOCGBRT', `0x80017600')
-+define(`SONYPI_IOCGBATFLAGS', `0x80017607')
-+define(`SONYPI_IOCGBLUE', `0x80017608')
-+define(`SONYPI_IOCGFAN', `0x8001760a')
-+define(`SONYPI_IOCGTEMP', `0x8001760c')
-+define(`CAPI_GET_ERRCODE', `0x80024321')
-+define(`CAPI_INSTALLED', `0x80024322')
-+define(`SNDRV_DM_FM_IOCTL_INFO', `0x80024820')
-+define(`IOCTL_WDM_MAX_COMMAND', `0x800248a0')
-+define(`IPMICTL_REGISTER_FOR_CMD', `0x8002690e')
-+define(`IPMICTL_UNREGISTER_FOR_CMD', `0x8002690f')
-+define(`FE_READ_SIGNAL_STRENGTH', `0x80026f47')
-+define(`FE_READ_SNR', `0x80026f48')
-+define(`SONYPI_IOCGBAT1CAP', `0x80027602')
-+define(`SONYPI_IOCGBAT1REM', `0x80027603')
-+define(`SONYPI_IOCGBAT2CAP', `0x80027604')
-+define(`SONYPI_IOCGBAT2REM', `0x80027605')
-+define(`MBXFB_IOCS_PLANEORDER', `0x8002f403')
-+define(`BLKI2OGRSTRAT', `0x80043201')
-+define(`BLKI2OGWSTRAT', `0x80043202')
-+define(`SNDRV_PCM_IOCTL_PVERSION', `0x80044100')
-+define(`CCISS_GETHEARTBEAT', `0x80044206')
-+define(`CCISS_GETBUSTYPES', `0x80044207')
-+define(`CCISS_GETFIRMVER', `0x80044208')
-+define(`CCISS_GETDRIVVER', `0x80044209')
-+define(`SNDRV_COMPRESS_IOCTL_VERSION', `0x80044300')
-+define(`CAPI_GET_FLAGS', `0x80044323')
-+define(`CAPI_SET_FLAGS', `0x80044324')
-+define(`CAPI_CLR_FLAGS', `0x80044325')
-+define(`CAPI_NCCI_OPENCOUNT', `0x80044326')
-+define(`CAPI_NCCI_GETUNIT', `0x80044327')
-+define(`EVIOCGVERSION', `0x80044501')
-+define(`APEI_ERST_GET_RECORD_COUNT', `0x80044502')
-+define(`EVIOCGEFFECTS', `0x80044584')
-+define(`FBIOGET_CONTRAST', `0x80044601')
-+define(`FBIGET_BRIGHTNESS', `0x80044603')
-+define(`FBIGET_COLOR', `0x80044605')
-+define(`SSTFB_GET_VGAPASS', `0x800446dd')
-+define(`SNDRV_HWDEP_IOCTL_PVERSION', `0x80044800')
-+define(`HIDIOCGRDESCSIZE', `0x80044801')
-+define(`HIDIOCGVERSION', `0x80044801')
-+define(`HIDIOCGFLAG', `0x8004480e')
-+define(`HDA_IOCTL_PVERSION', `0x80044810')
-+define(`SNDRV_EMU10K1_IOCTL_PVERSION', `0x80044840')
-+define(`SNDRV_EMUX_IOCTL_VERSION', `0x80044880')
-+define(`SNDRV_EMU10K1_IOCTL_DBG_READ', `0x80044884')
-+define(`HCIGETDEVLIST', `0x800448d2')
-+define(`HCIGETDEVINFO', `0x800448d3')
-+define(`HCIGETCONNLIST', `0x800448d4')
-+define(`HCIGETCONNINFO', `0x800448d5')
-+define(`HCIGETAUTHINFO', `0x800448d7')
-+define(`HCIINQUIRY', `0x800448f0')
-+define(`ROCCATIOCGREPSIZE', `0x800448f1')
-+define(`IMADDTIMER', `0x80044940')
-+define(`IMDELTIMER', `0x80044941')
-+define(`IMGETVERSION', `0x80044942')
-+define(`IMGETCOUNT', `0x80044943')
-+define(`IMGETDEVINFO', `0x80044944')
-+define(`IMCTRLREQ', `0x80044945')
-+define(`IMCLEAR_L2', `0x80044946')
-+define(`IMHOLD_L1', `0x80044948')
-+define(`MCE_GET_RECORD_LEN', `0x80044d01')
-+define(`MCE_GET_LOG_LEN', `0x80044d02')
-+define(`MCE_GETCLEAR_FLAGS', `0x80044d03')
-+define(`MEMGETREGIONCOUNT', `0x80044d07')
-+define(`MFB_GET_PIXFMT', `0x80044d08')
-+define(`OTPSELECT', `0x80044d0d')
-+define(`OSS_GETVERSION', `0x80044d76')
-+define(`UBI_IOCEBISMAP', `0x80044f05')
-+define(`SOUND_PCM_READ_RATE', `0x80045002')
-+define(`SOUND_PCM_READ_BITS', `0x80045005')
-+define(`SOUND_PCM_READ_CHANNELS', `0x80045006')
-+define(`SOUND_PCM_READ_FILTER', `0x80045007')
-+define(`SNDCTL_DSP_GETFMTS', `0x8004500b')
-+define(`SNDCTL_DSP_GETCAPS', `0x8004500f')
-+define(`SNDCTL_DSP_GETTRIGGER', `0x80045010')
-+define(`SNDCTL_DSP_GETODELAY', `0x80045017')
-+define(`SNDCTL_DSP_GETSPDIF', `0x80045043')
-+define(`SNDCTL_SEQ_GETOUTCOUNT', `0x80045104')
-+define(`SNDCTL_SEQ_GETINCOUNT', `0x80045105')
-+define(`SNDCTL_SEQ_NRSYNTHS', `0x8004510a')
-+define(`SNDCTL_SEQ_NRMIDIS', `0x8004510b')
-+define(`SNDCTL_SEQ_GETTIME', `0x80045113')
-+define(`RNDGETENTCNT', `0x80045200')
-+define(`SAA6588_CMD_READ', `0x80045203')
-+define(`SAA6588_CMD_POLL', `0x80045204')
-+define(`RFCOMMGETDEVLIST', `0x800452d2')
-+define(`RFCOMMGETDEVINFO', `0x800452d3')
-+define(`SNDRV_SEQ_IOCTL_PVERSION', `0x80045300')
-+define(`SNDRV_SEQ_IOCTL_CLIENT_ID', `0x80045301')
-+define(`SNDRV_TIMER_IOCTL_PVERSION', `0x80045400')
-+define(`TIOCGPTN', `0x80045430')
-+define(`TIOCGDEV', `0x80045432')
-+define(`TIOCGPKT', `0x80045438')
-+define(`TIOCGPTLCK', `0x80045439')
-+define(`TIOCGEXCL', `0x80045440')
-+define(`TUNGETFEATURES', `0x800454cf')
-+define(`TUNGETIFF', `0x800454d2')
-+define(`TUNGETSNDBUF', `0x800454d3')
-+define(`TUNGETVNETHDRSZ', `0x800454d7')
-+define(`TUNGETVNETLE', `0x800454dd')
-+define(`SNDRV_CTL_IOCTL_PVERSION', `0x80045500')
-+define(`USBDEVFS_RESETEP', `0x80045503')
-+define(`USBDEVFS_SETCONFIGURATION', `0x80045505')
-+define(`USBDEVFS_CLAIMINTERFACE', `0x8004550f')
-+define(`USBDEVFS_RELEASEINTERFACE', `0x80045510')
-+define(`USBDEVFS_CLEAR_HALT', `0x80045515')
-+define(`USBDEVFS_CLAIM_PORT', `0x80045518')
-+define(`USBDEVFS_RELEASE_PORT', `0x80045519')
-+define(`USBDEVFS_GET_CAPABILITIES', `0x8004551a')
-+define(`UI_GET_VERSION', `0x8004552d')
-+define(`SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE', `0x80045530')
-+define(`SNDRV_CTL_IOCTL_POWER_STATE', `0x800455d1')
-+define(`VIDIOC_G_INPUT', `0x80045626')
-+define(`VIDIOC_G_OUTPUT', `0x8004562e')
-+define(`VIDIOC_G_PRIORITY', `0x80045643')
-+define(`SNDRV_RAWMIDI_IOCTL_PVERSION', `0x80045700')
-+define(`WDIOC_GETSTATUS', `0x80045701')
-+define(`WDIOC_GETBOOTSTATUS', `0x80045702')
-+define(`WDIOC_GETTEMP', `0x80045703')
-+define(`WDIOC_SETOPTIONS', `0x80045704')
-+define(`WDIOC_KEEPALIVE', `0x80045705')
-+define(`WDIOC_GETTIMEOUT', `0x80045707')
-+define(`WDIOC_GETPRETIMEOUT', `0x80045709')
-+define(`WDIOC_GETTIMELEFT', `0x8004570a')
-+define(`SONET_GETDIAG', `0x80046114')
-+define(`SONET_GETFRAMING', `0x80046116')
-+define(`CHIOGPICKER', `0x80046304')
-+define(`DRM_IOCTL_GET_MAGIC', `0x80046402')
-+define(`DRM_IOCTL_I915_GET_VBLANK_PIPE', `0x8004644e')
-+define(`FS_IOC32_GETFLAGS', `0x80046601')
-+define(`LIRC_GET_FEATURES', `0x80046900')
-+define(`LIRC_GET_SEND_MODE', `0x80046901')
-+define(`LIRC_GET_REC_MODE', `0x80046902')
-+define(`LIRC_GET_SEND_CARRIER', `0x80046903')
-+define(`LIRC_GET_REC_CARRIER', `0x80046904')
-+define(`LIRC_GET_SEND_DUTY_CYCLE', `0x80046905')
-+define(`LIRC_GET_REC_DUTY_CYCLE', `0x80046906')
-+define(`LIRC_GET_REC_RESOLUTION', `0x80046907')
-+define(`I2OVALIDATE', `0x80046908')
-+define(`LIRC_GET_MIN_TIMEOUT', `0x80046908')
-+define(`LIRC_GET_MAX_TIMEOUT', `0x80046909')
-+define(`LIRC_GET_MIN_FILTER_PULSE', `0x8004690a')
-+define(`LIRC_GET_MAX_FILTER_PULSE', `0x8004690b')
-+define(`LIRC_GET_MIN_FILTER_SPACE', `0x8004690c')
-+define(`LIRC_GET_MAX_FILTER_SPACE', `0x8004690d')
-+define(`LIRC_GET_LENGTH', `0x8004690f')
-+define(`IPMICTL_SET_GETS_EVENTS_CMD', `0x80046910')
-+define(`IPMICTL_SET_MY_ADDRESS_CMD', `0x80046911')
-+define(`IPMICTL_GET_MY_ADDRESS_CMD', `0x80046912')
-+define(`IPMICTL_SET_MY_LUN_CMD', `0x80046913')
-+define(`IPMICTL_GET_MY_LUN_CMD', `0x80046914')
-+define(`IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD', `0x80046918')
-+define(`IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD', `0x80046919')
-+define(`IPMICTL_SET_MY_CHANNEL_LUN_CMD', `0x8004691a')
-+define(`IPMICTL_GET_MY_CHANNEL_LUN_CMD', `0x8004691b')
-+define(`IPMICTL_GET_MAINTENANCE_MODE_CMD', `0x8004691e')
-+define(`I8K_BIOS_VERSION', `0x80046980')
-+define(`I8K_MACHINE_ID', `0x80046981')
-+define(`IIO_GET_EVENT_FD_IOCTL', `0x80046990')
-+define(`JSIOCGVERSION', `0x80046a01')
-+define(`SPI_IOC_RD_MAX_SPEED_HZ', `0x80046b04')
-+define(`SPI_IOC_RD_MODE32', `0x80046b05')
-+define(`UDF_GETEASIZE', `0x80046c40')
-+define(`NCP_IOC_SIGN_WANTED', `0x80046e06')
-+define(`NCP_IOC_SETDENTRYTTL', `0x80046e0c')
-+define(`SISFB_GET_INFO_OLD', `0x80046ef8')
-+define(`SISFB_GET_VBRSTATUS_OLD', `0x80046ef9')
-+define(`SISFB_GET_AUTOMAXIMIZE_OLD', `0x80046efa')
-+define(`AUDIO_GET_CAPABILITIES', `0x80046f0b')
-+define(`VIDEO_GET_CAPABILITIES', `0x80046f21')
-+define(`VIDEO_GET_FRAME_RATE', `0x80046f38')
-+define(`FE_READ_STATUS', `0x80046f45')
-+define(`FE_READ_BER', `0x80046f46')
-+define(`FE_READ_UNCORRECTED_BLOCKS', `0x80046f49')
-+define(`RTC_VL_READ', `0x80047013')
-+define(`PPCLRIRQ', `0x80047093')
-+define(`PPGETMODES', `0x80047097')
-+define(`PPGETMODE', `0x80047098')
-+define(`PPGETPHASE', `0x80047099')
-+define(`PPGETFLAGS', `0x8004709a')
-+define(`PHONE_DTMF_READY', `0x80047196')
-+define(`PHONE_GET_DTMF', `0x80047197')
-+define(`PHONE_GET_DTMF_ASCII', `0x80047198')
-+define(`PHONE_EXCEPTION', `0x8004719a')
-+define(`IXJCTL_CARDTYPE', `0x800471c1')
-+define(`IXJCTL_SERIAL', `0x800471c2')
-+define(`IXJCTL_DSP_TYPE', `0x800471c3')
-+define(`IXJCTL_DSP_VERSION', `0x800471c4')
-+define(`IXJCTL_VMWI', `0x800471d8')
-+define(`BR_ERROR', `0x80047200')
-+define(`BR_ACQUIRE_RESULT', `0x80047204')
-+define(`FAT_IOCTL_GET_ATTRIBUTES', `0x80047210')
-+define(`FAT_IOCTL_GET_VOLUME_ID', `0x80047213')
-+define(`FS_IOC32_GETVERSION', `0x80047601')
-+define(`MEYEIOC_STILLJCAPT', `0x800476c5')
-+define(`OSIOCGNETADDR', `0x800489e1')
-+define(`SIOCGNETADDR', `0x800489e1')
-+define(`AUTOFS_IOC_PROTOVER', `0x80049363')
-+define(`AUTOFS_IOC_PROTOSUBVER', `0x80049367')
-+define(`AUTOFS_IOC_ASKUMOUNT', `0x80049370')
-+define(`GENWQE_GET_CARD_STATE', `0x8004a524')
-+define(`KVM_GET_MP_STATE', `0x8004ae98')
-+define(`CXL_IOCTL_GET_PROCESS_ELEMENT', `0x8004ca01')
-+define(`SISFB_GET_INFO_SIZE', `0x8004f300')
-+define(`SISFB_GET_VBRSTATUS', `0x8004f302')
-+define(`SISFB_GET_AUTOMAXIMIZE', `0x8004f303')
-+define(`SISFB_GET_TVPOSOFFSET', `0x8004f304')
-+define(`SONET_GETFRSENSE', `0x80066117')
-+define(`MEYEIOC_G_PARAMS', `0x800676c0')
-+define(`BLKBSZGET', `0x80081270')
-+define(`BLKGETSIZE64', `0x80081272')
-+define(`PERF_EVENT_IOC_ID', `0x80082407')
-+define(`SNAPSHOT_GET_IMAGE_SIZE', `0x8008330e')
-+define(`SNAPSHOT_AVAIL_SWAP_SIZE', `0x80083313')
-+define(`SNAPSHOT_ALLOC_SWAP_PAGE', `0x80083314')
-+define(`FBIO_RADEON_GET_MIRROR', `0x80084003')
-+define(`AGPIOC_INFO', `0x80084100')
-+define(`SNDRV_PCM_IOCTL_DELAY', `0x80084121')
-+define(`CCISS_GETPCIINFO', `0x80084201')
-+define(`PMU_IOC_GET_BACKLIGHT', `0x80084201')
-+define(`CCISS_GETINTINFO', `0x80084202')
-+define(`PMU_IOC_GET_MODEL', `0x80084203')
-+define(`PMU_IOC_HAS_ADB', `0x80084204')
-+define(`PMU_IOC_CAN_SLEEP', `0x80084205')
-+define(`PMU_IOC_GRAB_BACKLIGHT', `0x80084206')
-+define(`EVIOCGID', `0x80084502')
-+define(`EVIOCGREP', `0x80084503')
-+define(`EVIOCGKEYCODE', `0x80084504')
-+define(`FBIO_GETCONTROL2', `0x80084689')
-+define(`HIDIOCGRAWINFO', `0x80084803')
-+define(`SNDRV_HDSP_IOCTL_GET_VERSION', `0x80084843')
-+define(`SNDRV_HDSPM_IOCTL_GET_MIXER', `0x80084844')
-+define(`SNDRV_HDSP_IOCTL_GET_9632_AEB', `0x80084845')
-+define(`AMDKFD_IOC_GET_VERSION', `0x80084b01')
-+define(`MFB_GET_AOID', `0x80084d04')
-+define(`MEMISLOCKED', `0x80084d17')
-+define(`RNDGETPOOL', `0x80085202')
-+define(`USBDEVFS_SETINTERFACE', `0x80085504')
-+define(`USBDEVFS_DISCSIGNAL32', `0x8008550e')
-+define(`USBDEVFS_ALLOC_STREAMS', `0x8008551c')
-+define(`USBDEVFS_FREE_STREAMS', `0x8008551d')
-+define(`VIDIOC_G_STD', `0x80085617')
-+define(`VIDIOC_QUERYSTD', `0x8008563f')
-+define(`CM_IOCGSTATUS', `0x80086300')
-+define(`DRM_IOCTL_I810_OV0INFO', `0x80086449')
-+define(`FS_IOC_GETFLAGS', `0x80086601')
-+define(`I2OPASSTHRU32', `0x8008690c')
-+define(`IPMICTL_SET_TIMING_PARMS_CMD', `0x80086916')
-+define(`IPMICTL_GET_TIMING_PARMS_CMD', `0x80086917')
-+define(`I8K_POWER_STATUS', `0x80086982')
-+define(`I8K_FN_STATUS', `0x80086983')
-+define(`I8K_GET_TEMP', `0x80086984')
-+define(`UDF_GETEABLOCK', `0x80086c41')
-+define(`UDF_GETVOLIDENT', `0x80086c42')
-+define(`MMTIMER_GETRES', `0x80086d01')
-+define(`MMTIMER_GETFREQ', `0x80086d02')
-+define(`MTIOCPOS', `0x80086d03')
-+define(`MMTIMER_GETCOUNTER', `0x80086d09')
-+define(`NILFS_IOCTL_SYNC', `0x80086e8a')
-+define(`MATROXFB_GET_OUTPUT_CONNECTION', `0x80086ef8')
-+define(`MATROXFB_GET_AVAILABLE_OUTPUTS', `0x80086ef9')
-+define(`MATROXFB_GET_ALL_OUTPUTS', `0x80086efb')
-+define(`AUDIO_GET_PTS', `0x80086f13')
-+define(`DMX_GET_CAPS', `0x80086f30')
-+define(`VIDEO_GET_PTS', `0x80086f39')
-+define(`VIDEO_GET_FRAME_COUNT', `0x80086f3a')
-+define(`CA_GET_DESCR_INFO', `0x80086f83')
-+define(`RTC_IRQP_READ', `0x8008700b')
-+define(`RTC_EPOCH_READ', `0x8008700d')
-+define(`PPS_GETPARAMS', `0x800870a1')
-+define(`PPS_GETCAP', `0x800870a3')
-+define(`PHONE_CAPABILITIES_LIST', `0x80087181')
-+define(`IXJCTL_CID', `0x800871d4')
-+define(`IXJCTL_VERSION', `0x800871da')
-+define(`IXJCTL_FRAMES_READ', `0x800871e2')
-+define(`IXJCTL_FRAMES_WRITTEN', `0x800871e3')
-+define(`IXJCTL_READ_WAIT', `0x800871e4')
-+define(`IXJCTL_WRITE_WAIT', `0x800871e5')
-+define(`IXJCTL_DRYBUFFER_READ', `0x800871e6')
-+define(`BR_DEAD_BINDER', `0x8008720f')
-+define(`BR_CLEAR_DEATH_NOTIFICATION_DONE', `0x80087210')
-+define(`FS_IOC_GETVERSION', `0x80087601')
-+define(`BTRFS_IOC_START_SYNC', `0x80089418')
-+define(`BTRFS_IOC_SUBVOL_GETFLAGS', `0x80089419')
-+define(`KVM_X86_GET_MCE_CAP_SUPPORTED', `0x8008ae9d')
-+define(`KVM_ALLOCATE_RMA', `0x8008aea9')
-+define(`VHOST_GET_FEATURES', `0x8008af00')
-+define(`FUNCTIONFS_ENDPOINT_DESC', `0x80096782')
-+define(`DMX_GET_PES_PIDS', `0x800a6f2f')
-+define(`RAID_VERSION', `0x800c0910')
-+define(`CCISS_GETLUNINFO', `0x800c4211')
-+define(`OTPLOCK', `0x800c4d10')
-+define(`OMAPFB_GET_CAPS', `0x800c4f2a')
-+define(`SNDCTL_DSP_GETIPTR', `0x800c5011')
-+define(`SNDCTL_DSP_GETOPTR', `0x800c5012')
-+define(`IPMICTL_REGISTER_FOR_CMD_CHANS', `0x800c691c')
-+define(`IPMICTL_UNREGISTER_FOR_CMD_CHANS', `0x800c691d')
-+define(`NCP_IOC_SETROOT', `0x800c6e08')
-+define(`VIDEO_GET_SIZE', `0x800c6f37')
-+define(`FE_DISEQC_RECV_SLAVE_REPLY', `0x800c6f40')
-+define(`CA_GET_SLOT_INFO', `0x800c6f82')
-+define(`FDGETDRVTYP', `0x8010020f')
-+define(`FW_CDEV_IOC_GET_CYCLE_TIMER', `0x8010230c')
-+define(`CCISS_GETNODENAME', `0x80104204')
-+define(`SNDRV_HDSPM_IOCTL_GET_LTC', `0x80104846')
-+define(`ECCGETSTATS', `0x80104d12')
-+define(`SNDCTL_DSP_GETOSPACE', `0x8010500c')
-+define(`SNDCTL_DSP_GETISPACE', `0x8010500d')
-+define(`SNDCTL_DSP_MAPINBUF', `0x80105013')
-+define(`SNDCTL_DSP_MAPOUTBUF', `0x80105014')
-+define(`TUNGETFILTER', `0x801054db')
-+define(`USBDEVFS_DISCSIGNAL', `0x8010550e')
-+define(`DRM_IOCTL_I915_GEM_GET_APERTURE', `0x80106463')
-+define(`I2OPASSTHRU', `0x8010690c')
-+define(`MGSL_IOCGGPIO', `0x80106d11')
-+define(`NCP_IOC_NCPREQUEST', `0x80106e01')
-+define(`NCP_IOC_SETPRIVATEDATA', `0x80106e0a')
-+define(`FE_GET_PROPERTY', `0x80106f53')
-+define(`CA_GET_CAP', `0x80106f81')
-+define(`OSD_GET_CAPABILITY', `0x80106fa1')
-+define(`PPGETTIME', `0x80107095')
-+define(`BR_INCREFS', `0x80107207')
-+define(`BR_ACQUIRE', `0x80107208')
-+define(`BR_RELEASE', `0x80107209')
-+define(`BR_DECREFS', `0x8010720a')
-+define(`GENWQE_READ_REG64', `0x8010a51e')
-+define(`GENWQE_READ_REG32', `0x8010a520')
-+define(`GENWQE_READ_REG16', `0x8010a522')
-+define(`FDGETMAXERRS', `0x8014020e')
-+define(`GET_DISK_INFO', `0x80140912')
-+define(`SNDRV_COMPRESS_TSTAMP', `0x80144320')
-+define(`CHIOGPARAMS', `0x80146306')
-+define(`NCP_IOC_LOCKUNLOCK', `0x80146e07')
-+define(`VIDEO_GET_STATUS', `0x80146f1b')
-+define(`SNDRV_PCM_IOCTL_CHANNEL_INFO', `0x80184132')
-+define(`SNDRV_PCM_IOCTL_READI_FRAMES', `0x80184151')
-+define(`SNDRV_PCM_IOCTL_READN_FRAMES', `0x80184153')
-+define(`SNDRV_HDSPM_IOCTL_GET_CONFIG', `0x80184841')
-+define(`IMSETDEVNAME', `0x80184947')
-+define(`OMAPFB_MEMORY_READ', `0x80184f3a')
-+define(`HPET_INFO', `0x80186803')
-+define(`NCP_IOC_SIGN_INIT', `0x80186e05')
-+define(`NCP_IOC_SETOBJECTNAME', `0x80186e09')
-+define(`NILFS_IOCTL_GET_CPINFO', `0x80186e82')
-+define(`NILFS_IOCTL_GET_CPSTAT', `0x80186e83')
-+define(`NILFS_IOCTL_GET_SUINFO', `0x80186e84')
-+define(`BR_ATTEMPT_ACQUIRE', `0x8018720b')
-+define(`BTRFS_IOC_GET_FEATURES', `0x80189439')
-+define(`MBXFB_IOCG_ALPHA', `0x8018f401')
-+define(`SNDRV_COMPRESS_AVAIL', `0x801c4321')
-+define(`HIDIOCGDEVINFO', `0x801c4803')
-+define(`FDGETPRM', `0x80200204')
-+define(`FBIOGET_VBLANK', `0x80204612')
-+define(`SNDRV_HDSPM_IOCTL_GET_STATUS', `0x80204847')
-+define(`SNDRV_FIREWIRE_IOCTL_GET_INFO', `0x802048f8')
-+define(`MEMGETINFO', `0x80204d01')
-+define(`OMAPFB_GET_VRAM_INFO', `0x80204f3d')
-+define(`OMAPFB_GET_DISPLAY_INFO', `0x80204f3f')
-+define(`I2OGETIOPS', `0x80206900')
-+define(`AUDIO_GET_STATUS', `0x80206f0a')
-+define(`VIDEO_GET_EVENT', `0x80206f1c')
-+define(`RTC_PLL_GET', `0x80207011')
-+define(`KVM_ARM_PREFERRED_TARGET', `0x8020aeaf')
-+define(`SNDRV_HDSP_IOCTL_GET_CONFIG_INFO', `0x80244841')
-+define(`SNDRV_HDSPM_IOCTL_GET_VERSION', `0x80244848')
-+define(`SONET_GETSTAT', `0x80246110')
-+define(`SONET_GETSTATZ', `0x80246111')
-+define(`JSIOCGCORR', `0x80246a22')
-+define(`FE_GET_FRONTEND', `0x80246f4d')
-+define(`RTC_ALM_READ', `0x80247008')
-+define(`RTC_RD_TIME', `0x80247009')
-+define(`FDGETFDCSTAT', `0x80280215')
-+define(`FDWERRORGET', `0x80280217')
-+define(`EVIOCGKEYCODE_V2', `0x80284504')
-+define(`SNDRV_SB_CSP_IOCTL_INFO', `0x80284810')
-+define(`WDIOC_GETSUPPORT', `0x80285700')
-+define(`IPMICTL_SEND_COMMAND', `0x8028690d')
-+define(`FE_GET_EVENT', `0x80286f4e')
-+define(`RTC_WKALM_RD', `0x80287010')
-+define(`IOW_GETINFO', `0x8028c003')
-+define(`USBDEVFS_SUBMITURB32', `0x802a550a')
-+define(`NCP_IOC_SETCHARSETS', `0x802a6e0b')
-+define(`TCGETS2', `0x802c542a')
-+define(`SOUND_OLD_MIXER_INFO', `0x80304d65')
-+define(`VIDIOC_G_FBUF', `0x8030560a')
-+define(`IPMICTL_SEND_COMMAND_SETTIME', `0x80306915')
-+define(`MGSL_IOCGPARAMS', `0x80306d01')
-+define(`MTIOCGET', `0x80306d02')
-+define(`NILFS_IOCTL_GET_SUSTAT', `0x80306e85')
-+define(`BTRFS_IOC_QGROUP_LIMIT', `0x8030942b')
-+define(`KVM_GET_CLOCK', `0x8030ae7c')
-+define(`VIDIOC_G_AUDIO', `0x80345621')
-+define(`VIDIOC_G_AUDOUT', `0x80345631')
-+define(`USBDEVFS_SUBMITURB', `0x8038550a')
-+define(`DRM_IOCTL_AGP_INFO', `0x80386433')
-+define(`OMAPFB_GET_OVERLAY_COLORMODE', `0x803c4f3b')
-+define(`SNDRV_HWDEP_IOCTL_DSP_STATUS', `0x80404802')
-+define(`JSIOCGAXMAP', `0x80406a32')
-+define(`BR_TRANSACTION', `0x80407202')
-+define(`BR_REPLY', `0x80407203')
-+define(`BTRFS_IOC_QUOTA_RESCAN_STATUS', `0x8040942d')
-+define(`KVM_ASSIGN_PCI_DEVICE', `0x8040ae69')
-+define(`KVM_GET_VCPU_EVENTS', `0x8040ae9f')
-+define(`GET_ARRAY_INFO', `0x80480911')
-+define(`BTRFS_IOC_GET_SUPPORTED_FEATURES', `0x80489439')
-+define(`KVM_SET_PIT', `0x8048ae66')
-+define(`GSMIOC_GETCONF', `0x804c4700')
-+define(`FDGETDRVSTAT', `0x80500212')
-+define(`FDPOLLDRVSTAT', `0x80500213')
-+define(`PTP_CLOCK_GETCAPS', `0x80503d01')
-+define(`SOUND_MIXER_INFO', `0x805c4d65')
-+define(`SNDRV_TIMER_IOCTL_STATUS', `0x80605414')
-+define(`VIDIOC_QUERYCAP', `0x80685600')
-+define(`I2OEVTGET', `0x8068690b')
-+define(`CHIOGVPARAMS', `0x80706313')
-+define(`KVM_GET_PIT2', `0x8070ae9f')
-+define(`SNDRV_COMPRESS_GET_PARAMS', `0x80784313')
-+define(`FDGETDRVPRM', `0x80800211')
-+define(`USBDEVFS_HUB_PORTINFO', `0x80805513')
-+define(`KVM_GET_DEBUGREGS', `0x8080aea1')
-+define(`VIDIOC_QUERY_DV_TIMINGS', `0x80845663')
-+define(`VIDIOC_SUBDEV_QUERY_DV_TIMINGS', `0x80845663')
-+define(`VIDIOC_DQEVENT', `0x80885659')
-+define(`VIDIOC_G_JPEGCOMP', `0x808c563d')
-+define(`KVM_GET_REGS', `0x8090ae81')
-+define(`SNDRV_PCM_IOCTL_STATUS', `0x80984120')
-+define(`FE_GET_INFO', `0x80a86f3d')
-+define(`MEMGETOOBSEL', `0x80c84d0a')
-+define(`SNDRV_HWDEP_IOCTL_INFO', `0x80dc4801')
-+define(`SNDRV_CTL_IOCTL_HWDEP_INFO', `0x80dc5521')
-+define(`SNDRV_TIMER_IOCTL_INFO', `0x80e85411')
-+define(`DRM_IOCTL_GET_STATS', `0x80f86406')
-+define(`ASHMEM_GET_NAME', `0x81007702')
-+define(`BTRFS_IOC_GET_FSLABEL', `0x81009431')
-+define(`HIDIOCGSTRING', `0x81044804')
-+define(`USBDEVFS_DISCONNECT_CLAIM', `0x8108551b')
-+define(`SNDRV_RAWMIDI_IOCTL_INFO', `0x810c5701')
-+define(`CA_GET_MSG', `0x810c6f84')
-+define(`AUTOFS_IOC_EXPIRE', `0x810c9365')
-+define(`SISFB_GET_INFO', `0x811cf301')
-+define(`SNDRV_PCM_IOCTL_INFO', `0x81204101')
-+define(`KVM_GET_SREGS', `0x8138ae83')
-+define(`ECCGETLAYOUT', `0x81484d11')
-+define(`SNDRV_CTL_IOCTL_CARD_INFO', `0x81785501')
-+define(`KVM_GET_XCRS', `0x8188aea6')
-+define(`AMDKFD_IOC_GET_PROCESS_APERTURES', `0x81904b06')
-+define(`KVM_GET_FPU', `0x81a0ae8c')
-+define(`KVM_SET_IRQCHIP', `0x8208ae63')
-+define(`VFAT_IOCTL_READDIR_BOTH', `0x82307201')
-+define(`VFAT_IOCTL_READDIR_SHORT', `0x82307202')
-+define(`KVM_PPC_GET_SMMU_INFO', `0x8250aea6')
-+define(`SNDRV_HDSP_IOCTL_GET_PEAK_RMS', `0x83b04840')
-+define(`JSIOCGBTNMAP', `0x84006a34')
-+define(`BTRFS_IOC_FS_INFO', `0x8400941f')
-+define(`BTRFS_IOC_BALANCE_PROGRESS', `0x84009422')
-+define(`KVM_GET_LAPIC', `0x8400ae8e')
-+define(`VIDEO_GET_NAVI', `0x84046f34')
-+define(`SNDRV_EMU10K1_IOCTL_INFO', `0x880c4810')
-+define(`VIDIOC_G_ENC_INDEX', `0x8818564c')
-+define(`SNDRV_HDSPM_IOCTL_GET_PEAK_RMS', `0x89084842')
-+define(`SNDCTL_COPR_RCVMSG', `0x8fa44309')
-+define(`GET_BITMAP_FILE', `0x90000915')
-+define(`SNDRV_HDSP_IOCTL_GET_MIXER', `0x90004844')
-+define(`BTRFS_IOC_DEVICES_READY', `0x90009427')
-+define(`KVM_GET_XSAVE', `0x9000aea4')
-+define(`HIDIOCGRDESC', `0x90044802')
-+define(`SNDRV_SEQ_IOCTL_GET_QUEUE_OWNER', `0xc0005343')
-+define(`GADGET_SET_PRINTER_STATUS', `0xc0016722')
-+define(`CAPI_GET_MANUFACTURER', `0xc0044306')
-+define(`CAPI_GET_SERIAL', `0xc0044308')
-+define(`GIGASET_REDIR', `0xc0044700')
-+define(`GIGASET_CONFIG', `0xc0044701')
-+define(`ION_IOC_FREE', `0xc0044901')
-+define(`SOUND_MIXER_AGC', `0xc0044d67')
-+define(`SOUND_MIXER_3DSE', `0xc0044d68')
-+define(`SOUND_MIXER_PRIVATE1', `0xc0044d6f')
-+define(`SOUND_MIXER_PRIVATE2', `0xc0044d70')
-+define(`SOUND_MIXER_PRIVATE3', `0xc0044d71')
-+define(`SOUND_MIXER_PRIVATE4', `0xc0044d72')
-+define(`SOUND_MIXER_PRIVATE5', `0xc0044d73')
-+define(`SNDCTL_DSP_SPEED', `0xc0045002')
-+define(`SNDCTL_DSP_STEREO', `0xc0045003')
-+define(`SNDCTL_DSP_GETBLKSIZE', `0xc0045004')
-+define(`SNDCTL_DSP_SETFMT', `0xc0045005')
-+define(`SNDCTL_DSP_CHANNELS', `0xc0045006')
-+define(`SOUND_PCM_WRITE_FILTER', `0xc0045007')
-+define(`SNDCTL_DSP_SUBDIVIDE', `0xc0045009')
-+define(`SNDCTL_DSP_SETFRAGMENT', `0xc004500a')
-+define(`SNDCTL_DSP_GETCHANNELMASK', `0xc0045040')
-+define(`SNDCTL_DSP_BIND_CHANNEL', `0xc0045041')
-+define(`SNDCTL_SEQ_CTRLRATE', `0xc0045103')
-+define(`SNDCTL_SYNTH_MEMAVL', `0xc004510e')
-+define(`SNDCTL_TMR_TIMEBASE', `0xc0045401')
-+define(`SNDCTL_TMR_TEMPO', `0xc0045405')
-+define(`SNDCTL_TMR_SOURCE', `0xc0045406')
-+define(`SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS', `0xc0045516')
-+define(`SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE', `0xc0045520')
-+define(`SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE', `0xc0045540')
-+define(`SNDRV_CTL_IOCTL_POWER', `0xc00455d0')
-+define(`VIDIOC_S_INPUT', `0xc0045627')
-+define(`VIDIOC_S_OUTPUT', `0xc004562f')
-+define(`WDIOC_SETTIMEOUT', `0xc0045706')
-+define(`WDIOC_SETPRETIMEOUT', `0xc0045708')
-+define(`FIFREEZE', `0xc0045877')
-+define(`FITHAW', `0xc0045878')
-+define(`SONET_SETDIAG', `0xc0046112')
-+define(`SONET_CLRDIAG', `0xc0046113')
-+define(`BINDER_VERSION', `0xc0046209')
-+define(`DRM_IOCTL_BLOCK', `0xc0046412')
-+define(`DRM_IOCTL_UNBLOCK', `0xc0046413')
-+define(`DRM_IOCTL_ADD_DRAW', `0xc0046427')
-+define(`DRM_IOCTL_RM_DRAW', `0xc0046428')
-+define(`DRM_IOCTL_MGA_WAIT_FENCE', `0xc004644b')
-+define(`DRM_IOCTL_MODE_RMFB', `0xc00464af')
-+define(`DRM_IOCTL_MODE_DESTROY_DUMB', `0xc00464b4')
-+define(`SNDCTL_MIDI_PRETIME', `0xc0046d00')
-+define(`SNDCTL_MIDI_MPUMODE', `0xc0046d01')
-+define(`MGSL_IOCWAITEVENT', `0xc0046d08')
-+define(`TOSH_SMM', `0xc0047490')
-+define(`MEYEIOC_SYNC', `0xc00476c3')
-+define(`AUTOFS_IOC_SETTIMEOUT32', `0xc0049364')
-+define(`KVM_GET_MSR_INDEX_LIST', `0xc004ae02')
-+define(`KVM_PPC_ALLOCATE_HTAB', `0xc004aea7')
-+define(`NET_ADD_IF', `0xc0066f34')
-+define(`NET_GET_IF', `0xc0066f36')
-+define(`AGPIOC_ALLOCATE', `0xc0084106')
-+define(`HDA_IOCTL_VERB_WRITE', `0xc0084811')
-+define(`HDA_IOCTL_GET_WCAP', `0xc0084812')
-+define(`ION_IOC_MAP', `0xc0084902')
-+define(`ION_IOC_SHARE', `0xc0084904')
-+define(`ION_IOC_IMPORT', `0xc0084905')
-+define(`ION_IOC_SYNC', `0xc0084907')
-+define(`AMDKFD_IOC_DESTROY_QUEUE', `0xc0084b03')
-+define(`SNDRV_CTL_IOCTL_TLV_READ', `0xc008551a')
-+define(`SNDRV_CTL_IOCTL_TLV_WRITE', `0xc008551b')
-+define(`SNDRV_CTL_IOCTL_TLV_COMMAND', `0xc008551c')
-+define(`VIDIOC_G_CTRL', `0xc008561b')
-+define(`VIDIOC_S_CTRL', `0xc008561c')
-+define(`VIDIOC_OMAP3ISP_STAT_EN', `0xc00856c7')
-+define(`CM_IOCGATR', `0xc0086301')
-+define(`CIOC_KERNEL_VERSION', `0xc008630a')
-+define(`DRM_IOCTL_GEM_FLINK', `0xc008640a')
-+define(`DRM_IOCTL_ADD_CTX', `0xc0086420')
-+define(`DRM_IOCTL_RM_CTX', `0xc0086421')
-+define(`DRM_IOCTL_GET_CTX', `0xc0086423')
-+define(`DRM_IOCTL_QXL_ALLOC', `0xc0086440')
-+define(`DRM_IOCTL_TEGRA_GEM_MMAP', `0xc0086441')
-+define(`DRM_IOCTL_SAVAGE_BCI_EVENT_EMIT', `0xc0086442')
-+define(`DRM_IOCTL_TEGRA_SYNCPT_READ', `0xc0086442')
-+define(`DRM_IOCTL_VIA_AGP_INIT', `0xc0086442')
-+define(`DRM_IOCTL_TEGRA_SYNCPT_INCR', `0xc0086443')
-+define(`DRM_IOCTL_VIA_FB_INIT', `0xc0086443')
-+define(`DRM_IOCTL_I915_IRQ_EMIT', `0xc0086444')
-+define(`DRM_IOCTL_TEGRA_GEM_SET_FLAGS', `0xc008644c')
-+define(`DRM_IOCTL_TEGRA_GEM_GET_FLAGS', `0xc008644d')
-+define(`DRM_IOCTL_RADEON_IRQ_EMIT', `0xc0086456')
-+define(`DRM_IOCTL_I915_GEM_BUSY', `0xc0086457')
-+define(`DRM_IOCTL_EXYNOS_G2D_GET_VER', `0xc0086460')
-+define(`DRM_IOCTL_EXYNOS_G2D_EXEC', `0xc0086462')
-+define(`DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID', `0xc0086465')
-+define(`DRM_IOCTL_RADEON_GEM_BUSY', `0xc008646a')
-+define(`DRM_IOCTL_I915_GEM_CONTEXT_CREATE', `0xc008646d')
-+define(`DRM_IOCTL_I915_GEM_GET_CACHING', `0xc0086470')
-+define(`DRM_IOCTL_EXYNOS_IPP_CMD_CTRL', `0xc0086473')
-+define(`I8K_GET_SPEED', `0xc0086985')
-+define(`I8K_GET_FAN', `0xc0086986')
-+define(`I8K_SET_FAN', `0xc0086987')
-+define(`UDF_RELOCATE_BLOCKS', `0xc0086c43')
-+define(`MATROXFB_GET_OUTPUT_MODE', `0xc0086efa')
-+define(`PHN_GET_REG', `0xc0087000')
-+define(`PHN_GET_REGS', `0xc0087002')
-+define(`PHN_GETREG', `0xc0087005')
-+define(`PPS_FETCH', `0xc00870a4')
-+define(`PHONE_QUERY_CODEC', `0xc00871a7')
-+define(`MIC_VIRTIO_ADD_DEVICE', `0xc0087301')
-+define(`MIC_VIRTIO_COPY_DESC', `0xc0087302')
-+define(`MIC_VIRTIO_CONFIG_CHANGE', `0xc0087305')
-+define(`AUTOFS_IOC_SETTIMEOUT', `0xc0089364')
-+define(`KVM_GET_SUPPORTED_CPUID', `0xc008ae05')
-+define(`KVM_GET_EMULATED_CPUID', `0xc008ae09')
-+define(`KVM_IRQ_LINE_STATUS', `0xc008ae67')
-+define(`KVM_GET_MSRS', `0xc008ae88')
-+define(`KVM_GET_CPUID2', `0xc008ae91')
-+define(`KVM_GET_REG_LIST', `0xc008aeb0')
-+define(`FSL_HV_IOCTL_PARTITION_RESTART', `0xc008af01')
-+define(`FSL_HV_IOCTL_PARTITION_STOP', `0xc008af04')
-+define(`FSL_HV_IOCTL_DOORBELL', `0xc008af06')
-+define(`VHOST_GET_VRING_BASE', `0xc008af12')
-+define(`HIDIOCGREPORTINFO', `0xc00c4809')
-+define(`SNDCTL_SYNTH_REMOVESAMPLE', `0xc00c5116')
-+define(`USBDEVFS_IOCTL32', `0xc00c5512')
-+define(`UI_BEGIN_FF_ERASE', `0xc00c55ca')
-+define(`DRM_IOCTL_PRIME_HANDLE_TO_FD', `0xc00c642d')
-+define(`DRM_IOCTL_PRIME_FD_TO_HANDLE', `0xc00c642e')
-+define(`DRM_IOCTL_VIA_CMDBUF_SIZE', `0xc00c644b')
-+define(`DRM_IOCTL_I915_VBLANK_SWAP', `0xc00c644f')
-+define(`DRM_IOCTL_RADEON_GEM_SET_DOMAIN', `0xc00c6463')
-+define(`DRM_IOCTL_I915_GEM_MADVISE', `0xc00c6466')
-+define(`DRM_IOCTL_RADEON_GEM_SET_TILING', `0xc00c6468')
-+define(`DRM_IOCTL_RADEON_GEM_GET_TILING', `0xc00c6469')
-+define(`KVM_CREATE_DEVICE', `0xc00caee0')
-+define(`FSL_HV_IOCTL_PARTITION_GET_STATUS', `0xc00caf02')
-+define(`MBXFB_IOCX_REG', `0xc00cf405')
-+define(`CAPI_GET_VERSION', `0xc0104307')
-+define(`CAPI_MANUFACTURER_CMD', `0xc0104320')
-+define(`GIGASET_VERSION', `0xc0104703')
-+define(`IOCTL_MEI_CONNECT_CLIENT', `0xc0104801')
-+define(`HIDIOCGCOLLECTIONINFO', `0xc0104811')
-+define(`SNDRV_EMU10K1_IOCTL_TRAM_PEEK', `0xc0104822')
-+define(`SNDRV_EMUX_IOCTL_LOAD_PATCH', `0xc0104881')
-+define(`SNDRV_EMUX_IOCTL_MISC_MODE', `0xc0104884')
-+define(`ION_IOC_CUSTOM', `0xc0104906')
-+define(`MEMWRITEOOB', `0xc0104d03')
-+define(`MEMREADOOB', `0xc0104d04')
-+define(`MEMGETREGIONINFO', `0xc0104d08')
-+define(`SNDRV_SEQ_IOCTL_RUNNING_MODE', `0xc0105303')
-+define(`USBDEVFS_CONTROL32', `0xc0105500')
-+define(`USBDEVFS_BULK32', `0xc0105502')
-+define(`USBDEVFS_IOCTL', `0xc0105512')
-+define(`NS_GETPSTAT', `0xc0106161')
-+define(`DRM_IOCTL_GET_UNIQUE', `0xc0106401')
-+define(`DRM_IOCTL_IRQ_BUSID', `0xc0106403')
-+define(`DRM_IOCTL_SET_VERSION', `0xc0106407')
-+define(`DRM_IOCTL_GEM_OPEN', `0xc010640b')
-+define(`DRM_IOCTL_GET_CAP', `0xc010640c')
-+define(`DRM_IOCTL_INFO_BUFS', `0xc0106418')
-+define(`DRM_IOCTL_GET_SAREA_CTX', `0xc010641d')
-+define(`DRM_IOCTL_RES_CTX', `0xc0106426')
-+define(`DRM_IOCTL_SG_ALLOC', `0xc0106438')
-+define(`DRM_IOCTL_EXYNOS_GEM_CREATE', `0xc0106440')
-+define(`DRM_IOCTL_MSM_GET_PARAM', `0xc0106440')
-+define(`DRM_IOCTL_OMAP_GET_PARAM', `0xc0106440')
-+define(`DRM_IOCTL_TEGRA_GEM_CREATE', `0xc0106440')
-+define(`DRM_IOCTL_QXL_MAP', `0xc0106441')
-+define(`DRM_IOCTL_MSM_GEM_NEW', `0xc0106442')
-+define(`DRM_IOCTL_MSM_GEM_INFO', `0xc0106443')
-+define(`DRM_IOCTL_OMAP_GEM_NEW', `0xc0106443')
-+define(`DRM_IOCTL_EXYNOS_GEM_GET', `0xc0106444')
-+define(`DRM_IOCTL_QXL_GETPARAM', `0xc0106444')
-+define(`DRM_IOCTL_TEGRA_SYNCPT_WAIT', `0xc0106444')
-+define(`DRM_IOCTL_TEGRA_OPEN_CHANNEL', `0xc0106445')
-+define(`DRM_IOCTL_I915_GETPARAM', `0xc0106446')
-+define(`DRM_IOCTL_TEGRA_CLOSE_CHANNEL', `0xc0106446')
-+define(`DRM_IOCTL_EXYNOS_VIDI_CONNECTION', `0xc0106447')
-+define(`DRM_IOCTL_TEGRA_GET_SYNCPT', `0xc0106447')
-+define(`DRM_IOCTL_MGA_GETPARAM', `0xc0106449')
-+define(`DRM_IOCTL_TEGRA_GET_SYNCPT_BASE', `0xc0106449')
-+define(`DRM_IOCTL_TEGRA_GEM_SET_TILING', `0xc010644a')
-+define(`DRM_IOCTL_TEGRA_GEM_GET_TILING', `0xc010644b')
-+define(`DRM_IOCTL_RADEON_INDIRECT', `0xc010644d')
-+define(`DRM_IOCTL_R128_INDIRECT', `0xc010644f')
-+define(`DRM_IOCTL_RADEON_GETPARAM', `0xc0106451')
-+define(`DRM_IOCTL_R128_GETPARAM', `0xc0106452')
-+define(`DRM_IOCTL_SIS_AGP_INIT', `0xc0106453')
-+define(`DRM_IOCTL_I915_GEM_CREATE', `0xc010645b')
-+define(`DRM_IOCTL_I915_GEM_SET_TILING', `0xc0106461')
-+define(`DRM_IOCTL_I915_GEM_GET_TILING', `0xc0106462')
-+define(`DRM_IOCTL_I915_GEM_MMAP_GTT', `0xc0106464')
-+define(`DRM_IOCTL_RADEON_INFO', `0xc0106467')
-+define(`DRM_IOCTL_I915_GEM_WAIT', `0xc010646c')
-+define(`DRM_IOCTL_RADEON_GEM_OP', `0xc010646c')
-+define(`DRM_IOCTL_I915_REG_READ', `0xc0106471')
-+define(`DRM_IOCTL_MODE_SETPROPERTY', `0xc01064ab')
-+define(`DRM_IOCTL_MODE_GETPROPBLOB', `0xc01064ac')
-+define(`DRM_IOCTL_MODE_MAP_DUMB', `0xc01064b3')
-+define(`DRM_IOCTL_MODE_GETPLANERESOURCES', `0xc01064b5')
-+define(`MGSL_IOCWAITGPIO', `0xc0106d12')
-+define(`NCP_IOC_GETPRIVATEDATA', `0xc0106e0a')
-+define(`DMX_GET_STC', `0xc0106f32')
-+define(`UVCIOC_CTRL_QUERY', `0xc0107521')
-+define(`BTRFS_IOC_SPACE_INFO', `0xc0109414')
-+define(`BTRFS_IOC_QUOTA_CTL', `0xc0109428')
-+define(`FSL_HV_IOCTL_PARTITION_START', `0xc010af03')
-+define(`SNDCTL_COPR_RDATA', `0xc0144302')
-+define(`SNDCTL_COPR_RCODE', `0xc0144303')
-+define(`SNDCTL_COPR_RUN', `0xc0144306')
-+define(`SNDCTL_COPR_HALT', `0xc0144307')
-+define(`SNDRV_TIMER_IOCTL_NEXT_DEVICE', `0xc0145401')
-+define(`VIDIOC_REQBUFS', `0xc0145608')
-+define(`VIDIOC_G_CROP', `0xc014563b')
-+define(`DRM_IOCTL_I915_GET_SPRITE_COLORKEY', `0xc014646b')
-+define(`DRM_IOCTL_I915_SET_SPRITE_COLORKEY', `0xc014646b')
-+define(`DRM_IOCTL_MODE_GETENCODER', `0xc01464a6')
-+define(`FW_CDEV_IOC_ADD_DESCRIPTOR', `0xc0182306')
-+define(`FW_CDEV_IOC_QUEUE_ISO', `0xc0182309')
-+define(`FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE', `0xc018230d')
-+define(`FW_CDEV_IOC_GET_CYCLE_TIMER2', `0xc0182314')
-+define(`FW_CDEV_IOC_SEND_PHY_PACKET', `0xc0182315')
-+define(`HIDIOCGUSAGE', `0xc018480b')
-+define(`HIDIOCGUCODE', `0xc018480d')
-+define(`MTRRIOC_GET_ENTRY', `0xc0184d03')
-+define(`MTRRIOC_GET_PAGE_ENTRY', `0xc0184d08')
-+define(`MEMWRITEOOB64', `0xc0184d15')
-+define(`MEMREADOOB64', `0xc0184d16')
-+define(`USBDEVFS_CONTROL', `0xc0185500')
-+define(`USBDEVFS_BULK', `0xc0185502')
-+define(`PACKET_CTRL_CMD', `0xc0185801')
-+define(`FITRIM', `0xc0185879')
-+define(`DRM_IOCTL_MAP_BUFS', `0xc0186419')
-+define(`DRM_IOCTL_WAIT_VBLANK', `0xc018643a')
-+define(`DRM_IOCTL_I810_GETBUF', `0xc0186445')
-+define(`DRM_IOCTL_OMAP_GEM_INFO', `0xc0186446')
-+define(`DRM_IOCTL_QXL_ALLOC_SURF', `0xc0186446')
-+define(`DRM_IOCTL_I915_ALLOC', `0xc0186448')
-+define(`DRM_IOCTL_VIA_WAIT_IRQ', `0xc018644d')
-+define(`DRM_IOCTL_RADEON_ALLOC', `0xc0186453')
-+define(`DRM_IOCTL_I915_GEM_PIN', `0xc0186455')
-+define(`DRM_IOCTL_RADEON_GEM_INFO', `0xc018645c')
-+define(`DRM_IOCTL_RADEON_GEM_VA', `0xc018646b')
-+define(`DRM_IOCTL_RADEON_GEM_USERPTR', `0xc018646d')
-+define(`DRM_IOCTL_I915_GET_RESET_STATS', `0xc0186472')
-+define(`DRM_IOCTL_I915_GEM_USERPTR', `0xc0186473')
-+define(`DRM_IOCTL_MODE_PAGE_FLIP', `0xc01864b0')
-+define(`DRM_IOCTL_MODE_DIRTYFB', `0xc01864b1')
-+define(`DRM_IOCTL_MODE_OBJ_SETPROPERTY', `0xc01864ba')
-+define(`I2OHRTGET', `0xc0186901')
-+define(`I2OLCTGET', `0xc0186902')
-+define(`NCP_IOC_GETOBJECTNAME', `0xc0186e09')
-+define(`NILFS_IOCTL_GET_VINFO', `0xc0186e86')
-+define(`NILFS_IOCTL_GET_BDESCS', `0xc0186e87')
-+define(`AUTOFS_DEV_IOCTL_VERSION', `0xc0189371')
-+define(`AUTOFS_DEV_IOCTL_PROTOVER', `0xc0189372')
-+define(`AUTOFS_DEV_IOCTL_PROTOSUBVER', `0xc0189373')
-+define(`AUTOFS_DEV_IOCTL_OPENMOUNT', `0xc0189374')
-+define(`AUTOFS_DEV_IOCTL_CLOSEMOUNT', `0xc0189375')
-+define(`AUTOFS_DEV_IOCTL_READY', `0xc0189376')
-+define(`AUTOFS_DEV_IOCTL_FAIL', `0xc0189377')
-+define(`AUTOFS_DEV_IOCTL_SETPIPEFD', `0xc0189378')
-+define(`AUTOFS_DEV_IOCTL_CATATONIC', `0xc0189379')
-+define(`AUTOFS_DEV_IOCTL_TIMEOUT', `0xc018937a')
-+define(`AUTOFS_DEV_IOCTL_REQUESTER', `0xc018937b')
-+define(`AUTOFS_DEV_IOCTL_EXPIRE', `0xc018937c')
-+define(`AUTOFS_DEV_IOCTL_ASKUMOUNT', `0xc018937d')
-+define(`AUTOFS_DEV_IOCTL_ISMOUNTPOINT', `0xc018937e')
-+define(`BTRFS_IOC_FILE_EXTENT_SAME', `0xc0189436')
-+define(`KVM_TRANSLATE', `0xc018ae85')
-+define(`IB_USER_MAD_REGISTER_AGENT', `0xc01c1b01')
-+define(`SI4713_IOC_MEASURE_RNL', `0xc01c56c0')
-+define(`DRM_IOCTL_MODE_CURSOR', `0xc01c64a3')
-+define(`DRM_IOCTL_MODE_GETFB', `0xc01c64ad')
-+define(`DRM_IOCTL_MODE_ADDFB', `0xc01c64ae')
-+define(`FW_CDEV_IOC_ALLOCATE', `0xc0202302')
-+define(`FW_CDEV_IOC_CREATE_ISO_CONTEXT', `0xc0202308')
-+define(`ION_IOC_ALLOC', `0xc0204900')
-+define(`VIDIOC_G_EXT_CTRLS', `0xc0205647')
-+define(`VIDIOC_S_EXT_CTRLS', `0xc0205648')
-+define(`VIDIOC_TRY_EXT_CTRLS', `0xc0205649')
-+define(`VIDIOC_OMAP3ISP_AEWB_CFG', `0xc02056c3')
-+define(`X86_IOC_RDMSR_REGS', `0xc02063a0')
-+define(`X86_IOC_WRMSR_REGS', `0xc02063a1')
-+define(`DRM_IOCTL_ADD_BUFS', `0xc0206416')
-+define(`DRM_IOCTL_AGP_ALLOC', `0xc0206434')
-+define(`DRM_IOCTL_VIA_ALLOCMEM', `0xc0206440')
-+define(`DRM_IOCTL_SIS_FB_ALLOC', `0xc0206444')
-+define(`DRM_IOCTL_MSM_GEM_SUBMIT', `0xc0206446')
-+define(`DRM_IOCTL_VIA_DMA_INIT', `0xc0206447')
-+define(`DRM_IOCTL_MGA_DMA_BOOTSTRAP', `0xc020644c')
-+define(`DRM_IOCTL_RADEON_TEXTURE', `0xc020644e')
-+define(`DRM_IOCTL_SIS_AGP_ALLOC', `0xc0206454')
-+define(`DRM_IOCTL_RADEON_GEM_CREATE', `0xc020645d')
-+define(`DRM_IOCTL_I915_GEM_MMAP', `0xc020645e')
-+define(`DRM_IOCTL_RADEON_GEM_MMAP', `0xc020645e')
-+define(`DRM_IOCTL_RADEON_GEM_PREAD', `0xc0206461')
-+define(`DRM_IOCTL_RADEON_GEM_PWRITE', `0xc0206462')
-+define(`DRM_IOCTL_RADEON_CS', `0xc0206466')
-+define(`DRM_IOCTL_MODE_GETGAMMA', `0xc02064a4')
-+define(`DRM_IOCTL_MODE_SETGAMMA', `0xc02064a5')
-+define(`DRM_IOCTL_MODE_CREATE_DUMB', `0xc02064b2')
-+define(`DRM_IOCTL_MODE_GETPLANE', `0xc02064b6')
-+define(`DRM_IOCTL_MODE_OBJ_GETPROPERTIES', `0xc02064b9')
-+define(`FS_IOC_FIEMAP', `0xc020660b')
-+define(`GENWQE_PIN_MEM', `0xc020a528')
-+define(`GENWQE_UNPIN_MEM', `0xc020a529')
-+define(`SNDCTL_MIDI_MPUCMD', `0xc0216d02')
-+define(`SNDRV_COMPRESS_GET_METADATA', `0xc0244315')
-+define(`DRM_IOCTL_MODE_CURSOR2', `0xc02464bb')
-+define(`IB_USER_MAD_REGISTER_AGENT2', `0xc0281b04')
-+define(`FW_CDEV_IOC_GET_INFO', `0xc0282300')
-+define(`SYNC_IOC_MERGE', `0xc0283e01')
-+define(`SYNC_IOC_FENCE_INFO', `0xc0283e02')
-+define(`AMDKFD_IOC_GET_CLOCK_COUNTERS', `0xc0284b05')
-+define(`VIDIOC_G_EDID', `0xc0285628')
-+define(`VIDIOC_SUBDEV_G_EDID', `0xc0285628')
-+define(`VIDIOC_SUBDEV_S_EDID', `0xc0285629')
-+define(`VIDIOC_S_EDID', `0xc0285629')
-+define(`VIDIOC_ENCODER_CMD', `0xc028564d')
-+define(`VIDIOC_TRY_ENCODER_CMD', `0xc028564e')
-+define(`VIDIOC_OMAP3ISP_STAT_REQ', `0xc02856c6')
-+define(`SW_SYNC_IOC_CREATE_FENCE', `0xc0285700')
-+define(`DRM_IOCTL_GET_MAP', `0xc0286404')
-+define(`DRM_IOCTL_GET_CLIENT', `0xc0286405')
-+define(`DRM_IOCTL_ADD_MAP', `0xc0286415')
-+define(`DRM_IOCTL_VIA_MAP_INIT', `0xc0286444')
-+define(`DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST', `0xc0286461')
-+define(`DRM_IOCTL_EXYNOS_IPP_QUEUE_BUF', `0xc0286472')
-+define(`DRM_IOCTL_NOUVEAU_GEM_INFO', `0xc0286484')
-+define(`I2OPARMSET', `0xc0286903')
-+define(`I2OPARMGET', `0xc0286904')
-+define(`NCP_IOC_GET_FS_INFO', `0xc0286e04')
-+define(`PHN_GETREGS', `0xc0287007')
-+define(`MEDIA_IOC_ENUM_LINKS', `0xc0287c02')
-+define(`KVM_TPR_ACCESS_REPORTING', `0xc028ae92')
-+define(`FSL_HV_IOCTL_MEMCPY', `0xc028af05')
-+define(`FSL_HV_IOCTL_GETPROP', `0xc028af07')
-+define(`FSL_HV_IOCTL_SETPROP', `0xc028af08')
-+define(`NCP_IOC_GETCHARSETS', `0xc02a6e0b')
-+define(`SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO', `0xc02c5341')
-+define(`VIDIOC_QUERYMENU', `0xc02c5625')
-+define(`VIDIOC_G_FREQUENCY', `0xc02c5638')
-+define(`VIDIOC_CROPCAP', `0xc02c563a')
-+define(`VIDIOC_ENUM_FRAMESIZES', `0xc02c564a')
-+define(`DRM_IOCTL_I915_OVERLAY_ATTRS', `0xc02c6468')
-+define(`MEMWRITE', `0xc0304d18')
-+define(`SNDRV_SEQ_IOCTL_SYSTEM_INFO', `0xc0305302')
-+define(`VIDIOC_SUBDEV_ENUM_MBUS_CODE', `0xc0305602')
-+define(`VIDIOC_SUBDEV_G_FRAME_INTERVAL', `0xc0305615')
-+define(`VIDIOC_SUBDEV_S_FRAME_INTERVAL', `0xc0305616')
-+define(`VIDIOC_OMAP3ISP_HIST_CFG', `0xc03056c4')
-+define(`SNDRV_RAWMIDI_IOCTL_PARAMS', `0xc0305710')
-+define(`BINDER_WRITE_READ', `0xc0306201')
-+define(`DRM_IOCTL_NOUVEAU_GEM_NEW', `0xc0306480')
-+define(`DRM_IOCTL_MODE_SETPLANE', `0xc03064b7')
-+define(`I2OSWDL', `0xc0306905')
-+define(`I2OSWUL', `0xc0306906')
-+define(`I2OSWDEL', `0xc0306907')
-+define(`I2OHTML', `0xc0306909')
-+define(`IPMICTL_RECEIVE_MSG_TRUNC', `0xc030690b')
-+define(`IPMICTL_RECEIVE_MSG', `0xc030690c')
-+define(`NCP_IOC_GET_FS_INFO_V2', `0xc0306e04')
-+define(`MBXFB_IOCX_OVERLAY', `0xc030f400')
-+define(`VIDIOC_ENUMAUDIO', `0xc0345641')
-+define(`VIDIOC_ENUMAUDOUT', `0xc0345642')
-+define(`VIDIOC_ENUM_FRAMEINTERVALS', `0xc034564b')
-+define(`MEDIA_IOC_SETUP_LINK', `0xc0347c03')
-+define(`HIDIOCGFIELDINFO', `0xc038480a')
-+define(`VIDIOC_SUBDEV_G_CROP', `0xc038563b')
-+define(`VIDIOC_SUBDEV_S_CROP', `0xc038563c')
-+define(`VIDIOC_DBG_G_REGISTER', `0xc0385650')
-+define(`VIDIOC_OMAP3ISP_CCDC_CFG', `0xc03856c1')
-+define(`SNDRV_RAWMIDI_IOCTL_STATUS', `0xc0385720')
-+define(`BTRFS_IOC_INO_PATHS', `0xc0389423')
-+define(`BTRFS_IOC_LOGICAL_INO', `0xc0389424')
-+define(`GENWQE_SLU_UPDATE', `0xc038a550')
-+define(`GENWQE_SLU_READ', `0xc038a551')
-+define(`CAPI_GET_PROFILE', `0xc0404309')
-+define(`SNDRV_CTL_IOCTL_ELEM_REMOVE', `0xc0405519')
-+define(`VIDIOC_ENUM_FMT', `0xc0405602')
-+define(`VIDIOC_EXPBUF', `0xc0405610')
-+define(`VIDIOC_SUBDEV_G_SELECTION', `0xc040563d')
-+define(`VIDIOC_SUBDEV_S_SELECTION', `0xc040563e')
-+define(`VIDIOC_SUBDEV_ENUM_FRAME_SIZE', `0xc040564a')
-+define(`VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL', `0xc040564b')
-+define(`VIDIOC_G_SELECTION', `0xc040565e')
-+define(`VIDIOC_S_SELECTION', `0xc040565f')
-+define(`VIDIOC_ENUM_FREQ_BANDS', `0xc0405665')
-+define(`DRM_IOCTL_VERSION', `0xc0406400')
-+define(`DRM_IOCTL_DMA', `0xc0406429')
-+define(`DRM_IOCTL_NOUVEAU_GEM_PUSHBUF', `0xc0406481')
-+define(`DRM_IOCTL_MODE_GETRESOURCES', `0xc04064a0')
-+define(`DRM_IOCTL_MODE_GETPROPERTY', `0xc04064aa')
-+define(`VIDIOC_QUERYCTRL', `0xc0445624')
-+define(`VIDIOC_G_MODULATOR', `0xc0445636')
-+define(`DRM_IOCTL_MODE_ADDFB2', `0xc04464b8')
-+define(`BLKTRACESETUP', `0xc0481273')
-+define(`SNDRV_EMU10K1_IOCTL_PCM_PEEK', `0xc0484831')
-+define(`NVME_IOCTL_ADMIN_CMD', `0xc0484e41')
-+define(`NVME_IOCTL_IO_CMD', `0xc0484e43')
-+define(`VIDIOC_ENUMSTD', `0xc0485619')
-+define(`VIDIOC_ENUMOUTPUT', `0xc0485630')
-+define(`VIDIOC_DECODER_CMD', `0xc0485660')
-+define(`VIDIOC_TRY_DECODER_CMD', `0xc0485661')
-+define(`DRM_IOCTL_MODE_ATTACHMODE', `0xc04864a8')
-+define(`DRM_IOCTL_MODE_DETACHMODE', `0xc04864a9')
-+define(`VIDEO_COMMAND', `0xc0486f3b')
-+define(`VIDEO_TRY_COMMAND', `0xc0486f3c')
-+define(`KVM_GET_PIT', `0xc048ae65')
-+define(`MMC_IOC_CMD', `0xc048b300')
-+define(`SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT', `0xc04c5349')
-+define(`VIDIOC_OMAP3ISP_AF_CFG', `0xc04c56c5')
-+define(`SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION', `0xc0505350')
-+define(`SNDRV_TIMER_IOCTL_GSTATUS', `0xc0505405')
-+define(`SNDRV_CTL_IOCTL_ELEM_LIST', `0xc0505510')
-+define(`VIDIOC_ENUMINPUT', `0xc050561a')
-+define(`DRM_IOCTL_EXYNOS_IPP_GET_PROPERTY', `0xc0506470')
-+define(`DRM_IOCTL_MODE_GETCONNECTOR', `0xc05064a7')
-+define(`VIDIOC_G_TUNER', `0xc054561d')
-+define(`SISFB_COMMAND', `0xc054f305')
-+define(`CCISS_PASSTHRU', `0xc058420b')
-+define(`AMDKFD_IOC_CREATE_QUEUE', `0xc0584b02')
-+define(`SNDRV_SEQ_IOCTL_GET_CLIENT_POOL', `0xc058534b')
-+define(`SNDRV_SEQ_IOCTL_QUERY_SUBS', `0xc058534f')
-+define(`VIDIOC_SUBDEV_G_FMT', `0xc0585604')
-+define(`VIDIOC_SUBDEV_S_FMT', `0xc0585605')
-+define(`VIDIOC_QUERYBUF', `0xc0585609')
-+define(`VIDIOC_QBUF', `0xc058560f')
-+define(`VIDIOC_DQBUF', `0xc0585611')
-+define(`VIDIOC_PREPARE_BUF', `0xc058565d')
-+define(`DRM_IOCTL_TEGRA_SUBMIT', `0xc0586448')
-+define(`SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS', `0xc05c5340')
-+define(`PTP_PIN_GETFUNC', `0xc0603d06')
-+define(`CCISS_BIG_PASSTHRU', `0xc0604212')
-+define(`SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER', `0xc0605345')
-+define(`DRM_IOCTL_EXYNOS_IPP_SET_PROPERTY', `0xc0606471')
-+define(`UVCIOC_CTRL_MAP', `0xc0607520')
-+define(`FBIO_CURSOR', `0xc0684608')
-+define(`UI_BEGIN_FF_UPLOAD', `0xc06855c8')
-+define(`DRM_IOCTL_MODE_GETCRTC', `0xc06864a1')
-+define(`DRM_IOCTL_MODE_SETCRTC', `0xc06864a2')
-+define(`VIDIOC_OMAP3ISP_PRV_CFG', `0xc07056c2')
-+define(`BTRFS_IOC_TREE_SEARCH_V2', `0xc0709411')
-+define(`SNDCTL_MIDI_INFO', `0xc074510c')
-+define(`VIDIOC_G_SLICED_VBI_CAP', `0xc0745645')
-+define(`SOUND_MIXER_ACCESS', `0xc0804d66')
-+define(`VIDIOC_SUBDEV_S_DV_TIMINGS', `0xc0845657')
-+define(`VIDIOC_S_DV_TIMINGS', `0xc0845657')
-+define(`VIDIOC_G_DV_TIMINGS', `0xc0845658')
-+define(`VIDIOC_SUBDEV_G_DV_TIMINGS', `0xc0845658')
-+define(`SNDRV_PCM_IOCTL_SW_PARAMS', `0xc0884113')
-+define(`SNDRV_PCM_IOCTL_SYNC_PTR', `0xc0884123')
-+define(`SNDCTL_SYNTH_INFO', `0xc08c5102')
-+define(`SNDCTL_SYNTH_ID', `0xc08c5114')
-+define(`SNDRV_SEQ_IOCTL_CREATE_QUEUE', `0xc08c5332')
-+define(`SNDRV_SEQ_IOCTL_GET_QUEUE_INFO', `0xc08c5334')
-+define(`SNDRV_SEQ_IOCTL_SET_QUEUE_INFO', `0xc08c5335')
-+define(`SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE', `0xc08c5336')
-+define(`VIDIOC_DV_TIMINGS_CAP', `0xc0905664')
-+define(`VIDIOC_SUBDEV_DV_TIMINGS_CAP', `0xc0905664')
-+define(`VIDIOC_ENUM_DV_TIMINGS', `0xc0945662')
-+define(`VIDIOC_SUBDEV_ENUM_DV_TIMINGS', `0xc0945662')
-+define(`SOUND_MIXER_GETLEVELS', `0xc0a44d74')
-+define(`SOUND_MIXER_SETLEVELS', `0xc0a44d75')
-+define(`SNDRV_SEQ_IOCTL_CREATE_PORT', `0xc0a85320')
-+define(`SNDRV_SEQ_IOCTL_GET_PORT_INFO', `0xc0a85322')
-+define(`SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT', `0xc0a85352')
-+define(`SNDRV_SEQ_IOCTL_GET_CLIENT_INFO', `0xc0bc5310')
-+define(`SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT', `0xc0bc5351')
-+define(`SNDRV_COMPRESS_GET_CAPS', `0xc0c44310')
-+define(`VIDIOC_DBG_G_CHIP_INFO', `0xc0c85666')
-+define(`BTRFS_IOC_SET_RECEIVED_SUBVOL', `0xc0c89425')
-+define(`VIDIOC_G_PARM', `0xc0cc5615')
-+define(`VIDIOC_S_PARM', `0xc0cc5616')
-+define(`VIDIOC_G_FMT', `0xc0d05604')
-+define(`VIDIOC_S_FMT', `0xc0d05605')
-+define(`VIDIOC_TRY_FMT', `0xc0d05640')
-+define(`VIDIOC_QUERY_EXT_CTRL', `0xc0e85667')
-+define(`GENWQE_EXECUTE_DDCB', `0xc0e8a532')
-+define(`GENWQE_EXECUTE_RAW_DDCB', `0xc0e8a533')
-+define(`SNDRV_TIMER_IOCTL_GINFO', `0xc0f85403')
-+define(`VIDIOC_CREATE_BUFS', `0xc100565c')
-+define(`MEDIA_IOC_DEVICE_INFO', `0xc1007c00')
-+define(`MEDIA_IOC_ENUM_ENTITIES', `0xc1007c01')
-+define(`SNDRV_CTL_IOCTL_RAWMIDI_INFO', `0xc10c5541')
-+define(`SNDRV_CTL_IOCTL_ELEM_INFO', `0xc1105511')
-+define(`SNDRV_CTL_IOCTL_ELEM_ADD', `0xc1105517')
-+define(`SNDRV_CTL_IOCTL_ELEM_REPLACE', `0xc1105518')
-+define(`SNDRV_CTL_IOCTL_PCM_INFO', `0xc1205531')
-+define(`DM_VERSION', `0xc138fd00')
-+define(`DM_REMOVE_ALL', `0xc138fd01')
-+define(`DM_LIST_DEVICES', `0xc138fd02')
-+define(`DM_DEV_CREATE', `0xc138fd03')
-+define(`DM_DEV_REMOVE', `0xc138fd04')
-+define(`DM_DEV_RENAME', `0xc138fd05')
-+define(`DM_DEV_SUSPEND', `0xc138fd06')
-+define(`DM_DEV_STATUS', `0xc138fd07')
-+define(`DM_DEV_WAIT', `0xc138fd08')
-+define(`DM_TABLE_LOAD', `0xc138fd09')
-+define(`DM_TABLE_CLEAR', `0xc138fd0a')
-+define(`DM_TABLE_DEPS', `0xc138fd0b')
-+define(`DM_TABLE_STATUS', `0xc138fd0c')
-+define(`DM_LIST_VERSIONS', `0xc138fd0d')
-+define(`DM_TARGET_MSG', `0xc138fd0e')
-+define(`DM_DEV_SET_GEOMETRY', `0xc138fd0f')
-+define(`SNDRV_EMU10K1_IOCTL_CODE_PEEK', `0xc1b04812')
-+define(`KVM_GET_IRQCHIP', `0xc208ae62')
-+define(`SNDRV_PCM_IOCTL_HW_REFINE', `0xc2604110')
-+define(`SNDRV_PCM_IOCTL_HW_PARAMS', `0xc2604111')
-+define(`VIDIOC_VSP1_LUT_CONFIG', `0xc40056c1')
-+define(`BTRFS_IOC_SCRUB', `0xc400941b')
-+define(`BTRFS_IOC_SCRUB_PROGRESS', `0xc400941d')
-+define(`BTRFS_IOC_BALANCE_V2', `0xc4009420')
-+define(`BTRFS_IOC_GET_DEV_STATS', `0xc4089434')
-+define(`SNDRV_CTL_IOCTL_ELEM_READ', `0xc4c85512')
-+define(`SNDRV_CTL_IOCTL_ELEM_WRITE', `0xc4c85513')
-+define(`BTRFS_IOC_DEV_REPLACE', `0xca289435')
-+define(`SNDCTL_COPR_SENDMSG', `0xcfa44308')
-+define(`SNDCTL_SYNTH_CONTROL', `0xcfa45115')
-+define(`SNDCTL_COPR_LOAD', `0xcfb04301')
-+define(`BTRFS_IOC_TREE_SEARCH', `0xd0009411')
-+define(`BTRFS_IOC_INO_LOOKUP', `0xd0009412')
-+define(`BTRFS_IOC_DEV_INFO', `0xd000941e')
-+define(`HIDIOCGUSAGES', `0xd01c4813')
-+define(`SNDRV_COMPRESS_GET_CODEC_CAPS', `0xeb884311')
-+define(`WAN_IOC_ADD_FLT_RULE', `0x00006900')
-+define(`WAN_IOC_ADD_FLT_INDEX', `0x00006902')
-+define(`PPPIOCGL2TPSTATS',   `0x7436')
-+define(`PPPIOCGCHAN',        `0x7437')
-+define(`PPPIOCATTCHAN',      `0x7438')
-+define(`PPPIOCDISCONN',      `0x7439')
-+define(`PPPIOCCONNECT',      `0x743a')
-+define(`PPPIOCSMRRU',        `0x743b')
-+define(`PPPIOCDETACH',       `0x743c')
-+define(`PPPIOCATTACH',       `0x743d')
-+define(`PPPIOCNEWUNIT',      `0x743e')
-+define(`PPPIOCGIDLE',        `0x743f')
-+define(`PPPIOCSDEBUG',       `0x7440')
-+define(`PPPIOCGDEBUG',       `0x7441')
-+define(`PPPIOCSACTIVE',      `0x7446')
-+define(`PPPIOCSPASS',        `0x7447')
-+define(`PPPIOCSNPMODE',      `0x744b')
-+define(`PPPIOCGNPMODE',      `0x744c')
-+define(`PPPIOCSCOMPRESS',    `0x744d')
-+define(`PPPIOCXFERUNIT',     `0x744e')
-+define(`PPPIOCSXASYNCMAP',   `0x744f')
-+define(`PPPIOCGXASYNCMAP',   `0x7450')
-+define(`PPPIOCSMAXCID',      `0x7451')
-+define(`PPPIOCSMRU',         `0x7452')
-+define(`PPPIOCGMRU',         `0x7453')
-+define(`PPPIOCSRASYNCMAP',   `0x7454')
-+define(`PPPIOCGRASYNCMAP',   `0x7455')
-+define(`PPPIOCGUNIT',        `0x7456')
-+define(`PPPIOCSASYNCMAP',    `0x7457')
-+define(`PPPIOCGASYNCMAP',    `0x7458')
-+define(`PPPIOCSFLAGS',       `0x7459')
-+define(`PPPIOCGFLAGS',       `0x745a')
-+define(`PPPIOCGCALLINFO',    `0x7480')
-+define(`PPPIOCBUNDLE',       `0x7481')
-+define(`PPPIOCGMPFLAGS',     `0x7482')
-+define(`PPPIOCSMPFLAGS',     `0x7483')
-+define(`PPPIOCSMPMTU',       `0x7484')
-+define(`PPPIOCSMPMRU',       `0x7485')
-+define(`PPPIOCGCOMPRESSORS', `0x7486')
-+define(`PPPIOCSCOMPRESSOR',  `0x7487')
-+define(`PPPIOCGIFNAME',      `0x7488')
-diff --git a/prebuilts/api/28.0/public/ioctl_macros b/prebuilts/api/28.0/public/ioctl_macros
-new file mode 100644
-index 000000000..f7081d576
---- /dev/null
-+++ b/prebuilts/api/28.0/public/ioctl_macros
-@@ -0,0 +1,68 @@
-+# socket ioctls allowed to unprivileged apps
-+define(`unpriv_sock_ioctls', `
-+{
-+# Socket ioctls for gathering information about the interface
-+SIOCGSTAMP SIOCGSTAMPNS
-+SIOCGIFNAME SIOCGIFCONF SIOCGIFFLAGS SIOCGIFADDR SIOCGIFDSTADDR SIOCGIFBRDADDR
-+SIOCGIFNETMASK SIOCGIFMTU SIOCGIFINDEX SIOCGIFCOUNT SIOCGIFTXQLEN
-+# Wireless extension ioctls. Primarily get functions.
-+SIOCGIWNAME SIOCGIWFREQ SIOCGIWMODE SIOCGIWSENS SIOCGIWRANGE SIOCGIWPRIV
-+SIOCGIWSTATS SIOCGIWSPY SIOCSIWTHRSPY SIOCGIWTHRSPY SIOCGIWRATE SIOCGIWRTS
-+SIOCGIWFRAG SIOCGIWTXPOW SIOCGIWRETRY SIOCGIWPOWER
-+}')
-+
-+# socket ioctls never allowed to unprivileged apps
-+define(`priv_sock_ioctls', `
-+{
-+# qualcomm rmnet ioctls
-+WAN_IOC_ADD_FLT_RULE WAN_IOC_ADD_FLT_INDEX
-+# socket ioctls
-+SIOCADDRT SIOCDELRT SIOCRTMSG SIOCSIFLINK SIOCSIFFLAGS SIOCSIFADDR
-+SIOCSIFDSTADDR SIOCSIFBRDADDR SIOCSIFNETMASK SIOCGIFMETRIC SIOCSIFMETRIC SIOCGIFMEM
-+SIOCSIFMEM SIOCSIFMTU SIOCSIFNAME SIOCSIFHWADDR SIOCGIFENCAP SIOCSIFENCAP
-+SIOCGIFHWADDR SIOCGIFSLAVE SIOCSIFSLAVE SIOCADDMULTI SIOCDELMULTI
-+SIOCSIFPFLAGS SIOCGIFPFLAGS SIOCDIFADDR SIOCSIFHWBROADCAST SIOCKILLADDR SIOCGIFBR SIOCSIFBR
-+SIOCSIFTXQLEN SIOCETHTOOL SIOCGMIIPHY SIOCGMIIREG SIOCSMIIREG SIOCWANDEV
-+SIOCOUTQNSD SIOCDARP SIOCGARP SIOCSARP SIOCDRARP SIOCGRARP SIOCSRARP SIOCGIFMAP
-+SIOCSIFMAP SIOCADDDLCI SIOCDELDLCI SIOCGIFVLAN SIOCSIFVLAN SIOCBONDENSLAVE
-+SIOCBONDRELEASE SIOCBONDSETHWADDR SIOCBONDSLAVEINFOQUERY SIOCBONDINFOQUERY
-+SIOCBONDCHANGEACTIVE SIOCBRADDBR SIOCBRDELBR SIOCBRADDIF SIOCBRDELIF SIOCSHWTSTAMP
-+# device and protocol specific ioctls
-+SIOCDEVPRIVATE-SIOCDEVPRIVLAST
-+SIOCPROTOPRIVATE-SIOCPROTOPRIVLAST
-+# Wireless extension ioctls
-+SIOCSIWCOMMIT SIOCSIWNWID SIOCSIWFREQ SIOCSIWMODE SIOCSIWSENS SIOCSIWRANGE
-+SIOCSIWPRIV SIOCSIWSTATS SIOCSIWSPY SIOCSIWAP SIOCGIWAP SIOCSIWMLME SIOCGIWAPLIST
-+SIOCSIWSCAN SIOCGIWSCAN SIOCSIWESSID SIOCGIWESSID SIOCSIWNICKN SIOCGIWNICKN
-+SIOCSIWRATE SIOCSIWRTS SIOCSIWFRAG SIOCSIWTXPOW SIOCSIWRETRY SIOCSIWENCODE
-+SIOCGIWENCODE SIOCSIWPOWER SIOCSIWGENIE SIOCGIWGENIE SIOCSIWAUTH SIOCGIWAUTH
-+SIOCSIWENCODEEXT SIOCGIWENCODEEXT SIOCSIWPMKSA
-+# Dev private ioctl i.e. hardware specific ioctls
-+SIOCIWFIRSTPRIV-SIOCIWLASTPRIV
-+}')
-+
-+# commonly used ioctls on unix sockets
-+define(`unpriv_unix_sock_ioctls', `{
-+  TIOCOUTQ FIOCLEX TCGETS TIOCGWINSZ TIOCSWINSZ FIONREAD
-+}')
-+
-+# commonly used TTY ioctls
-+# merge with unpriv_unix_sock_ioctls?
-+define(`unpriv_tty_ioctls', `{
-+  TIOCOUTQ FIOCLEX TCGETS TCSETS TIOCGWINSZ TIOCSWINSZ TIOCSCTTY TCSETSW
-+  TCFLSH TIOCSPGRP TIOCGPGRP
-+}')
-+
-+# point to point ioctls
-+define(`ppp_ioctls', `{
-+PPPIOCGL2TPSTATS PPPIOCGCHAN PPPIOCATTCHAN PPPIOCDISCONN
-+PPPIOCCONNECT PPPIOCSMRRU PPPIOCDETACH PPPIOCATTACH
-+PPPIOCNEWUNIT PPPIOCGIDLE PPPIOCSDEBUG PPPIOCGDEBUG
-+PPPIOCSACTIVE PPPIOCSPASS PPPIOCSNPMODE PPPIOCGNPMODE
-+PPPIOCSCOMPRESS PPPIOCXFERUNIT PPPIOCSXASYNCMAP
-+PPPIOCGXASYNCMAP PPPIOCSMAXCID PPPIOCSMRU PPPIOCGMRU
-+PPPIOCSRASYNCMAP PPPIOCGRASYNCMAP PPPIOCGUNIT PPPIOCSASYNCMAP
-+PPPIOCGASYNCMAP PPPIOCSFLAGS PPPIOCGFLAGS PPPIOCGCALLINFO
-+PPPIOCBUNDLE PPPIOCGMPFLAGS PPPIOCSMPFLAGS PPPIOCSMPMTU
-+PPPIOCSMPMRU PPPIOCGCOMPRESSORS PPPIOCSCOMPRESSOR PPPIOCGIFNAME
-+}')
-diff --git a/prebuilts/api/28.0/public/isolated_app.te b/prebuilts/api/28.0/public/isolated_app.te
-new file mode 100644
-index 000000000..a907dacc2
---- /dev/null
-+++ b/prebuilts/api/28.0/public/isolated_app.te
-@@ -0,0 +1,9 @@
-+###
-+### Services with isolatedProcess=true in their manifest.
-+###
-+### This file defines the rules for isolated apps. An "isolated
-+### app" is an APP with UID between AID_ISOLATED_START (99000)
-+### and AID_ISOLATED_END (99999).
-+###
-+
-+type isolated_app, domain;
-diff --git a/prebuilts/api/28.0/public/kernel.te b/prebuilts/api/28.0/public/kernel.te
-new file mode 100644
-index 000000000..b7a351cc8
---- /dev/null
-+++ b/prebuilts/api/28.0/public/kernel.te
-@@ -0,0 +1,105 @@
-+# Life begins with the kernel.
-+type kernel, domain, mlstrustedsubject;
-+
-+allow kernel self:global_capability_class_set sys_nice;
-+
-+# Root fs.
-+r_dir_file(kernel, rootfs)
-+allow kernel proc_cmdline:file r_file_perms;
-+
-+# Get SELinux enforcing status.
-+allow kernel selinuxfs:dir r_dir_perms;
-+allow kernel selinuxfs:file r_file_perms;
-+
-+# Get file contexts during first stage
-+allow kernel file_contexts_file:file r_file_perms;
-+
-+# Allow init relabel itself.
-+allow kernel rootfs:file relabelfrom;
-+allow kernel init_exec:file relabelto;
-+# TODO: investigate why we need this.
-+allow kernel init:process share;
-+
-+# cgroup filesystem initialization prior to setting the cgroup root directory label.
-+allow kernel unlabeled:dir search;
-+
-+# Mount usbfs.
-+allow kernel usbfs:filesystem mount;
-+allow kernel usbfs:dir search;
-+
-+# Initial setenforce by init prior to switching to init domain.
-+# We use dontaudit instead of allow to prevent a kernel spawned userspace
-+# process from turning off SELinux once enabled.
-+dontaudit kernel self:security setenforce;
-+
-+# Write to /proc/1/oom_adj prior to switching to init domain.
-+allow kernel self:global_capability_class_set sys_resource;
-+
-+# Init reboot before switching selinux domains under certain error
-+# conditions. Allow it.
-+# As part of rebooting, init writes "u" to /proc/sysrq-trigger to
-+# remount filesystems read-only. /data is not mounted at this point,
-+# so we could ignore this. For now, we allow it.
-+allow kernel self:global_capability_class_set sys_boot;
-+allow kernel proc_sysrq:file w_file_perms;
-+
-+# Allow writing to /dev/kmsg which was created prior to loading policy.
-+allow kernel tmpfs:chr_file write;
-+
-+# Set checkreqprot by init.rc prior to switching to init domain.
-+allow kernel selinuxfs:file write;
-+allow kernel self:security setcheckreqprot;
-+
-+# kernel thread "loop0", used by the loop block device, for ASECs (b/17158723)
-+allow kernel sdcard_type:file { read write };
-+
-+# f_mtp driver accesses files from kernel context.
-+allow kernel mediaprovider:fd use;
-+
-+# Allow the kernel to read OBB files from app directories. (b/17428116)
-+# Kernel thread "loop0" reads a vold supplied file descriptor.
-+# Fixes CTS tests:
-+#  * android.os.storage.cts.StorageManagerTest#testMountAndUnmountObbNormal
-+#  * android.os.storage.cts.StorageManagerTest#testMountAndUnmountTwoObbs
-+allow kernel vold:fd use;
-+allow kernel app_data_file:file read;
-+allow kernel asec_image_file:file read;
-+
-+# Allow reading loop device in update_engine_unittests. (b/28319454)
-+# and for LTP kernel tests (b/73220071)
-+userdebug_or_eng(`
-+  allow kernel update_engine_data_file:file read;
-+  allow kernel nativetest_data_file:file { read write };
-+')
-+
-+# Access to /data/media.
-+# This should be removed if sdcardfs is modified to alter the secontext for its
-+# accesses to the underlying FS.
-+allow kernel media_rw_data_file:dir create_dir_perms;
-+allow kernel media_rw_data_file:file create_file_perms;
-+
-+# Access to /data/misc/vold/virtual_disk.
-+allow kernel vold_data_file:file read;
-+
-+###
-+### neverallow rules
-+###
-+
-+# The initial task starts in the kernel domain (assigned via
-+# initial_sid_contexts), but nothing ever transitions to it.
-+neverallow * kernel:process { transition dyntransition };
-+
-+# The kernel domain is never entered via an exec, nor should it
-+# ever execute a program outside the rootfs without changing to another domain.
-+# If you encounter an execute_no_trans denial on the kernel domain, then
-+# possible causes include:
-+# - The program is a kernel usermodehelper.  In this case, define a domain
-+#   for the program and domain_auto_trans() to it.
-+# - You are running an exploit which switched to the init task credentials
-+#   and is then trying to exec a shell or other program.  You lose!
-+neverallow kernel *:file { entrypoint execute_no_trans };
-+
-+# the kernel should not be accessing files owned by other users.
-+# Instead of adding dac_{read_search,override}, fix the unix permissions
-+# on files being accessed.
-+neverallow kernel self:global_capability_class_set { dac_override dac_read_search };
-diff --git a/prebuilts/api/28.0/public/keystore.te b/prebuilts/api/28.0/public/keystore.te
-new file mode 100644
-index 000000000..49355bd95
---- /dev/null
-+++ b/prebuilts/api/28.0/public/keystore.te
-@@ -0,0 +1,35 @@
-+type keystore, domain;
-+type keystore_exec, exec_type, file_type;
-+
-+# keystore daemon
-+typeattribute keystore mlstrustedsubject;
-+binder_use(keystore)
-+binder_service(keystore)
-+binder_call(keystore, system_server)
-+
-+allow keystore keystore_data_file:dir create_dir_perms;
-+allow keystore keystore_data_file:notdevfile_class_set create_file_perms;
-+allow keystore keystore_exec:file { getattr };
-+
-+add_service(keystore, keystore_service)
-+allow keystore sec_key_att_app_id_provider_service:service_manager find;
-+allow keystore dropbox_service:service_manager find;
-+
-+# Check SELinux permissions.
-+selinux_check_access(keystore)
-+
-+r_dir_file(keystore, cgroup)
-+
-+###
-+### Neverallow rules
-+###
-+### Protect ourself from others
-+###
-+
-+neverallow { domain -keystore } keystore_data_file:dir ~{ open create read getattr setattr search relabelto ioctl };
-+neverallow { domain -keystore } keystore_data_file:notdevfile_class_set ~{ relabelto getattr };
-+
-+neverallow { domain -keystore -init } keystore_data_file:dir *;
-+neverallow { domain -keystore -init } keystore_data_file:notdevfile_class_set *;
-+
-+neverallow * keystore:process ptrace;
-diff --git a/prebuilts/api/28.0/public/lmkd.te b/prebuilts/api/28.0/public/lmkd.te
-new file mode 100644
-index 000000000..5b4a235a0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/lmkd.te
-@@ -0,0 +1,52 @@
-+# lmkd low memory killer daemon
-+type lmkd, domain, mlstrustedsubject;
-+type lmkd_exec, exec_type, file_type;
-+
-+allow lmkd self:global_capability_class_set { dac_override sys_resource kill };
-+
-+# lmkd locks itself in memory, to prevent it from being
-+# swapped out and unable to kill other memory hogs.
-+# system/core commit b28ff9131363f7b4a698990da5748b2a88c3ed35
-+# b/16236289
-+allow lmkd self:global_capability_class_set ipc_lock;
-+
-+## Open and write to /proc/PID/oom_score_adj
-+## TODO: maybe scope this down?
-+r_dir_file(lmkd, appdomain)
-+allow lmkd appdomain:file write;
-+r_dir_file(lmkd, system_server)
-+allow lmkd system_server:file write;
-+
-+## Writes to /sys/module/lowmemorykiller/parameters/minfree
-+r_dir_file(lmkd, sysfs_lowmemorykiller)
-+allow lmkd sysfs_lowmemorykiller:file w_file_perms;
-+
-+# setsched and send kill signals
-+allow lmkd appdomain:process { setsched sigkill };
-+
-+# Clean up old cgroups
-+allow lmkd cgroup:dir { remove_name rmdir };
-+
-+# Allow to read memcg stats
-+allow lmkd cgroup:file r_file_perms;
-+
-+# Set self to SCHED_FIFO
-+allow lmkd self:global_capability_class_set sys_nice;
-+
-+allow lmkd proc_zoneinfo:file r_file_perms;
-+
-+# live lock watchdog process allowed to look through /proc/
-+allow lmkd domain:dir { search open read };
-+allow lmkd domain:file { open read };
-+
-+# live lock watchdog process allowed to dump process trace and
-+# reboot because orderly shutdown may not be possible.
-+allow lmkd proc_sysrq:file rw_file_perms;
-+
-+# Read /proc/meminfo
-+allow lmkd proc_meminfo:file r_file_perms;
-+
-+### neverallow rules
-+
-+# never honor LD_PRELOAD
-+neverallow * lmkd:process noatsecure;
-diff --git a/prebuilts/api/28.0/public/logd.te b/prebuilts/api/28.0/public/logd.te
-new file mode 100644
-index 000000000..817a7059f
---- /dev/null
-+++ b/prebuilts/api/28.0/public/logd.te
-@@ -0,0 +1,73 @@
-+# android user-space log manager
-+type logd, domain, mlstrustedsubject;
-+type logd_exec, exec_type, file_type;
-+
-+# Read access to pseudo filesystems.
-+r_dir_file(logd, cgroup)
-+r_dir_file(logd, proc_kmsg)
-+r_dir_file(logd, proc_meminfo)
-+r_dir_file(logd, proc_net)
-+
-+allow logd self:global_capability_class_set { setuid setgid setpcap sys_nice audit_control };
-+allow logd self:global_capability2_class_set syslog;
-+allow logd self:netlink_audit_socket { create_socket_perms_no_ioctl nlmsg_write };
-+allow logd kernel:system syslog_read;
-+allow logd kmsg_device:chr_file w_file_perms;
-+allow logd system_data_file:{ file lnk_file } r_file_perms;
-+allow logd pstorefs:dir search;
-+allow logd pstorefs:file r_file_perms;
-+userdebug_or_eng(`
-+  # Access to /data/misc/logd/event-log-tags
-+  allow logd misc_logd_file:dir r_dir_perms;
-+  allow logd misc_logd_file:file rw_file_perms;
-+')
-+allow logd runtime_event_log_tags_file:file rw_file_perms;
-+
-+# Access device logging gating property
-+get_prop(logd, device_logging_prop)
-+
-+r_dir_file(logd, domain)
-+
-+allow logd kernel:system syslog_mod;
-+
-+control_logd(logd)
-+read_runtime_log_tags(logd)
-+
-+allow runtime_event_log_tags_file tmpfs:filesystem associate;
-+# Typically harmlessly blindly trying to access via liblog
-+# event tag mapping while in the untrusted_app domain.
-+# Access for that domain is controlled and gated via the
-+# event log tag service (albeit at a performance penalty,
-+# expected to be locally cached).
-+dontaudit domain runtime_event_log_tags_file:file { open read };
-+
-+###
-+### Neverallow rules
-+###
-+### logd should NEVER do any of this
-+
-+# Block device access.
-+neverallow logd dev_type:blk_file { read write };
-+
-+# ptrace any other app
-+neverallow logd domain:process ptrace;
-+
-+# ... and nobody may ptrace me (except on userdebug or eng builds)
-+neverallow { domain userdebug_or_eng(`-crash_dump') } logd:process ptrace;
-+
-+# Write to /system.
-+neverallow logd system_file:dir_file_class_set write;
-+
-+# Write to files in /data/data or system files on /data
-+neverallow logd { app_data_file system_data_file }:dir_file_class_set write;
-+
-+# Only init is allowed to enter the logd domain via exec()
-+neverallow { domain -init } logd:process transition;
-+neverallow * logd:process dyntransition;
-+
-+# protect the event-log-tags file
-+neverallow {
-+  domain
-+  -init
-+  -logd
-+} runtime_event_log_tags_file:file no_w_file_perms;
-diff --git a/prebuilts/api/28.0/public/logpersist.te b/prebuilts/api/28.0/public/logpersist.te
-new file mode 100644
-index 000000000..7536cb84d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/logpersist.te
-@@ -0,0 +1,26 @@
-+# android debug logging, logpersist domains
-+type logpersist, domain;
-+
-+###
-+### Neverallow rules
-+###
-+### logpersist should NEVER do any of this
-+
-+# Block device access.
-+neverallow logpersist dev_type:blk_file { read write };
-+
-+# ptrace any other app
-+neverallow logpersist domain:process ptrace;
-+
-+# Write to files in /data/data or system files on /data except misc_logd_file
-+neverallow logpersist { app_data_file system_data_file }:dir_file_class_set write;
-+
-+# Only init should be allowed to enter the logpersist domain via exec()
-+# Following is a list of debug domains we know that transition to logpersist
-+# neverallow_with_undefined_domains {
-+#   domain
-+#   -init       # goldfish, logcatd, raft
-+#   -mmi        # bat, mtp8996, msmcobalt
-+#   -system_app # Smith.apk
-+# } logpersist:process transition;
-+neverallow * logpersist:process dyntransition;
-diff --git a/prebuilts/api/28.0/public/mdnsd.te b/prebuilts/api/28.0/public/mdnsd.te
-new file mode 100644
-index 000000000..ef7b065d8
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mdnsd.te
-@@ -0,0 +1,2 @@
-+# mdns daemon
-+type mdnsd, domain;
-diff --git a/prebuilts/api/28.0/public/mediacodec.te b/prebuilts/api/28.0/public/mediacodec.te
-new file mode 100644
-index 000000000..e5b4a7d35
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mediacodec.te
-@@ -0,0 +1,70 @@
-+# mediacodec - audio and video codecs live here
-+type mediacodec, domain;
-+type mediacodec_exec, exec_type, vendor_file_type, file_type;
-+
-+typeattribute mediacodec mlstrustedsubject;
-+
-+# TODO(b/36375899) attributize this domain appropriately as hal_omx
-+# and use macro hal_server_domain
-+get_prop(mediacodec, hwservicemanager_prop)
-+
-+# can route /dev/binder traffic to /dev/vndbinder
-+vndbinder_use(mediacodec)
-+
-+not_full_treble(`
-+    # on legacy devices, continue to allow /dev/binder traffic
-+    binder_use(mediacodec)
-+    binder_service(mediacodec)
-+    add_service(mediacodec, mediacodec_service)
-+    allow mediacodec mediametrics_service:service_manager find;
-+    allow mediacodec surfaceflinger_service:service_manager find;
-+')
-+binder_call(mediacodec, binderservicedomain)
-+binder_call(mediacodec, appdomain)
-+
-+# Allow mediacodec access to composer sync fences
-+allow mediacodec hal_graphics_composer:fd use;
-+
-+allow mediacodec gpu_device:chr_file rw_file_perms;
-+allow mediacodec video_device:chr_file rw_file_perms;
-+allow mediacodec video_device:dir search;
-+allow mediacodec ion_device:chr_file rw_file_perms;
-+allow mediacodec hal_camera:fd use;
-+
-+crash_dump_fallback(mediacodec)
-+
-+add_hwservice(mediacodec, hal_codec2_hwservice)
-+add_hwservice(mediacodec, hal_omx_hwservice)
-+
-+hal_client_domain(mediacodec, hal_allocator)
-+
-+hal_client_domain(mediacodec, hal_cas)
-+
-+# allocate and use graphic buffers
-+hal_client_domain(mediacodec, hal_graphics_allocator)
-+
-+# Recieve gralloc buffer FDs from bufferhubd. Note that mediacodec never
-+# directly connects to bufferhubd via PDX. Instead, a VR app acts as a bridge
-+# between those two: it talks to mediacodec via Binder and talks to bufferhubd
-+# via PDX. Thus, there is no need to use pdx_client macro.
-+allow mediacodec bufferhubd:fd use;
-+
-+###
-+### neverallow rules
-+###
-+
-+# mediacodec should never execute any executable without a
-+# domain transition
-+neverallow mediacodec { file_type fs_type }:file execute_no_trans;
-+
-+# The goal of the mediaserver split is to place media processing code into
-+# restrictive sandboxes with limited responsibilities and thus limited
-+# permissions. Example: Audioserver is only responsible for controlling audio
-+# hardware and processing audio content. Cameraserver does the same for camera
-+# hardware/content. Etc.
-+#
-+# Media processing code is inherently risky and thus should have limited
-+# permissions and be isolated from the rest of the system and network.
-+# Lengthier explanation here:
-+# https://android-developers.googleblog.com/2016/05/hardening-media-stack.html
-+neverallow mediacodec domain:{ tcp_socket udp_socket rawip_socket } *;
-diff --git a/prebuilts/api/28.0/public/mediadrmserver.te b/prebuilts/api/28.0/public/mediadrmserver.te
-new file mode 100644
-index 000000000..123cb29a5
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mediadrmserver.te
-@@ -0,0 +1,31 @@
-+# mediadrmserver - mediadrm daemon
-+type mediadrmserver, domain;
-+type mediadrmserver_exec, exec_type, file_type;
-+
-+typeattribute mediadrmserver mlstrustedsubject;
-+
-+net_domain(mediadrmserver)
-+binder_use(mediadrmserver)
-+binder_call(mediadrmserver, binderservicedomain)
-+binder_call(mediadrmserver, appdomain)
-+binder_service(mediadrmserver)
-+hal_client_domain(mediadrmserver, hal_drm)
-+
-+add_service(mediadrmserver, mediadrmserver_service)
-+allow mediadrmserver mediaserver_service:service_manager find;
-+allow mediadrmserver mediametrics_service:service_manager find;
-+allow mediadrmserver processinfo_service:service_manager find;
-+allow mediadrmserver surfaceflinger_service:service_manager find;
-+allow mediadrmserver system_file:dir r_dir_perms;
-+
-+binder_call(mediadrmserver, mediacodec)
-+###
-+### neverallow rules
-+###
-+
-+# mediadrmserver should never execute any executable without a
-+# domain transition
-+neverallow mediadrmserver { file_type fs_type }:file execute_no_trans;
-+
-+# do not allow privileged socket ioctl commands
-+neverallowxperm mediadrmserver domain:{ rawip_socket tcp_socket udp_socket } ioctl priv_sock_ioctls;
-diff --git a/prebuilts/api/28.0/public/mediaextractor.te b/prebuilts/api/28.0/public/mediaextractor.te
-new file mode 100644
-index 000000000..b0554626f
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mediaextractor.te
-@@ -0,0 +1,74 @@
-+# mediaextractor - multimedia daemon
-+type mediaextractor, domain;
-+type mediaextractor_exec, exec_type, file_type;
-+
-+typeattribute mediaextractor mlstrustedsubject;
-+
-+binder_use(mediaextractor)
-+binder_call(mediaextractor, binderservicedomain)
-+binder_call(mediaextractor, appdomain)
-+binder_service(mediaextractor)
-+
-+add_service(mediaextractor, mediaextractor_service)
-+allow mediaextractor mediametrics_service:service_manager find;
-+allow mediaextractor hidl_token_hwservice:hwservice_manager find;
-+
-+allow mediaextractor system_server:fd use;
-+
-+hal_client_domain(mediaextractor, hal_cas)
-+
-+r_dir_file(mediaextractor, cgroup)
-+allow mediaextractor proc_meminfo:file r_file_perms;
-+
-+crash_dump_fallback(mediaextractor)
-+
-+# allow mediaextractor read permissions for file sources
-+allow mediaextractor sdcardfs:file { getattr read };
-+allow mediaextractor media_rw_data_file:file { getattr read };
-+allow mediaextractor app_data_file:file { getattr read };
-+
-+# Read resources from open apk files passed over Binder
-+allow mediaextractor apk_data_file:file { read getattr };
-+allow mediaextractor asec_apk_file:file { read getattr };
-+allow mediaextractor ringtone_file:file { read getattr };
-+
-+# scan extractor library directory to dynamically load extractors
-+allow mediaextractor system_file:dir { read open };
-+
-+userdebug_or_eng(`
-+  # Allow extractor to add update service.
-+  add_service(mediaextractor, mediaextractor_update_service)
-+
-+  # Allow extractor to load media extractor plugins from update apk.
-+  allow mediaextractor apk_data_file:dir search;
-+  allow mediaextractor apk_data_file:file { execute open };
-+')
-+
-+###
-+### neverallow rules
-+###
-+
-+# mediaextractor should never execute any executable without a
-+# domain transition
-+neverallow mediaextractor { file_type fs_type }:file execute_no_trans;
-+
-+# The goal of the mediaserver split is to place media processing code into
-+# restrictive sandboxes with limited responsibilities and thus limited
-+# permissions. Example: Audioserver is only responsible for controlling audio
-+# hardware and processing audio content. Cameraserver does the same for camera
-+# hardware/content. Etc.
-+#
-+# Media processing code is inherently risky and thus should have limited
-+# permissions and be isolated from the rest of the system and network.
-+# Lengthier explanation here:
-+# https://android-developers.googleblog.com/2016/05/hardening-media-stack.html
-+neverallow mediaextractor domain:{ tcp_socket udp_socket rawip_socket } *;
-+
-+# mediaextractor should not be opening /data files directly. Any files
-+# it touches (with a few exceptions) need to be passed to it via a file
-+# descriptor opened outside the process.
-+neverallow mediaextractor {
-+  data_file_type
-+  -zoneinfo_data_file # time zone data from /data/misc/zoneinfo
-+  userdebug_or_eng(`-apk_data_file') # for loading media extractor plugins
-+}:file open;
-diff --git a/prebuilts/api/28.0/public/mediametrics.te b/prebuilts/api/28.0/public/mediametrics.te
-new file mode 100644
-index 000000000..ada90cca3
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mediametrics.te
-@@ -0,0 +1,41 @@
-+# mediametrics - daemon for collecting media.metrics data
-+type mediametrics, domain;
-+type mediametrics_exec, exec_type, file_type;
-+
-+
-+binder_use(mediametrics)
-+binder_call(mediametrics, binderservicedomain)
-+binder_service(mediametrics)
-+
-+add_service(mediametrics, mediametrics_service)
-+
-+allow mediametrics system_server:fd use;
-+
-+r_dir_file(mediametrics, cgroup)
-+allow mediametrics proc_meminfo:file r_file_perms;
-+
-+# allows interactions with dumpsys to GMScore
-+allow mediametrics app_data_file:file write;
-+
-+# allow access to package manager for uid->apk mapping
-+allow mediametrics package_native_service:service_manager find;
-+
-+###
-+### neverallow rules
-+###
-+
-+# mediametrics should never execute any executable without a
-+# domain transition
-+neverallow mediametrics { file_type fs_type }:file execute_no_trans;
-+
-+# The goal of the mediaserver split is to place media processing code into
-+# restrictive sandboxes with limited responsibilities and thus limited
-+# permissions. Example: Audioserver is only responsible for controlling audio
-+# hardware and processing audio content. Cameraserver does the same for camera
-+# hardware/content. Etc.
-+#
-+# Media processing code is inherently risky and thus should have limited
-+# permissions and be isolated from the rest of the system and network.
-+# Lengthier explanation here:
-+# https://android-developers.googleblog.com/2016/05/hardening-media-stack.html
-+neverallow mediametrics domain:{ tcp_socket udp_socket rawip_socket } *;
-diff --git a/prebuilts/api/28.0/public/mediaprovider.te b/prebuilts/api/28.0/public/mediaprovider.te
-new file mode 100644
-index 000000000..24170a5cf
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mediaprovider.te
-@@ -0,0 +1,6 @@
-+###
-+### A domain for android.process.media, which contains both
-+### MediaProvider and DownloadProvider and associated services.
-+###
-+
-+type mediaprovider, domain;
-diff --git a/prebuilts/api/28.0/public/mediaserver.te b/prebuilts/api/28.0/public/mediaserver.te
-new file mode 100644
-index 000000000..f0c94edc0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mediaserver.te
-@@ -0,0 +1,147 @@
-+# mediaserver - multimedia daemon
-+type mediaserver, domain;
-+type mediaserver_exec, exec_type, file_type;
-+
-+typeattribute mediaserver mlstrustedsubject;
-+
-+# TODO(b/36375899): replace with hal_client_domain macro on hal_omx
-+typeattribute mediaserver halclientdomain;
-+
-+net_domain(mediaserver)
-+
-+r_dir_file(mediaserver, sdcard_type)
-+r_dir_file(mediaserver, cgroup)
-+
-+# stat /proc/self
-+allow mediaserver proc:lnk_file getattr;
-+
-+# open /vendor/lib/mediadrm
-+allow mediaserver system_file:dir r_dir_perms;
-+
-+userdebug_or_eng(`
-+  # ptrace to processes in the same domain for memory leak detection
-+  allow mediaserver self:process ptrace;
-+')
-+
-+binder_use(mediaserver)
-+binder_call(mediaserver, binderservicedomain)
-+binder_call(mediaserver, appdomain)
-+binder_service(mediaserver)
-+
-+allow mediaserver media_data_file:dir create_dir_perms;
-+allow mediaserver media_data_file:file create_file_perms;
-+allow mediaserver app_data_file:dir search;
-+allow mediaserver app_data_file:file rw_file_perms;
-+allow mediaserver sdcard_type:file write;
-+allow mediaserver gpu_device:chr_file rw_file_perms;
-+allow mediaserver video_device:dir r_dir_perms;
-+allow mediaserver video_device:chr_file rw_file_perms;
-+
-+set_prop(mediaserver, audio_prop)
-+
-+# Read resources from open apk files passed over Binder.
-+allow mediaserver apk_data_file:file { read getattr };
-+allow mediaserver asec_apk_file:file { read getattr };
-+allow mediaserver ringtone_file:file { read getattr };
-+
-+# Read /data/data/com.android.providers.telephony files passed over Binder.
-+allow mediaserver radio_data_file:file { read getattr };
-+
-+# Use pipes passed over Binder from app domains.
-+allow mediaserver appdomain:fifo_file { getattr read write };
-+
-+allow mediaserver rpmsg_device:chr_file rw_file_perms;
-+
-+# Inter System processes communicate over named pipe (FIFO)
-+allow mediaserver system_server:fifo_file r_file_perms;
-+
-+r_dir_file(mediaserver, media_rw_data_file)
-+
-+# Grant access to read files on appfuse.
-+allow mediaserver app_fuse_file:file { read getattr };
-+
-+# Read/[write] to /proc/net/xt_qtaguid/ctrl and /dev/xt_qtaguid
-+allow mediaserver qtaguid_proc:file rw_file_perms;
-+allow mediaserver qtaguid_device:chr_file r_file_perms;
-+
-+# Needed on some devices for playing DRM protected content,
-+# but seems expected and appropriate for all devices.
-+unix_socket_connect(mediaserver, drmserver, drmserver)
-+
-+# Needed on some devices for playing audio on paired BT device,
-+# but seems appropriate for all devices.
-+unix_socket_connect(mediaserver, bluetooth, bluetooth)
-+
-+add_service(mediaserver, mediaserver_service)
-+allow mediaserver activity_service:service_manager find;
-+allow mediaserver appops_service:service_manager find;
-+allow mediaserver audioserver_service:service_manager find;
-+allow mediaserver cameraserver_service:service_manager find;
-+allow mediaserver batterystats_service:service_manager find;
-+allow mediaserver drmserver_service:service_manager find;
-+allow mediaserver mediaextractor_service:service_manager find;
-+allow mediaserver mediacodec_service:service_manager find;
-+allow mediaserver mediametrics_service:service_manager find;
-+allow mediaserver media_session_service:service_manager find;
-+allow mediaserver permission_service:service_manager find;
-+allow mediaserver power_service:service_manager find;
-+allow mediaserver processinfo_service:service_manager find;
-+allow mediaserver scheduling_policy_service:service_manager find;
-+allow mediaserver surfaceflinger_service:service_manager find;
-+
-+# for ModDrm/MediaPlayer
-+allow mediaserver mediadrmserver_service:service_manager find;
-+
-+# For interfacing with OMX HAL
-+allow mediaserver hidl_token_hwservice:hwservice_manager find;
-+
-+# /oem access
-+allow mediaserver oemfs:dir search;
-+allow mediaserver oemfs:file r_file_perms;
-+
-+use_drmservice(mediaserver)
-+allow mediaserver drmserver:drmservice {
-+    consumeRights
-+    setPlaybackStatus
-+    openDecryptSession
-+    closeDecryptSession
-+    initializeDecryptUnit
-+    decrypt
-+    finalizeDecryptUnit
-+    pread
-+};
-+
-+# only allow unprivileged socket ioctl commands
-+allowxperm mediaserver self:{ rawip_socket tcp_socket udp_socket }
-+  ioctl { unpriv_sock_ioctls unpriv_tty_ioctls };
-+
-+# Access to /data/media.
-+# This should be removed if sdcardfs is modified to alter the secontext for its
-+# accesses to the underlying FS.
-+allow mediaserver media_rw_data_file:dir create_dir_perms;
-+allow mediaserver media_rw_data_file:file create_file_perms;
-+
-+# Access to media in /data/preloads
-+allow mediaserver preloads_media_file:file { getattr read ioctl };
-+
-+allow mediaserver ion_device:chr_file r_file_perms;
-+allow mediaserver hal_graphics_allocator:fd use;
-+allow mediaserver hal_graphics_composer:fd use;
-+allow mediaserver hal_camera:fd use;
-+
-+allow mediaserver system_server:fd use;
-+
-+hal_client_domain(mediaserver, hal_allocator)
-+
-+binder_call(mediaserver, mediacodec)
-+
-+###
-+### neverallow rules
-+###
-+
-+# mediaserver should never execute any executable without a
-+# domain transition
-+neverallow mediaserver { file_type fs_type }:file execute_no_trans;
-+
-+# do not allow privileged socket ioctl commands
-+neverallowxperm mediaserver domain:{ rawip_socket tcp_socket udp_socket } ioctl priv_sock_ioctls;
-diff --git a/prebuilts/api/28.0/public/modprobe.te b/prebuilts/api/28.0/public/modprobe.te
-new file mode 100644
-index 000000000..119040921
---- /dev/null
-+++ b/prebuilts/api/28.0/public/modprobe.te
-@@ -0,0 +1,9 @@
-+type modprobe, domain;
-+
-+allow modprobe proc_modules:file r_file_perms;
-+allow modprobe self:global_capability_class_set sys_module;
-+allow modprobe kernel:key search;
-+recovery_only(`
-+  allow modprobe rootfs:system module_load;
-+  allow modprobe rootfs:file r_file_perms;
-+')
-diff --git a/prebuilts/api/28.0/public/mtp.te b/prebuilts/api/28.0/public/mtp.te
-new file mode 100644
-index 000000000..7256bcf55
---- /dev/null
-+++ b/prebuilts/api/28.0/public/mtp.te
-@@ -0,0 +1,11 @@
-+# vpn tunneling protocol manager
-+type mtp, domain;
-+type mtp_exec, exec_type, file_type;
-+
-+net_domain(mtp)
-+
-+# pptp policy
-+allow mtp self:socket create_socket_perms_no_ioctl;
-+allow mtp self:global_capability_class_set net_raw;
-+allow mtp ppp:process signal;
-+allow mtp vpn_data_file:dir search;
-diff --git a/prebuilts/api/28.0/public/net.te b/prebuilts/api/28.0/public/net.te
-new file mode 100644
-index 000000000..7e00ed845
---- /dev/null
-+++ b/prebuilts/api/28.0/public/net.te
-@@ -0,0 +1,4 @@
-+# Network types
-+type node, node_type;
-+type netif, netif_type;
-+type port, port_type;
-diff --git a/prebuilts/api/28.0/public/netd.te b/prebuilts/api/28.0/public/netd.te
-new file mode 100644
-index 000000000..1fb3d482a
---- /dev/null
-+++ b/prebuilts/api/28.0/public/netd.te
-@@ -0,0 +1,148 @@
-+# network manager
-+type netd, domain, mlstrustedsubject;
-+type netd_exec, exec_type, file_type;
-+
-+net_domain(netd)
-+# in addition to ioctls allowlisted for all domains, grant netd priv_sock_ioctls.
-+allowxperm netd self:udp_socket ioctl priv_sock_ioctls;
-+
-+r_dir_file(netd, cgroup)
-+
-+allow netd system_server:fd use;
-+
-+allow netd self:global_capability_class_set { net_admin net_raw kill };
-+# Note: fsetid is deliberately not included above. fsetid checks are
-+# triggered by chmod on a directory or file owned by a group other
-+# than one of the groups assigned to the current process to see if
-+# the setgid bit should be cleared, regardless of whether the setgid
-+# bit was even set.  We do not appear to truly need this capability
-+# for netd to operate.
-+dontaudit netd self:global_capability_class_set fsetid;
-+
-+allow netd self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+allow netd self:netlink_route_socket nlmsg_write;
-+allow netd self:netlink_nflog_socket create_socket_perms_no_ioctl;
-+allow netd self:netlink_socket create_socket_perms_no_ioctl;
-+allow netd self:netlink_tcpdiag_socket { create_socket_perms_no_ioctl nlmsg_read nlmsg_write };
-+allow netd self:netlink_generic_socket create_socket_perms_no_ioctl;
-+allow netd self:netlink_netfilter_socket create_socket_perms_no_ioctl;
-+allow netd shell_exec:file rx_file_perms;
-+allow netd system_file:file x_file_perms;
-+not_full_treble(`allow netd vendor_file:file x_file_perms;')
-+allow netd devpts:chr_file rw_file_perms;
-+
-+# Acquire advisory lock on /system/etc/xtables.lock
-+allow netd system_file:file lock;
-+
-+# Allow netd to write to qtaguid ctrl file. This is the same privilege level that normal apps have
-+# TODO: Add proper rules to prevent other process to access qtaguid_proc file after migration
-+#       complete
-+allow netd qtaguid_proc:file rw_file_perms;
-+# Allow netd to read /dev/qtaguid. This is the same privilege level that normal apps have.
-+allow netd qtaguid_device:chr_file r_file_perms;
-+
-+r_dir_file(netd, proc_net)
-+# For /proc/sys/net/ipv[46]/route/flush.
-+allow netd proc_net:file rw_file_perms;
-+
-+# Enables PppController and interface enumeration (among others)
-+allow netd sysfs:dir r_dir_perms;
-+r_dir_file(netd, sysfs_net)
-+
-+# Allows setting interface MTU
-+allow netd sysfs_net:file w_file_perms;
-+
-+# TODO: added to match above sysfs rule. Remove me?
-+allow netd sysfs_usb:file write;
-+
-+allow netd fs_bpf:dir  create_dir_perms;
-+allow netd fs_bpf:file create_file_perms;
-+
-+# TODO: netd previously thought it needed these permissions to do WiFi related
-+#       work.  However, after all the WiFi stuff is gone, we still need them.
-+#       Why?
-+allow netd self:global_capability_class_set { dac_override chown };
-+
-+# Needed to update /data/misc/net/rt_tables
-+allow netd net_data_file:file create_file_perms;
-+allow netd net_data_file:dir rw_dir_perms;
-+allow netd self:global_capability_class_set fowner;
-+
-+# Needed to lock the iptables lock.
-+allow netd system_file:file lock;
-+
-+# Allow netd to spawn dnsmasq in it's own domain
-+allow netd dnsmasq:process signal;
-+
-+# Allow netd to start clatd in its own domain
-+allow netd clatd:process signal;
-+
-+set_prop(netd, ctl_mdnsd_prop)
-+set_prop(netd, netd_stable_secret_prop)
-+
-+# Allow netd to publish a binder service and make binder calls.
-+binder_use(netd)
-+add_service(netd, netd_service)
-+allow netd dumpstate:fifo_file  { getattr write };
-+
-+# Allow netd to call into the system server so it can check permissions.
-+allow netd system_server:binder call;
-+allow netd permission_service:service_manager find;
-+
-+# Allow netd to talk to the framework service which collects netd events.
-+allow netd netd_listener_service:service_manager find;
-+
-+# Allow netd to operate on sockets that are passed to it.
-+allow netd netdomain:{
-+  tcp_socket
-+  udp_socket
-+  rawip_socket
-+  tun_socket
-+} { read write getattr setattr getopt setopt };
-+allow netd netdomain:fd use;
-+
-+# give netd permission to read and write netlink xfrm
-+allow netd self:netlink_xfrm_socket { create_socket_perms_no_ioctl nlmsg_write nlmsg_read };
-+
-+# give netd permission to use eBPF functionalities
-+allow netd self:bpf { map_create map_read map_write };
-+
-+# Allow netd to register as hal server.
-+add_hwservice(netd, system_net_netd_hwservice)
-+hwbinder_use(netd)
-+get_prop(netd, hwservicemanager_prop)
-+
-+###
-+### Neverallow rules
-+###
-+### netd should NEVER do any of this
-+
-+# Block device access.
-+neverallow netd dev_type:blk_file { read write };
-+
-+# ptrace any other app
-+neverallow netd { domain }:process ptrace;
-+
-+# Write to /system.
-+neverallow netd system_file:dir_file_class_set write;
-+
-+# Write to files in /data/data or system files on /data
-+neverallow netd { app_data_file system_data_file }:dir_file_class_set write;
-+
-+# only system_server and dumpstate may find netd service
-+neverallow { domain -system_server -dumpstate -netd } netd_service:service_manager find;
-+
-+# only netd can create the bpf maps
-+neverallow { domain -netd } netd:bpf { map_create };
-+
-+# apps may not interact with netd over binder.
-+neverallow appdomain netd:binder call;
-+neverallow netd { appdomain userdebug_or_eng(`-su') }:binder call;
-+
-+# persist.netd.stable_secret contains RFC 7217 secret key which should never be
-+# leaked to other processes. Make sure it never leaks.
-+neverallow { domain -netd -init -dumpstate } netd_stable_secret_prop:file r_file_perms;
-+
-+# We want to ensure that no other process ever tries tampering with persist.netd.stable_secret,
-+# the RFC 7217 secret key managed by netd. Doing so could compromise user privacy.
-+neverallow { domain -netd -init } netd_stable_secret_prop:property_service set;
-diff --git a/prebuilts/api/28.0/public/netutils_wrapper.te b/prebuilts/api/28.0/public/netutils_wrapper.te
-new file mode 100644
-index 000000000..c844762c8
---- /dev/null
-+++ b/prebuilts/api/28.0/public/netutils_wrapper.te
-@@ -0,0 +1,4 @@
-+type netutils_wrapper, domain;
-+type netutils_wrapper_exec, exec_type, file_type;
-+
-+neverallow domain netutils_wrapper_exec:file execute_no_trans;
-diff --git a/prebuilts/api/28.0/public/neverallow_macros b/prebuilts/api/28.0/public/neverallow_macros
-new file mode 100644
-index 000000000..e2b6ed1af
---- /dev/null
-+++ b/prebuilts/api/28.0/public/neverallow_macros
-@@ -0,0 +1,15 @@
-+#
-+# Common neverallow permissions
-+define(`no_w_file_perms', `{ append create link unlink relabelfrom rename setattr write }')
-+define(`no_rw_file_perms', `{ no_w_file_perms open read ioctl lock }')
-+define(`no_x_file_perms', `{ execute execute_no_trans }')
-+define(`no_w_dir_perms',  `{ add_name create link relabelfrom remove_name rename reparent rmdir setattr write }')
-+
-+#####################################
-+# neverallow_establish_socket_comms(src, dst)
-+# neverallow src domain establishing socket connections to dst domain.
-+#
-+define(`neverallow_establish_socket_comms', `
-+  neverallow $1 $2:socket_class_set { connect sendto };
-+  neverallow $1 $2:unix_stream_socket connectto;
-+')
-diff --git a/prebuilts/api/28.0/public/nfc.te b/prebuilts/api/28.0/public/nfc.te
-new file mode 100644
-index 000000000..e3a03e796
---- /dev/null
-+++ b/prebuilts/api/28.0/public/nfc.te
-@@ -0,0 +1,2 @@
-+# nfc subsystem
-+type nfc, domain;
-diff --git a/prebuilts/api/28.0/public/otapreopt_chroot.te b/prebuilts/api/28.0/public/otapreopt_chroot.te
-new file mode 100644
-index 000000000..894363ab1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/otapreopt_chroot.te
-@@ -0,0 +1,20 @@
-+# otapreopt_chroot executable
-+type otapreopt_chroot, domain;
-+type otapreopt_chroot_exec, exec_type, file_type;
-+
-+# Chroot preparation and execution.
-+# We need to create an unshared mount namespace, and then mount /data.
-+allow otapreopt_chroot postinstall_file:dir { search mounton };
-+allow otapreopt_chroot self:global_capability_class_set { sys_admin sys_chroot };
-+
-+# This is required to mount /vendor.
-+allow otapreopt_chroot block_device:dir search;
-+allow otapreopt_chroot labeledfs:filesystem mount;
-+# Mounting /vendor can have this side-effect. Ignore denial.
-+dontaudit otapreopt_chroot kernel:process setsched;
-+
-+# Allow otapreopt to use file descriptors from update-engine. It will
-+# close them immediately.
-+allow otapreopt_chroot postinstall:fd use;
-+allow otapreopt_chroot update_engine:fd use;
-+allow otapreopt_chroot update_engine:fifo_file write;
-diff --git a/prebuilts/api/28.0/public/otapreopt_slot.te b/prebuilts/api/28.0/public/otapreopt_slot.te
-new file mode 100644
-index 000000000..6551864c3
---- /dev/null
-+++ b/prebuilts/api/28.0/public/otapreopt_slot.te
-@@ -0,0 +1,27 @@
-+# otapreopt_slot
-+#
-+# This command set moves the artifact corresponding to the current slot
-+# from /data/ota to /data/dalvik-cache.
-+
-+type otapreopt_slot, domain, mlstrustedsubject;
-+type otapreopt_slot_exec, exec_type, file_type;
-+
-+
-+# The otapreopt_slot renames the OTA dalvik-cache to the regular dalvik-cache, and cleans up
-+# the directory afterwards. For logging of aggregate size, we need getattr.
-+allow otapreopt_slot ota_data_file:dir { rw_dir_perms rename reparent rmdir };
-+allow otapreopt_slot ota_data_file:{ file lnk_file } getattr;
-+# (du follows symlinks)
-+allow otapreopt_slot ota_data_file:lnk_file read;
-+
-+# Delete old content of the dalvik-cache.
-+allow otapreopt_slot dalvikcache_data_file:dir { add_name getattr open read remove_name rmdir search write };
-+allow otapreopt_slot dalvikcache_data_file:file { getattr unlink };
-+allow otapreopt_slot dalvikcache_data_file:lnk_file { getattr read unlink };
-+
-+# Allow cppreopts to execute itself using #!/system/bin/sh
-+allow otapreopt_slot shell_exec:file rx_file_perms;
-+
-+# Allow running the mv and rm/rmdir commands using otapreopt_slot  permissions.
-+# Needed so we can move artifacts into /data/dalvik-cache/dalvik-cache.
-+allow otapreopt_slot toolbox_exec:file rx_file_perms;
-diff --git a/prebuilts/api/28.0/public/performanced.te b/prebuilts/api/28.0/public/performanced.te
-new file mode 100644
-index 000000000..248d345d1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/performanced.te
-@@ -0,0 +1,30 @@
-+# performanced
-+type performanced, domain, mlstrustedsubject;
-+type performanced_exec, exec_type, file_type;
-+
-+# Needed to check for app permissions.
-+binder_use(performanced)
-+binder_call(performanced, system_server)
-+allow performanced permission_service:service_manager find;
-+
-+pdx_server(performanced, performance_client)
-+
-+# TODO: use file caps to obtain sys_nice instead of setuid / setgid.
-+allow performanced self:global_capability_class_set { setuid setgid sys_nice };
-+
-+# Access /proc to validate we're only affecting threads in the same thread group.
-+# Performanced also shields unbound kernel threads.  It scans every task in the
-+# root cpu set, but only affects the kernel threads.
-+r_dir_file(performanced, { appdomain bufferhubd kernel surfaceflinger })
-+dontaudit performanced domain:dir read;
-+allow performanced { appdomain bufferhubd kernel surfaceflinger }:process setsched;
-+
-+# These /proc accesses only show up in permissive mode but they
-+# generate a lot of noise in the log.
-+userdebug_or_eng(`
-+  dontaudit performanced domain:dir open;
-+  dontaudit performanced domain:file { open read getattr };
-+')
-+
-+# Access /dev/cpuset/cpuset.cpus
-+r_dir_file(performanced, cgroup)
-diff --git a/prebuilts/api/28.0/public/perfprofd.te b/prebuilts/api/28.0/public/perfprofd.te
-new file mode 100644
-index 000000000..f067af5d4
---- /dev/null
-+++ b/prebuilts/api/28.0/public/perfprofd.te
-@@ -0,0 +1,119 @@
-+# perfprofd - perf profile collection daemon
-+type perfprofd, domain;
-+type perfprofd_exec, exec_type, file_type;
-+
-+userdebug_or_eng(`
-+
-+  typeattribute perfprofd coredomain;
-+  typeattribute perfprofd mlstrustedsubject;
-+
-+  # perfprofd access to sysfs directory structure.
-+  allow perfprofd sysfs_type:dir search;
-+
-+  # perfprofd needs to control CPU hot-plug in order to avoid kernel
-+  # perfevents problems in cases where CPU goes on/off during measurement;
-+  # this means read access to /sys/devices/system/cpu/possible
-+  # and read/write access to /sys/devices/system/cpu/cpu*/online
-+  allow perfprofd sysfs_devices_system_cpu:file rw_file_perms;
-+
-+  # perfprofd checks for the existence of and then invokes simpleperf;
-+  # simpleperf retains perfprofd domain after exec
-+  allow perfprofd system_file:file rx_file_perms;
-+
-+  # perfprofd reads a config file from /data/data/com.google.android.gms/files
-+  allow perfprofd app_data_file:file r_file_perms;
-+  allow perfprofd app_data_file:dir search;
-+  allow perfprofd self:global_capability_class_set { dac_override };
-+
-+  # perfprofd opens a file for writing in /data/misc/perfprofd
-+  allow perfprofd perfprofd_data_file:file create_file_perms;
-+  allow perfprofd perfprofd_data_file:dir rw_dir_perms;
-+
-+  # perfprofd uses the system log
-+  read_logd(perfprofd);
-+  write_logd(perfprofd);
-+
-+  # perfprofd inspects /sys/power/wake_unlock
-+  wakelock_use(perfprofd);
-+
-+  # perfprofd looks at thermals.
-+  allow perfprofd sysfs_thermal:dir r_dir_perms;
-+
-+  # perfprofd checks power_supply.
-+  r_dir_file(perfprofd, sysfs_batteryinfo)
-+
-+  # simpleperf reads kernel notes.
-+  allow perfprofd sysfs_kernel_notes:file r_file_perms;
-+
-+  # Simpleperf & perfprofd query a range of proc stats.
-+  allow perfprofd proc_loadavg:file r_file_perms;
-+  allow perfprofd proc_stat:file r_file_perms;
-+  allow perfprofd proc_modules:file r_file_perms;
-+
-+  # simpleperf writes to perf_event_paranoid under /proc.
-+  allow perfprofd proc_perf:file write;
-+
-+  # Simpleperf: kptr_restrict. This would be required to dump kernel symbols.
-+  dontaudit perfprofd proc_security:file *;
-+
-+  # simpleperf uses ioctl() to turn on kernel perf events measurements
-+  allow perfprofd self:global_capability_class_set sys_admin;
-+
-+  # simpleperf needs to examine /proc to collect task/thread info
-+  r_dir_file(perfprofd, domain)
-+
-+  # simpleperf needs to access /proc/<pid>/exec
-+  allow perfprofd self:global_capability_class_set { sys_resource sys_ptrace };
-+  neverallow perfprofd domain:process ptrace;
-+
-+  # simpleperf needs open/read any file that turns up in a profile
-+  # to see whether it has a build ID
-+  allow perfprofd exec_type:file r_file_perms;
-+  # App & ART artifacts.
-+  r_dir_file(perfprofd, apk_data_file)
-+  r_dir_file(perfprofd, dalvikcache_data_file)
-+  # Vendor libraries.
-+  r_dir_file(perfprofd, vendor_file)
-+  # Vendor apps.
-+  r_dir_file(perfprofd, vendor_app_file)
-+
-+  # simpleperf will set security.perf_harden to enable access to perf_event_open()
-+  set_prop(perfprofd, shell_prop)
-+
-+  # simpleperf examines debugfs on startup to collect tracepoint event types
-+  r_dir_file(perfprofd, debugfs_tracing)
-+  r_dir_file(perfprofd, debugfs_tracing_debug)
-+
-+  # simpleperf is going to execute "sleep"
-+  allow perfprofd toolbox_exec:file rx_file_perms;
-+  # simpleperf is going to execute "mv" on a temp file
-+  allow perfprofd shell_exec:file rx_file_perms;
-+
-+  # needed for simpleperf on some kernels
-+  allow perfprofd self:global_capability_class_set ipc_lock;
-+
-+  # simpleperf attempts to put a temp file into /data/local/tmp. Do not allow,
-+  # use the fallback cwd code, do not spam the log. But ensure this is correctly
-+  # removed at some point. b/70232908.
-+  dontaudit perfprofd shell_data_file:dir *;
-+  dontaudit perfprofd shell_data_file:file *;
-+
-+  # Allow perfprofd to publish a binder service and make binder calls.
-+  binder_use(perfprofd)
-+  add_service(perfprofd, perfprofd_service)
-+
-+  # Use devpts for streams from cmd.
-+  #
-+  # This is normally granted to binderservicedomain, but this service
-+  # has tighter restrictions on the callers (see below), so must enable
-+  # this manually.
-+  allow perfprofd devpts:chr_file rw_file_perms;
-+
-+  # Use socket & pipe supplied by su, for cmd perfprofd dump.
-+  allow perfprofd su:unix_stream_socket { read write getattr sendto };
-+  allow perfprofd su:fifo_file r_file_perms;
-+
-+  # Allow perfprofd to submit to dropbox.
-+  allow perfprofd dropbox_service:service_manager find;
-+  binder_call(perfprofd, system_server)
-+')
-diff --git a/prebuilts/api/28.0/public/platform_app.te b/prebuilts/api/28.0/public/platform_app.te
-new file mode 100644
-index 000000000..9b1faf0f6
---- /dev/null
-+++ b/prebuilts/api/28.0/public/platform_app.te
-@@ -0,0 +1,5 @@
-+###
-+### Apps signed with the platform key.
-+###
-+
-+type platform_app, domain;
-diff --git a/prebuilts/api/28.0/public/postinstall.te b/prebuilts/api/28.0/public/postinstall.te
-new file mode 100644
-index 000000000..7fd4dc611
---- /dev/null
-+++ b/prebuilts/api/28.0/public/postinstall.te
-@@ -0,0 +1,36 @@
-+# Domain where the postinstall program runs during the update.
-+# Extend the permissions in this domain to allow this program to access other
-+# files needed by the specific device on your device's sepolicy directory.
-+type postinstall, domain;
-+
-+# Allow postinstall to write to its stdout/stderr when redirected via pipes to
-+# update_engine.
-+allow postinstall update_engine_common:fd use;
-+allow postinstall update_engine_common:fifo_file rw_file_perms;
-+
-+# Allow postinstall to read and execute directories and files in the same
-+# mounted location.
-+allow postinstall postinstall_file:file rx_file_perms;
-+allow postinstall postinstall_file:lnk_file r_file_perms;
-+allow postinstall postinstall_file:dir r_dir_perms;
-+
-+# Allow postinstall to execute the shell or other system executables.
-+allow postinstall shell_exec:file rx_file_perms;
-+allow postinstall system_file:file rx_file_perms;
-+allow postinstall toolbox_exec:file rx_file_perms;
-+
-+#
-+# For OTA dexopt.
-+#
-+
-+# Allow postinstall scripts to talk to the system server.
-+binder_use(postinstall)
-+binder_call(postinstall, system_server)
-+
-+# Need to talk to the otadexopt service.
-+allow postinstall otadexopt_service:service_manager find;
-+
-+# No domain other than update_engine and recovery (via update_engine_sideload)
-+# should transition to postinstall, as it is only meant to run during the
-+# update.
-+neverallow { domain -update_engine -recovery } postinstall:process { transition dyntransition };
-diff --git a/prebuilts/api/28.0/public/postinstall_dexopt.te b/prebuilts/api/28.0/public/postinstall_dexopt.te
-new file mode 100644
-index 000000000..ffd8bc574
---- /dev/null
-+++ b/prebuilts/api/28.0/public/postinstall_dexopt.te
-@@ -0,0 +1,59 @@
-+# Domain for the otapreopt executable, running under postinstall_dexopt
-+#
-+# Note: otapreopt is a driver for dex2oat, and reuses parts of installd. As such,
-+# this is derived and adapted from installd.te.
-+
-+type postinstall_dexopt, domain;
-+
-+allow postinstall_dexopt self:global_capability_class_set { chown dac_override fowner fsetid setgid setuid };
-+
-+allow postinstall_dexopt postinstall_file:filesystem getattr;
-+allow postinstall_dexopt postinstall_file:dir { getattr search };
-+allow postinstall_dexopt postinstall_file:lnk_file { getattr read };
-+allow postinstall_dexopt proc_filesystems:file { getattr open read };
-+allow postinstall_dexopt tmpfs:file read;
-+
-+# Note: /data/ota is created by init (see system/core/rootdir/init.rc) to avoid giving access
-+# here and having to relabel the directory.
-+
-+# Read app data (APKs) as input to dex2oat.
-+r_dir_file(postinstall_dexopt, apk_data_file)
-+# Read vendor app data (APKs) as input to dex2oat.
-+r_dir_file(postinstall_dexopt, vendor_app_file)
-+# Access to app oat directory.
-+r_dir_file(postinstall_dexopt, dalvikcache_data_file)
-+
-+# Read profile data.
-+allow postinstall_dexopt user_profile_data_file:dir { getattr search };
-+allow postinstall_dexopt user_profile_data_file:file r_file_perms;
-+# Suppress deletion denial (we do not want to update the profile).
-+dontaudit postinstall_dexopt user_profile_data_file:file { write };
-+
-+# Write to /data/ota(/*). Create symlinks in /data/ota(/*)
-+allow postinstall_dexopt ota_data_file:dir create_dir_perms;
-+allow postinstall_dexopt ota_data_file:file create_file_perms;
-+allow postinstall_dexopt ota_data_file:lnk_file create_file_perms;
-+
-+# Need to write .b files, which are dalvikcache_data_file, not ota_data_file.
-+# TODO: See whether we can apply ota_data_file?
-+allow postinstall_dexopt dalvikcache_data_file:dir rw_dir_perms;
-+allow postinstall_dexopt dalvikcache_data_file:file create_file_perms;
-+
-+# Allow labeling of files under /data/app/com.example/oat/
-+# TODO: Restrict to .b suffix?
-+allow postinstall_dexopt dalvikcache_data_file:dir relabelto;
-+allow postinstall_dexopt dalvikcache_data_file:file { relabelto link };
-+
-+# Check validity of SELinux context before use.
-+selinux_check_context(postinstall_dexopt)
-+selinux_check_access(postinstall_dexopt)
-+
-+
-+# Postinstall wants to know about our child.
-+allow postinstall_dexopt postinstall:process sigchld;
-+
-+# Allow otapreopt to use file descriptors from otapreopt_chroot.
-+# TODO: Probably we can actually close file descriptors...
-+allow postinstall_dexopt otapreopt_chroot:fd use;
-+
-+allow postinstall_dexopt cpuctl_device:dir search;
-diff --git a/prebuilts/api/28.0/public/ppp.te b/prebuilts/api/28.0/public/ppp.te
-new file mode 100644
-index 000000000..9340dee87
---- /dev/null
-+++ b/prebuilts/api/28.0/public/ppp.te
-@@ -0,0 +1,23 @@
-+# Point to Point Protocol daemon
-+type ppp, domain;
-+type ppp_device, dev_type;
-+type ppp_exec, exec_type, file_type;
-+
-+net_domain(ppp)
-+
-+r_dir_file(ppp, proc_net)
-+
-+allow ppp mtp:socket rw_socket_perms;
-+
-+# ioctls needed for VPN.
-+allowxperm ppp self:udp_socket ioctl priv_sock_ioctls;
-+allowxperm ppp mtp:socket ioctl ppp_ioctls;
-+
-+allow ppp mtp:unix_dgram_socket rw_socket_perms;
-+allow ppp ppp_device:chr_file rw_file_perms;
-+allow ppp self:global_capability_class_set net_admin;
-+allow ppp system_file:file rx_file_perms;
-+not_full_treble(`allow ppp vendor_file:file rx_file_perms;')
-+allow ppp vpn_data_file:dir w_dir_perms;
-+allow ppp vpn_data_file:file create_file_perms;
-+allow ppp mtp:fd use;
-diff --git a/prebuilts/api/28.0/public/preopt2cachename.te b/prebuilts/api/28.0/public/preopt2cachename.te
-new file mode 100644
-index 000000000..49df64725
---- /dev/null
-+++ b/prebuilts/api/28.0/public/preopt2cachename.te
-@@ -0,0 +1,13 @@
-+# preopt2cachename executable
-+#
-+# This executable translates names from the preopted versions the build system
-+# creates to the names the runtime expects in the data directory.
-+type preopt2cachename, domain;
-+type preopt2cachename_exec, exec_type, file_type;
-+
-+# Allow write to stdout.
-+allow preopt2cachename cppreopts:fd use;
-+allow preopt2cachename cppreopts:fifo_file { getattr read write };
-+
-+# Allow write to logcat.
-+allow preopt2cachename proc_net:file r_file_perms;
-diff --git a/prebuilts/api/28.0/public/priv_app.te b/prebuilts/api/28.0/public/priv_app.te
-new file mode 100644
-index 000000000..0761fc30f
---- /dev/null
-+++ b/prebuilts/api/28.0/public/priv_app.te
-@@ -0,0 +1,5 @@
-+###
-+### A domain for further sandboxing privileged apps.
-+###
-+
-+type priv_app, domain;
-diff --git a/prebuilts/api/28.0/public/profman.te b/prebuilts/api/28.0/public/profman.te
-new file mode 100644
-index 000000000..4296d1b17
---- /dev/null
-+++ b/prebuilts/api/28.0/public/profman.te
-@@ -0,0 +1,29 @@
-+# profman
-+type profman, domain;
-+type profman_exec, exec_type, file_type;
-+
-+allow profman user_profile_data_file:file { getattr read write lock };
-+
-+# Dumping profile info opens the application APK file for pretty printing.
-+allow profman asec_apk_file:file { read };
-+allow profman apk_data_file:file { getattr read };
-+allow profman apk_data_file:dir { getattr read search };
-+
-+allow profman oemfs:file { read };
-+# Reading an APK opens a ZipArchive, which unpack to tmpfs.
-+allow profman tmpfs:file { read };
-+allow profman profman_dump_data_file:file { write };
-+
-+allow profman installd:fd use;
-+
-+# Allow profman to analyze profiles for the secondary dex files. These
-+# are application dex files reported back to the framework when using
-+# BaseDexClassLoader.
-+allow profman app_data_file:file { getattr read write lock };
-+allow profman app_data_file:dir { getattr read search };
-+
-+###
-+### neverallow rules
-+###
-+
-+neverallow profman app_data_file:notdevfile_class_set open;
-diff --git a/prebuilts/api/28.0/public/property.te b/prebuilts/api/28.0/public/property.te
-new file mode 100644
-index 000000000..a4f0d87a1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/property.te
-@@ -0,0 +1,414 @@
-+type audio_prop, property_type, core_property_type;
-+type boottime_prop, property_type;
-+type boottime_public_prop, property_type;
-+type bluetooth_a2dp_offload_prop, property_type;
-+type bluetooth_prop, property_type;
-+type bootloader_boot_reason_prop, property_type;
-+type config_prop, property_type, core_property_type;
-+type cppreopt_prop, property_type, core_property_type;
-+type ctl_bootanim_prop, property_type;
-+type ctl_bugreport_prop, property_type;
-+type ctl_console_prop, property_type;
-+type ctl_default_prop, property_type;
-+type ctl_dumpstate_prop, property_type;
-+type ctl_fuse_prop, property_type;
-+type ctl_interface_restart_prop, property_type;
-+type ctl_interface_start_prop, property_type;
-+type ctl_interface_stop_prop, property_type;
-+type ctl_mdnsd_prop, property_type;
-+type ctl_restart_prop, property_type;
-+type ctl_rildaemon_prop, property_type;
-+type ctl_sigstop_prop, property_type;
-+type ctl_start_prop, property_type;
-+type ctl_stop_prop, property_type;
-+type dalvik_prop, property_type, core_property_type;
-+type debuggerd_prop, property_type, core_property_type;
-+type debug_prop, property_type, core_property_type;
-+type default_prop, property_type, core_property_type;
-+type device_logging_prop, property_type;
-+type dhcp_prop, property_type, core_property_type;
-+type dumpstate_options_prop, property_type;
-+type dumpstate_prop, property_type, core_property_type;
-+type exported_secure_prop, property_type;
-+type ffs_prop, property_type, core_property_type;
-+type fingerprint_prop, property_type, core_property_type;
-+type firstboot_prop, property_type;
-+type hwservicemanager_prop, property_type;
-+type last_boot_reason_prop, property_type;
-+type logd_prop, property_type, core_property_type;
-+type logpersistd_logging_prop, property_type;
-+type log_prop, property_type, log_property_type;
-+type log_tag_prop, property_type, log_property_type;
-+type lowpan_prop, property_type;
-+type mmc_prop, property_type;
-+type net_dns_prop, property_type;
-+type net_radio_prop, property_type, core_property_type;
-+type netd_stable_secret_prop, property_type;
-+type nfc_prop, property_type, core_property_type;
-+type overlay_prop, property_type;
-+type pan_result_prop, property_type, core_property_type;
-+type persist_debug_prop, property_type, core_property_type;
-+type persistent_properties_ready_prop, property_type;
-+type pm_prop, property_type;
-+type powerctl_prop, property_type, core_property_type;
-+type radio_prop, property_type, core_property_type;
-+type restorecon_prop, property_type, core_property_type;
-+type safemode_prop, property_type;
-+type serialno_prop, property_type;
-+type shell_prop, property_type, core_property_type;
-+type system_boot_reason_prop, property_type;
-+type system_prop, property_type, core_property_type;
-+type system_radio_prop, property_type, core_property_type;
-+type test_boot_reason_prop, property_type;
-+type traced_enabled_prop, property_type;
-+type vold_prop, property_type, core_property_type;
-+type wifi_log_prop, property_type, log_property_type;
-+type wifi_prop, property_type;
-+type vendor_security_patch_level_prop, property_type;
-+
-+# Properties for whitelisting
-+type exported_audio_prop, property_type;
-+type exported_bluetooth_prop, property_type;
-+type exported_config_prop, property_type;
-+type exported_dalvik_prop, property_type;
-+type exported_default_prop, property_type;
-+type exported_dumpstate_prop, property_type;
-+type exported_ffs_prop, property_type;
-+type exported_fingerprint_prop, property_type;
-+type exported_overlay_prop, property_type;
-+type exported_pm_prop, property_type;
-+type exported_radio_prop, property_type;
-+type exported_system_prop, property_type;
-+type exported_system_radio_prop, property_type;
-+type exported_vold_prop, property_type;
-+type exported_wifi_prop, property_type;
-+type exported2_config_prop, property_type;
-+type exported2_default_prop, property_type;
-+type exported2_radio_prop, property_type;
-+type exported2_system_prop, property_type;
-+type exported2_vold_prop, property_type;
-+type exported3_default_prop, property_type;
-+type exported3_radio_prop, property_type;
-+type exported3_system_prop, property_type;
-+type vendor_default_prop, property_type;
-+
-+allow property_type tmpfs:filesystem associate;
-+
-+###
-+### Neverallow rules
-+###
-+
-+# core_property_type should not be used for new properties or
-+# device specific properties. Properties with this attribute
-+# are readable to everyone, which is overly broad and should
-+# be avoided.
-+# New properties should have appropriate read / write access
-+# control rules written.
-+
-+neverallow * {
-+  core_property_type
-+  -audio_prop
-+  -config_prop
-+  -cppreopt_prop
-+  -dalvik_prop
-+  -debuggerd_prop
-+  -debug_prop
-+  -default_prop
-+  -dhcp_prop
-+  -dumpstate_prop
-+  -ffs_prop
-+  -fingerprint_prop
-+  -logd_prop
-+  -net_radio_prop
-+  -nfc_prop
-+  -pan_result_prop
-+  -persist_debug_prop
-+  -powerctl_prop
-+  -radio_prop
-+  -restorecon_prop
-+  -shell_prop
-+  -system_prop
-+  -system_radio_prop
-+  -vold_prop
-+}:file no_rw_file_perms;
-+
-+# sigstop property is only used for debugging; should only be set by su which is permissive
-+# for userdebug/eng
-+neverallow {
-+  domain
-+  -init
-+  -vendor_init
-+} ctl_sigstop_prop:property_service set;
-+
-+# Don't audit legacy ctl. property handling.  We only want the newer permission check to appear
-+# in the audit log
-+dontaudit domain {
-+  ctl_bootanim_prop
-+  ctl_bugreport_prop
-+  ctl_console_prop
-+  ctl_default_prop
-+  ctl_dumpstate_prop
-+  ctl_fuse_prop
-+  ctl_mdnsd_prop
-+  ctl_rildaemon_prop
-+}:property_service set;
-+
-+compatible_property_only(`
-+# Prevent properties from being set
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -vendor_init
-+  } {
-+    core_property_type
-+    extended_core_property_type
-+    exported_config_prop
-+    exported_dalvik_prop
-+    exported_default_prop
-+    exported_dumpstate_prop
-+    exported_ffs_prop
-+    exported_fingerprint_prop
-+    exported_system_prop
-+    exported_system_radio_prop
-+    exported_vold_prop
-+    exported2_config_prop
-+    exported2_default_prop
-+    exported2_system_prop
-+    exported2_vold_prop
-+    exported3_default_prop
-+    exported3_system_prop
-+    -nfc_prop
-+    -powerctl_prop
-+    -radio_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -hal_nfc_server
-+  } {
-+    nfc_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -hal_telephony_server
-+    -vendor_init
-+  } {
-+    exported_radio_prop
-+    exported3_radio_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -hal_telephony_server
-+  } {
-+    exported2_radio_prop
-+    radio_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -bluetooth
-+    -hal_bluetooth_server
-+  } {
-+    bluetooth_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -bluetooth
-+    -hal_bluetooth_server
-+    -vendor_init
-+  } {
-+    exported_bluetooth_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -hal_wifi_server
-+    -wificond
-+  } {
-+    wifi_prop
-+  }:property_service set;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -hal_wifi_server
-+    -wificond
-+    -vendor_init
-+  } {
-+    exported_wifi_prop
-+  }:property_service set;
-+
-+# Prevent properties from being read
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -vendor_init
-+  } {
-+    core_property_type
-+    extended_core_property_type
-+    exported_dalvik_prop
-+    exported_ffs_prop
-+    exported_system_radio_prop
-+    exported2_config_prop
-+    exported2_system_prop
-+    exported2_vold_prop
-+    exported3_default_prop
-+    exported3_system_prop
-+    -debug_prop
-+    -logd_prop
-+    -nfc_prop
-+    -powerctl_prop
-+    -radio_prop
-+  }:file no_rw_file_perms;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -hal_nfc_server
-+  } {
-+    nfc_prop
-+  }:file no_rw_file_perms;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -appdomain
-+    -hal_telephony_server
-+  } {
-+    radio_prop
-+  }:file no_rw_file_perms;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -bluetooth
-+    -hal_bluetooth_server
-+  } {
-+    bluetooth_prop
-+  }:file no_rw_file_perms;
-+
-+  neverallow {
-+    domain
-+    -coredomain
-+    -hal_wifi_server
-+    -wificond
-+  } {
-+    wifi_prop
-+  }:file no_rw_file_perms;
-+')
-+
-+compatible_property_only(`
-+  # Neverallow coredomain to set vendor properties
-+  neverallow {
-+    coredomain
-+    -init
-+    -system_writes_vendor_properties_violators
-+  } {
-+    property_type
-+    -audio_prop
-+    -bluetooth_a2dp_offload_prop
-+    -bluetooth_prop
-+    -bootloader_boot_reason_prop
-+    -boottime_prop
-+    -config_prop
-+    -cppreopt_prop
-+    -ctl_bootanim_prop
-+    -ctl_bugreport_prop
-+    -ctl_console_prop
-+    -ctl_default_prop
-+    -ctl_dumpstate_prop
-+    -ctl_fuse_prop
-+    -ctl_interface_restart_prop
-+    -ctl_interface_start_prop
-+    -ctl_interface_stop_prop
-+    -ctl_mdnsd_prop
-+    -ctl_restart_prop
-+    -ctl_rildaemon_prop
-+    -ctl_sigstop_prop
-+    -ctl_start_prop
-+    -ctl_stop_prop
-+    -dalvik_prop
-+    -debug_prop
-+    -debuggerd_prop
-+    -default_prop
-+    -device_logging_prop
-+    -dhcp_prop
-+    -dumpstate_options_prop
-+    -dumpstate_prop
-+    -exported2_config_prop
-+    -exported2_default_prop
-+    -exported2_radio_prop
-+    -exported2_system_prop
-+    -exported2_vold_prop
-+    -exported3_default_prop
-+    -exported3_radio_prop
-+    -exported3_system_prop
-+    -exported_bluetooth_prop
-+    -exported_config_prop
-+    -exported_dalvik_prop
-+    -exported_default_prop
-+    -exported_dumpstate_prop
-+    -exported_ffs_prop
-+    -exported_fingerprint_prop
-+    -exported_overlay_prop
-+    -exported_pm_prop
-+    -exported_radio_prop
-+    -exported_secure_prop
-+    -exported_system_prop
-+    -exported_system_radio_prop
-+    -exported_vold_prop
-+    -exported_wifi_prop
-+    -extended_core_property_type
-+    -ffs_prop
-+    -fingerprint_prop
-+    -firstboot_prop
-+    -hwservicemanager_prop
-+    -last_boot_reason_prop
-+    -log_prop
-+    -log_tag_prop
-+    -logd_prop
-+    -logpersistd_logging_prop
-+    -lowpan_prop
-+    -mmc_prop
-+    -net_dns_prop
-+    -net_radio_prop
-+    -netd_stable_secret_prop
-+    -nfc_prop
-+    -overlay_prop
-+    -pan_result_prop
-+    -persist_debug_prop
-+    -persistent_properties_ready_prop
-+    -pm_prop
-+    -powerctl_prop
-+    -radio_prop
-+    -restorecon_prop
-+    -safemode_prop
-+    -serialno_prop
-+    -shell_prop
-+    -system_boot_reason_prop
-+    -system_prop
-+    -system_radio_prop
-+    -test_boot_reason_prop
-+    -traced_enabled_prop
-+    -vendor_default_prop
-+    -vendor_security_patch_level_prop
-+    -vold_prop
-+    -wifi_log_prop
-+    -wifi_prop
-+  }:property_service set;
-+')
-diff --git a/prebuilts/api/28.0/public/property_contexts b/prebuilts/api/28.0/public/property_contexts
-new file mode 100644
-index 000000000..58a04d2be
---- /dev/null
-+++ b/prebuilts/api/28.0/public/property_contexts
-@@ -0,0 +1,310 @@
-+# vendor-init-readable
-+persist.radio.airplane_mode_on u:object_r:exported2_radio_prop:s0 exact int
-+
-+# vendor-init-settable
-+af.fast_track_multiplier u:object_r:exported3_default_prop:s0 exact int
-+audio.camerasound.force u:object_r:exported_audio_prop:s0 exact bool
-+camera.disable_zsl_mode u:object_r:exported3_default_prop:s0 exact bool
-+camera.fifo.disable u:object_r:exported3_default_prop:s0 exact int
-+dalvik.vm.appimageformat u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.backgroundgctype u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.checkjni u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.dex2oat-Xms u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.dex2oat-Xmx u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.dex2oat-filter u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.dex2oat-flags u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.dex2oat-threads u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.dexopt.secondary u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.execution-mode u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.extra-opts u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.gctype u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.heapgrowthlimit u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.heapmaxfree u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.heapminfree u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.heapsize u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.heapstartsize u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.heaptargetutilization u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.hot-startup-method-samples u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.image-dex2oat-Xms u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.image-dex2oat-Xmx u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.image-dex2oat-filter u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.image-dex2oat-flags u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.image-dex2oat-threads u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.isa.arm.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.arm.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.arm64.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.arm64.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.mips.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.mips.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.mips64.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.mips64.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.unknown.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.unknown.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.x86.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.x86.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.x86_64.features u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.isa.x86_64.variant u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.jitinitialsize u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.jitmaxsize u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.jitprithreadweight u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.jitthreshold u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.jittransitionweight u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.jniopts u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.lockprof.threshold u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.method-trace u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.method-trace-file u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.method-trace-file-siz u:object_r:exported_dalvik_prop:s0 exact int
-+dalvik.vm.method-trace-stream u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.profilesystemserver u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.profilebootimage u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.stack-trace-dir u:object_r:exported_dalvik_prop:s0 exact string
-+dalvik.vm.usejit u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.usejitprofiles u:object_r:exported_dalvik_prop:s0 exact bool
-+dalvik.vm.zygote.max-boot-retry u:object_r:exported_dalvik_prop:s0 exact int
-+drm.service.enabled u:object_r:exported3_default_prop:s0 exact bool
-+keyguard.no_require_sim u:object_r:exported3_default_prop:s0 exact bool
-+media.recorder.show_manufacturer_and_model u:object_r:exported3_default_prop:s0 exact bool
-+media.stagefright.cache-params u:object_r:exported3_default_prop:s0 exact string
-+persist.bluetooth.a2dp_offload.cap u:object_r:bluetooth_a2dp_offload_prop:s0 exact string
-+persist.bluetooth.a2dp_offload.disabled u:object_r:bluetooth_a2dp_offload_prop:s0 exact bool
-+persist.config.calibration_fac u:object_r:exported3_default_prop:s0 exact string
-+persist.dbg.volte_avail_ovr u:object_r:exported3_default_prop:s0 exact int
-+persist.dbg.vt_avail_ovr u:object_r:exported3_default_prop:s0 exact int
-+persist.dbg.wfc_avail_ovr u:object_r:exported3_default_prop:s0 exact int
-+persist.radio.multisim.config u:object_r:exported3_radio_prop:s0 exact string
-+persist.sys.dalvik.vm.lib.2 u:object_r:exported2_system_prop:s0 exact string
-+persist.sys.media.avsync u:object_r:exported2_system_prop:s0 exact bool
-+persist.sys.hdmi.keep_awake u:object_r:exported2_system_prop:s0 exact bool
-+persist.sys.sf.color_saturation u:object_r:exported2_system_prop:s0 exact string
-+persist.sys.sf.native_mode u:object_r:exported2_system_prop:s0 exact int
-+pm.dexopt.ab-ota u:object_r:exported_pm_prop:s0 exact string
-+pm.dexopt.bg-dexopt u:object_r:exported_pm_prop:s0 exact string
-+pm.dexopt.boot u:object_r:exported_pm_prop:s0 exact string
-+pm.dexopt.first-boot u:object_r:exported_pm_prop:s0 exact string
-+pm.dexopt.install u:object_r:exported_pm_prop:s0 exact string
-+ro.audio.monitorRotation u:object_r:exported3_default_prop:s0 exact bool
-+ro.bluetooth.a2dp_offload.supported u:object_r:bluetooth_a2dp_offload_prop:s0 exact bool
-+ro.boot.vendor.overlay.theme u:object_r:exported_overlay_prop:s0 exact string
-+ro.boot.wificountrycode u:object_r:exported3_default_prop:s0 exact string
-+ro.bt.bdaddr_path u:object_r:exported_bluetooth_prop:s0 exact string
-+ro.camera.notify_nfc u:object_r:exported3_default_prop:s0 exact int
-+ro.com.android.dataroaming u:object_r:exported3_default_prop:s0 exact bool
-+ro.com.android.prov_mobiledata u:object_r:exported3_default_prop:s0 exact bool
-+ro.com.google.clientidbase u:object_r:exported3_default_prop:s0 exact string
-+ro.config.alarm_alert u:object_r:exported2_config_prop:s0 exact string
-+ro.config.media_vol_steps u:object_r:exported2_config_prop:s0 exact int
-+ro.config.notification_sound u:object_r:exported2_config_prop:s0 exact string
-+ro.config.ringtone u:object_r:exported2_config_prop:s0 exact string
-+ro.control_privapp_permissions u:object_r:exported3_default_prop:s0 exact string
-+ro.cp_system_other_odex u:object_r:exported3_default_prop:s0 exact int
-+ro.crypto.scrypt_params u:object_r:exported2_vold_prop:s0 exact string
-+ro.dalvik.vm.native.bridge u:object_r:exported_dalvik_prop:s0 exact string
-+ro.enable_boot_charger_mode u:object_r:exported3_default_prop:s0 exact bool
-+ro.gfx.driver.0 u:object_r:exported3_default_prop:s0 exact string
-+ro.gfx.angle.supported u:object_r:exported3_default_prop:s0 exact bool
-+ro.hdmi.device_type u:object_r:exported3_default_prop:s0 exact string
-+ro.hdmi.wake_on_hotplug u:object_r:exported3_default_prop:s0 exact bool
-+ro.oem_unlock_supported u:object_r:exported3_default_prop:s0 exact int
-+ro.opengles.version u:object_r:exported3_default_prop:s0 exact int
-+ro.radio.noril u:object_r:exported3_default_prop:s0 exact string
-+ro.retaildemo.video_path u:object_r:exported3_default_prop:s0 exact string
-+ro.sf.disable_triple_buffer u:object_r:exported3_default_prop:s0 exact bool
-+ro.sf.lcd_density u:object_r:exported3_default_prop:s0 exact int
-+ro.storage_manager.enabled u:object_r:exported3_default_prop:s0 exact bool
-+ro.telephony.call_ring.multiple u:object_r:exported3_default_prop:s0 exact bool
-+ro.telephony.default_cdma_sub u:object_r:exported3_default_prop:s0 exact int
-+ro.telephony.default_network u:object_r:exported3_default_prop:s0 exact int
-+ro.url.legal u:object_r:exported3_default_prop:s0 exact string
-+ro.url.legal.android_privacy u:object_r:exported3_default_prop:s0 exact string
-+ro.vendor.build.security_patch u:object_r:vendor_security_patch_level_prop:s0 exact string
-+ro.zygote u:object_r:exported3_default_prop:s0 exact string
-+sendbug.preferred.domain u:object_r:exported3_default_prop:s0 exact string
-+sys.usb.controller u:object_r:exported2_system_prop:s0 exact string
-+sys.usb.ffs.max_read u:object_r:exported_ffs_prop:s0 exact int
-+sys.usb.ffs.max_write u:object_r:exported_ffs_prop:s0 exact int
-+sys.usb.mtp.device_type u:object_r:exported2_system_prop:s0 exact int
-+sys.usb.state u:object_r:exported2_system_prop:s0 exact string
-+telephony.lteOnCdmaDevice u:object_r:exported3_default_prop:s0 exact int
-+tombstoned.max_tombstone_count u:object_r:exported3_default_prop:s0 exact int
-+vold.post_fs_data_done u:object_r:exported2_vold_prop:s0 exact int
-+wlan.driver.status u:object_r:exported_wifi_prop:s0 exact enum ok unloaded
-+
-+# vendor-init-readable|vendor-init-actionable
-+dev.bootcomplete u:object_r:exported3_system_prop:s0 exact bool
-+persist.sys.usb.usbradio.config u:object_r:exported3_system_prop:s0 exact string
-+sys.boot_completed u:object_r:exported3_system_prop:s0 exact bool
-+sys.retaildemo.enabled u:object_r:exported3_system_prop:s0 exact int
-+
-+# vendor-init-settable|vendor-init-actionable
-+persist.sys.zram_enabled u:object_r:exported2_system_prop:s0 exact bool
-+sys.usb.config u:object_r:exported_system_radio_prop:s0 exact string
-+sys.usb.configfs u:object_r:exported_system_radio_prop:s0 exact int
-+
-+# public-readable
-+aac_drc_boost u:object_r:exported2_default_prop:s0 exact int
-+aac_drc_cut u:object_r:exported2_default_prop:s0 exact int
-+aac_drc_enc_target_level u:object_r:exported2_default_prop:s0 exact int
-+aac_drc_heavy u:object_r:exported2_default_prop:s0 exact int
-+aac_drc_reference_level u:object_r:exported2_default_prop:s0 exact int
-+ro.aac_drc_effect_type u:object_r:exported2_default_prop:s0 exact int
-+drm.64bit.enabled u:object_r:exported2_default_prop:s0 exact bool
-+dumpstate.dry_run u:object_r:exported_dumpstate_prop:s0 exact bool
-+hal.instrumentation.enable u:object_r:exported2_default_prop:s0 exact bool
-+init.svc.tombstoned u:object_r:exported2_default_prop:s0 exact string
-+libc.debug.malloc.options u:object_r:exported2_default_prop:s0 exact string
-+libc.debug.malloc.program u:object_r:exported2_default_prop:s0 exact string
-+libc.debug.hooks.enable u:object_r:exported2_default_prop:s0 exact string
-+persist.sys.timezone u:object_r:exported_system_prop:s0 exact string
-+ro.adb.secure u:object_r:exported_secure_prop:s0 exact int
-+ro.arch u:object_r:exported2_default_prop:s0 exact string
-+ro.audio.ignore_effects u:object_r:exported2_default_prop:s0 exact bool
-+ro.baseband u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.avb_version u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.baseband u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.bootdevice u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.bootloader u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.boottime u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.console u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.hardware u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.hardware.color u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.hardware.sku u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.keymaster u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.mode u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.vbmeta.avb_version u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.verifiedbootstate u:object_r:exported2_default_prop:s0 exact string
-+ro.boot.veritymode u:object_r:exported2_default_prop:s0 exact string
-+ro.bootimage.build.date u:object_r:exported2_default_prop:s0 exact string
-+ro.bootimage.build.date.utc u:object_r:exported2_default_prop:s0 exact int
-+ro.bootimage.build.fingerprint u:object_r:exported2_default_prop:s0 exact string
-+ro.bootloader u:object_r:exported2_default_prop:s0 exact string
-+ro.build.date u:object_r:exported2_default_prop:s0 exact string
-+ro.build.date.utc u:object_r:exported2_default_prop:s0 exact int
-+ro.build.description u:object_r:exported2_default_prop:s0 exact string
-+ro.build.display.id u:object_r:exported2_default_prop:s0 exact string
-+ro.build.fingerprint u:object_r:exported_fingerprint_prop:s0 exact string
-+ro.build.host u:object_r:exported2_default_prop:s0 exact string
-+ro.build.id u:object_r:exported2_default_prop:s0 exact string
-+ro.build.product u:object_r:exported2_default_prop:s0 exact string
-+ro.build.system_root_image u:object_r:exported2_default_prop:s0 exact bool
-+ro.build.tags u:object_r:exported2_default_prop:s0 exact string
-+ro.build.user u:object_r:exported2_default_prop:s0 exact string
-+ro.build.version.base_os u:object_r:exported2_default_prop:s0 exact string
-+ro.build.version.codename u:object_r:exported2_default_prop:s0 exact string
-+ro.build.version.incremental u:object_r:exported2_default_prop:s0 exact string
-+ro.build.version.preview_sdk u:object_r:exported2_default_prop:s0 exact int
-+ro.build.version.release u:object_r:exported2_default_prop:s0 exact string
-+ro.build.version.sdk u:object_r:exported2_default_prop:s0 exact int
-+ro.build.version.security_patch u:object_r:exported2_default_prop:s0 exact string
-+ro.crypto.state u:object_r:exported_vold_prop:s0 exact string
-+ro.crypto.type u:object_r:exported_vold_prop:s0 exact string
-+ro.debuggable u:object_r:exported2_default_prop:s0 exact int
-+ro.hardware u:object_r:exported2_default_prop:s0 exact string
-+ro.product.brand u:object_r:exported2_default_prop:s0 exact string
-+ro.product.cpu.abi u:object_r:exported2_default_prop:s0 exact string
-+ro.product.cpu.abilist u:object_r:exported2_default_prop:s0 exact string
-+ro.product.device u:object_r:exported2_default_prop:s0 exact string
-+ro.product.manufacturer u:object_r:exported2_default_prop:s0 exact string
-+ro.product.model u:object_r:exported2_default_prop:s0 exact string
-+ro.product.name u:object_r:exported2_default_prop:s0 exact string
-+ro.property_service.version u:object_r:exported2_default_prop:s0 exact int
-+ro.revision u:object_r:exported2_default_prop:s0 exact string
-+ro.secure u:object_r:exported_secure_prop:s0 exact int
-+service.bootanim.exit u:object_r:exported_system_prop:s0 exact int
-+sys.boot_from_charger_mode u:object_r:exported_system_prop:s0 exact int
-+vold.decrypt u:object_r:exported_vold_prop:s0 exact string
-+
-+# vendor-init-settable|public-readable
-+aaudio.hw_burst_min_usec u:object_r:exported_default_prop:s0 exact int
-+aaudio.minimum_sleep_usec u:object_r:exported_default_prop:s0 exact int
-+aaudio.mixer_bursts u:object_r:exported_default_prop:s0 exact int
-+aaudio.mmap_exclusive_policy u:object_r:exported_default_prop:s0 exact int
-+aaudio.mmap_policy u:object_r:exported_default_prop:s0 exact int
-+aaudio.wakeup_delay_usec u:object_r:exported_default_prop:s0 exact int
-+gsm.sim.operator.numeric u:object_r:exported_radio_prop:s0 exact string
-+media.mediadrmservice.enable u:object_r:exported_default_prop:s0 exact bool
-+persist.rcs.supported u:object_r:exported_default_prop:s0 exact int
-+rcs.publish.status u:object_r:exported_radio_prop:s0 exact string
-+ro.board.platform u:object_r:exported_default_prop:s0 exact string
-+ro.boot.fake_battery u:object_r:exported_default_prop:s0 exact int
-+ro.boot.hardware.revision u:object_r:exported_default_prop:s0 exact string
-+ro.boot.product.hardware.sku u:object_r:exported_default_prop:s0 exact string
-+ro.boot.slot_suffix u:object_r:exported_default_prop:s0 exact string
-+ro.carrier u:object_r:exported_default_prop:s0 exact string
-+ro.config.low_ram u:object_r:exported_config_prop:s0 exact bool
-+ro.config.vc_call_vol_steps u:object_r:exported_config_prop:s0 exact int
-+ro.frp.pst u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.activity_recognition u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.audio u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.audio.a2dp u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.audio.hearing_aid u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.audio.primary u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.audio.usb u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.audio_policy u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.bootctrl u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.camera u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.consumerir u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.context_hub u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.egl u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.fingerprint u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.flp u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.gatekeeper u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.gps u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.gralloc u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.hdmi_cec u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.hwcomposer u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.input u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.keystore u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.keystore_desede u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.lights u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.local_time u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.memtrack u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.nfc u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.nfc_nci u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.nfc_tag u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.nvram u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.power u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.radio u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.sensors u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.sound_trigger u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.thermal u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.tv_input u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.type u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.vehicle u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.vibrator u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.virtual_device u:object_r:exported_default_prop:s0 exact string
-+ro.hardware.vulkan u:object_r:exported_default_prop:s0 exact string
-+ro.kernel.qemu u:object_r:exported_default_prop:s0 exact int
-+ro.kernel.qemu. u:object_r:exported_default_prop:s0
-+ro.kernel.android.bootanim u:object_r:exported_default_prop:s0 exact int
-+ro.odm.build.date u:object_r:exported_default_prop:s0 exact string
-+ro.odm.build.date.utc u:object_r:exported_default_prop:s0 exact int
-+ro.odm.build.fingerprint u:object_r:exported_default_prop:s0 exact string
-+ro.oem.key1 u:object_r:exported_default_prop:s0 exact string
-+ro.product.board u:object_r:exported_default_prop:s0 exact string
-+ro.product.cpu.abilist32 u:object_r:exported_default_prop:s0 exact string
-+ro.product.cpu.abilist64 u:object_r:exported_default_prop:s0 exact string
-+ro.product.first_api_level u:object_r:exported_default_prop:s0 exact int
-+ro.product.odm.brand u:object_r:exported_default_prop:s0 exact string
-+ro.product.odm.device u:object_r:exported_default_prop:s0 exact string
-+ro.product.odm.manufacturer u:object_r:exported_default_prop:s0 exact string
-+ro.product.odm.model u:object_r:exported_default_prop:s0 exact string
-+ro.product.odm.name u:object_r:exported_default_prop:s0 exact string
-+ro.product.vendor.brand u:object_r:exported_default_prop:s0 exact string
-+ro.product.vendor.device u:object_r:exported_default_prop:s0 exact string
-+ro.product.vendor.manufacturer u:object_r:exported_default_prop:s0 exact string
-+ro.product.vendor.model u:object_r:exported_default_prop:s0 exact string
-+ro.product.vendor.name u:object_r:exported_default_prop:s0 exact string
-+ro.vendor.build.date u:object_r:exported_default_prop:s0 exact string
-+ro.vendor.build.date.utc u:object_r:exported_default_prop:s0 exact int
-+ro.vendor.build.fingerprint u:object_r:exported_default_prop:s0 exact string
-+ro.vndk.lite u:object_r:exported_default_prop:s0 exact bool
-+ro.vndk.version u:object_r:exported_default_prop:s0 exact string
-+ro.vts.coverage u:object_r:exported_default_prop:s0 exact int
-+wifi.direct.interface u:object_r:exported_default_prop:s0 exact string
-+wifi.interface u:object_r:exported_default_prop:s0 exact string
-+
-+# vendor-init-actionable|public-readable
-+ro.boot.revision u:object_r:exported2_default_prop:s0 exact string
-+ro.bootmode u:object_r:exported2_default_prop:s0 exact string
-+ro.build.type u:object_r:exported2_default_prop:s0 exact string
-+sys.shutdown.requested u:object_r:exported_system_prop:s0 exact string
-diff --git a/prebuilts/api/28.0/public/racoon.te b/prebuilts/api/28.0/public/racoon.te
-new file mode 100644
-index 000000000..c759217a0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/racoon.te
-@@ -0,0 +1,33 @@
-+# IKE key management daemon
-+type racoon, domain;
-+type racoon_exec, exec_type, file_type;
-+
-+typeattribute racoon mlstrustedsubject;
-+
-+net_domain(racoon)
-+allowxperm racoon self:udp_socket ioctl { SIOCSIFFLAGS SIOCSIFADDR SIOCSIFNETMASK };
-+
-+binder_use(racoon)
-+
-+allow racoon tun_device:chr_file r_file_perms;
-+allow racoon cgroup:dir { add_name create };
-+allow racoon kernel:system module_request;
-+
-+allow racoon self:key_socket create_socket_perms_no_ioctl;
-+allow racoon self:tun_socket create_socket_perms_no_ioctl;
-+allow racoon self:global_capability_class_set { net_admin net_bind_service net_raw };
-+
-+# XXX: should we give ip-up-vpn its own label (currently racoon domain)
-+allow racoon system_file:file rx_file_perms;
-+not_full_treble(`allow racoon vendor_file:file rx_file_perms;')
-+allow racoon vpn_data_file:file create_file_perms;
-+allow racoon vpn_data_file:dir w_dir_perms;
-+
-+use_keystore(racoon)
-+
-+# Racoon (VPN) has a restricted set of permissions from the default.
-+allow racoon keystore:keystore_key {
-+	get
-+	sign
-+	verify
-+};
-diff --git a/prebuilts/api/28.0/public/radio.te b/prebuilts/api/28.0/public/radio.te
-new file mode 100644
-index 000000000..8fb5ad638
---- /dev/null
-+++ b/prebuilts/api/28.0/public/radio.te
-@@ -0,0 +1,41 @@
-+# phone subsystem
-+type radio, domain, mlstrustedsubject;
-+
-+net_domain(radio)
-+bluetooth_domain(radio)
-+binder_service(radio)
-+
-+# Talks to hal_telephony_server via the rild socket only for devices without full treble
-+not_full_treble(`unix_socket_connect(radio, rild, hal_telephony_server)')
-+
-+# Data file accesses.
-+allow radio radio_data_file:dir create_dir_perms;
-+allow radio radio_data_file:notdevfile_class_set create_file_perms;
-+
-+allow radio alarm_device:chr_file rw_file_perms;
-+
-+allow radio net_data_file:dir search;
-+allow radio net_data_file:file r_file_perms;
-+
-+# Property service
-+set_prop(radio, radio_prop)
-+set_prop(radio, exported_radio_prop)
-+set_prop(radio, exported2_radio_prop)
-+set_prop(radio, exported3_radio_prop)
-+set_prop(radio, net_radio_prop)
-+
-+# ctl interface
-+set_prop(radio, ctl_rildaemon_prop)
-+
-+add_service(radio, radio_service)
-+allow radio audioserver_service:service_manager find;
-+allow radio cameraserver_service:service_manager find;
-+allow radio drmserver_service:service_manager find;
-+allow radio mediaserver_service:service_manager find;
-+allow radio nfc_service:service_manager find;
-+allow radio app_api_service:service_manager find;
-+allow radio system_api_service:service_manager find;
-+
-+# Perform HwBinder IPC.
-+hwbinder_use(radio)
-+hal_client_domain(radio, hal_telephony)
-diff --git a/prebuilts/api/28.0/public/recovery.te b/prebuilts/api/28.0/public/recovery.te
-new file mode 100644
-index 000000000..57ad2028b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/recovery.te
-@@ -0,0 +1,161 @@
-+# recovery console (used in recovery init.rc for /sbin/recovery)
-+
-+# Declare the domain unconditionally so we can always reference it
-+# in neverallow rules.
-+type recovery, domain;
-+
-+# But the allow rules are only included in the recovery policy.
-+# Otherwise recovery is only allowed the domain rules.
-+recovery_only(`
-+  # Allow recovery to perform an update as update_engine would do.
-+  typeattribute recovery update_engine_common;
-+  # Recovery can only use HALs in passthrough mode
-+  passthrough_hal_client_domain(recovery, hal_bootctl)
-+
-+  allow recovery self:global_capability_class_set {
-+    chown
-+    dac_override
-+    fowner
-+    setuid
-+    setgid
-+    sys_admin
-+    sys_tty_config
-+  };
-+
-+  # Run helpers from / or /system without changing domain.
-+  r_dir_file(recovery, rootfs)
-+  allow recovery rootfs:file execute_no_trans;
-+  allow recovery system_file:file execute_no_trans;
-+  allow recovery toolbox_exec:file rx_file_perms;
-+
-+  # Mount filesystems.
-+  allow recovery rootfs:dir mounton;
-+  allow recovery fs_type:filesystem ~relabelto;
-+  allow recovery unlabeled:filesystem ~relabelto;
-+  allow recovery contextmount_type:filesystem relabelto;
-+
-+  # We may be asked to set an SELinux label for a type not known to the
-+  # currently loaded policy. Allow it.
-+  allow recovery unlabeled:{ file lnk_file } { create_file_perms relabelfrom relabelto };
-+  allow recovery unlabeled:dir { create_dir_perms relabelfrom relabelto };
-+
-+  # Get file contexts
-+  allow recovery file_contexts_file:file r_file_perms;
-+
-+  # Write to /proc/sys/vm/drop_caches
-+  allow recovery proc_drop_caches:file w_file_perms;
-+
-+  # Read /proc/swaps
-+  allow recovery proc_swaps:file r_file_perms;
-+
-+  # Read kernel config through libvintf for OTA matching
-+  allow recovery config_gz:file { open read getattr };
-+
-+  # Write to /sys/class/android_usb/android0/enable.
-+  r_dir_file(recovery, sysfs_android_usb)
-+  allow recovery sysfs_android_usb:file w_file_perms;
-+
-+  # Write to /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq.
-+  allow recovery sysfs_devices_system_cpu:file w_file_perms;
-+
-+  allow recovery sysfs_batteryinfo:file r_file_perms;
-+
-+  # Read /sysfs/fs/ext4/features
-+  r_dir_file(recovery, sysfs_fs_ext4_features)
-+
-+  # Read from /sys/class/leds/lcd-backlight/max_brightness and write to /s/c/l/l/brightness to
-+  # control backlight brightness.
-+  allow recovery sysfs_leds:dir r_dir_perms;
-+  allow recovery sysfs_leds:file rw_file_perms;
-+  allow recovery sysfs_leds:lnk_file read;
-+
-+  allow recovery kernel:system syslog_read;
-+
-+  # Access /dev/usb-ffs/adb/ep0
-+  allow recovery functionfs:dir search;
-+  allow recovery functionfs:file rw_file_perms;
-+
-+  # Access to /sys/fs/selinux/policyvers for compatibility check
-+  allow recovery selinuxfs:file r_file_perms;
-+
-+  # Required to e.g. wipe userdata/cache.
-+  allow recovery device:dir r_dir_perms;
-+  allow recovery block_device:dir r_dir_perms;
-+  allow recovery dev_type:blk_file rw_file_perms;
-+
-+  # GUI
-+  allow recovery graphics_device:chr_file rw_file_perms;
-+  allow recovery graphics_device:dir r_dir_perms;
-+  allow recovery input_device:dir r_dir_perms;
-+  allow recovery input_device:chr_file r_file_perms;
-+  allow recovery tty_device:chr_file rw_file_perms;
-+
-+  # Create /tmp/recovery.log and execute /tmp/update_binary.
-+  allow recovery tmpfs:file { create_file_perms x_file_perms };
-+  allow recovery tmpfs:dir create_dir_perms;
-+
-+  # Manage files on /cache and /cache/recovery
-+  allow recovery { cache_file cache_recovery_file }:dir create_dir_perms;
-+  allow recovery { cache_file cache_recovery_file }:file create_file_perms;
-+
-+  # Read /sys/class/thermal/*/temp for thermal info.
-+  r_dir_file(recovery, sysfs_thermal)
-+
-+  # Read files on /oem.
-+  r_dir_file(recovery, oemfs);
-+
-+  # Reboot the device
-+  set_prop(recovery, powerctl_prop)
-+
-+  # Start/stop adbd via ctl.start adbd
-+  set_prop(recovery, ctl_default_prop)
-+
-+  # Read serial number of the device from system properties
-+  get_prop(recovery, serialno_prop)
-+
-+  # Set sys.usb.ffs.ready when starting minadbd for sideload.
-+  set_prop(recovery, ffs_prop)
-+  set_prop(recovery, exported_ffs_prop)
-+
-+  # Read ro.boot.bootreason
-+  get_prop(recovery, bootloader_boot_reason_prop)
-+
-+  # Use setfscreatecon() to label files for OTA updates.
-+  allow recovery self:process setfscreate;
-+
-+  # Allow recovery to create a fuse filesystem, and read files from it.
-+  allow recovery fuse_device:chr_file rw_file_perms;
-+  allow recovery fuse:dir r_dir_perms;
-+  allow recovery fuse:file r_file_perms;
-+
-+  wakelock_use(recovery)
-+
-+  # This line seems suspect, as it should not really need to
-+  # set scheduling parameters for a kernel domain task.
-+  allow recovery kernel:process setsched;
-+')
-+
-+###
-+### neverallow rules
-+###
-+
-+# Recovery should never touch /data.
-+#
-+# In particular, if /data is encrypted, it is not accessible
-+# to recovery anyway.
-+#
-+# For now, we only enforce write/execute restrictions, as domain.te
-+# contains a number of read-only rules that apply to all
-+# domains, including recovery.
-+#
-+# TODO: tighten this up further.
-+neverallow recovery {
-+   data_file_type
-+   -cache_file
-+   -cache_recovery_file
-+}:file { no_w_file_perms no_x_file_perms };
-+neverallow recovery {
-+   data_file_type
-+   -cache_file
-+   -cache_recovery_file
-+}:dir no_w_dir_perms;
-diff --git a/prebuilts/api/28.0/public/recovery_persist.te b/prebuilts/api/28.0/public/recovery_persist.te
-new file mode 100644
-index 000000000..59dff8c62
---- /dev/null
-+++ b/prebuilts/api/28.0/public/recovery_persist.te
-@@ -0,0 +1,26 @@
-+# android recovery persistent log manager
-+type recovery_persist, domain;
-+type recovery_persist_exec, exec_type, file_type;
-+
-+allow recovery_persist pstorefs:dir search;
-+allow recovery_persist pstorefs:file r_file_perms;
-+
-+allow recovery_persist recovery_data_file:file create_file_perms;
-+allow recovery_persist recovery_data_file:dir create_dir_perms;
-+
-+###
-+### Neverallow rules
-+###
-+### recovery_persist should NEVER do any of this
-+
-+# Block device access.
-+neverallow recovery_persist dev_type:blk_file { read write };
-+
-+# ptrace any other app
-+neverallow recovery_persist domain:process ptrace;
-+
-+# Write to /system.
-+neverallow recovery_persist system_file:dir_file_class_set write;
-+
-+# Write to files in /data/data
-+neverallow recovery_persist { app_data_file system_data_file }:dir_file_class_set write;
-diff --git a/prebuilts/api/28.0/public/recovery_refresh.te b/prebuilts/api/28.0/public/recovery_refresh.te
-new file mode 100644
-index 000000000..602ed51d7
---- /dev/null
-+++ b/prebuilts/api/28.0/public/recovery_refresh.te
-@@ -0,0 +1,24 @@
-+# android recovery refresh log manager
-+type recovery_refresh, domain;
-+type recovery_refresh_exec, exec_type, file_type;
-+
-+allow recovery_refresh pstorefs:dir search;
-+allow recovery_refresh pstorefs:file r_file_perms;
-+# NB: domain inherits write_logd which hands us write to pmsg_device
-+
-+###
-+### Neverallow rules
-+###
-+### recovery_refresh should NEVER do any of this
-+
-+# Block device access.
-+neverallow recovery_refresh dev_type:blk_file { read write };
-+
-+# ptrace any other app
-+neverallow recovery_refresh domain:process ptrace;
-+
-+# Write to /system.
-+neverallow recovery_refresh system_file:dir_file_class_set write;
-+
-+# Write to files in /data/data or system files on /data
-+neverallow recovery_refresh { app_data_file system_data_file }:dir_file_class_set write;
-diff --git a/prebuilts/api/28.0/public/roles b/prebuilts/api/28.0/public/roles
-new file mode 100644
-index 000000000..ca9293439
---- /dev/null
-+++ b/prebuilts/api/28.0/public/roles
-@@ -0,0 +1 @@
-+role r types domain;
-diff --git a/prebuilts/api/28.0/public/runas.te b/prebuilts/api/28.0/public/runas.te
-new file mode 100644
-index 000000000..053a87f6b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/runas.te
-@@ -0,0 +1,42 @@
-+type runas, domain, mlstrustedsubject;
-+type runas_exec, exec_type, file_type;
-+
-+allow runas adbd:fd use;
-+allow runas adbd:process sigchld;
-+allow runas adbd:unix_stream_socket { read write };
-+allow runas shell:fd use;
-+allow runas shell:fifo_file { read write };
-+allow runas shell:unix_stream_socket { read write };
-+allow runas devpts:chr_file { read write ioctl };
-+allow runas shell_data_file:file { read write };
-+
-+# run-as reads package information.
-+allow runas system_data_file:file r_file_perms;
-+allow runas system_data_file:lnk_file getattr;
-+
-+# The app's data dir may be accessed through a symlink.
-+allow runas system_data_file:lnk_file read;
-+
-+# run-as checks and changes to the app data dir.
-+dontaudit runas self:global_capability_class_set dac_override;
-+allow runas app_data_file:dir { getattr search };
-+
-+# run-as switches to the app UID/GID.
-+allow runas self:global_capability_class_set { setuid setgid };
-+
-+# run-as switches to the app security context.
-+selinux_check_context(runas) # validate context
-+allow runas self:process setcurrent;
-+allow runas non_system_app_set:process dyntransition; # setcon
-+
-+# runas/libselinux needs access to seapp_contexts_file to
-+# determine which domain to transition to.
-+allow runas seapp_contexts_file:file r_file_perms;
-+
-+###
-+### neverallow rules
-+###
-+
-+# run-as cannot have capabilities other than CAP_SETUID and CAP_SETGID
-+neverallow runas self:global_capability_class_set ~{ setuid setgid };
-+neverallow runas self:global_capability2_class_set *;
-diff --git a/prebuilts/api/28.0/public/sdcardd.te b/prebuilts/api/28.0/public/sdcardd.te
-new file mode 100644
-index 000000000..4a88f54d0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/sdcardd.te
-@@ -0,0 +1,43 @@
-+type sdcardd, domain;
-+type sdcardd_exec, exec_type, file_type;
-+
-+allow sdcardd cgroup:dir create_dir_perms;
-+allow sdcardd fuse_device:chr_file rw_file_perms;
-+allow sdcardd rootfs:dir mounton;  # TODO: deprecated in M
-+allow sdcardd sdcardfs:filesystem remount;
-+allow sdcardd tmpfs:dir r_dir_perms;
-+allow sdcardd mnt_media_rw_file:dir r_dir_perms;
-+allow sdcardd storage_file:dir search;
-+allow sdcardd storage_stub_file:dir { search mounton };
-+allow sdcardd sdcard_type:filesystem { mount unmount };
-+allow sdcardd self:global_capability_class_set { setuid setgid dac_override sys_admin sys_resource };
-+
-+allow sdcardd sdcard_type:dir create_dir_perms;
-+allow sdcardd sdcard_type:file create_file_perms;
-+
-+allow sdcardd media_rw_data_file:dir create_dir_perms;
-+allow sdcardd media_rw_data_file:file create_file_perms;
-+
-+# Read /data/system/packages.list.
-+allow sdcardd system_data_file:file r_file_perms;
-+
-+# Read /data/.layout_version
-+allow sdcardd install_data_file:file r_file_perms;
-+
-+# Allow stdin/out back to vold
-+allow sdcardd vold:fd use;
-+allow sdcardd vold:fifo_file { read write getattr };
-+
-+# Allow running on top of expanded storage
-+allow sdcardd mnt_expand_file:dir search;
-+
-+# access /proc/filesystems
-+allow sdcardd proc_filesystems:file r_file_perms;
-+
-+###
-+### neverallow rules
-+###
-+
-+# The sdcard daemon should no longer be started from init
-+neverallow init sdcardd_exec:file execute;
-+neverallow init sdcardd:process { transition dyntransition };
-diff --git a/prebuilts/api/28.0/public/secure_element.te b/prebuilts/api/28.0/public/secure_element.te
-new file mode 100644
-index 000000000..4ce6714f6
---- /dev/null
-+++ b/prebuilts/api/28.0/public/secure_element.te
-@@ -0,0 +1,2 @@
-+# secure_element subsystem
-+type secure_element, domain;
-diff --git a/prebuilts/api/28.0/public/service.te b/prebuilts/api/28.0/public/service.te
-new file mode 100644
-index 000000000..3526049f2
---- /dev/null
-+++ b/prebuilts/api/28.0/public/service.te
-@@ -0,0 +1,161 @@
-+type audioserver_service,       service_manager_type;
-+type batteryproperties_service, app_api_service, ephemeral_app_api_service, service_manager_type;
-+type bluetooth_service,         service_manager_type;
-+type cameraserver_service,      service_manager_type;
-+type default_android_service,   service_manager_type;
-+type drmserver_service,         service_manager_type;
-+type dumpstate_service,         service_manager_type;
-+type fingerprintd_service,      service_manager_type;
-+type hal_fingerprint_service,   service_manager_type;
-+type gatekeeper_service,        app_api_service, service_manager_type;
-+type gpu_service,               service_manager_type;
-+type inputflinger_service,      service_manager_type;
-+type incident_service,          service_manager_type;
-+type installd_service,          service_manager_type;
-+type keystore_service,          service_manager_type;
-+type mediaserver_service,       service_manager_type;
-+type mediametrics_service,      service_manager_type;
-+type mediaextractor_service,    service_manager_type;
-+type mediaextractor_update_service, service_manager_type;
-+type mediacodec_service,        service_manager_type;
-+type mediadrmserver_service,    service_manager_type;
-+type netd_service,              service_manager_type;
-+type nfc_service,               service_manager_type;
-+type perfprofd_service,         service_manager_type;
-+type radio_service,             service_manager_type;
-+type secure_element_service,    service_manager_type;
-+type storaged_service,          service_manager_type;
-+type surfaceflinger_service,    app_api_service, ephemeral_app_api_service, service_manager_type;
-+type system_app_service,        service_manager_type;
-+type thermal_service,           service_manager_type;
-+type update_engine_service,     service_manager_type;
-+type virtual_touchpad_service,  service_manager_type;
-+type vold_service,              service_manager_type;
-+type vr_hwc_service,            service_manager_type;
-+
-+# system_server_services broken down
-+type accessibility_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type account_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type activity_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type alarm_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type appops_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type appwidget_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type assetatlas_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type audio_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type autofill_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type backup_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type batterystats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type battery_service, system_server_service, service_manager_type;
-+type binder_calls_stats_service, system_server_service, service_manager_type;
-+type bluetooth_manager_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type broadcastradio_service, system_server_service, service_manager_type;
-+type cameraproxy_service, system_server_service, service_manager_type;
-+type clipboard_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type contexthub_service, app_api_service,  system_server_service, service_manager_type;
-+type crossprofileapps_service, app_api_service, system_server_service, service_manager_type;
-+type IProxyService_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type commontime_management_service, system_server_service, service_manager_type;
-+type companion_device_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type connectivity_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type connmetrics_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type consumer_ir_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type content_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type country_detector_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+# Note: The coverage_service should only be enabled for userdebug / eng builds that were compiled
-+# with EMMA_INSTRUMENT=true. We should consider locking this down in the future.
-+type coverage_service, system_server_service, service_manager_type;
-+type cpuinfo_service, system_api_service, system_server_service, service_manager_type;
-+type dbinfo_service, system_api_service, system_server_service, service_manager_type;
-+type device_policy_service, app_api_service, system_server_service, service_manager_type;
-+type deviceidle_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type device_identifiers_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type devicestoragemonitor_service, system_server_service, service_manager_type;
-+type diskstats_service, system_api_service, system_server_service, service_manager_type;
-+type display_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type font_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type netd_listener_service, system_server_service, service_manager_type;
-+type network_watchlist_service, system_server_service, service_manager_type;
-+type DockObserver_service, system_server_service, service_manager_type;
-+type dreams_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type dropbox_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type lowpan_service, system_api_service, system_server_service, service_manager_type;
-+type ethernet_service, app_api_service, system_server_service, service_manager_type;
-+type fingerprint_service, app_api_service, system_server_service, service_manager_type;
-+type gfxinfo_service, system_api_service, system_server_service, service_manager_type;
-+type graphicsstats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type hardware_service, system_server_service, service_manager_type;
-+type hardware_properties_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type hdmi_control_service, system_api_service, system_server_service, service_manager_type;
-+type input_method_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type input_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type imms_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type ipsec_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type jobscheduler_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type launcherapps_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type location_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type lock_settings_service, system_api_service, system_server_service, service_manager_type;
-+type media_projection_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type media_router_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type media_session_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type meminfo_service, system_api_service, system_server_service, service_manager_type;
-+type midi_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type mount_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type netpolicy_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type netstats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type network_management_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type network_score_service, system_api_service, system_server_service, service_manager_type;
-+type network_time_update_service, system_server_service, service_manager_type;
-+type notification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type oem_lock_service, system_api_service, system_server_service, service_manager_type;
-+type otadexopt_service, system_server_service, service_manager_type;
-+type overlay_service, system_api_service, system_server_service, service_manager_type;
-+type package_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type package_native_service, system_server_service, service_manager_type;
-+type permission_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type persistent_data_block_service, system_api_service, system_server_service, service_manager_type;
-+type pinner_service, system_server_service, service_manager_type;
-+type power_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type print_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type processinfo_service, system_server_service, service_manager_type;
-+type procstats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type recovery_service, system_server_service, service_manager_type;
-+type registry_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type restrictions_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type rttmanager_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type samplingprofiler_service, system_server_service, service_manager_type;
-+type scheduling_policy_service, system_server_service, service_manager_type;
-+type search_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type sec_key_att_app_id_provider_service, app_api_service, system_server_service, service_manager_type;
-+type sensorservice_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type serial_service, system_api_service, system_server_service, service_manager_type;
-+type servicediscovery_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type settings_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type shortcut_service, app_api_service, system_server_service, service_manager_type;
-+type slice_service, app_api_service, system_server_service, service_manager_type;
-+type statusbar_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type storagestats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type system_update_service, system_server_service, service_manager_type;
-+type task_service, system_server_service, service_manager_type;
-+type textclassification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type textservices_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type telecom_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type timezone_service, system_server_service, service_manager_type;
-+type trust_service, app_api_service, system_server_service, service_manager_type;
-+type tv_input_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type uimode_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type updatelock_service, system_api_service, system_server_service, service_manager_type;
-+type usagestats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type usb_service, app_api_service, system_server_service, service_manager_type;
-+type user_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type vibrator_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type voiceinteraction_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type vr_manager_service, system_server_service, service_manager_type;
-+type wallpaper_service, app_api_service, system_server_service, service_manager_type;
-+type webviewupdate_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-+type wifip2p_service, app_api_service, system_server_service, service_manager_type;
-+type wifiscanner_service, system_api_service, system_server_service, service_manager_type;
-+type wifi_service, app_api_service, system_server_service, service_manager_type;
-+type wificond_service, service_manager_type;
-+type wifiaware_service, app_api_service, system_server_service, service_manager_type;
-+type window_service, system_api_service, system_server_service, service_manager_type;
-+type wpantund_service, system_api_service, service_manager_type;
-diff --git a/prebuilts/api/28.0/public/servicemanager.te b/prebuilts/api/28.0/public/servicemanager.te
-new file mode 100644
-index 000000000..87e3a2217
---- /dev/null
-+++ b/prebuilts/api/28.0/public/servicemanager.te
-@@ -0,0 +1,25 @@
-+# servicemanager - the Binder context manager
-+type servicemanager, domain, mlstrustedsubject;
-+type servicemanager_exec, exec_type, file_type;
-+
-+# Note that we do not use the binder_* macros here.
-+# servicemanager is unique in that it only provides
-+# name service (aka context manager) for Binder.
-+# As such, it only ever receives and transfers other references
-+# created by other domains.  It never passes its own references
-+# or initiates a Binder IPC.
-+allow servicemanager self:binder set_context_mgr;
-+allow servicemanager {
-+  domain
-+  -init
-+  -vendor_init
-+  -hwservicemanager
-+  -vndservicemanager
-+}:binder transfer;
-+
-+allow servicemanager service_contexts_file:file r_file_perms;
-+# nonplat_service_contexts only accessible on non full-treble devices
-+not_full_treble(`allow servicemanager nonplat_service_contexts_file:file r_file_perms;')
-+
-+# Check SELinux permissions.
-+selinux_check_access(servicemanager)
-diff --git a/prebuilts/api/28.0/public/sgdisk.te b/prebuilts/api/28.0/public/sgdisk.te
-new file mode 100644
-index 000000000..ca3096cef
---- /dev/null
-+++ b/prebuilts/api/28.0/public/sgdisk.te
-@@ -0,0 +1,22 @@
-+# sgdisk called from vold
-+type sgdisk, domain;
-+type sgdisk_exec, exec_type, file_type;
-+
-+# Allowed to read/write low-level partition tables
-+allow sgdisk block_device:dir search;
-+allow sgdisk vold_device:blk_file rw_file_perms;
-+
-+# Inherit and use pty created by android_fork_execvp()
-+allow sgdisk devpts:chr_file { read write ioctl getattr };
-+
-+# Allow stdin/out back to vold
-+allow sgdisk vold:fd use;
-+allow sgdisk vold:fifo_file { read write getattr };
-+
-+# Used to probe kernel to reload partition tables
-+allow sgdisk self:global_capability_class_set sys_admin;
-+
-+# Only allow entry from vold
-+neverallow { domain -vold } sgdisk:process transition;
-+neverallow * sgdisk:process dyntransition;
-+neverallow sgdisk { file_type fs_type -sgdisk_exec }:file entrypoint;
-diff --git a/prebuilts/api/28.0/public/shared_relro.te b/prebuilts/api/28.0/public/shared_relro.te
-new file mode 100644
-index 000000000..8fe1fead5
---- /dev/null
-+++ b/prebuilts/api/28.0/public/shared_relro.te
-@@ -0,0 +1,10 @@
-+# Process which creates/updates shared RELRO files to be used by other apps.
-+type shared_relro, domain;
-+
-+# Grant write access to the shared relro files/directory.
-+allow shared_relro shared_relro_file:dir rw_dir_perms;
-+allow shared_relro shared_relro_file:file create_file_perms;
-+
-+# Needs to contact the "webviewupdate" and "activity" services
-+allow shared_relro activity_service:service_manager find;
-+allow shared_relro webviewupdate_service:service_manager find;
-diff --git a/prebuilts/api/28.0/public/shell.te b/prebuilts/api/28.0/public/shell.te
-new file mode 100644
-index 000000000..307e10342
---- /dev/null
-+++ b/prebuilts/api/28.0/public/shell.te
-@@ -0,0 +1,226 @@
-+# Domain for shell processes spawned by ADB or console service.
-+type shell, domain, mlstrustedsubject;
-+type shell_exec, exec_type, file_type;
-+
-+# Create and use network sockets.
-+net_domain(shell)
-+
-+# logcat
-+read_logd(shell)
-+control_logd(shell)
-+# logcat -L (directly, or via dumpstate)
-+allow shell pstorefs:dir search;
-+allow shell pstorefs:file r_file_perms;
-+
-+# Root fs.
-+allow shell rootfs:dir r_dir_perms;
-+
-+# read files in /data/anr
-+allow shell anr_data_file:dir r_dir_perms;
-+allow shell anr_data_file:file r_file_perms;
-+
-+# Access /data/local/tmp.
-+allow shell shell_data_file:dir create_dir_perms;
-+allow shell shell_data_file:file create_file_perms;
-+allow shell shell_data_file:file rx_file_perms;
-+allow shell shell_data_file:lnk_file create_file_perms;
-+
-+# Read and delete from /data/local/traces.
-+allow shell trace_data_file:file { r_file_perms unlink };
-+allow shell trace_data_file:dir { r_dir_perms remove_name write };
-+
-+# Access /data/misc/profman.
-+allow shell profman_dump_data_file:dir { write remove_name r_dir_perms };
-+allow shell profman_dump_data_file:file { unlink r_file_perms };
-+
-+# Read/execute files in /data/nativetest
-+userdebug_or_eng(`
-+  allow shell nativetest_data_file:dir r_dir_perms;
-+  allow shell nativetest_data_file:file rx_file_perms;
-+')
-+
-+# adb bugreport
-+unix_socket_connect(shell, dumpstate, dumpstate)
-+
-+allow shell devpts:chr_file rw_file_perms;
-+allow shell tty_device:chr_file rw_file_perms;
-+allow shell console_device:chr_file rw_file_perms;
-+allow shell input_device:dir r_dir_perms;
-+allow shell input_device:chr_file rw_file_perms;
-+r_dir_file(shell, system_file)
-+allow shell system_file:file x_file_perms;
-+allow shell toolbox_exec:file rx_file_perms;
-+allow shell tzdatacheck_exec:file rx_file_perms;
-+allow shell shell_exec:file rx_file_perms;
-+allow shell zygote_exec:file rx_file_perms;
-+
-+r_dir_file(shell, apk_data_file)
-+
-+# Set properties.
-+set_prop(shell, shell_prop)
-+set_prop(shell, ctl_bugreport_prop)
-+set_prop(shell, ctl_dumpstate_prop)
-+set_prop(shell, dumpstate_prop)
-+set_prop(shell, exported_dumpstate_prop)
-+set_prop(shell, debug_prop)
-+set_prop(shell, powerctl_prop)
-+set_prop(shell, log_tag_prop)
-+set_prop(shell, wifi_log_prop)
-+# Allow shell to start/stop traced via the persist.traced.enable
-+# property (which also takes care of /data/misc initialization).
-+set_prop(shell, traced_enabled_prop)
-+# adjust is_loggable properties
-+userdebug_or_eng(`set_prop(shell, log_prop)')
-+# logpersist script
-+userdebug_or_eng(`set_prop(shell, logpersistd_logging_prop)')
-+
-+userdebug_or_eng(`
-+  # "systrace --boot" support - allow boottrace service to run
-+  allow shell boottrace_data_file:dir rw_dir_perms;
-+  allow shell boottrace_data_file:file create_file_perms;
-+  set_prop(shell, persist_debug_prop)
-+')
-+
-+# Read device's serial number from system properties
-+get_prop(shell, serialno_prop)
-+
-+# Allow shell to read the vendor security patch level for CTS
-+get_prop(shell, vendor_security_patch_level_prop)
-+
-+# Read state of logging-related properties
-+get_prop(shell, device_logging_prop)
-+
-+# Read state of boot reason properties
-+get_prop(shell, bootloader_boot_reason_prop)
-+get_prop(shell, last_boot_reason_prop)
-+get_prop(shell, system_boot_reason_prop)
-+
-+# allow shell access to services
-+allow shell servicemanager:service_manager list;
-+# don't allow shell to access GateKeeper service
-+# TODO: why is this so broad? Tightening candidate? It needs at list:
-+# - dumpstate_service (so it can receive dumpstate progress updates)
-+allow shell {
-+  service_manager_type
-+  -gatekeeper_service
-+  -incident_service
-+  -installd_service
-+  -netd_service
-+  -virtual_touchpad_service
-+  -vold_service
-+  -vr_hwc_service
-+}:service_manager find;
-+allow shell dumpstate:binder call;
-+
-+# allow shell to get information from hwservicemanager
-+# for instance, listing hardware services with lshal
-+hwbinder_use(shell)
-+allow shell hwservicemanager:hwservice_manager list;
-+
-+# allow shell to look through /proc/ for lsmod, ps, top, netstat.
-+r_dir_file(shell, proc_net)
-+
-+allow shell {
-+  proc_asound
-+  proc_filesystems
-+  proc_interrupts
-+  proc_meminfo
-+  proc_modules
-+  proc_pid_max
-+  proc_stat
-+  proc_timer
-+  proc_uptime
-+  proc_version
-+  proc_zoneinfo
-+}:file r_file_perms;
-+
-+# allow listing network interfaces under /sys/class/net.
-+allow shell sysfs_net:dir r_dir_perms;
-+
-+r_dir_file(shell, cgroup)
-+allow shell domain:dir { search open read getattr };
-+allow shell domain:{ file lnk_file } { open read getattr };
-+
-+# statvfs() of /proc and other labeled filesystems
-+# (yaffs2, jffs2, ext2, ext3, ext4, xfs, btrfs, f2fs, squashfs)
-+allow shell { proc labeledfs }:filesystem getattr;
-+
-+# stat() of /dev
-+allow shell device:dir getattr;
-+
-+# allow shell to read /proc/pid/attr/current for ps -Z
-+allow shell domain:process getattr;
-+
-+# Allow pulling the SELinux policy for CTS purposes
-+allow shell selinuxfs:dir r_dir_perms;
-+allow shell selinuxfs:file r_file_perms;
-+
-+# enable shell domain to read/write files/dirs for bootchart data
-+# User will creates the start and stop file via adb shell
-+# and read other files created by init process under /data/bootchart
-+allow shell bootchart_data_file:dir rw_dir_perms;
-+allow shell bootchart_data_file:file create_file_perms;
-+
-+# Make sure strace works for the non-privileged shell user
-+allow shell self:process ptrace;
-+
-+# allow shell to get battery info
-+allow shell sysfs:dir r_dir_perms;
-+allow shell sysfs_batteryinfo:dir r_dir_perms;
-+allow shell sysfs_batteryinfo:file r_file_perms;
-+
-+# Allow access to ion memory allocation device.
-+allow shell ion_device:chr_file rw_file_perms;
-+
-+#
-+# filesystem test for insecure chr_file's is done
-+# via a host side test
-+#
-+allow shell dev_type:dir r_dir_perms;
-+allow shell dev_type:chr_file getattr;
-+
-+# /dev/fd is a symlink
-+allow shell proc:lnk_file getattr;
-+
-+#
-+# filesystem test for insucre blk_file's is done
-+# via hostside test
-+#
-+allow shell dev_type:blk_file getattr;
-+
-+# read selinux policy files
-+allow shell file_contexts_file:file r_file_perms;
-+allow shell property_contexts_file:file r_file_perms;
-+allow shell seapp_contexts_file:file r_file_perms;
-+allow shell service_contexts_file:file r_file_perms;
-+allow shell sepolicy_file:file r_file_perms;
-+
-+# Allow shell to start up vendor shell
-+allow shell vendor_shell_exec:file rx_file_perms;
-+
-+###
-+### Neverallow rules
-+###
-+
-+# Do not allow shell to hard link to any files.
-+# In particular, if shell hard links to app data
-+# files, installd will not be able to guarantee the deletion
-+# of the linked to file. Hard links also contribute to security
-+# bugs, so we want to ensure the shell user never has this
-+# capability.
-+neverallow shell file_type:file link;
-+
-+# Do not allow privileged socket ioctl commands
-+neverallowxperm shell domain:{ rawip_socket tcp_socket udp_socket } ioctl priv_sock_ioctls;
-+
-+# limit shell access to sensitive char drivers to
-+# only getattr required for host side test.
-+neverallow shell {
-+  fuse_device
-+  hw_random_device
-+  kmem_device
-+  port_device
-+}:chr_file ~getattr;
-+
-+# Limit shell to only getattr on blk devices for host side tests.
-+neverallow shell dev_type:blk_file ~getattr;
-diff --git a/prebuilts/api/28.0/public/slideshow.te b/prebuilts/api/28.0/public/slideshow.te
-new file mode 100644
-index 000000000..8ded68655
---- /dev/null
-+++ b/prebuilts/api/28.0/public/slideshow.te
-@@ -0,0 +1,13 @@
-+# slideshow seclabel is specified in init.rc since
-+# it lives in the rootfs and has no unique file type.
-+type slideshow, domain;
-+
-+allow slideshow kmsg_device:chr_file rw_file_perms;
-+wakelock_use(slideshow)
-+allow slideshow device:dir r_dir_perms;
-+allow slideshow self:global_capability_class_set sys_tty_config;
-+allow slideshow graphics_device:dir r_dir_perms;
-+allow slideshow graphics_device:chr_file rw_file_perms;
-+allow slideshow input_device:dir r_dir_perms;
-+allow slideshow input_device:chr_file r_file_perms;
-+allow slideshow tty_device:chr_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/public/su.te b/prebuilts/api/28.0/public/su.te
-new file mode 100644
-index 000000000..031294548
---- /dev/null
-+++ b/prebuilts/api/28.0/public/su.te
-@@ -0,0 +1,100 @@
-+# All types must be defined regardless of build variant to ensure
-+# policy compilation succeeds with userdebug/user combination at boot
-+type su, domain;
-+
-+# File types must be defined for file_contexts.
-+type su_exec, exec_type, file_type;
-+
-+userdebug_or_eng(`
-+  # Domain used for su processes, as well as for adbd and adb shell
-+  # after performing an adb root command.  The domain definition is
-+  # wrapped to ensure that it does not exist at all on -user builds.
-+  typeattribute su mlstrustedsubject;
-+
-+  # Add su to various domains
-+  net_domain(su)
-+
-+  # grant su access to vndbinder
-+  vndbinder_use(su)
-+
-+  dontaudit su self:capability_class_set *;
-+  dontaudit su kernel:security *;
-+  dontaudit su kernel:system *;
-+  dontaudit su self:memprotect *;
-+  dontaudit su domain:process *;
-+  dontaudit su domain:fd *;
-+  dontaudit su domain:dir *;
-+  dontaudit su domain:lnk_file *;
-+  dontaudit su domain:{ fifo_file file } *;
-+  dontaudit su domain:socket_class_set *;
-+  dontaudit su domain:ipc_class_set *;
-+  dontaudit su domain:key *;
-+  dontaudit su fs_type:filesystem *;
-+  dontaudit su {fs_type dev_type file_type}:dir_file_class_set *;
-+  dontaudit su node_type:node *;
-+  dontaudit su node_type:{ tcp_socket udp_socket rawip_socket } *;
-+  dontaudit su netif_type:netif *;
-+  dontaudit su port_type:socket_class_set *;
-+  dontaudit su port_type:{ tcp_socket dccp_socket } *;
-+  dontaudit su domain:peer *;
-+  dontaudit su domain:binder *;
-+  dontaudit su property_type:property_service *;
-+  dontaudit su property_type:file *;
-+  dontaudit su service_manager_type:service_manager *;
-+  dontaudit su hwservice_manager_type:hwservice_manager *;
-+  dontaudit su vndservice_manager_type:service_manager *;
-+  dontaudit su servicemanager:service_manager list;
-+  dontaudit su hwservicemanager:hwservice_manager list;
-+  dontaudit su vndservicemanager:service_manager list;
-+  dontaudit su keystore:keystore_key *;
-+  dontaudit su domain:drmservice *;
-+  dontaudit su unlabeled:filesystem *;
-+  dontaudit su postinstall_file:filesystem *;
-+
-+  # VTS tests run in the permissive su domain on debug builds, but the HALs
-+  # being tested run in enforcing mode. Because hal_foo_server is enforcing
-+  # su needs to be declared as hal_foo_client to grant hal_foo_server
-+  # permission to interact with it.
-+  typeattribute su halclientdomain;
-+  typeattribute su hal_allocator_client;
-+  typeattribute su hal_audio_client;
-+  typeattribute su hal_authsecret_client;
-+  typeattribute su hal_bluetooth_client;
-+  typeattribute su hal_bootctl_client;
-+  typeattribute su hal_camera_client;
-+  typeattribute su hal_configstore_client;
-+  typeattribute su hal_confirmationui_client;
-+  typeattribute su hal_contexthub_client;
-+  typeattribute su hal_drm_client;
-+  typeattribute su hal_cas_client;
-+  typeattribute su hal_dumpstate_client;
-+  typeattribute su hal_fingerprint_client;
-+  typeattribute su hal_gatekeeper_client;
-+  typeattribute su hal_gnss_client;
-+  typeattribute su hal_graphics_allocator_client;
-+  typeattribute su hal_graphics_composer_client;
-+  typeattribute su hal_health_client;
-+  typeattribute su hal_ir_client;
-+  typeattribute su hal_keymaster_client;
-+  typeattribute su hal_light_client;
-+  typeattribute su hal_memtrack_client;
-+  typeattribute su hal_neuralnetworks_client;
-+  typeattribute su hal_nfc_client;
-+  typeattribute su hal_oemlock_client;
-+  typeattribute su hal_power_client;
-+  typeattribute su hal_secure_element_client;
-+  typeattribute su hal_sensors_client;
-+  typeattribute su hal_telephony_client;
-+  typeattribute su hal_tetheroffload_client;
-+  typeattribute su hal_thermal_client;
-+  typeattribute su hal_tv_cec_client;
-+  typeattribute su hal_tv_input_client;
-+  typeattribute su hal_usb_client;
-+  typeattribute su hal_vibrator_client;
-+  typeattribute su hal_vr_client;
-+  typeattribute su hal_weaver_client;
-+  typeattribute su hal_wifi_client;
-+  typeattribute su hal_wifi_hostapd_client;
-+  typeattribute su hal_wifi_offload_client;
-+  typeattribute su hal_wifi_supplicant_client;
-+')
-diff --git a/prebuilts/api/28.0/public/surfaceflinger.te b/prebuilts/api/28.0/public/surfaceflinger.te
-new file mode 100644
-index 000000000..ae00287d8
---- /dev/null
-+++ b/prebuilts/api/28.0/public/surfaceflinger.te
-@@ -0,0 +1,2 @@
-+# surfaceflinger - display compositor service
-+type surfaceflinger, domain;
-diff --git a/prebuilts/api/28.0/public/system_app.te b/prebuilts/api/28.0/public/system_app.te
-new file mode 100644
-index 000000000..023058ee0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/system_app.te
-@@ -0,0 +1,7 @@
-+###
-+### Apps that run with the system UID, e.g. com.android.system.ui,
-+### com.android.settings.  These are not as privileged as the system
-+### server.
-+###
-+
-+type system_app, domain;
-diff --git a/prebuilts/api/28.0/public/system_server.te b/prebuilts/api/28.0/public/system_server.te
-new file mode 100644
-index 000000000..805d6175d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/system_server.te
-@@ -0,0 +1,5 @@
-+#
-+# System Server aka system_server spawned by zygote.
-+# Most of the framework services run in this process.
-+#
-+type system_server, domain;
-diff --git a/prebuilts/api/28.0/public/te_macros b/prebuilts/api/28.0/public/te_macros
-new file mode 100644
-index 000000000..9cfe47c84
---- /dev/null
-+++ b/prebuilts/api/28.0/public/te_macros
-@@ -0,0 +1,597 @@
-+#####################################
-+# domain_trans(olddomain, type, newdomain)
-+# Allow a transition from olddomain to newdomain
-+# upon executing a file labeled with type.
-+# This only allows the transition; it does not
-+# cause it to occur automatically - use domain_auto_trans
-+# if that is what you want.
-+#
-+define(`domain_trans', `
-+# Old domain may exec the file and transition to the new domain.
-+allow $1 $2:file { getattr open read execute map };
-+allow $1 $3:process transition;
-+# New domain is entered by executing the file.
-+allow $3 $2:file { entrypoint open read execute getattr map };
-+# New domain can send SIGCHLD to its caller.
-+ifelse($1, `init', `', `allow $3 $1:process sigchld;')
-+# Enable AT_SECURE, i.e. libc secure mode.
-+dontaudit $1 $3:process noatsecure;
-+# XXX dontaudit candidate but requires further study.
-+allow $1 $3:process { siginh rlimitinh };
-+')
-+
-+#####################################
-+# domain_auto_trans(olddomain, type, newdomain)
-+# Automatically transition from olddomain to newdomain
-+# upon executing a file labeled with type.
-+#
-+define(`domain_auto_trans', `
-+# Allow the necessary permissions.
-+domain_trans($1,$2,$3)
-+# Make the transition occur by default.
-+type_transition $1 $2:process $3;
-+')
-+
-+#####################################
-+# file_type_trans(domain, dir_type, file_type)
-+# Allow domain to create a file labeled file_type in a
-+# directory labeled dir_type.
-+# This only allows the transition; it does not
-+# cause it to occur automatically - use file_type_auto_trans
-+# if that is what you want.
-+#
-+define(`file_type_trans', `
-+# Allow the domain to add entries to the directory.
-+allow $1 $2:dir ra_dir_perms;
-+# Allow the domain to create the file.
-+allow $1 $3:notdevfile_class_set create_file_perms;
-+allow $1 $3:dir create_dir_perms;
-+')
-+
-+#####################################
-+# file_type_auto_trans(domain, dir_type, file_type)
-+# Automatically label new files with file_type when
-+# they are created by domain in directories labeled dir_type.
-+#
-+define(`file_type_auto_trans', `
-+# Allow the necessary permissions.
-+file_type_trans($1, $2, $3)
-+# Make the transition occur by default.
-+type_transition $1 $2:dir $3;
-+type_transition $1 $2:notdevfile_class_set $3;
-+')
-+
-+#####################################
-+# r_dir_file(domain, type)
-+# Allow the specified domain to read directories, files
-+# and symbolic links of the specified type.
-+define(`r_dir_file', `
-+allow $1 $2:dir r_dir_perms;
-+allow $1 $2:{ file lnk_file } r_file_perms;
-+')
-+
-+#####################################
-+# tmpfs_domain(domain)
-+# Define and allow access to a unique type for
-+# this domain when creating tmpfs / shmem / ashmem files.
-+define(`tmpfs_domain', `
-+type $1_tmpfs, file_type;
-+type_transition $1 tmpfs:file $1_tmpfs;
-+allow $1 $1_tmpfs:file { read write getattr map };
-+allow $1 tmpfs:dir { getattr search };
-+')
-+
-+# pdx macros for IPC. pdx is a high-level name which contains transport-specific
-+# rules from underlying transport (e.g. UDS-based implementation).
-+
-+#####################################
-+# pdx_service_attributes(service)
-+# Defines type attribute used to identify various service-related types.
-+define(`pdx_service_attributes', `
-+attribute pdx_$1_endpoint_dir_type;
-+attribute pdx_$1_endpoint_socket_type;
-+attribute pdx_$1_channel_socket_type;
-+attribute pdx_$1_server_type;
-+')
-+
-+#####################################
-+# pdx_service_socket_types(service, endpoint_dir_t)
-+# Define types for endpoint and channel sockets.
-+define(`pdx_service_socket_types', `
-+typeattribute $2 pdx_$1_endpoint_dir_type;
-+type pdx_$1_endpoint_socket, pdx_$1_endpoint_socket_type, pdx_endpoint_socket_type, file_type, coredomain_socket, mlstrustedobject, mlstrustedsubject;
-+type pdx_$1_channel_socket, pdx_$1_channel_socket_type, pdx_channel_socket_type, coredomain_socket;
-+userdebug_or_eng(`
-+dontaudit su pdx_$1_endpoint_socket:unix_stream_socket *;
-+dontaudit su pdx_$1_channel_socket:unix_stream_socket *;
-+')
-+')
-+
-+#####################################
-+# pdx_server(server_domain, service)
-+define(`pdx_server', `
-+# Mark the server domain as a PDX server.
-+typeattribute $1 pdx_$2_server_type;
-+# Allow the init process to create the initial endpoint socket.
-+allow init pdx_$2_endpoint_socket_type:unix_stream_socket { create bind };
-+# Allow the server domain to use the endpoint socket and accept connections on it.
-+# Not using macro like "rw_socket_perms_no_ioctl" because it provides more rights
-+# than we need (e.g. we don"t need "bind" or "connect").
-+allow $1 pdx_$2_endpoint_socket_type:unix_stream_socket { read getattr write setattr lock append getopt setopt shutdown listen accept };
-+# Allow the server domain to apply security context label to the channel socket pair (allow process to use setsockcreatecon_raw()).
-+allow $1 self:process setsockcreate;
-+# Allow the server domain to create a client channel socket.
-+allow $1 pdx_$2_channel_socket_type:unix_stream_socket create_stream_socket_perms;
-+# Prevent other processes from claiming to be a server for the same service.
-+neverallow {domain -$1} pdx_$2_endpoint_socket_type:unix_stream_socket { listen accept };
-+')
-+
-+#####################################
-+# pdx_connect(client, service)
-+define(`pdx_connect', `
-+# Allow client to open the service endpoint file.
-+allow $1 pdx_$2_endpoint_dir_type:dir r_dir_perms;
-+allow $1 pdx_$2_endpoint_socket_type:sock_file rw_file_perms;
-+# Allow the client to connect to endpoint socket.
-+allow $1 pdx_$2_endpoint_socket_type:unix_stream_socket { connectto read write shutdown };
-+')
-+
-+#####################################
-+# pdx_use(client, service)
-+define(`pdx_use', `
-+# Allow the client to use the PDX channel socket.
-+# Not using macro like "rw_socket_perms_no_ioctl" because it provides more rights
-+# than we need (e.g. we don"t need "bind" or "connect").
-+allow $1 pdx_$2_channel_socket_type:unix_stream_socket { read getattr write setattr lock append getopt setopt shutdown };
-+# Client needs to use an channel event fd from the server.
-+allow $1 pdx_$2_server_type:fd use;
-+# Servers may receive sync fences, gralloc buffers, etc, from clients.
-+# This could be tightened on a per-server basis, but keeping track of service
-+# clients is error prone.
-+allow pdx_$2_server_type $1:fd use;
-+')
-+
-+#####################################
-+# pdx_client(client, service)
-+define(`pdx_client', `
-+pdx_connect($1, $2)
-+pdx_use($1, $2)
-+')
-+
-+#####################################
-+# init_daemon_domain(domain)
-+# Set up a transition from init to the daemon domain
-+# upon executing its binary.
-+define(`init_daemon_domain', `
-+domain_auto_trans(init, $1_exec, $1)
-+tmpfs_domain($1)
-+')
-+
-+#####################################
-+# app_domain(domain)
-+# Allow a base set of permissions required for all apps.
-+define(`app_domain', `
-+typeattribute $1 appdomain;
-+# Label ashmem objects with our own unique type.
-+tmpfs_domain($1)
-+# Map with PROT_EXEC.
-+allow $1 $1_tmpfs:file execute;
-+neverallow { $1 -shell } { domain -$1 }:file no_rw_file_perms;
-+neverallow { appdomain -shell -$1 } $1:file no_rw_file_perms;
-+')
-+
-+#####################################
-+# untrusted_app_domain(domain)
-+# Allow a base set of permissions required for all untrusted apps.
-+define(`untrusted_app_domain', `
-+typeattribute $1 untrusted_app_all;
-+')
-+
-+#####################################
-+# net_domain(domain)
-+# Allow a base set of permissions required for network access.
-+define(`net_domain', `
-+typeattribute $1 netdomain;
-+')
-+
-+#####################################
-+# bluetooth_domain(domain)
-+# Allow a base set of permissions required for bluetooth access.
-+define(`bluetooth_domain', `
-+typeattribute $1 bluetoothdomain;
-+')
-+
-+#####################################
-+# hal_attribute(hal_name)
-+# Add an attribute for hal implementations along with necessary
-+# restrictions.
-+define(`hal_attribute', `
-+attribute hal_$1;
-+expandattribute hal_$1 true;
-+attribute hal_$1_client;
-+expandattribute hal_$1_client true;
-+attribute hal_$1_server;
-+expandattribute hal_$1_server false;
-+
-+neverallow { hal_$1_server -halserverdomain } domain:process fork;
-+')
-+
-+#####################################
-+# hal_server_domain(domain, hal_type)
-+# Allow a base set of permissions required for a domain to offer a
-+# HAL implementation of the specified type over HwBinder.
-+#
-+# For example, default implementation of Foo HAL:
-+#   type hal_foo_default, domain;
-+#   hal_server_domain(hal_foo_default, hal_foo)
-+#
-+define(`hal_server_domain', `
-+typeattribute $1 halserverdomain;
-+typeattribute $1 $2_server;
-+typeattribute $1 $2;
-+')
-+
-+#####################################
-+# hal_client_domain(domain, hal_type)
-+# Allow a base set of permissions required for a domain to be a
-+# client of a HAL of the specified type.
-+#
-+# For example, make some_domain a client of Foo HAL:
-+#   hal_client_domain(some_domain, hal_foo)
-+#
-+define(`hal_client_domain', `
-+typeattribute $1 halclientdomain;
-+typeattribute $1 $2_client;
-+
-+# TODO(b/34170079): Make the inclusion of the rules below conditional also on
-+# non-Treble devices. For now, on non-Treble device, always grant clients of a
-+# HAL sufficient access to run the HAL in passthrough mode (i.e., in-process).
-+not_full_treble(`
-+typeattribute $1 $2;
-+# Find passthrough HAL implementations
-+allow $2 system_file:dir r_dir_perms;
-+allow $2 vendor_file:dir r_dir_perms;
-+allow $2 vendor_file:file { read open getattr execute map };
-+')
-+')
-+
-+#####################################
-+# passthrough_hal_client_domain(domain, hal_type)
-+# Allow a base set of permissions required for a domain to be a
-+# client of a passthrough HAL of the specified type.
-+#
-+# For example, make some_domain a client of passthrough Foo HAL:
-+#   passthrough_hal_client_domain(some_domain, hal_foo)
-+#
-+define(`passthrough_hal_client_domain', `
-+typeattribute $1 halclientdomain;
-+typeattribute $1 $2_client;
-+typeattribute $1 $2;
-+# Find passthrough HAL implementations
-+allow $2 system_file:dir r_dir_perms;
-+allow $2 vendor_file:dir r_dir_perms;
-+allow $2 vendor_file:file { read open getattr execute map };
-+')
-+
-+#####################################
-+# unix_socket_connect(clientdomain, socket, serverdomain)
-+# Allow a local socket connection from clientdomain via
-+# socket to serverdomain.
-+#
-+# Note: If you see denial records that distill to the
-+# following allow rules:
-+# allow clientdomain property_socket:sock_file write;
-+# allow clientdomain init:unix_stream_socket connectto;
-+# allow clientdomain something_prop:property_service set;
-+#
-+# This sequence is indicative of attempting to set a property.
-+# use set_prop(sourcedomain, targetproperty)
-+#
-+define(`unix_socket_connect', `
-+allow $1 $2_socket:sock_file write;
-+allow $1 $3:unix_stream_socket connectto;
-+')
-+
-+#####################################
-+# set_prop(sourcedomain, targetproperty)
-+# Allows source domain to set the
-+# targetproperty.
-+#
-+define(`set_prop', `
-+unix_socket_connect($1, property, init)
-+allow $1 $2:property_service set;
-+get_prop($1, $2)
-+')
-+
-+#####################################
-+# get_prop(sourcedomain, targetproperty)
-+# Allows source domain to read the
-+# targetproperty.
-+#
-+define(`get_prop', `
-+allow $1 $2:file r_file_perms;
-+')
-+
-+#####################################
-+# unix_socket_send(clientdomain, socket, serverdomain)
-+# Allow a local socket send from clientdomain via
-+# socket to serverdomain.
-+define(`unix_socket_send', `
-+allow $1 $2_socket:sock_file write;
-+allow $1 $3:unix_dgram_socket sendto;
-+')
-+
-+#####################################
-+# binder_use(domain)
-+# Allow domain to use Binder IPC.
-+define(`binder_use', `
-+# Call the servicemanager and transfer references to it.
-+allow $1 servicemanager:binder { call transfer };
-+# servicemanager performs getpidcon on clients.
-+allow servicemanager $1:dir search;
-+allow servicemanager $1:file { read open };
-+allow servicemanager $1:process getattr;
-+# rw access to /dev/binder and /dev/ashmem is presently granted to
-+# all domains in domain.te.
-+')
-+
-+#####################################
-+# hwbinder_use(domain)
-+# Allow domain to use HwBinder IPC.
-+define(`hwbinder_use', `
-+# Call the hwservicemanager and transfer references to it.
-+allow $1 hwservicemanager:binder { call transfer };
-+# Allow hwservicemanager to send out callbacks
-+allow hwservicemanager $1:binder { call transfer };
-+# hwservicemanager performs getpidcon on clients.
-+allow hwservicemanager $1:dir search;
-+allow hwservicemanager $1:file { read open };
-+allow hwservicemanager $1:process getattr;
-+# rw access to /dev/hwbinder and /dev/ashmem is presently granted to
-+# all domains in domain.te.
-+')
-+
-+#####################################
-+# vndbinder_use(domain)
-+# Allow domain to use Binder IPC.
-+define(`vndbinder_use', `
-+# Talk to the vndbinder device node
-+allow $1 vndbinder_device:chr_file rw_file_perms;
-+# Call the vndservicemanager and transfer references to it.
-+allow $1 vndservicemanager:binder { call transfer };
-+# vndservicemanager performs getpidcon on clients.
-+allow vndservicemanager $1:dir search;
-+allow vndservicemanager $1:file { read open };
-+allow vndservicemanager $1:process getattr;
-+')
-+
-+#####################################
-+# binder_call(clientdomain, serverdomain)
-+# Allow clientdomain to perform binder IPC to serverdomain.
-+define(`binder_call', `
-+# Call the server domain and optionally transfer references to it.
-+allow $1 $2:binder { call transfer };
-+# Allow the serverdomain to transfer references to the client on the reply.
-+allow $2 $1:binder transfer;
-+# Receive and use open files from the server.
-+allow $1 $2:fd use;
-+')
-+
-+#####################################
-+# binder_service(domain)
-+# Mark a domain as being a Binder service domain.
-+# Used to allow binder IPC to the various system services.
-+define(`binder_service', `
-+typeattribute $1 binderservicedomain;
-+')
-+
-+#####################################
-+# wakelock_use(domain)
-+# Allow domain to manage wake locks
-+define(`wakelock_use', `
-+# Access /sys/power/wake_lock and /sys/power/wake_unlock
-+allow $1 sysfs_wake_lock:file rw_file_perms;
-+# Accessing these files requires CAP_BLOCK_SUSPEND
-+allow $1 self:global_capability2_class_set block_suspend;
-+')
-+
-+#####################################
-+# selinux_check_access(domain)
-+# Allow domain to check SELinux permissions via selinuxfs.
-+define(`selinux_check_access', `
-+r_dir_file($1, selinuxfs)
-+allow $1 selinuxfs:file w_file_perms;
-+allow $1 kernel:security compute_av;
-+allow $1 self:netlink_selinux_socket { read write create getattr setattr lock relabelfrom relabelto append bind connect listen accept getopt setopt shutdown recvfrom sendto name_bind };
-+')
-+
-+#####################################
-+# selinux_check_context(domain)
-+# Allow domain to check SELinux contexts via selinuxfs.
-+define(`selinux_check_context', `
-+r_dir_file($1, selinuxfs)
-+allow $1 selinuxfs:file w_file_perms;
-+allow $1 kernel:security check_context;
-+')
-+
-+#####################################
-+# create_pty(domain)
-+# Allow domain to create and use a pty, isolated from any other domain ptys.
-+define(`create_pty', `
-+# Each domain gets a unique devpts type.
-+type $1_devpts, fs_type;
-+# Label the pty with the unique type when created.
-+type_transition $1 devpts:chr_file $1_devpts;
-+# Allow use of the pty after creation.
-+allow $1 $1_devpts:chr_file { open getattr read write ioctl };
-+allowxperm $1 $1_devpts:chr_file ioctl unpriv_tty_ioctls;
-+# TIOCSTI is only ever used for exploits. Block it.
-+# b/33073072, b/7530569
-+# http://www.openwall.com/lists/oss-security/2016/09/26/14
-+neverallowxperm * $1_devpts:chr_file ioctl TIOCSTI;
-+# Note: devpts:dir search and ptmx_device:chr_file rw_file_perms
-+# allowed to everyone via domain.te.
-+')
-+
-+#####################################
-+# Non system_app application set
-+#
-+define(`non_system_app_set', `{ appdomain -system_app }')
-+
-+#####################################
-+# Recovery only
-+# SELinux rules which apply only to recovery mode
-+#
-+define(`recovery_only', ifelse(target_recovery, `true', $1, ))
-+
-+#####################################
-+# Full TREBLE only
-+# SELinux rules which apply only to full TREBLE devices
-+#
-+define(`full_treble_only', ifelse(target_full_treble, `true', $1,
-+ifelse(target_full_treble, `cts',
-+# BEGIN_TREBLE_ONLY -- this marker is used by CTS -- do not modify
-+$1
-+# END_TREBLE_ONLY -- this marker is used by CTS -- do not modify
-+, )))
-+
-+#####################################
-+# Not full TREBLE
-+# SELinux rules which apply only to devices which are not full TREBLE devices
-+#
-+define(`not_full_treble', ifelse(target_full_treble, `true', , $1))
-+
-+#####################################
-+# Compatible property only
-+# SELinux rules which apply only to devices with compatible property
-+#
-+define(`compatible_property_only', ifelse(target_compatible_property, `true', $1,
-+ifelse(target_compatible_property, `cts',
-+# BEGIN_COMPATIBLE_PROPERTY_ONLY -- this marker is used by CTS -- do not modify
-+$1
-+# END_COMPATIBLE_PROPERTY_ONLY -- this marker is used by CTS -- do not modify
-+, )))
-+
-+#####################################
-+# Not compatible property
-+# SELinux rules which apply only to devices without compatible property
-+#
-+define(`not_compatible_property', ifelse(target_compatible_property, `true', , $1))
-+
-+#####################################
-+# Userdebug or eng builds
-+# SELinux rules which apply only to userdebug or eng builds
-+#
-+define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1)))
-+
-+#####################################
-+# asan builds
-+# SELinux rules which apply only to asan builds
-+#
-+define(`with_asan', ifelse(target_with_asan, `true', userdebug_or_eng(`$1'), ))
-+
-+####################################
-+# Fallback crash handling for processes that can't exec crash_dump (e.g. because of seccomp).
-+#
-+define(`crash_dump_fallback', `
-+userdebug_or_eng(`
-+  allow $1 su:fifo_file append;
-+')
-+allow $1 anr_data_file:file append;
-+allow $1 dumpstate:fd use;
-+allow $1 incidentd:fd use;
-+# TODO: Figure out why write is needed.
-+allow $1 dumpstate:fifo_file { append write };
-+allow $1 incidentd:fifo_file { append write };
-+allow $1 system_server:fifo_file { append write };
-+allow $1 tombstoned:unix_stream_socket connectto;
-+allow $1 tombstoned:fd use;
-+allow $1 tombstoned_crash_socket:sock_file write;
-+allow $1 tombstone_data_file:file append;
-+')
-+
-+#####################################
-+# WITH_DEXPREOPT builds
-+# SELinux rules which apply only when pre-opting.
-+#
-+define(`with_dexpreopt', ifelse(target_with_dexpreopt, `true', $1))
-+
-+#####################################
-+# write_logd(domain)
-+# Ability to write to android log
-+# daemon via sockets
-+define(`write_logd', `
-+unix_socket_send($1, logdw, logd)
-+allow $1 pmsg_device:chr_file w_file_perms;
-+')
-+
-+#####################################
-+# read_logd(domain)
-+# Ability to run logcat and read from android
-+# log daemon via sockets
-+define(`read_logd', `
-+allow $1 logcat_exec:file rx_file_perms;
-+unix_socket_connect($1, logdr, logd)
-+')
-+
-+#####################################
-+# read_runtime_log_tags(domain)
-+# ability to directly map the runtime event log tags
-+define(`read_runtime_log_tags', `
-+allow $1 runtime_event_log_tags_file:file r_file_perms;
-+')
-+
-+#####################################
-+# control_logd(domain)
-+# Ability to control
-+# android log daemon via sockets
-+define(`control_logd', `
-+# Group AID_LOG checked by filesystem & logd
-+# to permit control commands
-+unix_socket_connect($1, logd, logd)
-+')
-+
-+#####################################
-+# use_keystore(domain)
-+# Ability to use keystore.
-+# Keystore is requires the following permissions
-+# to call getpidcon.
-+define(`use_keystore', `
-+  allow keystore $1:dir search;
-+  allow keystore $1:file { read open };
-+  allow keystore $1:process getattr;
-+  allow $1 keystore_service:service_manager find;
-+  binder_call($1, keystore)
-+  binder_call(keystore, $1)
-+')
-+
-+###########################################
-+# use_drmservice(domain)
-+# Ability to use DrmService which requires
-+# DrmService to call getpidcon.
-+define(`use_drmservice', `
-+  allow drmserver $1:dir search;
-+  allow drmserver $1:file { read open };
-+  allow drmserver $1:process getattr;
-+')
-+
-+###########################################
-+# add_service(domain, service)
-+# Ability for domain to add a service to service_manager
-+# and find it. It also creates a neverallow preventing
-+# others from adding it.
-+define(`add_service', `
-+  allow $1 $2:service_manager { add find };
-+  neverallow { domain -$1 } $2:service_manager add;
-+')
-+
-+###########################################
-+# add_hwservice(domain, service)
-+# Ability for domain to add a service to hwservice_manager
-+# and find it. It also creates a neverallow preventing
-+# others from adding it.
-+define(`add_hwservice', `
-+  allow $1 $2:hwservice_manager { add find };
-+  allow $1 hidl_base_hwservice:hwservice_manager add;
-+  neverallow { domain -$1 } $2:hwservice_manager add;
-+')
-diff --git a/prebuilts/api/28.0/public/tee.te b/prebuilts/api/28.0/public/tee.te
-new file mode 100644
-index 000000000..06627c33a
---- /dev/null
-+++ b/prebuilts/api/28.0/public/tee.te
-@@ -0,0 +1,10 @@
-+##
-+# trusted execution environment (tee) daemon
-+#
-+type tee, domain;
-+
-+# Device(s) for communicating with the TEE
-+type tee_device, dev_type;
-+
-+allow tee fingerprint_vendor_data_file:dir rw_dir_perms;
-+allow tee fingerprint_vendor_data_file:file create_file_perms;
-diff --git a/prebuilts/api/28.0/public/thermalserviced.te b/prebuilts/api/28.0/public/thermalserviced.te
-new file mode 100644
-index 000000000..00e007132
---- /dev/null
-+++ b/prebuilts/api/28.0/public/thermalserviced.te
-@@ -0,0 +1,13 @@
-+# thermalserviced -- thermal management services for system and vendor
-+type thermalserviced, domain;
-+type thermalserviced_exec, exec_type, file_type;
-+
-+binder_use(thermalserviced)
-+binder_service(thermalserviced)
-+add_service(thermalserviced, thermal_service)
-+
-+hwbinder_use(thermalserviced)
-+hal_client_domain(thermalserviced, hal_thermal)
-+add_hwservice(thermalserviced, thermalcallback_hwservice)
-+
-+binder_call(thermalserviced, platform_app)
-diff --git a/prebuilts/api/28.0/public/tombstoned.te b/prebuilts/api/28.0/public/tombstoned.te
-new file mode 100644
-index 000000000..0e585b662
---- /dev/null
-+++ b/prebuilts/api/28.0/public/tombstoned.te
-@@ -0,0 +1,22 @@
-+# debugger interface
-+type tombstoned, domain, mlstrustedsubject;
-+type tombstoned_exec, exec_type, file_type;
-+
-+# Write to arbitrary pipes given to us.
-+allow tombstoned domain:fd use;
-+allow tombstoned domain:fifo_file write;
-+
-+allow tombstoned domain:dir r_dir_perms;
-+allow tombstoned domain:file r_file_perms;
-+allow tombstoned tombstone_data_file:dir rw_dir_perms;
-+allow tombstoned tombstone_data_file:file { create_file_perms link };
-+
-+# TODO: Remove append / write permissions. They were temporarily
-+# granted due to a bug which appears to have been fixed.
-+allow tombstoned anr_data_file:file { append write };
-+auditallow tombstoned anr_data_file:file { append write };
-+
-+# Changes for the new stack dumping mechanism. Each trace goes into a
-+# separate file, and these files are managed by tombstoned.
-+allow tombstoned anr_data_file:dir rw_dir_perms;
-+allow tombstoned anr_data_file:file { create getattr open link unlink };
-diff --git a/prebuilts/api/28.0/public/toolbox.te b/prebuilts/api/28.0/public/toolbox.te
-new file mode 100644
-index 000000000..59c3a9c73
---- /dev/null
-+++ b/prebuilts/api/28.0/public/toolbox.te
-@@ -0,0 +1,24 @@
-+# Any toolbox command run by init.
-+# At present, the only known usage is for running mkswap via fs_mgr.
-+# Do NOT use this domain for toolbox when run by any other domain.
-+type toolbox, domain;
-+type toolbox_exec, exec_type, file_type;
-+
-+# /dev/__null__ created by init prior to policy load,
-+# open fd inherited by fsck.
-+allow toolbox tmpfs:chr_file { read write ioctl };
-+
-+# Inherit and use pty created by android_fork_execvp_ext().
-+allow toolbox devpts:chr_file { read write getattr ioctl };
-+
-+# mkswap-specific.
-+# Read/write block devices used for swap partitions.
-+# Assign swap_block_device type any such partition in your
-+# device/<vendor>/<product>/sepolicy/file_contexts file.
-+allow toolbox block_device:dir search;
-+allow toolbox swap_block_device:blk_file rw_file_perms;
-+
-+# Only allow entry from init via the toolbox binary.
-+neverallow { domain -init } toolbox:process transition;
-+neverallow * toolbox:process dyntransition;
-+neverallow toolbox { file_type fs_type -toolbox_exec}:file entrypoint;
-diff --git a/prebuilts/api/28.0/public/traced_probes.te b/prebuilts/api/28.0/public/traced_probes.te
-new file mode 100644
-index 000000000..3e587c8ef
---- /dev/null
-+++ b/prebuilts/api/28.0/public/traced_probes.te
-@@ -0,0 +1 @@
-+type traced_probes, domain, coredomain, mlstrustedsubject;
-diff --git a/prebuilts/api/28.0/public/traceur_app.te b/prebuilts/api/28.0/public/traceur_app.te
-new file mode 100644
-index 000000000..7113fa7ce
---- /dev/null
-+++ b/prebuilts/api/28.0/public/traceur_app.te
-@@ -0,0 +1,21 @@
-+type traceur_app, domain;
-+
-+allow traceur_app servicemanager:service_manager list;
-+allow traceur_app hwservicemanager:hwservice_manager list;
-+
-+set_prop(traceur_app, debug_prop)
-+
-+allow traceur_app {
-+  service_manager_type
-+  -gatekeeper_service
-+  -incident_service
-+  -installd_service
-+  -netd_service
-+  -virtual_touchpad_service
-+  -vold_service
-+  -vr_hwc_service
-+}:service_manager find;
-+
-+dontaudit traceur_app service_manager_type:service_manager find;
-+dontaudit traceur_app hwservice_manager_type:hwservice_manager find;
-+dontaudit traceur_app domain:binder call;
-diff --git a/prebuilts/api/28.0/public/tzdatacheck.te b/prebuilts/api/28.0/public/tzdatacheck.te
-new file mode 100644
-index 000000000..6f60c8e2a
---- /dev/null
-+++ b/prebuilts/api/28.0/public/tzdatacheck.te
-@@ -0,0 +1,18 @@
-+# The tzdatacheck command run by init.
-+type tzdatacheck, domain;
-+type tzdatacheck_exec, exec_type, file_type;
-+
-+allow tzdatacheck zoneinfo_data_file:dir create_dir_perms;
-+allow tzdatacheck zoneinfo_data_file:file unlink;
-+
-+# Below are strong assertion that only init, system_server and tzdatacheck
-+# can modify the /data time zone rules directories. This is to make it very
-+# clear that only these domains should modify the actual time zone rules data.
-+# The tzdatacheck binary itself may be executed by shell for tests but it must
-+# not be able to modify the real rules.
-+# If other users / binaries could modify time zone rules on device this might
-+# have negative implications for users (who may get incorrect local times)
-+# or break assumptions made / invalidate data held by the components actually
-+# responsible for updating time zone rules.
-+neverallow { domain -system_server -init -tzdatacheck } zoneinfo_data_file:file no_w_file_perms;
-+neverallow { domain -system_server -init -tzdatacheck } zoneinfo_data_file:dir no_w_dir_perms;
-diff --git a/prebuilts/api/28.0/public/ueventd.te b/prebuilts/api/28.0/public/ueventd.te
-new file mode 100644
-index 000000000..9b9eacb25
---- /dev/null
-+++ b/prebuilts/api/28.0/public/ueventd.te
-@@ -0,0 +1,57 @@
-+# ueventd seclabel is specified in init.rc since
-+# it lives in the rootfs and has no unique file type.
-+type ueventd, domain;
-+
-+# Write to /dev/kmsg.
-+allow ueventd kmsg_device:chr_file rw_file_perms;
-+
-+allow ueventd self:global_capability_class_set { chown mknod net_admin setgid fsetid sys_rawio dac_override fowner };
-+allow ueventd device:file create_file_perms;
-+
-+r_dir_file(ueventd, rootfs)
-+
-+# ueventd needs write access to files in /sys to regenerate uevents
-+allow ueventd sysfs_type:file w_file_perms;
-+r_dir_file(ueventd, sysfs_type)
-+allow ueventd sysfs_type:{ file lnk_file } { relabelfrom relabelto setattr };
-+allow ueventd sysfs_type:dir { relabelfrom relabelto setattr };
-+allow ueventd tmpfs:chr_file rw_file_perms;
-+allow ueventd dev_type:dir create_dir_perms;
-+allow ueventd dev_type:lnk_file { create unlink };
-+allow ueventd dev_type:chr_file { getattr create setattr unlink };
-+allow ueventd dev_type:blk_file { getattr relabelfrom relabelto create setattr unlink };
-+allow ueventd self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+allow ueventd efs_file:dir search;
-+allow ueventd efs_file:file r_file_perms;
-+
-+# Get SELinux enforcing status.
-+r_dir_file(ueventd, selinuxfs)
-+
-+# Access for /vendor/ueventd.rc and /vendor/firmware
-+r_dir_file(ueventd, { vendor_file_type -vendor_app_file -vendor_overlay_file })
-+
-+# Get file contexts for new device nodes
-+allow ueventd file_contexts_file:file r_file_perms;
-+
-+# Use setfscreatecon() to label /dev directories and files.
-+allow ueventd self:process setfscreate;
-+
-+# Allow ueventd to read androidboot.android_dt_dir from kernel cmdline.
-+allow ueventd proc_cmdline:file r_file_perms;
-+
-+#####
-+##### neverallow rules
-+#####
-+
-+# ueventd must never set properties, otherwise deadlocks may occur.
-+# https://android-review.googlesource.com/#/c/133120/6/init/devices.cpp@941
-+# No writing to the property socket, connecting to init, or setting properties.
-+neverallow ueventd property_socket:sock_file write;
-+neverallow ueventd init:unix_stream_socket connectto;
-+neverallow ueventd property_type:property_service set;
-+
-+# Restrict ueventd access on block devices to maintenence operations.
-+neverallow ueventd dev_type:blk_file ~{ getattr relabelfrom relabelto create setattr unlink };
-+
-+# Only relabelto as we would never want to relabelfrom kmem_device or port_device
-+neverallow ueventd { kmem_device port_device }:chr_file ~{ getattr create setattr unlink relabelto };
-diff --git a/prebuilts/api/28.0/public/uncrypt.te b/prebuilts/api/28.0/public/uncrypt.te
-new file mode 100644
-index 000000000..1e48b831d
---- /dev/null
-+++ b/prebuilts/api/28.0/public/uncrypt.te
-@@ -0,0 +1,45 @@
-+# uncrypt
-+type uncrypt, domain, mlstrustedsubject;
-+type uncrypt_exec, exec_type, file_type;
-+
-+allow uncrypt self:global_capability_class_set dac_override;
-+
-+# Read OTA zip file from /data/data/com.google.android.gsf/app_download
-+r_dir_file(uncrypt, app_data_file)
-+
-+userdebug_or_eng(`
-+  # For debugging, allow /data/local/tmp access
-+  r_dir_file(uncrypt, shell_data_file)
-+')
-+
-+# Read /cache/recovery/command
-+# Read /cache/recovery/uncrypt_file
-+allow uncrypt cache_file:dir search;
-+allow uncrypt cache_recovery_file:dir rw_dir_perms;
-+allow uncrypt cache_recovery_file:file create_file_perms;
-+
-+# Read OTA zip file at /data/ota_package/.
-+allow uncrypt ota_package_file:dir r_dir_perms;
-+allow uncrypt ota_package_file:file r_file_perms;
-+
-+# Write to /dev/socket/uncrypt
-+unix_socket_connect(uncrypt, uncrypt, uncrypt)
-+
-+# Set a property to reboot the device.
-+set_prop(uncrypt, powerctl_prop)
-+
-+# Raw writes to block device
-+allow uncrypt self:global_capability_class_set sys_rawio;
-+allow uncrypt misc_block_device:blk_file w_file_perms;
-+allow uncrypt block_device:dir r_dir_perms;
-+
-+# Access userdata block device.
-+allow uncrypt userdata_block_device:blk_file w_file_perms;
-+
-+r_dir_file(uncrypt, rootfs)
-+
-+# uncrypt reads /proc/cmdline
-+allow uncrypt proc_cmdline:file r_file_perms;
-+
-+# Read files in /sys
-+r_dir_file(uncrypt, sysfs_dt_firmware_android)
-diff --git a/prebuilts/api/28.0/public/untrusted_app.te b/prebuilts/api/28.0/public/untrusted_app.te
-new file mode 100644
-index 000000000..5289bf96b
---- /dev/null
-+++ b/prebuilts/api/28.0/public/untrusted_app.te
-@@ -0,0 +1,21 @@
-+###
-+### Untrusted apps.
-+###
-+### Apps are labeled based on mac_permissions.xml (maps signer and
-+### optionally package name to seinfo value) and seapp_contexts (maps UID
-+### and optionally seinfo value to domain for process and type for data
-+### directory).  The untrusted_app domain is the default assignment in
-+### seapp_contexts for any app with UID between APP_AID (10000)
-+### and AID_ISOLATED_START (99000) if the app has no specific seinfo
-+### value as determined from mac_permissions.xml.  In current AOSP, this
-+### domain is assigned to all non-system apps as well as to any system apps
-+### that are not signed by the platform key.  To move
-+### a system app into a specific domain, add a signer entry for it to
-+### mac_permissions.xml and assign it one of the pre-existing seinfo values
-+### or define and use a new seinfo value in both mac_permissions.xml and
-+### seapp_contexts.
-+###
-+
-+type untrusted_app, domain;
-+type untrusted_app_27, domain;
-+type untrusted_app_25, domain;
-diff --git a/prebuilts/api/28.0/public/untrusted_v2_app.te b/prebuilts/api/28.0/public/untrusted_v2_app.te
-new file mode 100644
-index 000000000..ac82f1531
---- /dev/null
-+++ b/prebuilts/api/28.0/public/untrusted_v2_app.te
-@@ -0,0 +1,5 @@
-+###
-+### Untrusted v2 sandbox apps.
-+###
-+
-+type untrusted_v2_app, domain;
-diff --git a/prebuilts/api/28.0/public/update_engine.te b/prebuilts/api/28.0/public/update_engine.te
-new file mode 100644
-index 000000000..ca73c7e89
---- /dev/null
-+++ b/prebuilts/api/28.0/public/update_engine.te
-@@ -0,0 +1,58 @@
-+# Domain for update_engine daemon.
-+type update_engine, domain, update_engine_common;
-+type update_engine_exec, exec_type, file_type;
-+
-+net_domain(update_engine);
-+
-+# Read/[write] to /proc/net/xt_qtaguid/ctrl and /dev/xt_qtaguid to tag network
-+# sockets.
-+allow update_engine qtaguid_proc:file rw_file_perms;
-+allow update_engine qtaguid_device:chr_file r_file_perms;
-+
-+# Following permissions are needed for update_engine.
-+allow update_engine self:process { setsched };
-+allow update_engine self:global_capability_class_set { fowner sys_admin };
-+# Note: fsetid checks are triggered when creating a file in a directory with
-+# the setgid bit set to determine if the file should inherit setgid. In this
-+# case, setgid on the file is undesirable so we should just suppress the
-+# denial.
-+dontaudit update_engine self:global_capability_class_set fsetid;
-+
-+allow update_engine kmsg_device:chr_file w_file_perms;
-+allow update_engine update_engine_exec:file rx_file_perms;
-+wakelock_use(update_engine);
-+
-+# Ignore these denials.
-+dontaudit update_engine kernel:process setsched;
-+dontaudit update_engine self:capability sys_rawio;
-+
-+# Allow using persistent storage in /data/misc/update_engine.
-+allow update_engine update_engine_data_file:dir create_dir_perms;
-+allow update_engine update_engine_data_file:file create_file_perms;
-+
-+# Allow using persistent storage in /data/misc/update_engine_log.
-+allow update_engine update_engine_log_data_file:dir create_dir_perms;
-+allow update_engine update_engine_log_data_file:file create_file_perms;
-+
-+# Don't allow kernel module loading, just silence the logs.
-+dontaudit update_engine kernel:system module_request;
-+
-+# Register the service to perform Binder IPC.
-+binder_use(update_engine)
-+add_service(update_engine, update_engine_service)
-+
-+# Allow update_engine to call the callback function provided by priv_app.
-+binder_call(update_engine, priv_app)
-+
-+# Read OTA zip file at /data/ota_package/.
-+allow update_engine ota_package_file:file r_file_perms;
-+allow update_engine ota_package_file:dir r_dir_perms;
-+
-+# Use Boot Control HAL
-+hal_client_domain(update_engine, hal_bootctl)
-+
-+# access /proc/misc
-+allow update_engine proc_misc:file r_file_perms;
-+
-+# read directories on /system and /vendor
-+allow update_engine system_file:dir r_dir_perms;
-diff --git a/prebuilts/api/28.0/public/update_engine_common.te b/prebuilts/api/28.0/public/update_engine_common.te
-new file mode 100644
-index 000000000..eb4cdc194
---- /dev/null
-+++ b/prebuilts/api/28.0/public/update_engine_common.te
-@@ -0,0 +1,45 @@
-+# update_engine payload application permissions. These are shared between the
-+# background daemon and the recovery tool to sideload an update.
-+
-+# Allow update_engine to reach block devices in /dev/block.
-+allow update_engine_common block_device:dir search;
-+
-+# Allow read/write on system and boot partitions.
-+allow update_engine_common boot_block_device:blk_file rw_file_perms;
-+allow update_engine_common system_block_device:blk_file rw_file_perms;
-+
-+# Allow to set recovery options in the BCB. Used to trigger factory reset when
-+# the update to an older version (channel change) or incompatible version
-+# requires it.
-+allow update_engine_common misc_block_device:blk_file rw_file_perms;
-+
-+# read fstab
-+allow update_engine_common rootfs:dir getattr;
-+allow update_engine_common rootfs:file r_file_perms;
-+
-+# Allow update_engine_common to mount on the /postinstall directory and reset the
-+# labels on the mounted filesystem to postinstall_file.
-+allow update_engine_common postinstall_mnt_dir:dir { mounton getattr search };
-+allow update_engine_common postinstall_file:filesystem { mount unmount relabelfrom relabelto };
-+allow update_engine_common labeledfs:filesystem relabelfrom;
-+
-+# Allow update_engine_common to read and execute postinstall_file.
-+allow update_engine_common postinstall_file:file rx_file_perms;
-+allow update_engine_common postinstall_file:lnk_file r_file_perms;
-+allow update_engine_common postinstall_file:dir r_dir_perms;
-+
-+# install update.zip from cache
-+r_dir_file(update_engine_common, cache_file)
-+
-+# A postinstall program is typically a shell script (with a #!), so we allow
-+# to execute those.
-+allow update_engine_common shell_exec:file rx_file_perms;
-+
-+# Allow update_engine_common to suspend, resume and kill the postinstall program.
-+allow update_engine_common postinstall:process { signal sigstop sigkill };
-+
-+# access /proc/cmdline
-+allow update_engine_common proc_cmdline:file r_file_perms;
-+
-+# Read files in /sys/firmware/devicetree/base/firmware/android/
-+r_dir_file(update_engine_common, sysfs_dt_firmware_android)
-diff --git a/prebuilts/api/28.0/public/update_verifier.te b/prebuilts/api/28.0/public/update_verifier.te
-new file mode 100644
-index 000000000..5d20eca82
---- /dev/null
-+++ b/prebuilts/api/28.0/public/update_verifier.te
-@@ -0,0 +1,31 @@
-+# update_verifier
-+type update_verifier, domain;
-+type update_verifier_exec, exec_type, file_type;
-+
-+# Allow update_verifier to reach block devices in /dev/block.
-+allow update_verifier block_device:dir search;
-+
-+# Read care map in /data/ota_package/.
-+allow update_verifier ota_package_file:dir r_dir_perms;
-+allow update_verifier ota_package_file:file r_file_perms;
-+
-+# Read /sys/block to find all the DM directories like (/sys/block/dm-X).
-+allow update_verifier sysfs:dir r_dir_perms;
-+
-+# Read /sys/block/dm-X/dm/name (which is a symlink to
-+# /sys/devices/virtual/block/dm-X/dm/name) to identify the mapping between
-+# dm-X and system/vendor partitions.
-+allow update_verifier sysfs_dm:dir r_dir_perms;
-+allow update_verifier sysfs_dm:file r_file_perms;
-+
-+# Read all blocks in DM wrapped system partition.
-+allow update_verifier dm_device:blk_file r_file_perms;
-+
-+# Write to kernel message.
-+allow update_verifier kmsg_device:chr_file w_file_perms;
-+
-+# Allow update_verifier to reboot the device.
-+set_prop(update_verifier, powerctl_prop)
-+
-+# Use Boot Control HAL
-+hal_client_domain(update_verifier, hal_bootctl)
-diff --git a/prebuilts/api/28.0/public/usbd.te b/prebuilts/api/28.0/public/usbd.te
-new file mode 100644
-index 000000000..a98724b69
---- /dev/null
-+++ b/prebuilts/api/28.0/public/usbd.te
-@@ -0,0 +1,2 @@
-+type usbd, domain;
-+type usbd_exec, exec_type, file_type;
-diff --git a/prebuilts/api/28.0/public/vdc.te b/prebuilts/api/28.0/public/vdc.te
-new file mode 100644
-index 000000000..424bdea02
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vdc.te
-@@ -0,0 +1,20 @@
-+# vdc spawned from init for the following services:
-+#  defaultcrypto
-+#  encrypt
-+#
-+# We also transition into this domain from dumpstate, when
-+# collecting bug reports.
-+
-+type vdc, domain;
-+type vdc_exec, exec_type, file_type;
-+
-+# vdc can be invoked with logwrapper, so let it write to pty
-+allow vdc devpts:chr_file rw_file_perms;
-+
-+# vdc writes directly to kmsg during the boot process
-+allow vdc kmsg_device:chr_file w_file_perms;
-+
-+# vdc talks to vold over Binder
-+binder_use(vdc)
-+binder_call(vdc, vold)
-+allow vdc vold_service:service_manager find;
-diff --git a/prebuilts/api/28.0/public/vendor_init.te b/prebuilts/api/28.0/public/vendor_init.te
-new file mode 100644
-index 000000000..4e4b31365
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vendor_init.te
-@@ -0,0 +1,198 @@
-+# vendor_init is its own domain.
-+type vendor_init, domain, mlstrustedsubject;
-+
-+# Communication to the main init process
-+allow vendor_init init:unix_stream_socket { read write };
-+
-+# Vendor init shouldn't communicate with any vendor process, nor most system processes.
-+neverallow_establish_socket_comms(vendor_init, { domain -init -logd -su -vendor_init });
-+
-+# Logging to kmsg
-+allow vendor_init kmsg_device:chr_file { open write };
-+
-+# Mount on /dev/usb-ffs/adb.
-+allow vendor_init device:dir mounton;
-+
-+# Create and remove symlinks in /.
-+allow vendor_init rootfs:lnk_file { create unlink };
-+
-+# Create cgroups mount points in tmpfs and mount cgroups on them.
-+allow vendor_init cgroup:dir create_dir_perms;
-+
-+# /config
-+allow vendor_init configfs:dir mounton;
-+allow vendor_init configfs:dir create_dir_perms;
-+allow vendor_init configfs:{ file lnk_file } create_file_perms;
-+
-+# Create directories under /dev/cpuctl after chowning it to system.
-+allow vendor_init self:global_capability_class_set dac_override;
-+
-+# mkdir, symlink, write, rm/rmdir, chown/chmod, restorecon/restorecon_recursive from init.rc files.
-+# chown/chmod require open+read+setattr required for open()+fchown/fchmod().
-+# system/core/init.rc requires at least cache_file and data_file_type.
-+# init.<board>.rc files often include device-specific types, so
-+# we just allow all file types except /system files here.
-+allow vendor_init self:global_capability_class_set { chown fowner fsetid };
-+
-+# mkdir with FBE requires reading /data/unencrypted/{ref,mode}.
-+allow vendor_init unencrypted_data_file:dir search;
-+allow vendor_init unencrypted_data_file:file r_file_perms;
-+
-+allow vendor_init system_data_file:dir getattr;
-+
-+allow vendor_init {
-+  file_type
-+  -core_data_file_type
-+  -exec_type
-+  -system_file
-+  -unlabeled
-+  -vendor_file_type
-+  -vold_metadata_file
-+}:dir { create search getattr open read setattr ioctl write add_name remove_name rmdir relabelfrom };
-+
-+allow vendor_init {
-+  file_type
-+  -core_data_file_type
-+  -exec_type
-+  -runtime_event_log_tags_file
-+  -system_file
-+  -unlabeled
-+  -vendor_file_type
-+  -vold_metadata_file
-+}:file { create getattr open read write setattr relabelfrom unlink };
-+
-+allow vendor_init {
-+  file_type
-+  -core_data_file_type
-+  -exec_type
-+  -system_file
-+  -unlabeled
-+  -vendor_file_type
-+  -vold_metadata_file
-+}:{ sock_file fifo_file } { create getattr open read setattr relabelfrom unlink };
-+
-+allow vendor_init {
-+  file_type
-+  -core_data_file_type
-+  -exec_type
-+  -system_file
-+  -unlabeled
-+  -vendor_file_type
-+  -vold_metadata_file
-+}:lnk_file { create getattr setattr relabelfrom unlink };
-+
-+allow vendor_init {
-+  file_type
-+  -core_data_file_type
-+  -exec_type
-+  -system_file
-+  -vendor_file_type
-+  -vold_metadata_file
-+}:dir_file_class_set relabelto;
-+
-+allow vendor_init dev_type:dir create_dir_perms;
-+allow vendor_init dev_type:lnk_file create;
-+
-+# Disable tracing by writing to /sys/kernel/debug/tracing/tracing_on
-+allow vendor_init debugfs_tracing:file w_file_perms;
-+
-+# chown/chmod on pseudo files.
-+allow vendor_init {
-+  fs_type
-+  -contextmount_type
-+  -sdcard_type
-+  -rootfs
-+  -proc_uid_time_in_state
-+  -proc_uid_concurrent_active_time
-+  -proc_uid_concurrent_policy_time
-+}:file { open read setattr };
-+
-+allow vendor_init {
-+  fs_type
-+  -contextmount_type
-+  -sdcard_type
-+  -rootfs
-+  -proc_uid_time_in_state
-+  -proc_uid_concurrent_active_time
-+  -proc_uid_concurrent_policy_time
-+}:dir  { open read setattr search };
-+
-+# chown/chmod on devices, e.g. /dev/ttyHS0
-+allow vendor_init {
-+  dev_type
-+  -kmem_device
-+  -port_device
-+  -lowpan_device
-+  -hw_random_device
-+}:chr_file setattr;
-+
-+allow vendor_init dev_type:blk_file getattr;
-+
-+# Write to /proc/sys/net/ping_group_range and other /proc/sys/net files.
-+r_dir_file(vendor_init, proc_net)
-+allow vendor_init proc_net:file w_file_perms;
-+allow vendor_init self:global_capability_class_set net_admin;
-+
-+# Write to /proc/sys/vm/page-cluster
-+allow vendor_init proc_page_cluster:file w_file_perms;
-+
-+# Write to sysfs nodes.
-+allow vendor_init sysfs_type:dir r_dir_perms;
-+allow vendor_init sysfs_type:lnk_file read;
-+allow vendor_init { sysfs_type -sysfs_usermodehelper }:file rw_file_perms;
-+
-+# setfscreatecon() for labeling directories and socket files.
-+allow vendor_init self:process { setfscreate };
-+
-+r_dir_file(vendor_init, vendor_file_type)
-+
-+# Vendor init can read properties
-+allow vendor_init serialno_prop:file { getattr open read };
-+
-+# Vendor init can perform operations on trusted and security Extended Attributes
-+allow vendor_init self:global_capability_class_set sys_admin;
-+
-+# Raw writes to misc block device
-+allow vendor_init misc_block_device:blk_file w_file_perms;
-+
-+not_compatible_property(`
-+    set_prop(vendor_init, {
-+      property_type
-+      -restorecon_prop
-+      -netd_stable_secret_prop
-+      -firstboot_prop
-+      -pm_prop
-+      -system_boot_reason_prop
-+      -bootloader_boot_reason_prop
-+      -last_boot_reason_prop
-+    })
-+')
-+
-+set_prop(vendor_init, bluetooth_a2dp_offload_prop)
-+set_prop(vendor_init, debug_prop)
-+set_prop(vendor_init, exported_audio_prop)
-+set_prop(vendor_init, exported_bluetooth_prop)
-+set_prop(vendor_init, exported_config_prop)
-+set_prop(vendor_init, exported_dalvik_prop)
-+set_prop(vendor_init, exported_default_prop)
-+set_prop(vendor_init, exported_ffs_prop)
-+set_prop(vendor_init, exported_overlay_prop)
-+set_prop(vendor_init, exported_pm_prop)
-+set_prop(vendor_init, exported_radio_prop)
-+set_prop(vendor_init, exported_system_radio_prop)
-+set_prop(vendor_init, exported_wifi_prop)
-+set_prop(vendor_init, exported2_config_prop)
-+set_prop(vendor_init, exported2_system_prop)
-+set_prop(vendor_init, exported2_vold_prop)
-+set_prop(vendor_init, exported3_default_prop)
-+set_prop(vendor_init, exported3_radio_prop)
-+set_prop(vendor_init, logd_prop)
-+set_prop(vendor_init, log_tag_prop)
-+set_prop(vendor_init, log_prop)
-+set_prop(vendor_init, serialno_prop)
-+set_prop(vendor_init, vendor_default_prop)
-+set_prop(vendor_init, vendor_security_patch_level_prop)
-+set_prop(vendor_init, wifi_log_prop)
-+
-+get_prop(vendor_init, exported2_radio_prop)
-+get_prop(vendor_init, exported3_system_prop)
-diff --git a/prebuilts/api/28.0/public/vendor_shell.te b/prebuilts/api/28.0/public/vendor_shell.te
-new file mode 100644
-index 000000000..7d30acba4
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vendor_shell.te
-@@ -0,0 +1,19 @@
-+type vendor_shell, domain;
-+type vendor_shell_exec, exec_type, vendor_file_type, file_type;
-+
-+allow vendor_shell vendor_shell_exec:file rx_file_perms;
-+allow vendor_shell vendor_toolbox_exec:file rx_file_perms;
-+
-+# Use fd from shell when vendor_shell is started from shell
-+allow vendor_shell shell:fd use;
-+
-+# adbd: allow `adb shell /vendor/bin/sh` and `adb shell` then `/vendor/bin/sh`
-+allow vendor_shell adbd:fd use;
-+allow vendor_shell adbd:process sigchld;
-+allow vendor_shell adbd:unix_stream_socket { getattr ioctl read write };
-+
-+allow vendor_shell devpts:chr_file rw_file_perms;
-+allow vendor_shell tty_device:chr_file rw_file_perms;
-+allow vendor_shell console_device:chr_file rw_file_perms;
-+allow vendor_shell input_device:dir r_dir_perms;
-+allow vendor_shell input_device:chr_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/public/vendor_toolbox.te b/prebuilts/api/28.0/public/vendor_toolbox.te
-new file mode 100644
-index 000000000..63f938de1
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vendor_toolbox.te
-@@ -0,0 +1,16 @@
-+# Toolbox installation for vendor binaries / scripts
-+# Non-vendor processes are not allowed to execute the binary
-+# and is always executed without transition.
-+type vendor_toolbox_exec, exec_type, vendor_file_type, file_type;
-+
-+# Do not allow domains to transition to vendor toolbox
-+# or read, execute the vendor_toolbox file.
-+full_treble_only(`
-+    # Do not allow non-vendor domains to transition
-+    # to vendor toolbox except for the allowlisted domains.
-+    neverallow {
-+        coredomain
-+        -init
-+        -modprobe
-+    } vendor_toolbox_exec:file { entrypoint execute execute_no_trans };
-+')
-diff --git a/prebuilts/api/28.0/public/virtual_touchpad.te b/prebuilts/api/28.0/public/virtual_touchpad.te
-new file mode 100644
-index 000000000..c2800e3ef
---- /dev/null
-+++ b/prebuilts/api/28.0/public/virtual_touchpad.te
-@@ -0,0 +1,16 @@
-+type virtual_touchpad, domain;
-+type virtual_touchpad_exec, exec_type, file_type;
-+
-+binder_use(virtual_touchpad)
-+binder_service(virtual_touchpad)
-+add_service(virtual_touchpad, virtual_touchpad_service)
-+
-+# Needed to check app permissions.
-+binder_call(virtual_touchpad, system_server)
-+
-+# Requires access to /dev/uinput to create and feed the virtual device.
-+allow virtual_touchpad uhid_device:chr_file { w_file_perms ioctl };
-+
-+# Requires access to the permission service to validate that clients have the
-+# appropriate VR permissions.
-+allow virtual_touchpad permission_service:service_manager find;
-diff --git a/prebuilts/api/28.0/public/vndservice.te b/prebuilts/api/28.0/public/vndservice.te
-new file mode 100644
-index 000000000..0d309bf71
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vndservice.te
-@@ -0,0 +1 @@
-+type default_android_vndservice, vndservice_manager_type;
-diff --git a/prebuilts/api/28.0/public/vndservicemanager.te b/prebuilts/api/28.0/public/vndservicemanager.te
-new file mode 100644
-index 000000000..6b9f73dc0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vndservicemanager.te
-@@ -0,0 +1,2 @@
-+# vndservicemanager - the Binder context manager for vendor processes
-+type vndservicemanager, domain;
-diff --git a/prebuilts/api/28.0/public/vold.te b/prebuilts/api/28.0/public/vold.te
-new file mode 100644
-index 000000000..131f555d4
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vold.te
-@@ -0,0 +1,269 @@
-+# volume manager
-+type vold, domain;
-+type vold_exec, exec_type, file_type;
-+
-+# Read already opened /cache files.
-+allow vold cache_file:dir r_dir_perms;
-+allow vold cache_file:file { getattr read };
-+allow vold cache_file:lnk_file r_file_perms;
-+
-+# Read access to pseudo filesystems.
-+r_dir_file(vold, proc_net)
-+r_dir_file(vold, sysfs_type)
-+# XXX Label sysfs files with a specific type?
-+allow vold sysfs:file w_file_perms; # writing to /sys/*/uevent during coldboot.
-+allow vold sysfs_dm:file w_file_perms;
-+allow vold sysfs_usb:file w_file_perms;
-+allow vold sysfs_zram_uevent:file w_file_perms;
-+
-+r_dir_file(vold, rootfs)
-+r_dir_file(vold, metadata_file)
-+allow vold {
-+  proc # b/67049235 processes /proc/<pid>/* files are mislabeled.
-+  proc_cmdline
-+  proc_drop_caches
-+  proc_filesystems
-+  proc_meminfo
-+  proc_mounts
-+}:file r_file_perms;
-+
-+#Get file contexts
-+allow vold file_contexts_file:file r_file_perms;
-+
-+# Allow us to jump into execution domains of above tools
-+allow vold self:process setexec;
-+
-+# For sgdisk launched through popen()
-+allow vold shell_exec:file rx_file_perms;
-+
-+# For formatting adoptable storage devices
-+allow vold e2fs_exec:file rx_file_perms;
-+
-+typeattribute vold mlstrustedsubject;
-+allow vold self:process setfscreate;
-+allow vold system_file:file x_file_perms;
-+not_full_treble(`allow vold vendor_file:file x_file_perms;')
-+allow vold block_device:dir create_dir_perms;
-+allow vold device:dir write;
-+allow vold devpts:chr_file rw_file_perms;
-+allow vold rootfs:dir mounton;
-+allow vold sdcard_type:dir mounton; # TODO: deprecated in M
-+allow vold sdcard_type:filesystem { mount remount unmount }; # TODO: deprecated in M
-+allow vold sdcard_type:dir create_dir_perms; # TODO: deprecated in M
-+allow vold sdcard_type:file create_file_perms; # TODO: deprecated in M
-+
-+# Manage locations where storage is mounted
-+allow vold { mnt_media_rw_file storage_file sdcard_type }:dir create_dir_perms;
-+allow vold { mnt_media_rw_file storage_file sdcard_type }:file create_file_perms;
-+
-+# Access to storage that backs emulated FUSE daemons for migration optimization
-+allow vold media_rw_data_file:dir create_dir_perms;
-+allow vold media_rw_data_file:file create_file_perms;
-+
-+# Allow mounting of storage devices
-+allow vold { mnt_media_rw_stub_file storage_stub_file }:dir { mounton create rmdir getattr setattr };
-+
-+# Manage per-user primary symlinks
-+allow vold mnt_user_file:dir create_dir_perms;
-+allow vold mnt_user_file:lnk_file create_file_perms;
-+
-+# Allow to create and mount expanded storage
-+allow vold mnt_expand_file:dir { create_dir_perms mounton };
-+allow vold apk_data_file:dir { create getattr setattr };
-+allow vold shell_data_file:dir { create getattr setattr };
-+
-+allow vold tmpfs:filesystem { mount unmount };
-+allow vold tmpfs:dir create_dir_perms;
-+allow vold tmpfs:dir mounton;
-+allow vold self:global_capability_class_set { net_admin dac_override mknod sys_admin chown fowner fsetid };
-+allow vold self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-+allow vold app_data_file:dir search;
-+allow vold app_data_file:file rw_file_perms;
-+allow vold loop_control_device:chr_file rw_file_perms;
-+allow vold loop_device:blk_file { create setattr unlink rw_file_perms };
-+allow vold vold_device:blk_file { create setattr unlink rw_file_perms };
-+allow vold dm_device:chr_file rw_file_perms;
-+allow vold dm_device:blk_file rw_file_perms;
-+# For vold Process::killProcessesWithOpenFiles function.
-+allow vold domain:dir r_dir_perms;
-+allow vold domain:{ file lnk_file } r_file_perms;
-+allow vold domain:process { signal sigkill };
-+allow vold self:global_capability_class_set { sys_ptrace kill };
-+
-+allow vold kmsg_device:chr_file rw_file_perms;
-+
-+# Run fsck in the fsck domain.
-+allow vold fsck_exec:file { r_file_perms execute };
-+
-+# Log fsck results
-+allow vold fscklogs:dir rw_dir_perms;
-+allow vold fscklogs:file create_file_perms;
-+
-+#
-+# Rules to support encrypted fs support.
-+#
-+
-+# Unmount and mount the fs.
-+allow vold labeledfs:filesystem { mount unmount };
-+
-+# Access /efs/userdata_footer.
-+# XXX Split into a separate type?
-+allow vold efs_file:file rw_file_perms;
-+
-+# Create and mount on /data/tmp_mnt and management of expansion mounts
-+allow vold system_data_file:dir { create rw_dir_perms mounton setattr rmdir };
-+allow vold system_data_file:lnk_file getattr;
-+
-+# Vold create users in /data/vendor_{ce,de}/[0-9]+
-+allow vold vendor_data_file:dir create_dir_perms;
-+
-+# for secdiscard
-+allow vold system_data_file:file read;
-+
-+# Set scheduling policy of kernel processes
-+allow vold kernel:process setsched;
-+
-+# Property Service
-+set_prop(vold, vold_prop)
-+set_prop(vold, exported_vold_prop)
-+set_prop(vold, exported2_vold_prop)
-+set_prop(vold, powerctl_prop)
-+set_prop(vold, ctl_fuse_prop)
-+set_prop(vold, restorecon_prop)
-+
-+# ASEC
-+allow vold asec_image_file:file create_file_perms;
-+allow vold asec_image_file:dir rw_dir_perms;
-+allow vold asec_apk_file:dir { create_dir_perms mounton relabelfrom relabelto };
-+allow vold asec_public_file:dir { relabelto setattr };
-+allow vold asec_apk_file:file { r_file_perms setattr relabelfrom relabelto };
-+allow vold asec_public_file:file { relabelto setattr };
-+# restorecon files in asec containers created on 4.2 or earlier.
-+allow vold unlabeled:dir { r_dir_perms setattr relabelfrom };
-+allow vold unlabeled:file { r_file_perms setattr relabelfrom };
-+
-+# Handle wake locks (used for device encryption)
-+wakelock_use(vold)
-+
-+# Allow vold to publish a binder service and make binder calls.
-+binder_use(vold)
-+add_service(vold, vold_service)
-+
-+# Allow vold to call into the system server so it can check permissions.
-+binder_call(vold, system_server)
-+allow vold permission_service:service_manager find;
-+
-+# talk to batteryservice
-+binder_call(vold, healthd)
-+
-+# talk to keymaster
-+hal_client_domain(vold, hal_keymaster)
-+
-+# Access userdata block device.
-+allow vold userdata_block_device:blk_file rw_file_perms;
-+
-+# Access metadata block device used for encryption meta-data.
-+allow vold metadata_block_device:blk_file rw_file_perms;
-+
-+# Allow vold to manipulate /data/unencrypted
-+allow vold unencrypted_data_file:{ file } create_file_perms;
-+allow vold unencrypted_data_file:dir create_dir_perms;
-+
-+# Write to /proc/sys/vm/drop_caches
-+allow vold proc_drop_caches:file w_file_perms;
-+
-+# Give vold a place where only vold can store files; everyone else is off limits
-+allow vold vold_data_file:dir create_dir_perms;
-+allow vold vold_data_file:file create_file_perms;
-+
-+# And a similar place in the metadata partition
-+allow vold vold_metadata_file:dir create_dir_perms;
-+allow vold vold_metadata_file:file create_file_perms;
-+
-+# linux keyring configuration
-+allow vold init:key { write search setattr };
-+allow vold vold:key { write search setattr };
-+
-+# vold temporarily changes its priority when running benchmarks
-+allow vold self:global_capability_class_set sys_nice;
-+
-+# vold needs to chroot into app namespaces to remount when runtime permissions change
-+allow vold self:global_capability_class_set sys_chroot;
-+allow vold storage_file:dir mounton;
-+
-+# For AppFuse.
-+allow vold fuse_device:chr_file rw_file_perms;
-+allow vold fuse:filesystem { relabelfrom };
-+allow vold app_fusefs:filesystem { relabelfrom relabelto };
-+allow vold app_fusefs:filesystem { mount unmount };
-+
-+# MoveTask.cpp executes cp and rm
-+allow vold toolbox_exec:file rx_file_perms;
-+
-+# Prepare profile dir for users.
-+allow vold user_profile_data_file:dir create_dir_perms;
-+
-+# Raw writes to misc block device
-+allow vold misc_block_device:blk_file w_file_perms;
-+
-+neverallow {
-+    domain
-+    -vold
-+    -vold_prepare_subdirs
-+} vold_data_file:dir ~{ open create read getattr setattr search relabelto ioctl };
-+
-+neverallow {
-+    domain
-+    -init
-+    -vold
-+    -vold_prepare_subdirs
-+} vold_data_file:dir *;
-+
-+neverallow {
-+    domain
-+    -init
-+    -vendor_init
-+    -vold
-+} vold_metadata_file:dir *;
-+
-+neverallow {
-+    domain
-+    -kernel
-+    -vold
-+    -vold_prepare_subdirs
-+} vold_data_file:notdevfile_class_set ~{ relabelto getattr };
-+
-+neverallow {
-+    domain
-+    -init
-+    -vold
-+    -vold_prepare_subdirs
-+} vold_metadata_file:notdevfile_class_set ~{ relabelto getattr };
-+
-+neverallow {
-+    domain
-+    -init
-+    -kernel
-+    -vendor_init
-+    -vold
-+    -vold_prepare_subdirs
-+} { vold_data_file vold_metadata_file }:notdevfile_class_set *;
-+
-+neverallow { domain -vold -init } restorecon_prop:property_service set;
-+
-+# Only system_server and vdc can interact with vold over binder
-+neverallow { domain -system_server -vdc -vold } vold_service:service_manager find;
-+neverallow vold {
-+  domain
-+  -hal_keymaster_server
-+  -healthd
-+  -hwservicemanager
-+  -servicemanager
-+  -system_server
-+  userdebug_or_eng(`-su')
-+}:binder call;
-+
-+neverallow vold fsck_exec:file execute_no_trans;
-+neverallow { domain -init } vold:process { transition dyntransition };
-+neverallow vold *:process ptrace;
-+neverallow vold *:rawip_socket *;
-diff --git a/prebuilts/api/28.0/public/vold_prepare_subdirs.te b/prebuilts/api/28.0/public/vold_prepare_subdirs.te
-new file mode 100644
-index 000000000..6405d2dcb
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vold_prepare_subdirs.te
-@@ -0,0 +1,6 @@
-+# SELinux directory creation and labelling for vold-managed directories
-+
-+type vold_prepare_subdirs, domain;
-+type vold_prepare_subdirs_exec, exec_type, file_type;
-+
-+typeattribute vold_prepare_subdirs coredomain;
-diff --git a/prebuilts/api/28.0/public/vr_hwc.te b/prebuilts/api/28.0/public/vr_hwc.te
-new file mode 100644
-index 000000000..c05dd638a
---- /dev/null
-+++ b/prebuilts/api/28.0/public/vr_hwc.te
-@@ -0,0 +1,31 @@
-+type vr_hwc, domain;
-+type vr_hwc_exec, exec_type, file_type;
-+
-+# Get buffer metadata.
-+hal_client_domain(vr_hwc, hal_graphics_allocator)
-+
-+binder_use(vr_hwc)
-+binder_service(vr_hwc)
-+
-+binder_call(vr_hwc, surfaceflinger)
-+# Needed to check for app permissions.
-+binder_call(vr_hwc, system_server)
-+
-+add_service(vr_hwc, vr_hwc_service)
-+
-+# Hosts the VR HWC implementation and provides a simple Binder interface for VR
-+# Window Manager to receive the layers/buffers.
-+hwbinder_use(vr_hwc)
-+
-+# Load vendor libraries.
-+allow vr_hwc system_file:dir r_dir_perms;
-+
-+allow vr_hwc ion_device:chr_file r_file_perms;
-+
-+# Allow connection to VR DisplayClient to get the primary display metadata
-+# (ie: size).
-+pdx_client(vr_hwc, display_client)
-+
-+# Requires access to the permission service to validate that clients have the
-+# appropriate VR permissions.
-+allow vr_hwc permission_service:service_manager find;
-diff --git a/prebuilts/api/28.0/public/watchdogd.te b/prebuilts/api/28.0/public/watchdogd.te
-new file mode 100644
-index 000000000..00292a9a9
---- /dev/null
-+++ b/prebuilts/api/28.0/public/watchdogd.te
-@@ -0,0 +1,4 @@
-+# watchdogd seclabel is specified in init.<board>.rc
-+type watchdogd, domain;
-+allow watchdogd watchdog_device:chr_file rw_file_perms;
-+allow watchdogd kmsg_device:chr_file rw_file_perms;
-diff --git a/prebuilts/api/28.0/public/webview_zygote.te b/prebuilts/api/28.0/public/webview_zygote.te
-new file mode 100644
-index 000000000..5d19b3226
---- /dev/null
-+++ b/prebuilts/api/28.0/public/webview_zygote.te
-@@ -0,0 +1,5 @@
-+# webview_zygote is an auxiliary zygote process that is used to spawn
-+# isolated_app processes for rendering untrusted web content.
-+
-+type webview_zygote, domain;
-+type webview_zygote_exec, exec_type, file_type;
-diff --git a/prebuilts/api/28.0/public/wificond.te b/prebuilts/api/28.0/public/wificond.te
-new file mode 100644
-index 000000000..9e4dc7d32
---- /dev/null
-+++ b/prebuilts/api/28.0/public/wificond.te
-@@ -0,0 +1,31 @@
-+# wificond
-+type wificond, domain;
-+type wificond_exec, exec_type, file_type;
-+
-+binder_use(wificond)
-+binder_call(wificond, system_server)
-+
-+add_service(wificond, wificond_service)
-+
-+set_prop(wificond, exported_wifi_prop)
-+set_prop(wificond, wifi_prop)
-+set_prop(wificond, ctl_default_prop)
-+
-+# create sockets to set interfaces up and down
-+allow wificond self:udp_socket create_socket_perms;
-+# setting interface state up/down is a privileged ioctl
-+allowxperm wificond self:udp_socket ioctl { SIOCSIFFLAGS SIOCSIFHWADDR };
-+allow wificond self:global_capability_class_set { net_admin net_raw };
-+# allow wificond to speak to nl80211 in the kernel
-+allow wificond self:netlink_socket create_socket_perms_no_ioctl;
-+# newer kernels (e.g. 4.4 but not 4.1) have a new class for sockets
-+allow wificond self:netlink_generic_socket create_socket_perms_no_ioctl;
-+
-+r_dir_file(wificond, proc_net)
-+
-+# allow wificond to check permission for dumping logs
-+allow wificond permission_service:service_manager find;
-+
-+# dumpstate support
-+allow wificond dumpstate:fd use;
-+allow wificond dumpstate:fifo_file write;
-diff --git a/prebuilts/api/28.0/public/wpantund.te b/prebuilts/api/28.0/public/wpantund.te
-new file mode 100644
-index 000000000..b31723651
---- /dev/null
-+++ b/prebuilts/api/28.0/public/wpantund.te
-@@ -0,0 +1,29 @@
-+type wpantund, domain;
-+type wpantund_exec, exec_type, file_type;
-+
-+hal_client_domain(wpantund, hal_lowpan)
-+net_domain(wpantund)
-+
-+binder_use(wpantund)
-+binder_call(wpantund, system_server)
-+
-+# wpantund needs to be able to check in with the lowpan_service
-+allow wpantund lowpan_service:service_manager find;
-+
-+# Allow wpantund to call any callbacks that have been registered with it.
-+# Generally, only privileged apps are able to register callbacks with
-+# wpantund, so we are limiting the scope for callbacks to only privileged
-+# apps. We also add shell to allow the command-line utility `lowpanctl`
-+# to work properly from `adb shell`.
-+allow wpantund {priv_app shell}:binder call;
-+
-+# create sockets to set interfaces up and down, add multicast groups, etc.
-+allow wpantund self:udp_socket create_socket_perms;
-+
-+# setting interface state up/down and changing MTU are privileged ioctls
-+allowxperm wpantund self:udp_socket ioctl { SIOCSIFFLAGS SIOCSIFMTU };
-+
-+# Allow us to bring up a TUN network interface.
-+allow wpantund tun_device:chr_file rw_file_perms;
-+allow wpantund self:global_capability_class_set { net_admin net_raw };
-+allow wpantund self:tun_socket create;
-diff --git a/prebuilts/api/28.0/public/zygote.te b/prebuilts/api/28.0/public/zygote.te
-new file mode 100644
-index 000000000..83c42efb0
---- /dev/null
-+++ b/prebuilts/api/28.0/public/zygote.te
-@@ -0,0 +1,3 @@
-+# zygote
-+type zygote, domain;
-+type zygote_exec, exec_type, file_type;
-diff --git a/prebuilts/api/29.0/private/compat/28.0/28.0.cil b/prebuilts/api/29.0/private/compat/28.0/28.0.cil
-new file mode 100644
-index 000000000..338cbd027
---- /dev/null
-+++ b/prebuilts/api/29.0/private/compat/28.0/28.0.cil
-@@ -0,0 +1,1742 @@
-+;; types removed from current policy
-+(type alarm_device)
-+(type audio_seq_device)
-+(type audio_timer_device)
-+(type commontime_management_service)
-+(type cpuctl_device)
-+(type full_device)
-+(type i2c_device)
-+(type kmem_device)
-+(type mediacodec)
-+(type mediacodec_exec)
-+(type mediaextractor_update_service)
-+(type mtd_device)
-+(type netd_socket)
-+(type qtaguid_proc)
-+(type thermalcallback_hwservice)
-+(type thermalserviced)
-+(type thermalserviced_exec)
-+(type untrusted_v2_app)
-+(type vcs_device)
-+
-+;; Public 28.0 SEPolicy is divergent on different devices w.r.t
-+;; exported_audio_prop type. We need this typeattribute declaration so that the
-+;; mapping file compiles with vendor policies without exported_audio_prop type.
-+(typeattribute exported_audio_prop_28_0)
-+
-+(expandtypeattribute (accessibility_service_28_0) true)
-+(expandtypeattribute (account_service_28_0) true)
-+(expandtypeattribute (activity_service_28_0) true)
-+(expandtypeattribute (adbd_28_0) true)
-+(expandtypeattribute (adb_data_file_28_0) true)
-+(expandtypeattribute (adbd_exec_28_0) true)
-+(expandtypeattribute (adbd_socket_28_0) true)
-+(expandtypeattribute (adb_keys_file_28_0) true)
-+(expandtypeattribute (alarm_device_28_0) true)
-+(expandtypeattribute (alarm_service_28_0) true)
-+(expandtypeattribute (anr_data_file_28_0) true)
-+(expandtypeattribute (apk_data_file_28_0) true)
-+(expandtypeattribute (apk_private_data_file_28_0) true)
-+(expandtypeattribute (apk_private_tmp_file_28_0) true)
-+(expandtypeattribute (apk_tmp_file_28_0) true)
-+(expandtypeattribute (app_data_file_28_0) true)
-+(expandtypeattribute (app_fuse_file_28_0) true)
-+(expandtypeattribute (app_fusefs_28_0) true)
-+(expandtypeattribute (appops_service_28_0) true)
-+(expandtypeattribute (appwidget_service_28_0) true)
-+(expandtypeattribute (asec_apk_file_28_0) true)
-+(expandtypeattribute (asec_image_file_28_0) true)
-+(expandtypeattribute (asec_public_file_28_0) true)
-+(expandtypeattribute (ashmem_device_28_0) true)
-+(expandtypeattribute (assetatlas_service_28_0) true)
-+(expandtypeattribute (audio_data_file_28_0) true)
-+(expandtypeattribute (audio_device_28_0) true)
-+(expandtypeattribute (audiohal_data_file_28_0) true)
-+(expandtypeattribute (audio_prop_28_0) true)
-+(expandtypeattribute (audio_seq_device_28_0) true)
-+(expandtypeattribute (audioserver_28_0) true)
-+(expandtypeattribute (audioserver_data_file_28_0) true)
-+(expandtypeattribute (audioserver_service_28_0) true)
-+(expandtypeattribute (audio_service_28_0) true)
-+(expandtypeattribute (audio_timer_device_28_0) true)
-+(expandtypeattribute (autofill_service_28_0) true)
-+(expandtypeattribute (backup_data_file_28_0) true)
-+(expandtypeattribute (backup_service_28_0) true)
-+(expandtypeattribute (batteryproperties_service_28_0) true)
-+(expandtypeattribute (battery_service_28_0) true)
-+(expandtypeattribute (batterystats_service_28_0) true)
-+(expandtypeattribute (binder_calls_stats_service_28_0) true)
-+(expandtypeattribute (binder_device_28_0) true)
-+(expandtypeattribute (binfmt_miscfs_28_0) true)
-+(expandtypeattribute (blkid_28_0) true)
-+(expandtypeattribute (blkid_untrusted_28_0) true)
-+(expandtypeattribute (block_device_28_0) true)
-+(expandtypeattribute (bluetooth_28_0) true)
-+(expandtypeattribute (bluetooth_a2dp_offload_prop_28_0) true)
-+(expandtypeattribute (bluetooth_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_efs_file_28_0) true)
-+(expandtypeattribute (bluetooth_logs_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_manager_service_28_0) true)
-+(expandtypeattribute (bluetooth_prop_28_0) true)
-+(expandtypeattribute (bluetooth_service_28_0) true)
-+(expandtypeattribute (bluetooth_socket_28_0) true)
-+(expandtypeattribute (bootanim_28_0) true)
-+(expandtypeattribute (bootanim_exec_28_0) true)
-+(expandtypeattribute (boot_block_device_28_0) true)
-+(expandtypeattribute (bootchart_data_file_28_0) true)
-+(expandtypeattribute (bootloader_boot_reason_prop_28_0) true)
-+(expandtypeattribute (bootstat_28_0) true)
-+(expandtypeattribute (bootstat_data_file_28_0) true)
-+(expandtypeattribute (bootstat_exec_28_0) true)
-+(expandtypeattribute (boottime_prop_28_0) true)
-+(expandtypeattribute (boottrace_data_file_28_0) true)
-+(expandtypeattribute (broadcastradio_service_28_0) true)
-+(expandtypeattribute (bufferhubd_28_0) true)
-+(expandtypeattribute (bufferhubd_exec_28_0) true)
-+(expandtypeattribute (cache_backup_file_28_0) true)
-+(expandtypeattribute (cache_block_device_28_0) true)
-+(expandtypeattribute (cache_file_28_0) true)
-+(expandtypeattribute (cache_private_backup_file_28_0) true)
-+(expandtypeattribute (cache_recovery_file_28_0) true)
-+(expandtypeattribute (camera_data_file_28_0) true)
-+(expandtypeattribute (camera_device_28_0) true)
-+(expandtypeattribute (cameraproxy_service_28_0) true)
-+(expandtypeattribute (cameraserver_28_0) true)
-+(expandtypeattribute (cameraserver_exec_28_0) true)
-+(expandtypeattribute (cameraserver_service_28_0) true)
-+(expandtypeattribute (cgroup_28_0) true)
-+(expandtypeattribute (cgroup_bpf_28_0) true)
-+(expandtypeattribute (charger_28_0) true)
-+(expandtypeattribute (clatd_28_0) true)
-+(expandtypeattribute (clatd_exec_28_0) true)
-+(expandtypeattribute (clipboard_service_28_0) true)
-+(expandtypeattribute (commontime_management_service_28_0) true)
-+(expandtypeattribute (companion_device_service_28_0) true)
-+(expandtypeattribute (configfs_28_0) true)
-+(expandtypeattribute (config_prop_28_0) true)
-+(expandtypeattribute (connectivity_service_28_0) true)
-+(expandtypeattribute (connmetrics_service_28_0) true)
-+(expandtypeattribute (console_device_28_0) true)
-+(expandtypeattribute (consumer_ir_service_28_0) true)
-+(expandtypeattribute (content_service_28_0) true)
-+(expandtypeattribute (contexthub_service_28_0) true)
-+(expandtypeattribute (coredump_file_28_0) true)
-+(expandtypeattribute (country_detector_service_28_0) true)
-+(expandtypeattribute (coverage_service_28_0) true)
-+(expandtypeattribute (cppreopt_prop_28_0) true)
-+(expandtypeattribute (cppreopts_28_0) true)
-+(expandtypeattribute (cppreopts_exec_28_0) true)
-+(expandtypeattribute (cpuctl_device_28_0) true)
-+(expandtypeattribute (cpuinfo_service_28_0) true)
-+(expandtypeattribute (crash_dump_28_0) true)
-+(expandtypeattribute (crash_dump_exec_28_0) true)
-+(expandtypeattribute (crossprofileapps_service_28_0) true)
-+(expandtypeattribute (ctl_bootanim_prop_28_0) true)
-+(expandtypeattribute (ctl_bugreport_prop_28_0) true)
-+(expandtypeattribute (ctl_console_prop_28_0) true)
-+(expandtypeattribute (ctl_default_prop_28_0) true)
-+(expandtypeattribute (ctl_dumpstate_prop_28_0) true)
-+(expandtypeattribute (ctl_fuse_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_start_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_stop_prop_28_0) true)
-+(expandtypeattribute (ctl_mdnsd_prop_28_0) true)
-+(expandtypeattribute (ctl_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_rildaemon_prop_28_0) true)
-+(expandtypeattribute (ctl_sigstop_prop_28_0) true)
-+(expandtypeattribute (ctl_start_prop_28_0) true)
-+(expandtypeattribute (ctl_stop_prop_28_0) true)
-+(expandtypeattribute (dalvikcache_data_file_28_0) true)
-+(expandtypeattribute (dalvik_prop_28_0) true)
-+(expandtypeattribute (dbinfo_service_28_0) true)
-+(expandtypeattribute (debugfs_28_0) true)
-+(expandtypeattribute (debugfs_mmc_28_0) true)
-+(expandtypeattribute (debugfs_trace_marker_28_0) true)
-+(expandtypeattribute (debugfs_tracing_28_0) true)
-+(expandtypeattribute (debugfs_tracing_debug_28_0) true)
-+(expandtypeattribute (debugfs_tracing_instances_28_0) true)
-+(expandtypeattribute (debugfs_wakeup_sources_28_0) true)
-+(expandtypeattribute (debugfs_wifi_tracing_28_0) true)
-+(expandtypeattribute (debuggerd_prop_28_0) true)
-+(expandtypeattribute (debug_prop_28_0) true)
-+(expandtypeattribute (default_android_hwservice_28_0) true)
-+(expandtypeattribute (default_android_service_28_0) true)
-+(expandtypeattribute (default_android_vndservice_28_0) true)
-+(expandtypeattribute (default_prop_28_0) true)
-+(expandtypeattribute (device_28_0) true)
-+(expandtypeattribute (device_identifiers_service_28_0) true)
-+(expandtypeattribute (deviceidle_service_28_0) true)
-+(expandtypeattribute (device_logging_prop_28_0) true)
-+(expandtypeattribute (device_policy_service_28_0) true)
-+(expandtypeattribute (devicestoragemonitor_service_28_0) true)
-+(expandtypeattribute (devpts_28_0) true)
-+(expandtypeattribute (dex2oat_28_0) true)
-+(expandtypeattribute (dex2oat_exec_28_0) true)
-+(expandtypeattribute (dhcp_28_0) true)
-+(expandtypeattribute (dhcp_data_file_28_0) true)
-+(expandtypeattribute (dhcp_exec_28_0) true)
-+(expandtypeattribute (dhcp_prop_28_0) true)
-+(expandtypeattribute (diskstats_service_28_0) true)
-+(expandtypeattribute (display_service_28_0) true)
-+(expandtypeattribute (dm_device_28_0) true)
-+(expandtypeattribute (dnsmasq_28_0) true)
-+(expandtypeattribute (dnsmasq_exec_28_0) true)
-+(expandtypeattribute (dnsproxyd_socket_28_0) true)
-+(expandtypeattribute (DockObserver_service_28_0) true)
-+(expandtypeattribute (dreams_service_28_0) true)
-+(expandtypeattribute (drm_data_file_28_0) true)
-+(expandtypeattribute (drmserver_28_0) true)
-+(expandtypeattribute (drmserver_exec_28_0) true)
-+(expandtypeattribute (drmserver_service_28_0) true)
-+(expandtypeattribute (drmserver_socket_28_0) true)
-+(expandtypeattribute (dropbox_service_28_0) true)
-+(expandtypeattribute (dumpstate_28_0) true)
-+(expandtypeattribute (dumpstate_exec_28_0) true)
-+(expandtypeattribute (dumpstate_options_prop_28_0) true)
-+(expandtypeattribute (dumpstate_prop_28_0) true)
-+(expandtypeattribute (dumpstate_service_28_0) true)
-+(expandtypeattribute (dumpstate_socket_28_0) true)
-+(expandtypeattribute (e2fs_28_0) true)
-+(expandtypeattribute (e2fs_exec_28_0) true)
-+(expandtypeattribute (efs_file_28_0) true)
-+(expandtypeattribute (ephemeral_app_28_0) true)
-+(expandtypeattribute (ethernet_service_28_0) true)
-+(expandtypeattribute (exfat_28_0) true)
-+(expandtypeattribute (exported2_config_prop_28_0) true)
-+(expandtypeattribute (exported2_default_prop_28_0) true)
-+(expandtypeattribute (exported2_radio_prop_28_0) true)
-+(expandtypeattribute (exported2_system_prop_28_0) true)
-+(expandtypeattribute (exported2_vold_prop_28_0) true)
-+(expandtypeattribute (exported3_default_prop_28_0) true)
-+(expandtypeattribute (exported3_radio_prop_28_0) true)
-+(expandtypeattribute (exported3_system_prop_28_0) true)
-+(expandtypeattribute (exported_audio_prop_28_0) true)
-+(expandtypeattribute (exported_bluetooth_prop_28_0) true)
-+(expandtypeattribute (exported_config_prop_28_0) true)
-+(expandtypeattribute (exported_dalvik_prop_28_0) true)
-+(expandtypeattribute (exported_default_prop_28_0) true)
-+(expandtypeattribute (exported_dumpstate_prop_28_0) true)
-+(expandtypeattribute (exported_ffs_prop_28_0) true)
-+(expandtypeattribute (exported_fingerprint_prop_28_0) true)
-+(expandtypeattribute (exported_overlay_prop_28_0) true)
-+(expandtypeattribute (exported_pm_prop_28_0) true)
-+(expandtypeattribute (exported_radio_prop_28_0) true)
-+(expandtypeattribute (exported_secure_prop_28_0) true)
-+(expandtypeattribute (exported_system_prop_28_0) true)
-+(expandtypeattribute (exported_system_radio_prop_28_0) true)
-+(expandtypeattribute (exported_vold_prop_28_0) true)
-+(expandtypeattribute (exported_wifi_prop_28_0) true)
-+(expandtypeattribute (ffs_prop_28_0) true)
-+(expandtypeattribute (file_contexts_file_28_0) true)
-+(expandtypeattribute (fingerprintd_28_0) true)
-+(expandtypeattribute (fingerprintd_data_file_28_0) true)
-+(expandtypeattribute (fingerprintd_exec_28_0) true)
-+(expandtypeattribute (fingerprintd_service_28_0) true)
-+(expandtypeattribute (fingerprint_prop_28_0) true)
-+(expandtypeattribute (fingerprint_service_28_0) true)
-+(expandtypeattribute (fingerprint_vendor_data_file_28_0) true)
-+(expandtypeattribute (firstboot_prop_28_0) true)
-+(expandtypeattribute (font_service_28_0) true)
-+(expandtypeattribute (frp_block_device_28_0) true)
-+(expandtypeattribute (fs_bpf_28_0) true)
-+(expandtypeattribute (fsck_28_0) true)
-+(expandtypeattribute (fsck_exec_28_0) true)
-+(expandtypeattribute (fscklogs_28_0) true)
-+(expandtypeattribute (fsck_untrusted_28_0) true)
-+(expandtypeattribute (full_device_28_0) true)
-+(expandtypeattribute (functionfs_28_0) true)
-+(expandtypeattribute (fuse_28_0) true)
-+(expandtypeattribute (fuse_device_28_0) true)
-+(expandtypeattribute (fwk_display_hwservice_28_0) true)
-+(expandtypeattribute (fwk_scheduler_hwservice_28_0) true)
-+(expandtypeattribute (fwk_sensor_hwservice_28_0) true)
-+(expandtypeattribute (fwmarkd_socket_28_0) true)
-+(expandtypeattribute (gatekeeperd_28_0) true)
-+(expandtypeattribute (gatekeeper_data_file_28_0) true)
-+(expandtypeattribute (gatekeeperd_exec_28_0) true)
-+(expandtypeattribute (gatekeeper_service_28_0) true)
-+(expandtypeattribute (gfxinfo_service_28_0) true)
-+(expandtypeattribute (gps_control_28_0) true)
-+(expandtypeattribute (gpu_device_28_0) true)
-+(expandtypeattribute (gpu_service_28_0) true)
-+(expandtypeattribute (graphics_device_28_0) true)
-+(expandtypeattribute (graphicsstats_service_28_0) true)
-+(expandtypeattribute (hal_audiocontrol_hwservice_28_0) true)
-+(expandtypeattribute (hal_audio_hwservice_28_0) true)
-+(expandtypeattribute (hal_authsecret_hwservice_28_0) true)
-+(expandtypeattribute (hal_bluetooth_hwservice_28_0) true)
-+(expandtypeattribute (hal_bootctl_hwservice_28_0) true)
-+(expandtypeattribute (hal_broadcastradio_hwservice_28_0) true)
-+(expandtypeattribute (hal_camera_hwservice_28_0) true)
-+(expandtypeattribute (hal_cas_hwservice_28_0) true)
-+(expandtypeattribute (hal_codec2_hwservice_28_0) true)
-+(expandtypeattribute (hal_configstore_ISurfaceFlingerConfigs_28_0) true)
-+(expandtypeattribute (hal_confirmationui_hwservice_28_0) true)
-+(expandtypeattribute (hal_contexthub_hwservice_28_0) true)
-+(expandtypeattribute (hal_drm_hwservice_28_0) true)
-+(expandtypeattribute (hal_dumpstate_hwservice_28_0) true)
-+(expandtypeattribute (hal_evs_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_service_28_0) true)
-+(expandtypeattribute (hal_gatekeeper_hwservice_28_0) true)
-+(expandtypeattribute (hal_gnss_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_composer_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_mapper_hwservice_28_0) true)
-+(expandtypeattribute (hal_health_hwservice_28_0) true)
-+(expandtypeattribute (hal_ir_hwservice_28_0) true)
-+(expandtypeattribute (hal_keymaster_hwservice_28_0) true)
-+(expandtypeattribute (hal_light_hwservice_28_0) true)
-+(expandtypeattribute (hal_lowpan_hwservice_28_0) true)
-+(expandtypeattribute (hal_memtrack_hwservice_28_0) true)
-+(expandtypeattribute (hal_neuralnetworks_hwservice_28_0) true)
-+(expandtypeattribute (hal_nfc_hwservice_28_0) true)
-+(expandtypeattribute (hal_oemlock_hwservice_28_0) true)
-+(expandtypeattribute (hal_omx_hwservice_28_0) true)
-+(expandtypeattribute (hal_power_hwservice_28_0) true)
-+(expandtypeattribute (hal_renderscript_hwservice_28_0) true)
-+(expandtypeattribute (hal_secure_element_hwservice_28_0) true)
-+(expandtypeattribute (hal_sensors_hwservice_28_0) true)
-+(expandtypeattribute (hal_telephony_hwservice_28_0) true)
-+(expandtypeattribute (hal_tetheroffload_hwservice_28_0) true)
-+(expandtypeattribute (hal_thermal_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_cec_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_input_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_gadget_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_hwservice_28_0) true)
-+(expandtypeattribute (hal_vehicle_hwservice_28_0) true)
-+(expandtypeattribute (hal_vibrator_hwservice_28_0) true)
-+(expandtypeattribute (hal_vr_hwservice_28_0) true)
-+(expandtypeattribute (hal_weaver_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hostapd_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_offload_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_supplicant_hwservice_28_0) true)
-+(expandtypeattribute (hardware_properties_service_28_0) true)
-+(expandtypeattribute (hardware_service_28_0) true)
-+(expandtypeattribute (hci_attach_dev_28_0) true)
-+(expandtypeattribute (hdmi_control_service_28_0) true)
-+(expandtypeattribute (healthd_28_0) true)
-+(expandtypeattribute (healthd_exec_28_0) true)
-+(expandtypeattribute (heapdump_data_file_28_0) true)
-+(expandtypeattribute (hidl_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hidl_base_hwservice_28_0) true)
-+(expandtypeattribute (hidl_manager_hwservice_28_0) true)
-+(expandtypeattribute (hidl_memory_hwservice_28_0) true)
-+(expandtypeattribute (hidl_token_hwservice_28_0) true)
-+(expandtypeattribute (hwbinder_device_28_0) true)
-+(expandtypeattribute (hw_random_device_28_0) true)
-+(expandtypeattribute (hwservice_contexts_file_28_0) true)
-+(expandtypeattribute (hwservicemanager_28_0) true)
-+(expandtypeattribute (hwservicemanager_exec_28_0) true)
-+(expandtypeattribute (hwservicemanager_prop_28_0) true)
-+(expandtypeattribute (i2c_device_28_0) true)
-+(expandtypeattribute (icon_file_28_0) true)
-+(expandtypeattribute (idmap_28_0) true)
-+(expandtypeattribute (idmap_exec_28_0) true)
-+(expandtypeattribute (iio_device_28_0) true)
-+(expandtypeattribute (imms_service_28_0) true)
-+(expandtypeattribute (incident_28_0) true)
-+(expandtypeattribute (incidentd_28_0) true)
-+(expandtypeattribute (incident_data_file_28_0) true)
-+(expandtypeattribute (incident_helper_28_0) true)
-+(expandtypeattribute (incident_service_28_0) true)
-+(expandtypeattribute (init_28_0) true)
-+(expandtypeattribute (init_exec_28_0) true)
-+(expandtypeattribute (inotify_28_0) true)
-+(expandtypeattribute (input_device_28_0) true)
-+(expandtypeattribute (inputflinger_28_0) true)
-+(expandtypeattribute (inputflinger_exec_28_0) true)
-+(expandtypeattribute (inputflinger_service_28_0) true)
-+(expandtypeattribute (input_method_service_28_0) true)
-+(expandtypeattribute (input_service_28_0) true)
-+(expandtypeattribute (installd_28_0) true)
-+(expandtypeattribute (install_data_file_28_0) true)
-+(expandtypeattribute (installd_exec_28_0) true)
-+(expandtypeattribute (installd_service_28_0) true)
-+(expandtypeattribute (install_recovery_28_0) true)
-+(expandtypeattribute (install_recovery_exec_28_0) true)
-+(expandtypeattribute (ion_device_28_0) true)
-+(expandtypeattribute (IProxyService_service_28_0) true)
-+(expandtypeattribute (ipsec_service_28_0) true)
-+(expandtypeattribute (isolated_app_28_0) true)
-+(expandtypeattribute (jobscheduler_service_28_0) true)
-+(expandtypeattribute (kernel_28_0) true)
-+(expandtypeattribute (keychain_data_file_28_0) true)
-+(expandtypeattribute (keychord_device_28_0) true)
-+(expandtypeattribute (keystore_28_0) true)
-+(expandtypeattribute (keystore_data_file_28_0) true)
-+(expandtypeattribute (keystore_exec_28_0) true)
-+(expandtypeattribute (keystore_service_28_0) true)
-+(expandtypeattribute (kmem_device_28_0) true)
-+(expandtypeattribute (kmsg_debug_device_28_0) true)
-+(expandtypeattribute (kmsg_device_28_0) true)
-+(expandtypeattribute (labeledfs_28_0) true)
-+(expandtypeattribute (last_boot_reason_prop_28_0) true)
-+(expandtypeattribute (launcherapps_service_28_0) true)
-+(expandtypeattribute (lmkd_28_0) true)
-+(expandtypeattribute (lmkd_exec_28_0) true)
-+(expandtypeattribute (lmkd_socket_28_0) true)
-+(expandtypeattribute (location_service_28_0) true)
-+(expandtypeattribute (lock_settings_service_28_0) true)
-+(expandtypeattribute (logcat_exec_28_0) true)
-+(expandtypeattribute (logd_28_0) true)
-+(expandtypeattribute (logd_exec_28_0) true)
-+(expandtypeattribute (logd_prop_28_0) true)
-+(expandtypeattribute (logdr_socket_28_0) true)
-+(expandtypeattribute (logd_socket_28_0) true)
-+(expandtypeattribute (logdw_socket_28_0) true)
-+(expandtypeattribute (logpersist_28_0) true)
-+(expandtypeattribute (logpersistd_logging_prop_28_0) true)
-+(expandtypeattribute (log_prop_28_0) true)
-+(expandtypeattribute (log_tag_prop_28_0) true)
-+(expandtypeattribute (loop_control_device_28_0) true)
-+(expandtypeattribute (loop_device_28_0) true)
-+(expandtypeattribute (lowpan_device_28_0) true)
-+(expandtypeattribute (lowpan_prop_28_0) true)
-+(expandtypeattribute (lowpan_service_28_0) true)
-+(expandtypeattribute (mac_perms_file_28_0) true)
-+(expandtypeattribute (mdnsd_28_0) true)
-+(expandtypeattribute (mdnsd_socket_28_0) true)
-+(expandtypeattribute (mdns_socket_28_0) true)
-+(expandtypeattribute (mediacodec_28_0) true)
-+(expandtypeattribute (mediacodec_exec_28_0) true)
-+(expandtypeattribute (mediacodec_service_28_0) true)
-+(expandtypeattribute (media_data_file_28_0) true)
-+(expandtypeattribute (mediadrmserver_28_0) true)
-+(expandtypeattribute (mediadrmserver_exec_28_0) true)
-+(expandtypeattribute (mediadrmserver_service_28_0) true)
-+(expandtypeattribute (mediaextractor_28_0) true)
-+(expandtypeattribute (mediaextractor_exec_28_0) true)
-+(expandtypeattribute (mediaextractor_service_28_0) true)
-+(expandtypeattribute (mediaextractor_update_service_28_0) true)
-+(expandtypeattribute (mediametrics_28_0) true)
-+(expandtypeattribute (mediametrics_exec_28_0) true)
-+(expandtypeattribute (mediametrics_service_28_0) true)
-+(expandtypeattribute (media_projection_service_28_0) true)
-+(expandtypeattribute (mediaprovider_28_0) true)
-+(expandtypeattribute (media_router_service_28_0) true)
-+(expandtypeattribute (media_rw_data_file_28_0) true)
-+(expandtypeattribute (mediaserver_28_0) true)
-+(expandtypeattribute (mediaserver_exec_28_0) true)
-+(expandtypeattribute (mediaserver_service_28_0) true)
-+(expandtypeattribute (media_session_service_28_0) true)
-+(expandtypeattribute (meminfo_service_28_0) true)
-+(expandtypeattribute (metadata_block_device_28_0) true)
-+(expandtypeattribute (metadata_file_28_0) true)
-+(expandtypeattribute (method_trace_data_file_28_0) true)
-+(expandtypeattribute (midi_service_28_0) true)
-+(expandtypeattribute (misc_block_device_28_0) true)
-+(expandtypeattribute (misc_logd_file_28_0) true)
-+(expandtypeattribute (misc_user_data_file_28_0) true)
-+(expandtypeattribute (mmc_prop_28_0) true)
-+(expandtypeattribute (mnt_expand_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_stub_file_28_0) true)
-+(expandtypeattribute (mnt_user_file_28_0) true)
-+(expandtypeattribute (mnt_vendor_file_28_0) true)
-+(expandtypeattribute (modprobe_28_0) true)
-+(expandtypeattribute (mount_service_28_0) true)
-+(expandtypeattribute (mqueue_28_0) true)
-+(expandtypeattribute (mtd_device_28_0) true)
-+(expandtypeattribute (mtp_28_0) true)
-+(expandtypeattribute (mtp_device_28_0) true)
-+(expandtypeattribute (mtpd_socket_28_0) true)
-+(expandtypeattribute (mtp_exec_28_0) true)
-+(expandtypeattribute (nativetest_data_file_28_0) true)
-+(expandtypeattribute (netd_28_0) true)
-+(expandtypeattribute (net_data_file_28_0) true)
-+(expandtypeattribute (netd_exec_28_0) true)
-+(expandtypeattribute (netd_listener_service_28_0) true)
-+(expandtypeattribute (net_dns_prop_28_0) true)
-+(expandtypeattribute (netd_service_28_0) true)
-+(expandtypeattribute (netd_socket_28_0) true)
-+(expandtypeattribute (netd_stable_secret_prop_28_0) true)
-+(expandtypeattribute (netif_28_0) true)
-+(expandtypeattribute (netpolicy_service_28_0) true)
-+(expandtypeattribute (net_radio_prop_28_0) true)
-+(expandtypeattribute (netstats_service_28_0) true)
-+(expandtypeattribute (netutils_wrapper_28_0) true)
-+(expandtypeattribute (netutils_wrapper_exec_28_0) true)
-+(expandtypeattribute (network_management_service_28_0) true)
-+(expandtypeattribute (network_score_service_28_0) true)
-+(expandtypeattribute (network_time_update_service_28_0) true)
-+(expandtypeattribute (network_watchlist_data_file_28_0) true)
-+(expandtypeattribute (network_watchlist_service_28_0) true)
-+(expandtypeattribute (nfc_28_0) true)
-+(expandtypeattribute (nfc_data_file_28_0) true)
-+(expandtypeattribute (nfc_device_28_0) true)
-+(expandtypeattribute (nfc_prop_28_0) true)
-+(expandtypeattribute (nfc_service_28_0) true)
-+(expandtypeattribute (node_28_0) true)
-+(expandtypeattribute (nonplat_service_contexts_file_28_0) true)
-+(expandtypeattribute (notification_service_28_0) true)
-+(expandtypeattribute (null_device_28_0) true)
-+(expandtypeattribute (oemfs_28_0) true)
-+(expandtypeattribute (oem_lock_service_28_0) true)
-+(expandtypeattribute (ota_data_file_28_0) true)
-+(expandtypeattribute (otadexopt_service_28_0) true)
-+(expandtypeattribute (ota_package_file_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_exec_28_0) true)
-+(expandtypeattribute (otapreopt_slot_28_0) true)
-+(expandtypeattribute (otapreopt_slot_exec_28_0) true)
-+(expandtypeattribute (overlay_prop_28_0) true)
-+(expandtypeattribute (overlay_service_28_0) true)
-+(expandtypeattribute (owntty_device_28_0) true)
-+(expandtypeattribute (package_native_service_28_0) true)
-+(expandtypeattribute (package_service_28_0) true)
-+(expandtypeattribute (pan_result_prop_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_dir_28_0) true)
-+(expandtypeattribute (pdx_display_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_dir_28_0) true)
-+(expandtypeattribute (pdx_display_manager_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_manager_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_dir_28_0) true)
-+(expandtypeattribute (performanced_28_0) true)
-+(expandtypeattribute (performanced_exec_28_0) true)
-+(expandtypeattribute (perfprofd_28_0) true)
-+(expandtypeattribute (perfprofd_data_file_28_0) true)
-+(expandtypeattribute (perfprofd_exec_28_0) true)
-+(expandtypeattribute (perfprofd_service_28_0) true)
-+(expandtypeattribute (permission_service_28_0) true)
-+(expandtypeattribute (persist_debug_prop_28_0) true)
-+(expandtypeattribute (persistent_data_block_service_28_0) true)
-+(expandtypeattribute (persistent_properties_ready_prop_28_0) true)
-+(expandtypeattribute (pinner_service_28_0) true)
-+(expandtypeattribute (pipefs_28_0) true)
-+(expandtypeattribute (platform_app_28_0) true)
-+(expandtypeattribute (pm_prop_28_0) true)
-+(expandtypeattribute (pmsg_device_28_0) true)
-+(expandtypeattribute (port_28_0) true)
-+(expandtypeattribute (port_device_28_0) true)
-+(expandtypeattribute (postinstall_28_0) true)
-+(expandtypeattribute (postinstall_dexopt_28_0) true)
-+(expandtypeattribute (postinstall_file_28_0) true)
-+(expandtypeattribute (postinstall_mnt_dir_28_0) true)
-+(expandtypeattribute (powerctl_prop_28_0) true)
-+(expandtypeattribute (power_service_28_0) true)
-+(expandtypeattribute (ppp_28_0) true)
-+(expandtypeattribute (ppp_device_28_0) true)
-+(expandtypeattribute (ppp_exec_28_0) true)
-+(expandtypeattribute (preloads_data_file_28_0) true)
-+(expandtypeattribute (preloads_media_file_28_0) true)
-+(expandtypeattribute (preopt2cachename_28_0) true)
-+(expandtypeattribute (preopt2cachename_exec_28_0) true)
-+(expandtypeattribute (print_service_28_0) true)
-+(expandtypeattribute (priv_app_28_0) true)
-+(expandtypeattribute (proc_28_0) true)
-+(expandtypeattribute (proc_abi_28_0) true)
-+(expandtypeattribute (proc_asound_28_0) true)
-+(expandtypeattribute (proc_bluetooth_writable_28_0) true)
-+(expandtypeattribute (proc_buddyinfo_28_0) true)
-+(expandtypeattribute (proc_cmdline_28_0) true)
-+(expandtypeattribute (proc_cpuinfo_28_0) true)
-+(expandtypeattribute (proc_dirty_28_0) true)
-+(expandtypeattribute (proc_diskstats_28_0) true)
-+(expandtypeattribute (proc_drop_caches_28_0) true)
-+(expandtypeattribute (processinfo_service_28_0) true)
-+(expandtypeattribute (proc_extra_free_kbytes_28_0) true)
-+(expandtypeattribute (proc_filesystems_28_0) true)
-+(expandtypeattribute (proc_hostname_28_0) true)
-+(expandtypeattribute (proc_hung_task_28_0) true)
-+(expandtypeattribute (proc_interrupts_28_0) true)
-+(expandtypeattribute (proc_iomem_28_0) true)
-+(expandtypeattribute (proc_kmsg_28_0) true)
-+(expandtypeattribute (proc_loadavg_28_0) true)
-+(expandtypeattribute (proc_max_map_count_28_0) true)
-+(expandtypeattribute (proc_meminfo_28_0) true)
-+(expandtypeattribute (proc_min_free_order_shift_28_0) true)
-+(expandtypeattribute (proc_misc_28_0) true)
-+(expandtypeattribute (proc_modules_28_0) true)
-+(expandtypeattribute (proc_mounts_28_0) true)
-+(expandtypeattribute (proc_net_28_0) true)
-+(expandtypeattribute (proc_overcommit_memory_28_0) true)
-+(expandtypeattribute (proc_page_cluster_28_0) true)
-+(expandtypeattribute (proc_pagetypeinfo_28_0) true)
-+(expandtypeattribute (proc_panic_28_0) true)
-+(expandtypeattribute (proc_perf_28_0) true)
-+(expandtypeattribute (proc_pid_max_28_0) true)
-+(expandtypeattribute (proc_pipe_conf_28_0) true)
-+(expandtypeattribute (proc_qtaguid_stat_28_0) true)
-+(expandtypeattribute (proc_random_28_0) true)
-+(expandtypeattribute (proc_sched_28_0) true)
-+(expandtypeattribute (proc_security_28_0) true)
-+(expandtypeattribute (proc_stat_28_0) true)
-+(expandtypeattribute (procstats_service_28_0) true)
-+(expandtypeattribute (proc_swaps_28_0) true)
-+(expandtypeattribute (proc_sysrq_28_0) true)
-+(expandtypeattribute (proc_timer_28_0) true)
-+(expandtypeattribute (proc_tty_drivers_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_active_time_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_policy_time_28_0) true)
-+(expandtypeattribute (proc_uid_cpupower_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_removeuid_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_showstat_28_0) true)
-+(expandtypeattribute (proc_uid_io_stats_28_0) true)
-+(expandtypeattribute (proc_uid_procstat_set_28_0) true)
-+(expandtypeattribute (proc_uid_time_in_state_28_0) true)
-+(expandtypeattribute (proc_uptime_28_0) true)
-+(expandtypeattribute (proc_version_28_0) true)
-+(expandtypeattribute (proc_vmallocinfo_28_0) true)
-+(expandtypeattribute (proc_vmstat_28_0) true)
-+(expandtypeattribute (proc_zoneinfo_28_0) true)
-+(expandtypeattribute (profman_28_0) true)
-+(expandtypeattribute (profman_dump_data_file_28_0) true)
-+(expandtypeattribute (profman_exec_28_0) true)
-+(expandtypeattribute (properties_device_28_0) true)
-+(expandtypeattribute (properties_serial_28_0) true)
-+(expandtypeattribute (property_contexts_file_28_0) true)
-+(expandtypeattribute (property_data_file_28_0) true)
-+(expandtypeattribute (property_info_28_0) true)
-+(expandtypeattribute (property_socket_28_0) true)
-+(expandtypeattribute (pstorefs_28_0) true)
-+(expandtypeattribute (ptmx_device_28_0) true)
-+(expandtypeattribute (qtaguid_device_28_0) true)
-+(expandtypeattribute (qtaguid_proc_28_0) true)
-+(expandtypeattribute (racoon_28_0) true)
-+(expandtypeattribute (racoon_exec_28_0) true)
-+(expandtypeattribute (racoon_socket_28_0) true)
-+(expandtypeattribute (radio_28_0) true)
-+(expandtypeattribute (radio_data_file_28_0) true)
-+(expandtypeattribute (radio_device_28_0) true)
-+(expandtypeattribute (radio_prop_28_0) true)
-+(expandtypeattribute (radio_service_28_0) true)
-+(expandtypeattribute (ram_device_28_0) true)
-+(expandtypeattribute (random_device_28_0) true)
-+(expandtypeattribute (recovery_28_0) true)
-+(expandtypeattribute (recovery_block_device_28_0) true)
-+(expandtypeattribute (recovery_data_file_28_0) true)
-+(expandtypeattribute (recovery_persist_28_0) true)
-+(expandtypeattribute (recovery_persist_exec_28_0) true)
-+(expandtypeattribute (recovery_refresh_28_0) true)
-+(expandtypeattribute (recovery_refresh_exec_28_0) true)
-+(expandtypeattribute (recovery_service_28_0) true)
-+(expandtypeattribute (registry_service_28_0) true)
-+(expandtypeattribute (resourcecache_data_file_28_0) true)
-+(expandtypeattribute (restorecon_prop_28_0) true)
-+(expandtypeattribute (restrictions_service_28_0) true)
-+(expandtypeattribute (rild_debug_socket_28_0) true)
-+(expandtypeattribute (rild_socket_28_0) true)
-+(expandtypeattribute (ringtone_file_28_0) true)
-+(expandtypeattribute (root_block_device_28_0) true)
-+(expandtypeattribute (rootfs_28_0) true)
-+(expandtypeattribute (rpmsg_device_28_0) true)
-+(expandtypeattribute (rtc_device_28_0) true)
-+(expandtypeattribute (rttmanager_service_28_0) true)
-+(expandtypeattribute (runas_28_0) true)
-+(expandtypeattribute (runas_exec_28_0) true)
-+(expandtypeattribute (runtime_event_log_tags_file_28_0) true)
-+(expandtypeattribute (safemode_prop_28_0) true)
-+(expandtypeattribute (same_process_hal_file_28_0) true)
-+(expandtypeattribute (samplingprofiler_service_28_0) true)
-+(expandtypeattribute (scheduling_policy_service_28_0) true)
-+(expandtypeattribute (sdcardd_28_0) true)
-+(expandtypeattribute (sdcardd_exec_28_0) true)
-+(expandtypeattribute (sdcardfs_28_0) true)
-+(expandtypeattribute (seapp_contexts_file_28_0) true)
-+(expandtypeattribute (search_service_28_0) true)
-+(expandtypeattribute (sec_key_att_app_id_provider_service_28_0) true)
-+(expandtypeattribute (secure_element_28_0) true)
-+(expandtypeattribute (secure_element_device_28_0) true)
-+(expandtypeattribute (secure_element_service_28_0) true)
-+(expandtypeattribute (selinuxfs_28_0) true)
-+(expandtypeattribute (sensors_device_28_0) true)
-+(expandtypeattribute (sensorservice_service_28_0) true)
-+(expandtypeattribute (sepolicy_file_28_0) true)
-+(expandtypeattribute (serial_device_28_0) true)
-+(expandtypeattribute (serialno_prop_28_0) true)
-+(expandtypeattribute (serial_service_28_0) true)
-+(expandtypeattribute (service_contexts_file_28_0) true)
-+(expandtypeattribute (servicediscovery_service_28_0) true)
-+(expandtypeattribute (servicemanager_28_0) true)
-+(expandtypeattribute (servicemanager_exec_28_0) true)
-+(expandtypeattribute (settings_service_28_0) true)
-+(expandtypeattribute (sgdisk_28_0) true)
-+(expandtypeattribute (sgdisk_exec_28_0) true)
-+(expandtypeattribute (shared_relro_28_0) true)
-+(expandtypeattribute (shared_relro_file_28_0) true)
-+(expandtypeattribute (shell_28_0) true)
-+(expandtypeattribute (shell_data_file_28_0) true)
-+(expandtypeattribute (shell_exec_28_0) true)
-+(expandtypeattribute (shell_prop_28_0) true)
-+(expandtypeattribute (shm_28_0) true)
-+(expandtypeattribute (shortcut_manager_icons_28_0) true)
-+(expandtypeattribute (shortcut_service_28_0) true)
-+(expandtypeattribute (slice_service_28_0) true)
-+(expandtypeattribute (slideshow_28_0) true)
-+(expandtypeattribute (socket_device_28_0) true)
-+(expandtypeattribute (sockfs_28_0) true)
-+(expandtypeattribute (statusbar_service_28_0) true)
-+(expandtypeattribute (storaged_service_28_0) true)
-+(expandtypeattribute (storage_file_28_0) true)
-+(expandtypeattribute (storagestats_service_28_0) true)
-+(expandtypeattribute (storage_stub_file_28_0) true)
-+(expandtypeattribute (su_28_0) true)
-+(expandtypeattribute (su_exec_28_0) true)
-+(expandtypeattribute (surfaceflinger_28_0) true)
-+(expandtypeattribute (surfaceflinger_service_28_0) true)
-+(expandtypeattribute (swap_block_device_28_0) true)
-+(expandtypeattribute (sysfs_28_0) true)
-+(expandtypeattribute (sysfs_android_usb_28_0) true)
-+(expandtypeattribute (sysfs_batteryinfo_28_0) true)
-+(expandtypeattribute (sysfs_bluetooth_writable_28_0) true)
-+(expandtypeattribute (sysfs_devices_system_cpu_28_0) true)
-+(expandtypeattribute (sysfs_dm_28_0) true)
-+(expandtypeattribute (sysfs_dt_firmware_android_28_0) true)
-+(expandtypeattribute (sysfs_fs_ext4_features_28_0) true)
-+(expandtypeattribute (sysfs_hwrandom_28_0) true)
-+(expandtypeattribute (sysfs_ipv4_28_0) true)
-+(expandtypeattribute (sysfs_kernel_notes_28_0) true)
-+(expandtypeattribute (sysfs_leds_28_0) true)
-+(expandtypeattribute (sysfs_lowmemorykiller_28_0) true)
-+(expandtypeattribute (sysfs_mac_address_28_0) true)
-+(expandtypeattribute (sysfs_net_28_0) true)
-+(expandtypeattribute (sysfs_nfc_power_writable_28_0) true)
-+(expandtypeattribute (sysfs_power_28_0) true)
-+(expandtypeattribute (sysfs_rtc_28_0) true)
-+(expandtypeattribute (sysfs_switch_28_0) true)
-+(expandtypeattribute (sysfs_thermal_28_0) true)
-+(expandtypeattribute (sysfs_uio_28_0) true)
-+(expandtypeattribute (sysfs_usb_28_0) true)
-+(expandtypeattribute (sysfs_usermodehelper_28_0) true)
-+(expandtypeattribute (sysfs_vibrator_28_0) true)
-+(expandtypeattribute (sysfs_wake_lock_28_0) true)
-+(expandtypeattribute (sysfs_wakeup_reasons_28_0) true)
-+(expandtypeattribute (sysfs_wlan_fwpath_28_0) true)
-+(expandtypeattribute (sysfs_zram_28_0) true)
-+(expandtypeattribute (sysfs_zram_uevent_28_0) true)
-+(expandtypeattribute (system_app_28_0) true)
-+(expandtypeattribute (system_app_data_file_28_0) true)
-+(expandtypeattribute (system_app_service_28_0) true)
-+(expandtypeattribute (system_block_device_28_0) true)
-+(expandtypeattribute (system_boot_reason_prop_28_0) true)
-+(expandtypeattribute (system_data_file_28_0) true)
-+(expandtypeattribute (system_file_28_0) true)
-+(expandtypeattribute (systemkeys_data_file_28_0) true)
-+(expandtypeattribute (system_ndebug_socket_28_0) true)
-+(expandtypeattribute (system_net_netd_hwservice_28_0) true)
-+(expandtypeattribute (system_prop_28_0) true)
-+(expandtypeattribute (system_radio_prop_28_0) true)
-+(expandtypeattribute (system_server_28_0) true)
-+(expandtypeattribute (system_update_service_28_0) true)
-+(expandtypeattribute (system_wifi_keystore_hwservice_28_0) true)
-+(expandtypeattribute (system_wpa_socket_28_0) true)
-+(expandtypeattribute (task_service_28_0) true)
-+(expandtypeattribute (tee_28_0) true)
-+(expandtypeattribute (tee_data_file_28_0) true)
-+(expandtypeattribute (tee_device_28_0) true)
-+(expandtypeattribute (telecom_service_28_0) true)
-+(expandtypeattribute (test_boot_reason_prop_28_0) true)
-+(expandtypeattribute (textclassification_service_28_0) true)
-+(expandtypeattribute (textclassifier_data_file_28_0) true)
-+(expandtypeattribute (textservices_service_28_0) true)
-+(expandtypeattribute (thermalcallback_hwservice_28_0) true)
-+(expandtypeattribute (thermal_service_28_0) true)
-+(expandtypeattribute (timezone_service_28_0) true)
-+(expandtypeattribute (tmpfs_28_0) true)
-+(expandtypeattribute (tombstoned_28_0) true)
-+(expandtypeattribute (tombstone_data_file_28_0) true)
-+(expandtypeattribute (tombstoned_crash_socket_28_0) true)
-+(expandtypeattribute (tombstoned_exec_28_0) true)
-+(expandtypeattribute (tombstoned_intercept_socket_28_0) true)
-+(expandtypeattribute (tombstoned_java_trace_socket_28_0) true)
-+(expandtypeattribute (tombstone_wifi_data_file_28_0) true)
-+(expandtypeattribute (toolbox_28_0) true)
-+(expandtypeattribute (toolbox_exec_28_0) true)
-+(expandtypeattribute (trace_data_file_28_0) true)
-+(expandtypeattribute (traced_consumer_socket_28_0) true)
-+(expandtypeattribute (traced_enabled_prop_28_0) true)
-+(expandtypeattribute (traced_probes_28_0) true)
-+(expandtypeattribute (traced_producer_socket_28_0) true)
-+(expandtypeattribute (traceur_app_28_0) true)
-+(expandtypeattribute (trust_service_28_0) true)
-+(expandtypeattribute (tty_device_28_0) true)
-+(expandtypeattribute (tun_device_28_0) true)
-+(expandtypeattribute (tv_input_service_28_0) true)
-+(expandtypeattribute (tzdatacheck_28_0) true)
-+(expandtypeattribute (tzdatacheck_exec_28_0) true)
-+(expandtypeattribute (ueventd_28_0) true)
-+(expandtypeattribute (uhid_device_28_0) true)
-+(expandtypeattribute (uimode_service_28_0) true)
-+(expandtypeattribute (uio_device_28_0) true)
-+(expandtypeattribute (uncrypt_28_0) true)
-+(expandtypeattribute (uncrypt_exec_28_0) true)
-+(expandtypeattribute (uncrypt_socket_28_0) true)
-+(expandtypeattribute (unencrypted_data_file_28_0) true)
-+(expandtypeattribute (unlabeled_28_0) true)
-+(expandtypeattribute (untrusted_app_25_28_0) true)
-+(expandtypeattribute (untrusted_app_27_28_0) true)
-+(expandtypeattribute (untrusted_app_28_0) true)
-+(expandtypeattribute (untrusted_v2_app_28_0) true)
-+(expandtypeattribute (update_engine_28_0) true)
-+(expandtypeattribute (update_engine_data_file_28_0) true)
-+(expandtypeattribute (update_engine_exec_28_0) true)
-+(expandtypeattribute (update_engine_log_data_file_28_0) true)
-+(expandtypeattribute (update_engine_service_28_0) true)
-+(expandtypeattribute (updatelock_service_28_0) true)
-+(expandtypeattribute (update_verifier_28_0) true)
-+(expandtypeattribute (update_verifier_exec_28_0) true)
-+(expandtypeattribute (usagestats_service_28_0) true)
-+(expandtypeattribute (usbaccessory_device_28_0) true)
-+(expandtypeattribute (usbd_28_0) true)
-+(expandtypeattribute (usb_device_28_0) true)
-+(expandtypeattribute (usbd_exec_28_0) true)
-+(expandtypeattribute (usbfs_28_0) true)
-+(expandtypeattribute (usb_service_28_0) true)
-+(expandtypeattribute (userdata_block_device_28_0) true)
-+(expandtypeattribute (usermodehelper_28_0) true)
-+(expandtypeattribute (user_profile_data_file_28_0) true)
-+(expandtypeattribute (user_service_28_0) true)
-+(expandtypeattribute (vcs_device_28_0) true)
-+(expandtypeattribute (vdc_28_0) true)
-+(expandtypeattribute (vdc_exec_28_0) true)
-+(expandtypeattribute (vendor_app_file_28_0) true)
-+(expandtypeattribute (vendor_configs_file_28_0) true)
-+(expandtypeattribute (vendor_data_file_28_0) true)
-+(expandtypeattribute (vendor_default_prop_28_0) true)
-+(expandtypeattribute (vendor_file_28_0) true)
-+(expandtypeattribute (vendor_framework_file_28_0) true)
-+(expandtypeattribute (vendor_hal_file_28_0) true)
-+(expandtypeattribute (vendor_init_28_0) true)
-+(expandtypeattribute (vendor_overlay_file_28_0) true)
-+(expandtypeattribute (vendor_security_patch_level_prop_28_0) true)
-+(expandtypeattribute (vendor_shell_28_0) true)
-+(expandtypeattribute (vendor_shell_exec_28_0) true)
-+(expandtypeattribute (vendor_toolbox_exec_28_0) true)
-+(expandtypeattribute (vfat_28_0) true)
-+(expandtypeattribute (vibrator_service_28_0) true)
-+(expandtypeattribute (video_device_28_0) true)
-+(expandtypeattribute (virtual_touchpad_28_0) true)
-+(expandtypeattribute (virtual_touchpad_exec_28_0) true)
-+(expandtypeattribute (virtual_touchpad_service_28_0) true)
-+(expandtypeattribute (vndbinder_device_28_0) true)
-+(expandtypeattribute (vndk_sp_file_28_0) true)
-+(expandtypeattribute (vndservice_contexts_file_28_0) true)
-+(expandtypeattribute (vndservicemanager_28_0) true)
-+(expandtypeattribute (voiceinteraction_service_28_0) true)
-+(expandtypeattribute (vold_28_0) true)
-+(expandtypeattribute (vold_data_file_28_0) true)
-+(expandtypeattribute (vold_device_28_0) true)
-+(expandtypeattribute (vold_exec_28_0) true)
-+(expandtypeattribute (vold_metadata_file_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_exec_28_0) true)
-+(expandtypeattribute (vold_prop_28_0) true)
-+(expandtypeattribute (vold_service_28_0) true)
-+(expandtypeattribute (vpn_data_file_28_0) true)
-+(expandtypeattribute (vr_hwc_28_0) true)
-+(expandtypeattribute (vr_hwc_exec_28_0) true)
-+(expandtypeattribute (vr_hwc_service_28_0) true)
-+(expandtypeattribute (vr_manager_service_28_0) true)
-+(expandtypeattribute (wallpaper_file_28_0) true)
-+(expandtypeattribute (wallpaper_service_28_0) true)
-+(expandtypeattribute (watchdogd_28_0) true)
-+(expandtypeattribute (watchdog_device_28_0) true)
-+(expandtypeattribute (webviewupdate_service_28_0) true)
-+(expandtypeattribute (webview_zygote_28_0) true)
-+(expandtypeattribute (webview_zygote_exec_28_0) true)
-+(expandtypeattribute (wifiaware_service_28_0) true)
-+(expandtypeattribute (wificond_28_0) true)
-+(expandtypeattribute (wificond_exec_28_0) true)
-+(expandtypeattribute (wificond_service_28_0) true)
-+(expandtypeattribute (wifi_data_file_28_0) true)
-+(expandtypeattribute (wifi_log_prop_28_0) true)
-+(expandtypeattribute (wifip2p_service_28_0) true)
-+(expandtypeattribute (wifi_prop_28_0) true)
-+(expandtypeattribute (wifiscanner_service_28_0) true)
-+(expandtypeattribute (wifi_service_28_0) true)
-+(expandtypeattribute (window_service_28_0) true)
-+(expandtypeattribute (wpantund_28_0) true)
-+(expandtypeattribute (wpantund_exec_28_0) true)
-+(expandtypeattribute (wpantund_service_28_0) true)
-+(expandtypeattribute (wpa_socket_28_0) true)
-+(expandtypeattribute (zero_device_28_0) true)
-+(expandtypeattribute (zoneinfo_data_file_28_0) true)
-+(expandtypeattribute (zygote_28_0) true)
-+(expandtypeattribute (zygote_exec_28_0) true)
-+(expandtypeattribute (zygote_socket_28_0) true)
-+(typeattributeset accessibility_service_28_0 (accessibility_service))
-+(typeattributeset account_service_28_0 (account_service))
-+(typeattributeset activity_service_28_0 (activity_service))
-+(typeattributeset adbd_28_0 (adbd))
-+(typeattributeset adb_data_file_28_0 (adb_data_file))
-+(typeattributeset adbd_exec_28_0 (adbd_exec))
-+(typeattributeset adbd_socket_28_0 (adbd_socket))
-+(typeattributeset adb_keys_file_28_0 (adb_keys_file))
-+(typeattributeset alarm_device_28_0 (alarm_device))
-+(typeattributeset alarm_service_28_0 (alarm_service))
-+(typeattributeset anr_data_file_28_0 (anr_data_file))
-+(typeattributeset apk_data_file_28_0 (apk_data_file))
-+(typeattributeset apk_private_data_file_28_0 (apk_private_data_file))
-+(typeattributeset apk_private_tmp_file_28_0 (apk_private_tmp_file))
-+(typeattributeset apk_tmp_file_28_0 (apk_tmp_file))
-+(typeattributeset app_data_file_28_0 (app_data_file privapp_data_file))
-+(typeattributeset app_fuse_file_28_0 (app_fuse_file))
-+(typeattributeset app_fusefs_28_0 (app_fusefs))
-+(typeattributeset appops_service_28_0 (appops_service))
-+(typeattributeset appwidget_service_28_0 (appwidget_service))
-+(typeattributeset asec_apk_file_28_0 (asec_apk_file))
-+(typeattributeset asec_image_file_28_0 (asec_image_file))
-+(typeattributeset asec_public_file_28_0 (asec_public_file))
-+(typeattributeset ashmem_device_28_0 (ashmem_device))
-+(typeattributeset assetatlas_service_28_0 (assetatlas_service))
-+(typeattributeset audio_data_file_28_0 (audio_data_file))
-+(typeattributeset audio_device_28_0 (audio_device))
-+(typeattributeset audiohal_data_file_28_0 (audiohal_data_file))
-+(typeattributeset audio_prop_28_0 (audio_prop))
-+(typeattributeset audio_seq_device_28_0 (audio_seq_device))
-+(typeattributeset audioserver_28_0 (audioserver))
-+(typeattributeset audioserver_data_file_28_0 (audioserver_data_file))
-+(typeattributeset audioserver_service_28_0 (audioserver_service))
-+(typeattributeset audio_service_28_0 (audio_service))
-+(typeattributeset audio_timer_device_28_0 (audio_timer_device))
-+(typeattributeset autofill_service_28_0 (autofill_service))
-+(typeattributeset backup_data_file_28_0 (backup_data_file))
-+(typeattributeset backup_service_28_0 (backup_service))
-+(typeattributeset batteryproperties_service_28_0 (batteryproperties_service))
-+(typeattributeset battery_service_28_0 (battery_service))
-+(typeattributeset batterystats_service_28_0 (batterystats_service))
-+(typeattributeset binder_calls_stats_service_28_0 (binder_calls_stats_service))
-+(typeattributeset binder_device_28_0 (binder_device))
-+(typeattributeset binfmt_miscfs_28_0 (binfmt_miscfs))
-+(typeattributeset blkid_28_0 (blkid))
-+(typeattributeset blkid_untrusted_28_0 (blkid_untrusted))
-+(typeattributeset block_device_28_0 (block_device))
-+(typeattributeset bluetooth_28_0 (bluetooth))
-+(typeattributeset bluetooth_a2dp_offload_prop_28_0 (bluetooth_a2dp_offload_prop))
-+(typeattributeset bluetooth_data_file_28_0 (bluetooth_data_file))
-+(typeattributeset bluetooth_efs_file_28_0 (bluetooth_efs_file))
-+(typeattributeset bluetooth_logs_data_file_28_0 (bluetooth_logs_data_file))
-+(typeattributeset bluetooth_manager_service_28_0 (bluetooth_manager_service))
-+(typeattributeset bluetooth_prop_28_0 (bluetooth_prop))
-+(typeattributeset bluetooth_service_28_0 (bluetooth_service))
-+(typeattributeset bluetooth_socket_28_0 (bluetooth_socket))
-+(typeattributeset bootanim_28_0 (bootanim))
-+(typeattributeset bootanim_exec_28_0 (bootanim_exec))
-+(typeattributeset boot_block_device_28_0 (boot_block_device))
-+(typeattributeset bootchart_data_file_28_0 (bootchart_data_file))
-+(typeattributeset bootloader_boot_reason_prop_28_0 (bootloader_boot_reason_prop))
-+(typeattributeset bootstat_28_0 (bootstat))
-+(typeattributeset bootstat_data_file_28_0 (bootstat_data_file))
-+(typeattributeset bootstat_exec_28_0 (bootstat_exec))
-+(typeattributeset boottime_prop_28_0 (boottime_prop))
-+(typeattributeset boottrace_data_file_28_0 (boottrace_data_file))
-+(typeattributeset broadcastradio_service_28_0 (broadcastradio_service))
-+(typeattributeset bufferhubd_28_0 (bufferhubd))
-+(typeattributeset bufferhubd_exec_28_0 (bufferhubd_exec))
-+(typeattributeset cache_backup_file_28_0 (cache_backup_file))
-+(typeattributeset cache_block_device_28_0 (cache_block_device))
-+(typeattributeset cache_file_28_0 (cache_file))
-+(typeattributeset cache_private_backup_file_28_0 (cache_private_backup_file))
-+(typeattributeset cache_recovery_file_28_0 (cache_recovery_file))
-+(typeattributeset camera_data_file_28_0 (camera_data_file))
-+(typeattributeset camera_device_28_0 (camera_device))
-+(typeattributeset cameraproxy_service_28_0 (cameraproxy_service))
-+(typeattributeset cameraserver_28_0 (cameraserver))
-+(typeattributeset cameraserver_exec_28_0 (cameraserver_exec))
-+(typeattributeset cameraserver_service_28_0 (cameraserver_service))
-+(typeattributeset cgroup_28_0 (cgroup))
-+(typeattributeset cgroup_bpf_28_0 (cgroup_bpf))
-+(typeattributeset charger_28_0 (charger))
-+(typeattributeset clatd_28_0 (clatd))
-+(typeattributeset clatd_exec_28_0 (clatd_exec))
-+(typeattributeset clipboard_service_28_0 (clipboard_service))
-+(typeattributeset commontime_management_service_28_0 (commontime_management_service))
-+(typeattributeset companion_device_service_28_0 (companion_device_service))
-+(typeattributeset configfs_28_0 (configfs))
-+(typeattributeset config_prop_28_0 (config_prop))
-+(typeattributeset connectivity_service_28_0 (connectivity_service))
-+(typeattributeset connmetrics_service_28_0 (connmetrics_service))
-+(typeattributeset console_device_28_0 (console_device))
-+(typeattributeset consumer_ir_service_28_0 (consumer_ir_service))
-+(typeattributeset content_service_28_0 (content_service))
-+(typeattributeset contexthub_service_28_0 (contexthub_service))
-+(typeattributeset coredump_file_28_0 (coredump_file))
-+(typeattributeset country_detector_service_28_0 (country_detector_service))
-+(typeattributeset coverage_service_28_0 (coverage_service))
-+(typeattributeset cppreopt_prop_28_0 (cppreopt_prop))
-+(typeattributeset cppreopts_28_0 (cppreopts))
-+(typeattributeset cppreopts_exec_28_0 (cppreopts_exec))
-+(typeattributeset cpuctl_device_28_0 (cpuctl_device))
-+(typeattributeset cpuinfo_service_28_0 (cpuinfo_service))
-+(typeattributeset crash_dump_28_0 (crash_dump))
-+(typeattributeset crash_dump_exec_28_0 (crash_dump_exec))
-+(typeattributeset crossprofileapps_service_28_0 (crossprofileapps_service))
-+(typeattributeset ctl_bootanim_prop_28_0 (ctl_bootanim_prop))
-+(typeattributeset ctl_bugreport_prop_28_0 (ctl_bugreport_prop))
-+(typeattributeset ctl_console_prop_28_0 (ctl_console_prop))
-+(typeattributeset ctl_default_prop_28_0
-+  ( ctl_adbd_prop
-+    ctl_default_prop))
-+(typeattributeset ctl_dumpstate_prop_28_0 (ctl_dumpstate_prop))
-+(typeattributeset ctl_fuse_prop_28_0 (ctl_fuse_prop))
-+(typeattributeset ctl_interface_restart_prop_28_0 (ctl_interface_restart_prop))
-+(typeattributeset ctl_interface_start_prop_28_0 (ctl_interface_start_prop))
-+(typeattributeset ctl_interface_stop_prop_28_0 (ctl_interface_stop_prop))
-+(typeattributeset ctl_mdnsd_prop_28_0 (ctl_mdnsd_prop))
-+(typeattributeset ctl_restart_prop_28_0 (ctl_restart_prop))
-+(typeattributeset ctl_rildaemon_prop_28_0 (ctl_rildaemon_prop))
-+(typeattributeset ctl_sigstop_prop_28_0 (ctl_sigstop_prop))
-+(typeattributeset ctl_start_prop_28_0 (ctl_start_prop))
-+(typeattributeset ctl_stop_prop_28_0 (ctl_stop_prop))
-+(typeattributeset dalvikcache_data_file_28_0 (dalvikcache_data_file))
-+(typeattributeset dalvik_prop_28_0 (dalvik_prop))
-+(typeattributeset dbinfo_service_28_0 (dbinfo_service))
-+(typeattributeset debugfs_28_0 (debugfs))
-+(typeattributeset debugfs_mmc_28_0 (debugfs_mmc))
-+(typeattributeset debugfs_trace_marker_28_0 (debugfs_trace_marker))
-+(typeattributeset debugfs_tracing_28_0 (debugfs_tracing))
-+(typeattributeset debugfs_tracing_debug_28_0 (debugfs_tracing_debug))
-+(typeattributeset debugfs_tracing_instances_28_0 (debugfs_tracing_instances))
-+(typeattributeset debugfs_wakeup_sources_28_0 (debugfs_wakeup_sources))
-+(typeattributeset debugfs_wifi_tracing_28_0 (debugfs_wifi_tracing))
-+(typeattributeset debuggerd_prop_28_0 (debuggerd_prop))
-+(typeattributeset debug_prop_28_0 (debug_prop))
-+(typeattributeset default_android_hwservice_28_0 (default_android_hwservice))
-+(typeattributeset default_android_service_28_0 (default_android_service))
-+(typeattributeset default_android_vndservice_28_0 (default_android_vndservice))
-+(typeattributeset default_prop_28_0 (default_prop))
-+(typeattributeset device_28_0 (device))
-+(typeattributeset device_identifiers_service_28_0 (device_identifiers_service))
-+(typeattributeset deviceidle_service_28_0 (deviceidle_service))
-+(typeattributeset device_logging_prop_28_0 (device_logging_prop))
-+(typeattributeset device_policy_service_28_0 (device_policy_service))
-+(typeattributeset devicestoragemonitor_service_28_0 (devicestoragemonitor_service))
-+(typeattributeset devpts_28_0 (devpts))
-+(typeattributeset dex2oat_28_0 (dex2oat))
-+(typeattributeset dex2oat_exec_28_0 (dex2oat_exec))
-+(typeattributeset dhcp_28_0 (dhcp))
-+(typeattributeset dhcp_data_file_28_0 (dhcp_data_file))
-+(typeattributeset dhcp_exec_28_0 (dhcp_exec))
-+(typeattributeset dhcp_prop_28_0 (dhcp_prop))
-+(typeattributeset diskstats_service_28_0 (diskstats_service))
-+(typeattributeset display_service_28_0 (display_service))
-+(typeattributeset dm_device_28_0 (dm_device))
-+(typeattributeset dnsmasq_28_0 (dnsmasq))
-+(typeattributeset dnsmasq_exec_28_0 (dnsmasq_exec))
-+(typeattributeset dnsproxyd_socket_28_0 (dnsproxyd_socket))
-+(typeattributeset DockObserver_service_28_0 (DockObserver_service))
-+(typeattributeset dreams_service_28_0 (dreams_service))
-+(typeattributeset drm_data_file_28_0 (drm_data_file))
-+(typeattributeset drmserver_28_0 (drmserver))
-+(typeattributeset drmserver_exec_28_0 (drmserver_exec))
-+(typeattributeset drmserver_service_28_0 (drmserver_service))
-+(typeattributeset drmserver_socket_28_0 (drmserver_socket))
-+(typeattributeset dropbox_service_28_0 (dropbox_service))
-+(typeattributeset dumpstate_28_0 (dumpstate))
-+(typeattributeset dumpstate_exec_28_0 (dumpstate_exec))
-+(typeattributeset dumpstate_options_prop_28_0 (dumpstate_options_prop))
-+(typeattributeset dumpstate_prop_28_0 (dumpstate_prop))
-+(typeattributeset dumpstate_service_28_0 (dumpstate_service))
-+(typeattributeset dumpstate_socket_28_0 (dumpstate_socket))
-+(typeattributeset e2fs_28_0 (e2fs))
-+(typeattributeset e2fs_exec_28_0 (e2fs_exec))
-+(typeattributeset efs_file_28_0 (efs_file))
-+(typeattributeset ephemeral_app_28_0 (ephemeral_app))
-+(typeattributeset ethernet_service_28_0 (ethernet_service))
-+(typeattributeset exfat_28_0 (exfat))
-+(typeattributeset exported2_config_prop_28_0 (exported2_config_prop))
-+(typeattributeset exported2_default_prop_28_0 (exported2_default_prop))
-+(typeattributeset exported2_radio_prop_28_0 (exported2_radio_prop))
-+(typeattributeset exported2_system_prop_28_0 (exported2_system_prop))
-+(typeattributeset exported2_vold_prop_28_0 (exported2_vold_prop))
-+(typeattributeset exported3_default_prop_28_0 (exported3_default_prop))
-+(typeattributeset exported3_radio_prop_28_0 (exported3_radio_prop))
-+(typeattributeset exported3_system_prop_28_0 (exported3_system_prop))
-+(typeattributeset exported_audio_prop_28_0 (exported_audio_prop))
-+(typeattributeset exported_bluetooth_prop_28_0 (exported_bluetooth_prop))
-+(typeattributeset exported_config_prop_28_0 (exported_config_prop))
-+(typeattributeset exported_dalvik_prop_28_0 (exported_dalvik_prop))
-+(typeattributeset exported_default_prop_28_0 (exported_default_prop))
-+(typeattributeset exported_dumpstate_prop_28_0 (exported_dumpstate_prop))
-+(typeattributeset exported_ffs_prop_28_0 (exported_ffs_prop))
-+(typeattributeset exported_fingerprint_prop_28_0 (exported_fingerprint_prop))
-+(typeattributeset exported_overlay_prop_28_0 (exported_overlay_prop))
-+(typeattributeset exported_pm_prop_28_0 (exported_pm_prop))
-+(typeattributeset exported_radio_prop_28_0 (exported_radio_prop))
-+(typeattributeset exported_secure_prop_28_0 (exported_secure_prop))
-+(typeattributeset exported_system_prop_28_0 (exported_system_prop))
-+(typeattributeset exported_system_radio_prop_28_0 (exported_system_radio_prop))
-+(typeattributeset exported_vold_prop_28_0 (exported_vold_prop))
-+(typeattributeset exported_wifi_prop_28_0 (exported_wifi_prop))
-+(typeattributeset ffs_prop_28_0 (ffs_prop))
-+(typeattributeset file_contexts_file_28_0 (file_contexts_file))
-+(typeattributeset fingerprintd_28_0 (fingerprintd))
-+(typeattributeset fingerprintd_data_file_28_0 (fingerprintd_data_file))
-+(typeattributeset fingerprintd_exec_28_0 (fingerprintd_exec))
-+(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
-+(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
-+(typeattributeset fingerprint_service_28_0 (fingerprint_service))
-+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
-+(typeattributeset firstboot_prop_28_0 (firstboot_prop))
-+(typeattributeset font_service_28_0 (font_service))
-+(typeattributeset frp_block_device_28_0 (frp_block_device))
-+(typeattributeset fs_bpf_28_0 (fs_bpf))
-+(typeattributeset fsck_28_0 (fsck))
-+(typeattributeset fsck_exec_28_0 (fsck_exec))
-+(typeattributeset fscklogs_28_0 (fscklogs))
-+(typeattributeset fsck_untrusted_28_0 (fsck_untrusted))
-+(typeattributeset full_device_28_0 (full_device))
-+(typeattributeset functionfs_28_0 (functionfs))
-+(typeattributeset fuse_28_0 (fuse))
-+(typeattributeset fuse_device_28_0 (fuse_device))
-+(typeattributeset fwk_display_hwservice_28_0 (fwk_display_hwservice))
-+(typeattributeset fwk_scheduler_hwservice_28_0 (fwk_scheduler_hwservice))
-+(typeattributeset fwk_sensor_hwservice_28_0 (fwk_sensor_hwservice))
-+(typeattributeset fwmarkd_socket_28_0 (fwmarkd_socket))
-+(typeattributeset gatekeeperd_28_0 (gatekeeperd))
-+(typeattributeset gatekeeper_data_file_28_0 (gatekeeper_data_file))
-+(typeattributeset gatekeeperd_exec_28_0 (gatekeeperd_exec))
-+(typeattributeset gatekeeper_service_28_0 (gatekeeper_service))
-+(typeattributeset gfxinfo_service_28_0 (gfxinfo_service))
-+(typeattributeset gps_control_28_0 (gps_control))
-+(typeattributeset gpu_device_28_0 (gpu_device))
-+(typeattributeset gpu_service_28_0 (gpu_service))
-+(typeattributeset graphics_device_28_0 (graphics_device))
-+(typeattributeset graphicsstats_service_28_0 (graphicsstats_service))
-+(typeattributeset hal_audiocontrol_hwservice_28_0 (hal_audiocontrol_hwservice))
-+(typeattributeset hal_audio_hwservice_28_0 (hal_audio_hwservice))
-+(typeattributeset hal_authsecret_hwservice_28_0 (hal_authsecret_hwservice))
-+(typeattributeset hal_bluetooth_hwservice_28_0 (hal_bluetooth_hwservice))
-+(typeattributeset hal_bootctl_hwservice_28_0 (hal_bootctl_hwservice))
-+(typeattributeset hal_broadcastradio_hwservice_28_0 (hal_broadcastradio_hwservice))
-+(typeattributeset hal_camera_hwservice_28_0 (hal_camera_hwservice))
-+(typeattributeset hal_cas_hwservice_28_0 (hal_cas_hwservice))
-+(typeattributeset hal_codec2_hwservice_28_0 (hal_codec2_hwservice))
-+(typeattributeset hal_configstore_ISurfaceFlingerConfigs_28_0 (hal_configstore_ISurfaceFlingerConfigs))
-+(typeattributeset hal_confirmationui_hwservice_28_0 (hal_confirmationui_hwservice))
-+(typeattributeset hal_contexthub_hwservice_28_0 (hal_contexthub_hwservice))
-+(typeattributeset hal_drm_hwservice_28_0 (hal_drm_hwservice))
-+(typeattributeset hal_dumpstate_hwservice_28_0 (hal_dumpstate_hwservice))
-+(typeattributeset hal_evs_hwservice_28_0 (hal_evs_hwservice))
-+(typeattributeset hal_fingerprint_hwservice_28_0 (hal_fingerprint_hwservice))
-+(typeattributeset hal_fingerprint_service_28_0 (hal_fingerprint_service))
-+(typeattributeset hal_gatekeeper_hwservice_28_0 (hal_gatekeeper_hwservice))
-+(typeattributeset hal_gnss_hwservice_28_0 (hal_gnss_hwservice))
-+(typeattributeset hal_graphics_allocator_hwservice_28_0 (hal_graphics_allocator_hwservice))
-+(typeattributeset hal_graphics_composer_hwservice_28_0 (hal_graphics_composer_hwservice))
-+(typeattributeset hal_graphics_mapper_hwservice_28_0 (hal_graphics_mapper_hwservice))
-+(typeattributeset hal_health_hwservice_28_0 (hal_health_hwservice))
-+(typeattributeset hal_ir_hwservice_28_0 (hal_ir_hwservice))
-+(typeattributeset hal_keymaster_hwservice_28_0 (hal_keymaster_hwservice))
-+(typeattributeset hal_light_hwservice_28_0 (hal_light_hwservice))
-+(typeattributeset hal_lowpan_hwservice_28_0 (hal_lowpan_hwservice))
-+(typeattributeset hal_memtrack_hwservice_28_0 (hal_memtrack_hwservice))
-+(typeattributeset hal_neuralnetworks_hwservice_28_0 (hal_neuralnetworks_hwservice))
-+(typeattributeset hal_nfc_hwservice_28_0 (hal_nfc_hwservice))
-+(typeattributeset hal_oemlock_hwservice_28_0 (hal_oemlock_hwservice))
-+(typeattributeset hal_omx_hwservice_28_0 (hal_omx_hwservice))
-+(typeattributeset hal_power_hwservice_28_0 (hal_power_hwservice))
-+(typeattributeset hal_renderscript_hwservice_28_0 (hal_renderscript_hwservice))
-+(typeattributeset hal_secure_element_hwservice_28_0 (hal_secure_element_hwservice))
-+(typeattributeset hal_sensors_hwservice_28_0 (hal_sensors_hwservice))
-+(typeattributeset hal_telephony_hwservice_28_0 (hal_telephony_hwservice))
-+(typeattributeset hal_tetheroffload_hwservice_28_0 (hal_tetheroffload_hwservice))
-+(typeattributeset hal_thermal_hwservice_28_0 (hal_thermal_hwservice))
-+(typeattributeset hal_tv_cec_hwservice_28_0 (hal_tv_cec_hwservice))
-+(typeattributeset hal_tv_input_hwservice_28_0 (hal_tv_input_hwservice))
-+(typeattributeset hal_usb_gadget_hwservice_28_0 (hal_usb_gadget_hwservice))
-+(typeattributeset hal_usb_hwservice_28_0 (hal_usb_hwservice))
-+(typeattributeset hal_vehicle_hwservice_28_0 (hal_vehicle_hwservice))
-+(typeattributeset hal_vibrator_hwservice_28_0 (hal_vibrator_hwservice))
-+(typeattributeset hal_vr_hwservice_28_0 (hal_vr_hwservice))
-+(typeattributeset hal_weaver_hwservice_28_0 (hal_weaver_hwservice))
-+(typeattributeset hal_wifi_hostapd_hwservice_28_0 (hal_wifi_hostapd_hwservice))
-+(typeattributeset hal_wifi_hwservice_28_0 (hal_wifi_hwservice))
-+(typeattributeset hal_wifi_offload_hwservice_28_0 (hal_wifi_offload_hwservice))
-+(typeattributeset hal_wifi_supplicant_hwservice_28_0 (hal_wifi_supplicant_hwservice))
-+(typeattributeset hardware_properties_service_28_0 (hardware_properties_service))
-+(typeattributeset hardware_service_28_0 (hardware_service))
-+(typeattributeset hci_attach_dev_28_0 (hci_attach_dev))
-+(typeattributeset hdmi_control_service_28_0 (hdmi_control_service))
-+(typeattributeset healthd_28_0 (healthd))
-+(typeattributeset healthd_exec_28_0 (healthd_exec))
-+(typeattributeset heapdump_data_file_28_0 (heapdump_data_file))
-+(typeattributeset hidl_allocator_hwservice_28_0 (hidl_allocator_hwservice))
-+(typeattributeset hidl_base_hwservice_28_0 (hidl_base_hwservice))
-+(typeattributeset hidl_manager_hwservice_28_0 (hidl_manager_hwservice))
-+(typeattributeset hidl_memory_hwservice_28_0 (hidl_memory_hwservice))
-+(typeattributeset hidl_token_hwservice_28_0 (hidl_token_hwservice))
-+(typeattributeset hwbinder_device_28_0 (hwbinder_device))
-+(typeattributeset hw_random_device_28_0 (hw_random_device))
-+(typeattributeset hwservice_contexts_file_28_0 (hwservice_contexts_file))
-+(typeattributeset hwservicemanager_28_0 (hwservicemanager))
-+(typeattributeset hwservicemanager_exec_28_0 (hwservicemanager_exec))
-+(typeattributeset hwservicemanager_prop_28_0 (hwservicemanager_prop))
-+(typeattributeset i2c_device_28_0 (i2c_device))
-+(typeattributeset icon_file_28_0 (icon_file))
-+(typeattributeset idmap_28_0 (idmap))
-+(typeattributeset idmap_exec_28_0 (idmap_exec))
-+(typeattributeset iio_device_28_0 (iio_device))
-+(typeattributeset imms_service_28_0 (imms_service))
-+(typeattributeset incident_28_0 (incident))
-+(typeattributeset incidentd_28_0 (incidentd))
-+(typeattributeset incident_data_file_28_0 (incident_data_file))
-+(typeattributeset incident_helper_28_0 (incident_helper))
-+(typeattributeset incident_service_28_0 (incident_service))
-+(typeattributeset init_28_0 (init))
-+(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
-+(typeattributeset inotify_28_0 (inotify))
-+(typeattributeset input_device_28_0 (input_device))
-+(typeattributeset inputflinger_28_0 (inputflinger))
-+(typeattributeset inputflinger_exec_28_0 (inputflinger_exec))
-+(typeattributeset inputflinger_service_28_0 (inputflinger_service))
-+(typeattributeset input_method_service_28_0 (input_method_service))
-+(typeattributeset input_service_28_0 (input_service))
-+(typeattributeset installd_28_0 (installd))
-+(typeattributeset install_data_file_28_0 (install_data_file))
-+(typeattributeset installd_exec_28_0 (installd_exec))
-+(typeattributeset installd_service_28_0 (installd_service))
-+(typeattributeset install_recovery_28_0 (install_recovery))
-+(typeattributeset install_recovery_exec_28_0 (install_recovery_exec))
-+(typeattributeset ion_device_28_0 (ion_device))
-+(typeattributeset IProxyService_service_28_0 (IProxyService_service))
-+(typeattributeset ipsec_service_28_0 (ipsec_service))
-+(typeattributeset isolated_app_28_0 (isolated_app))
-+(typeattributeset jobscheduler_service_28_0 (jobscheduler_service))
-+(typeattributeset kernel_28_0 (kernel))
-+(typeattributeset keychain_data_file_28_0 (keychain_data_file))
-+(typeattributeset keychord_device_28_0 (keychord_device))
-+(typeattributeset keystore_28_0 (keystore))
-+(typeattributeset keystore_data_file_28_0 (keystore_data_file))
-+(typeattributeset keystore_exec_28_0 (keystore_exec))
-+(typeattributeset keystore_service_28_0 (keystore_service))
-+(typeattributeset kmem_device_28_0 (kmem_device))
-+(typeattributeset kmsg_debug_device_28_0 (kmsg_debug_device))
-+(typeattributeset kmsg_device_28_0 (kmsg_device))
-+(typeattributeset labeledfs_28_0 (labeledfs))
-+(typeattributeset last_boot_reason_prop_28_0 (last_boot_reason_prop))
-+(typeattributeset launcherapps_service_28_0 (launcherapps_service))
-+(typeattributeset lmkd_28_0 (lmkd))
-+(typeattributeset lmkd_exec_28_0 (lmkd_exec))
-+(typeattributeset lmkd_socket_28_0 (lmkd_socket))
-+(typeattributeset location_service_28_0 (location_service))
-+(typeattributeset lock_settings_service_28_0 (lock_settings_service))
-+(typeattributeset logcat_exec_28_0 (logcat_exec))
-+(typeattributeset logd_28_0 (logd))
-+(typeattributeset logd_exec_28_0 (logd_exec))
-+(typeattributeset logd_prop_28_0 (logd_prop))
-+(typeattributeset logdr_socket_28_0 (logdr_socket))
-+(typeattributeset logd_socket_28_0 (logd_socket))
-+(typeattributeset logdw_socket_28_0 (logdw_socket))
-+(typeattributeset logpersist_28_0 (logpersist))
-+(typeattributeset logpersistd_logging_prop_28_0 (logpersistd_logging_prop))
-+(typeattributeset log_prop_28_0 (log_prop))
-+(typeattributeset log_tag_prop_28_0 (log_tag_prop))
-+(typeattributeset loop_control_device_28_0 (loop_control_device))
-+(typeattributeset loop_device_28_0 (loop_device))
-+(typeattributeset lowpan_device_28_0 (lowpan_device))
-+(typeattributeset lowpan_prop_28_0 (lowpan_prop))
-+(typeattributeset lowpan_service_28_0 (lowpan_service))
-+(typeattributeset mac_perms_file_28_0 (mac_perms_file))
-+(typeattributeset mdnsd_28_0 (mdnsd))
-+(typeattributeset mdnsd_socket_28_0 (mdnsd_socket))
-+(typeattributeset mdns_socket_28_0 (mdns_socket))
-+(typeattributeset hal_omx_server (mediacodec_28_0))
-+(typeattributeset mediacodec_28_0 (mediacodec))
-+(typeattributeset mediacodec_exec_28_0 (mediacodec_exec))
-+(typeattributeset mediacodec_service_28_0 (mediacodec_service))
-+(typeattributeset media_data_file_28_0 (media_data_file))
-+(typeattributeset mediadrmserver_28_0 (mediadrmserver))
-+(typeattributeset mediadrmserver_exec_28_0 (mediadrmserver_exec))
-+(typeattributeset mediadrmserver_service_28_0 (mediadrmserver_service))
-+(typeattributeset mediaextractor_28_0 (mediaextractor))
-+(typeattributeset mediaextractor_exec_28_0 (mediaextractor_exec))
-+(typeattributeset mediaextractor_service_28_0 (mediaextractor_service))
-+(typeattributeset mediaextractor_update_service_28_0 (mediaextractor_update_service))
-+(typeattributeset mediametrics_28_0 (mediametrics))
-+(typeattributeset mediametrics_exec_28_0 (mediametrics_exec))
-+(typeattributeset mediametrics_service_28_0 (mediametrics_service))
-+(typeattributeset media_projection_service_28_0 (media_projection_service))
-+(typeattributeset mediaprovider_28_0 (mediaprovider))
-+(typeattributeset media_router_service_28_0 (media_router_service))
-+(typeattributeset media_rw_data_file_28_0 (media_rw_data_file))
-+(typeattributeset mediaserver_28_0 (mediaserver))
-+(typeattributeset mediaserver_exec_28_0 (mediaserver_exec))
-+(typeattributeset mediaserver_service_28_0 (mediaserver_service))
-+(typeattributeset media_session_service_28_0 (media_session_service))
-+(typeattributeset meminfo_service_28_0 (meminfo_service))
-+(typeattributeset metadata_block_device_28_0 (metadata_block_device))
-+(typeattributeset metadata_file_28_0 (metadata_file))
-+(typeattributeset method_trace_data_file_28_0 (method_trace_data_file))
-+(typeattributeset midi_service_28_0 (midi_service))
-+(typeattributeset misc_block_device_28_0 (misc_block_device))
-+(typeattributeset misc_logd_file_28_0 (misc_logd_file))
-+(typeattributeset misc_user_data_file_28_0 (misc_user_data_file))
-+(typeattributeset mmc_prop_28_0 (mmc_prop))
-+(typeattributeset mnt_expand_file_28_0 (mnt_expand_file))
-+(typeattributeset mnt_media_rw_file_28_0 (mnt_media_rw_file))
-+(typeattributeset mnt_media_rw_stub_file_28_0 (mnt_media_rw_stub_file))
-+(typeattributeset mnt_user_file_28_0 (mnt_user_file))
-+(typeattributeset mnt_vendor_file_28_0 (mnt_vendor_file))
-+(typeattributeset modprobe_28_0 (modprobe))
-+(typeattributeset mount_service_28_0 (mount_service))
-+(typeattributeset mqueue_28_0 (mqueue))
-+(typeattributeset mtd_device_28_0 (mtd_device))
-+(typeattributeset mtp_28_0 (mtp))
-+(typeattributeset mtp_device_28_0 (mtp_device))
-+(typeattributeset mtpd_socket_28_0 (mtpd_socket))
-+(typeattributeset mtp_exec_28_0 (mtp_exec))
-+(typeattributeset nativetest_data_file_28_0 (nativetest_data_file))
-+(typeattributeset netd_28_0 (netd))
-+(typeattributeset net_data_file_28_0 (net_data_file))
-+(typeattributeset netd_exec_28_0 (netd_exec))
-+(typeattributeset netd_listener_service_28_0 (netd_listener_service))
-+(typeattributeset net_dns_prop_28_0 (net_dns_prop))
-+(typeattributeset netd_service_28_0 (netd_service))
-+(typeattributeset netd_socket_28_0 (netd_socket))
-+(typeattributeset netd_stable_secret_prop_28_0 (netd_stable_secret_prop))
-+(typeattributeset netif_28_0 (netif))
-+(typeattributeset netpolicy_service_28_0 (netpolicy_service))
-+(typeattributeset net_radio_prop_28_0 (net_radio_prop))
-+(typeattributeset netstats_service_28_0 (netstats_service))
-+(typeattributeset netutils_wrapper_28_0 (netutils_wrapper))
-+(typeattributeset netutils_wrapper_exec_28_0 (netutils_wrapper_exec))
-+(typeattributeset network_management_service_28_0 (network_management_service))
-+(typeattributeset network_score_service_28_0 (network_score_service))
-+(typeattributeset network_time_update_service_28_0 (network_time_update_service))
-+(typeattributeset network_watchlist_data_file_28_0 (network_watchlist_data_file))
-+(typeattributeset network_watchlist_service_28_0 (network_watchlist_service))
-+(typeattributeset nfc_28_0 (nfc))
-+(typeattributeset nfc_data_file_28_0 (nfc_data_file))
-+(typeattributeset nfc_device_28_0 (nfc_device))
-+(typeattributeset nfc_prop_28_0 (nfc_prop))
-+(typeattributeset nfc_service_28_0 (nfc_service))
-+(typeattributeset node_28_0 (node))
-+(typeattributeset nonplat_service_contexts_file_28_0 (nonplat_service_contexts_file))
-+(typeattributeset notification_service_28_0 (notification_service))
-+(typeattributeset null_device_28_0 (null_device))
-+(typeattributeset oemfs_28_0 (oemfs))
-+(typeattributeset oem_lock_service_28_0 (oem_lock_service))
-+(typeattributeset ota_data_file_28_0 (ota_data_file))
-+(typeattributeset otadexopt_service_28_0 (otadexopt_service))
-+(typeattributeset ota_package_file_28_0 (ota_package_file))
-+(typeattributeset otapreopt_chroot_28_0 (otapreopt_chroot))
-+(typeattributeset otapreopt_chroot_exec_28_0 (otapreopt_chroot_exec))
-+(typeattributeset otapreopt_slot_28_0 (otapreopt_slot))
-+(typeattributeset otapreopt_slot_exec_28_0 (otapreopt_slot_exec))
-+(typeattributeset overlay_prop_28_0 (overlay_prop))
-+(typeattributeset overlay_service_28_0 (overlay_service))
-+(typeattributeset owntty_device_28_0 (owntty_device))
-+(typeattributeset package_native_service_28_0 (package_native_service))
-+(typeattributeset package_service_28_0 (package_service))
-+(typeattributeset pan_result_prop_28_0 (pan_result_prop))
-+(typeattributeset pdx_bufferhub_client_channel_socket_28_0 (pdx_bufferhub_client_channel_socket))
-+(typeattributeset pdx_bufferhub_client_endpoint_socket_28_0 (pdx_bufferhub_client_endpoint_socket))
-+(typeattributeset pdx_bufferhub_dir_28_0 (pdx_bufferhub_dir))
-+(typeattributeset pdx_display_client_channel_socket_28_0 (pdx_display_client_channel_socket))
-+(typeattributeset pdx_display_client_endpoint_socket_28_0 (pdx_display_client_endpoint_socket))
-+(typeattributeset pdx_display_dir_28_0 (pdx_display_dir))
-+(typeattributeset pdx_display_manager_channel_socket_28_0 (pdx_display_manager_channel_socket))
-+(typeattributeset pdx_display_manager_endpoint_socket_28_0 (pdx_display_manager_endpoint_socket))
-+(typeattributeset pdx_display_screenshot_channel_socket_28_0 (pdx_display_screenshot_channel_socket))
-+(typeattributeset pdx_display_screenshot_endpoint_socket_28_0 (pdx_display_screenshot_endpoint_socket))
-+(typeattributeset pdx_display_vsync_channel_socket_28_0 (pdx_display_vsync_channel_socket))
-+(typeattributeset pdx_display_vsync_endpoint_socket_28_0 (pdx_display_vsync_endpoint_socket))
-+(typeattributeset pdx_performance_client_channel_socket_28_0 (pdx_performance_client_channel_socket))
-+(typeattributeset pdx_performance_client_endpoint_socket_28_0 (pdx_performance_client_endpoint_socket))
-+(typeattributeset pdx_performance_dir_28_0 (pdx_performance_dir))
-+(typeattributeset performanced_28_0 (performanced))
-+(typeattributeset performanced_exec_28_0 (performanced_exec))
-+(typeattributeset perfprofd_28_0 (perfprofd))
-+(typeattributeset perfprofd_data_file_28_0 (perfprofd_data_file))
-+(typeattributeset perfprofd_exec_28_0 (perfprofd_exec))
-+(typeattributeset perfprofd_service_28_0 (perfprofd_service))
-+(typeattributeset permission_service_28_0 (permission_service))
-+(typeattributeset persist_debug_prop_28_0 (persist_debug_prop))
-+(typeattributeset persistent_data_block_service_28_0 (persistent_data_block_service))
-+(typeattributeset persistent_properties_ready_prop_28_0 (persistent_properties_ready_prop))
-+(typeattributeset pinner_service_28_0 (pinner_service))
-+(typeattributeset pipefs_28_0 (pipefs))
-+(typeattributeset platform_app_28_0 (platform_app))
-+(typeattributeset pm_prop_28_0 (pm_prop))
-+(typeattributeset pmsg_device_28_0 (pmsg_device))
-+(typeattributeset port_28_0 (port))
-+(typeattributeset port_device_28_0 (port_device))
-+(typeattributeset postinstall_28_0 (postinstall))
-+(typeattributeset postinstall_dexopt_28_0 (postinstall_dexopt))
-+(typeattributeset postinstall_file_28_0 (postinstall_file))
-+(typeattributeset postinstall_mnt_dir_28_0 (postinstall_mnt_dir))
-+(typeattributeset powerctl_prop_28_0 (powerctl_prop))
-+(typeattributeset power_service_28_0 (power_service))
-+(typeattributeset ppp_28_0 (ppp))
-+(typeattributeset ppp_device_28_0 (ppp_device))
-+(typeattributeset ppp_exec_28_0 (ppp_exec))
-+(typeattributeset preloads_data_file_28_0 (preloads_data_file))
-+(typeattributeset preloads_media_file_28_0 (preloads_media_file))
-+(typeattributeset preopt2cachename_28_0 (preopt2cachename))
-+(typeattributeset preopt2cachename_exec_28_0 (preopt2cachename_exec))
-+(typeattributeset print_service_28_0 (print_service))
-+(typeattributeset priv_app_28_0 (priv_app))
-+(typeattributeset proc_28_0
-+  ( proc
-+    proc_fs_verity
-+    proc_keys
-+    proc_pressure_cpu
-+    proc_pressure_io
-+    proc_pressure_mem
-+    proc_slabinfo))
-+(typeattributeset proc_abi_28_0 (proc_abi))
-+(typeattributeset proc_asound_28_0 (proc_asound))
-+(typeattributeset proc_bluetooth_writable_28_0 (proc_bluetooth_writable))
-+(typeattributeset proc_buddyinfo_28_0 (proc_buddyinfo))
-+(typeattributeset proc_cmdline_28_0 (proc_cmdline))
-+(typeattributeset proc_cpuinfo_28_0 (proc_cpuinfo))
-+(typeattributeset proc_dirty_28_0 (proc_dirty))
-+(typeattributeset proc_diskstats_28_0 (proc_diskstats))
-+(typeattributeset proc_drop_caches_28_0 (proc_drop_caches))
-+(typeattributeset processinfo_service_28_0 (processinfo_service))
-+(typeattributeset proc_extra_free_kbytes_28_0 (proc_extra_free_kbytes))
-+(typeattributeset proc_filesystems_28_0 (proc_filesystems))
-+(typeattributeset proc_hostname_28_0 (proc_hostname))
-+(typeattributeset proc_hung_task_28_0 (proc_hung_task))
-+(typeattributeset proc_interrupts_28_0 (proc_interrupts))
-+(typeattributeset proc_iomem_28_0 (proc_iomem))
-+(typeattributeset proc_kmsg_28_0 (proc_kmsg))
-+(typeattributeset proc_loadavg_28_0 (proc_loadavg))
-+(typeattributeset proc_max_map_count_28_0 (proc_max_map_count))
-+(typeattributeset proc_meminfo_28_0 (proc_meminfo))
-+(typeattributeset proc_min_free_order_shift_28_0 (proc_min_free_order_shift))
-+(typeattributeset proc_misc_28_0 (proc_misc))
-+(typeattributeset proc_modules_28_0 (proc_modules))
-+(typeattributeset proc_mounts_28_0 (proc_mounts))
-+(typeattributeset proc_net_28_0
-+  ( proc_net
-+    proc_net_tcp_udp))
-+(typeattributeset proc_overcommit_memory_28_0 (proc_overcommit_memory))
-+(typeattributeset proc_page_cluster_28_0 (proc_page_cluster))
-+(typeattributeset proc_pagetypeinfo_28_0 (proc_pagetypeinfo))
-+(typeattributeset proc_panic_28_0 (proc_panic))
-+(typeattributeset proc_perf_28_0 (proc_perf))
-+(typeattributeset proc_pid_max_28_0 (proc_pid_max))
-+(typeattributeset proc_pipe_conf_28_0 (proc_pipe_conf))
-+(typeattributeset proc_qtaguid_stat_28_0 (proc_qtaguid_stat))
-+(typeattributeset proc_random_28_0 (proc_random))
-+(typeattributeset proc_sched_28_0 (proc_sched))
-+(typeattributeset proc_security_28_0 (proc_security))
-+(typeattributeset proc_stat_28_0 (proc_stat))
-+(typeattributeset procstats_service_28_0 (procstats_service))
-+(typeattributeset proc_swaps_28_0 (proc_swaps))
-+(typeattributeset proc_sysrq_28_0 (proc_sysrq))
-+(typeattributeset proc_timer_28_0 (proc_timer))
-+(typeattributeset proc_tty_drivers_28_0 (proc_tty_drivers))
-+(typeattributeset proc_uid_concurrent_active_time_28_0 (proc_uid_concurrent_active_time))
-+(typeattributeset proc_uid_concurrent_policy_time_28_0 (proc_uid_concurrent_policy_time))
-+(typeattributeset proc_uid_cpupower_28_0 (proc_uid_cpupower))
-+(typeattributeset proc_uid_cputime_removeuid_28_0 (proc_uid_cputime_removeuid))
-+(typeattributeset proc_uid_cputime_showstat_28_0 (proc_uid_cputime_showstat))
-+(typeattributeset proc_uid_io_stats_28_0 (proc_uid_io_stats))
-+(typeattributeset proc_uid_procstat_set_28_0 (proc_uid_procstat_set))
-+(typeattributeset proc_uid_time_in_state_28_0 (proc_uid_time_in_state))
-+(typeattributeset proc_uptime_28_0 (proc_uptime))
-+(typeattributeset proc_version_28_0 (proc_version))
-+(typeattributeset proc_vmallocinfo_28_0 (proc_vmallocinfo))
-+(typeattributeset proc_vmstat_28_0 (proc_vmstat))
-+(typeattributeset proc_zoneinfo_28_0 (proc_zoneinfo))
-+(typeattributeset profman_28_0 (profman))
-+(typeattributeset profman_dump_data_file_28_0 (profman_dump_data_file))
-+(typeattributeset profman_exec_28_0 (profman_exec))
-+(typeattributeset properties_device_28_0 (properties_device))
-+(typeattributeset properties_serial_28_0 (properties_serial))
-+(typeattributeset property_contexts_file_28_0 (property_contexts_file))
-+(typeattributeset property_data_file_28_0 (property_data_file))
-+(typeattributeset property_info_28_0 (property_info))
-+(typeattributeset property_socket_28_0 (property_socket))
-+(typeattributeset pstorefs_28_0 (pstorefs))
-+(typeattributeset ptmx_device_28_0 (ptmx_device))
-+(typeattributeset qtaguid_device_28_0 (qtaguid_device))
-+(typeattributeset qtaguid_proc_28_0
-+  ( proc_qtaguid_ctrl
-+    qtaguid_proc))
-+(typeattributeset racoon_28_0 (racoon))
-+(typeattributeset racoon_exec_28_0 (racoon_exec))
-+(typeattributeset racoon_socket_28_0 (racoon_socket))
-+(typeattributeset radio_28_0 (radio))
-+(typeattributeset radio_data_file_28_0 (radio_data_file))
-+(typeattributeset radio_device_28_0 (radio_device))
-+(typeattributeset radio_prop_28_0 (radio_prop))
-+(typeattributeset radio_service_28_0 (radio_service))
-+(typeattributeset ram_device_28_0 (ram_device))
-+(typeattributeset random_device_28_0 (random_device))
-+(typeattributeset recovery_28_0 (recovery))
-+(typeattributeset recovery_block_device_28_0 (recovery_block_device))
-+(typeattributeset recovery_data_file_28_0 (recovery_data_file))
-+(typeattributeset recovery_persist_28_0 (recovery_persist))
-+(typeattributeset recovery_persist_exec_28_0 (recovery_persist_exec))
-+(typeattributeset recovery_refresh_28_0 (recovery_refresh))
-+(typeattributeset recovery_refresh_exec_28_0 (recovery_refresh_exec))
-+(typeattributeset recovery_service_28_0 (recovery_service))
-+(typeattributeset registry_service_28_0 (registry_service))
-+(typeattributeset resourcecache_data_file_28_0 (resourcecache_data_file))
-+(typeattributeset restorecon_prop_28_0 (restorecon_prop))
-+(typeattributeset restrictions_service_28_0 (restrictions_service))
-+(typeattributeset rild_debug_socket_28_0 (rild_debug_socket))
-+(typeattributeset rild_socket_28_0 (rild_socket))
-+(typeattributeset ringtone_file_28_0 (ringtone_file))
-+(typeattributeset root_block_device_28_0 (root_block_device))
-+(typeattributeset rootfs_28_0 (rootfs))
-+(typeattributeset rpmsg_device_28_0 (rpmsg_device))
-+(typeattributeset rtc_device_28_0 (rtc_device))
-+(typeattributeset rttmanager_service_28_0 (rttmanager_service))
-+(typeattributeset runas_28_0 (runas))
-+(typeattributeset runas_exec_28_0 (runas_exec))
-+(typeattributeset runtime_event_log_tags_file_28_0 (runtime_event_log_tags_file))
-+(typeattributeset safemode_prop_28_0 (safemode_prop))
-+(typeattributeset same_process_hal_file_28_0
-+  ( same_process_hal_file
-+    vendor_public_lib_file))
-+(typeattributeset samplingprofiler_service_28_0 (samplingprofiler_service))
-+(typeattributeset scheduling_policy_service_28_0 (scheduling_policy_service))
-+(typeattributeset sdcardd_28_0 (sdcardd))
-+(typeattributeset sdcardd_exec_28_0 (sdcardd_exec))
-+(typeattributeset sdcardfs_28_0 (sdcardfs))
-+(typeattributeset seapp_contexts_file_28_0 (seapp_contexts_file))
-+(typeattributeset search_service_28_0 (search_service))
-+(typeattributeset sec_key_att_app_id_provider_service_28_0 (sec_key_att_app_id_provider_service))
-+(typeattributeset secure_element_28_0 (secure_element))
-+(typeattributeset secure_element_device_28_0 (secure_element_device))
-+(typeattributeset secure_element_service_28_0 (secure_element_service))
-+(typeattributeset selinuxfs_28_0 (selinuxfs))
-+(typeattributeset sensors_device_28_0 (sensors_device))
-+(typeattributeset sensorservice_service_28_0 (sensorservice_service))
-+(typeattributeset sepolicy_file_28_0 (sepolicy_file))
-+(typeattributeset serial_device_28_0 (serial_device))
-+(typeattributeset serialno_prop_28_0 (serialno_prop))
-+(typeattributeset serial_service_28_0 (serial_service))
-+(typeattributeset service_contexts_file_28_0 (service_contexts_file))
-+(typeattributeset servicediscovery_service_28_0 (servicediscovery_service))
-+(typeattributeset servicemanager_28_0 (servicemanager))
-+(typeattributeset servicemanager_exec_28_0 (servicemanager_exec))
-+(typeattributeset settings_service_28_0 (settings_service))
-+(typeattributeset sgdisk_28_0 (sgdisk))
-+(typeattributeset sgdisk_exec_28_0 (sgdisk_exec))
-+(typeattributeset shared_relro_28_0 (shared_relro))
-+(typeattributeset shared_relro_file_28_0 (shared_relro_file))
-+(typeattributeset shell_28_0 (shell))
-+(typeattributeset shell_data_file_28_0 (shell_data_file))
-+(typeattributeset shell_exec_28_0 (shell_exec))
-+(typeattributeset shell_prop_28_0 (shell_prop))
-+(typeattributeset shm_28_0 (shm))
-+(typeattributeset shortcut_manager_icons_28_0 (shortcut_manager_icons))
-+(typeattributeset shortcut_service_28_0 (shortcut_service))
-+(typeattributeset slice_service_28_0 (slice_service))
-+(typeattributeset slideshow_28_0 (slideshow))
-+(typeattributeset socket_device_28_0 (socket_device))
-+(typeattributeset sockfs_28_0 (sockfs))
-+(typeattributeset statusbar_service_28_0 (statusbar_service))
-+(typeattributeset storaged_service_28_0 (storaged_service))
-+(typeattributeset storage_file_28_0 (storage_file))
-+(typeattributeset storagestats_service_28_0 (storagestats_service))
-+(typeattributeset storage_stub_file_28_0 (storage_stub_file))
-+(typeattributeset su_28_0 (su))
-+(typeattributeset su_exec_28_0 (su_exec))
-+(typeattributeset surfaceflinger_28_0 (surfaceflinger))
-+(typeattributeset surfaceflinger_service_28_0 (surfaceflinger_service))
-+(typeattributeset swap_block_device_28_0 (swap_block_device))
-+(typeattributeset sysfs_28_0
-+  ( sysfs
-+    sysfs_devices_block
-+    sysfs_extcon
-+    sysfs_loop
-+    sysfs_transparent_hugepage))
-+(typeattributeset sysfs_android_usb_28_0 (sysfs_android_usb))
-+(typeattributeset sysfs_batteryinfo_28_0 (sysfs_batteryinfo))
-+(typeattributeset sysfs_bluetooth_writable_28_0 (sysfs_bluetooth_writable))
-+(typeattributeset sysfs_devices_system_cpu_28_0 (sysfs_devices_system_cpu))
-+(typeattributeset sysfs_dm_28_0 (sysfs_dm))
-+(typeattributeset sysfs_dt_firmware_android_28_0 (sysfs_dt_firmware_android))
-+(typeattributeset sysfs_fs_ext4_features_28_0 (sysfs_fs_ext4_features))
-+(typeattributeset sysfs_hwrandom_28_0 (sysfs_hwrandom))
-+(typeattributeset sysfs_ipv4_28_0 (sysfs_ipv4))
-+(typeattributeset sysfs_kernel_notes_28_0 (sysfs_kernel_notes))
-+(typeattributeset sysfs_leds_28_0 (sysfs_leds))
-+(typeattributeset sysfs_lowmemorykiller_28_0 (sysfs_lowmemorykiller))
-+(typeattributeset sysfs_mac_address_28_0 (sysfs_mac_address))
-+(typeattributeset sysfs_net_28_0 (sysfs_net))
-+(typeattributeset sysfs_nfc_power_writable_28_0 (sysfs_nfc_power_writable))
-+(typeattributeset sysfs_power_28_0 (sysfs_power))
-+(typeattributeset sysfs_rtc_28_0 (sysfs_rtc))
-+(typeattributeset sysfs_switch_28_0 (sysfs_switch))
-+(typeattributeset sysfs_thermal_28_0 (sysfs_thermal))
-+(typeattributeset sysfs_uio_28_0 (sysfs_uio))
-+(typeattributeset sysfs_usb_28_0 (sysfs_usb))
-+(typeattributeset sysfs_usermodehelper_28_0 (sysfs_usermodehelper))
-+(typeattributeset sysfs_vibrator_28_0 (sysfs_vibrator))
-+(typeattributeset sysfs_wake_lock_28_0 (sysfs_wake_lock))
-+(typeattributeset sysfs_wakeup_reasons_28_0 (sysfs_wakeup_reasons))
-+(typeattributeset sysfs_wlan_fwpath_28_0 (sysfs_wlan_fwpath))
-+(typeattributeset sysfs_zram_28_0 (sysfs_zram))
-+(typeattributeset sysfs_zram_uevent_28_0 (sysfs_zram_uevent))
-+(typeattributeset system_app_28_0 (system_app))
-+(typeattributeset system_app_data_file_28_0 (system_app_data_file))
-+(typeattributeset system_app_service_28_0 (system_app_service))
-+(typeattributeset system_block_device_28_0 (system_block_device))
-+(typeattributeset system_boot_reason_prop_28_0 (system_boot_reason_prop))
-+(typeattributeset system_data_file_28_0
-+  ( dropbox_data_file
-+    system_data_file
-+    packages_list_file))
-+(typeattributeset system_file_28_0
-+  ( system_file
-+    system_asan_options_file
-+    system_lib_file
-+    system_linker_config_file
-+    system_linker_exec
-+    system_seccomp_policy_file
-+    system_security_cacerts_file
-+    tcpdump_exec
-+    system_zoneinfo_file
-+))
-+(typeattributeset systemkeys_data_file_28_0 (systemkeys_data_file))
-+(typeattributeset system_ndebug_socket_28_0 (system_ndebug_socket))
-+(typeattributeset system_net_netd_hwservice_28_0 (system_net_netd_hwservice))
-+(typeattributeset system_prop_28_0 (system_prop))
-+(typeattributeset system_radio_prop_28_0 (system_radio_prop))
-+(typeattributeset system_server_28_0 (system_server))
-+(typeattributeset system_update_service_28_0 (system_update_service))
-+(typeattributeset system_wifi_keystore_hwservice_28_0 (system_wifi_keystore_hwservice))
-+(typeattributeset system_wpa_socket_28_0 (system_wpa_socket))
-+(typeattributeset task_service_28_0 (task_service))
-+(typeattributeset tee_28_0 (tee))
-+(typeattributeset tee_data_file_28_0 (tee_data_file))
-+(typeattributeset tee_device_28_0 (tee_device))
-+(typeattributeset telecom_service_28_0 (telecom_service))
-+(typeattributeset test_boot_reason_prop_28_0 (test_boot_reason_prop))
-+(typeattributeset textclassification_service_28_0 (textclassification_service))
-+(typeattributeset textclassifier_data_file_28_0 (textclassifier_data_file))
-+(typeattributeset textservices_service_28_0 (textservices_service))
-+(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
-+(typeattributeset thermal_service_28_0 (thermal_service))
-+(typeattributeset timezone_service_28_0 (timezone_service))
-+(typeattributeset tmpfs_28_0 (tmpfs))
-+(typeattributeset tombstoned_28_0 (tombstoned))
-+(typeattributeset tombstone_data_file_28_0 (tombstone_data_file))
-+(typeattributeset tombstoned_crash_socket_28_0 (tombstoned_crash_socket))
-+(typeattributeset tombstoned_exec_28_0 (tombstoned_exec))
-+(typeattributeset tombstoned_intercept_socket_28_0 (tombstoned_intercept_socket))
-+(typeattributeset tombstoned_java_trace_socket_28_0 (tombstoned_java_trace_socket))
-+(typeattributeset tombstone_wifi_data_file_28_0 (tombstone_wifi_data_file))
-+(typeattributeset toolbox_28_0 (toolbox))
-+(typeattributeset toolbox_exec_28_0 (toolbox_exec))
-+(typeattributeset trace_data_file_28_0 (trace_data_file))
-+(typeattributeset traced_consumer_socket_28_0 (traced_consumer_socket))
-+(typeattributeset traced_enabled_prop_28_0 (traced_enabled_prop))
-+(typeattributeset traced_probes_28_0 (traced_probes))
-+(typeattributeset traced_producer_socket_28_0 (traced_producer_socket))
-+(typeattributeset traceur_app_28_0 (traceur_app))
-+(typeattributeset trust_service_28_0 (trust_service))
-+(typeattributeset tty_device_28_0 (tty_device))
-+(typeattributeset tun_device_28_0 (tun_device))
-+(typeattributeset tv_input_service_28_0 (tv_input_service))
-+(typeattributeset tzdatacheck_28_0 (tzdatacheck))
-+(typeattributeset tzdatacheck_exec_28_0 (tzdatacheck_exec))
-+(typeattributeset ueventd_28_0 (ueventd))
-+(typeattributeset uhid_device_28_0 (uhid_device))
-+(typeattributeset uimode_service_28_0 (uimode_service))
-+(typeattributeset uio_device_28_0 (uio_device))
-+(typeattributeset uncrypt_28_0 (uncrypt))
-+(typeattributeset uncrypt_exec_28_0 (uncrypt_exec))
-+(typeattributeset uncrypt_socket_28_0 (uncrypt_socket))
-+(typeattributeset unencrypted_data_file_28_0 (unencrypted_data_file))
-+(typeattributeset unlabeled_28_0 (unlabeled))
-+(typeattributeset untrusted_app_25_28_0 (untrusted_app_25))
-+(typeattributeset untrusted_app_27_28_0 (untrusted_app_27))
-+(typeattributeset untrusted_app_28_0 (untrusted_app))
-+(typeattributeset untrusted_v2_app_28_0 (untrusted_v2_app))
-+(typeattributeset update_engine_28_0 (update_engine))
-+(typeattributeset update_engine_data_file_28_0 (update_engine_data_file))
-+(typeattributeset update_engine_exec_28_0 (update_engine_exec))
-+(typeattributeset update_engine_log_data_file_28_0 (update_engine_log_data_file))
-+(typeattributeset update_engine_service_28_0 (update_engine_service))
-+(typeattributeset updatelock_service_28_0 (updatelock_service))
-+(typeattributeset update_verifier_28_0 (update_verifier))
-+(typeattributeset update_verifier_exec_28_0 (update_verifier_exec))
-+(typeattributeset usagestats_service_28_0 (usagestats_service))
-+(typeattributeset usbaccessory_device_28_0 (usbaccessory_device))
-+(typeattributeset usbd_28_0 (usbd))
-+(typeattributeset usb_device_28_0 (usb_device))
-+(typeattributeset usbd_exec_28_0 (usbd_exec))
-+(typeattributeset usbfs_28_0 (usbfs))
-+(typeattributeset usb_service_28_0 (usb_service))
-+(typeattributeset userdata_block_device_28_0 (userdata_block_device))
-+(typeattributeset usermodehelper_28_0 (usermodehelper))
-+(typeattributeset user_profile_data_file_28_0 (user_profile_data_file))
-+(typeattributeset user_service_28_0 (user_service))
-+(typeattributeset vcs_device_28_0 (vcs_device))
-+(typeattributeset vdc_28_0 (vdc))
-+(typeattributeset vdc_exec_28_0 (vdc_exec))
-+(typeattributeset vendor_app_file_28_0 (vendor_app_file))
-+(typeattributeset vendor_configs_file_28_0 (vendor_configs_file))
-+(typeattributeset vendor_data_file_28_0 (vendor_data_file))
-+(typeattributeset vendor_default_prop_28_0 (vendor_default_prop))
-+(typeattributeset vendor_file_28_0 (vendor_file))
-+(typeattributeset vendor_framework_file_28_0 (vendor_framework_file))
-+(typeattributeset vendor_hal_file_28_0 (vendor_hal_file))
-+(typeattributeset vendor_init_28_0 (vendor_init))
-+(typeattributeset vendor_overlay_file_28_0 (vendor_overlay_file))
-+(typeattributeset vendor_security_patch_level_prop_28_0 (vendor_security_patch_level_prop))
-+(typeattributeset vendor_shell_28_0 (vendor_shell))
-+(typeattributeset vendor_shell_exec_28_0 (vendor_shell_exec))
-+(typeattributeset vendor_toolbox_exec_28_0 (vendor_toolbox_exec))
-+(typeattributeset vfat_28_0 (vfat))
-+(typeattributeset vibrator_service_28_0 (vibrator_service))
-+(typeattributeset video_device_28_0 (video_device))
-+(typeattributeset virtual_touchpad_28_0 (virtual_touchpad))
-+(typeattributeset virtual_touchpad_exec_28_0 (virtual_touchpad_exec))
-+(typeattributeset virtual_touchpad_service_28_0 (virtual_touchpad_service))
-+(typeattributeset vndbinder_device_28_0 (vndbinder_device))
-+(typeattributeset vndk_sp_file_28_0 (vndk_sp_file))
-+(typeattributeset vndservice_contexts_file_28_0 (vndservice_contexts_file))
-+(typeattributeset vndservicemanager_28_0 (vndservicemanager))
-+(typeattributeset voiceinteraction_service_28_0 (voiceinteraction_service))
-+(typeattributeset vold_28_0 (vold))
-+(typeattributeset vold_data_file_28_0 (vold_data_file))
-+(typeattributeset vold_device_28_0 (vold_device))
-+(typeattributeset vold_exec_28_0 (vold_exec))
-+(typeattributeset vold_metadata_file_28_0 (vold_metadata_file))
-+(typeattributeset vold_prepare_subdirs_28_0 (vold_prepare_subdirs))
-+(typeattributeset vold_prepare_subdirs_exec_28_0 (vold_prepare_subdirs_exec))
-+(typeattributeset vold_prop_28_0 (vold_prop))
-+(typeattributeset vold_service_28_0 (vold_service))
-+(typeattributeset vpn_data_file_28_0 (vpn_data_file))
-+(typeattributeset vr_hwc_28_0 (vr_hwc))
-+(typeattributeset vr_hwc_exec_28_0 (vr_hwc_exec))
-+(typeattributeset vr_hwc_service_28_0 (vr_hwc_service))
-+(typeattributeset vr_manager_service_28_0 (vr_manager_service))
-+(typeattributeset wallpaper_file_28_0 (wallpaper_file))
-+(typeattributeset wallpaper_service_28_0 (wallpaper_service))
-+(typeattributeset watchdogd_28_0 (watchdogd))
-+(typeattributeset watchdog_device_28_0 (watchdog_device))
-+(typeattributeset webviewupdate_service_28_0 (webviewupdate_service))
-+(typeattributeset webview_zygote_28_0 (webview_zygote))
-+(typeattributeset webview_zygote_exec_28_0 (webview_zygote_exec))
-+(typeattributeset wifiaware_service_28_0 (wifiaware_service))
-+(typeattributeset wificond_28_0 (wificond))
-+(typeattributeset wificond_exec_28_0 (wificond_exec))
-+(typeattributeset wificond_service_28_0 (wificond_service))
-+(typeattributeset wifi_data_file_28_0 (wifi_data_file))
-+(typeattributeset wifi_log_prop_28_0 (wifi_log_prop))
-+(typeattributeset wifip2p_service_28_0 (wifip2p_service))
-+(typeattributeset wifi_prop_28_0 (wifi_prop))
-+(typeattributeset wifiscanner_service_28_0 (wifiscanner_service))
-+(typeattributeset wifi_service_28_0 (wifi_service))
-+(typeattributeset window_service_28_0 (window_service))
-+(typeattributeset wpantund_28_0 (wpantund))
-+(typeattributeset wpantund_exec_28_0 (wpantund_exec))
-+(typeattributeset wpantund_service_28_0 (wpantund_service))
-+(typeattributeset wpa_socket_28_0 (wpa_socket))
-+(typeattributeset zero_device_28_0 (zero_device))
-+(typeattributeset zoneinfo_data_file_28_0 (zoneinfo_data_file))
-+(typeattributeset zygote_28_0 (zygote))
-+(typeattributeset zygote_exec_28_0 (zygote_exec))
-+(typeattributeset zygote_socket_28_0 (zygote_socket))
-diff --git a/prebuilts/api/29.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/29.0/private/compat/28.0/28.0.ignore.cil
-new file mode 100644
-index 000000000..ed3671f11
---- /dev/null
-+++ b/prebuilts/api/29.0/private/compat/28.0/28.0.ignore.cil
-@@ -0,0 +1,151 @@
-+;; new_objects - a collection of types that have been introduced that have no
-+;;   analogue in older policy.  Thus, we do not need to map these types to
-+;;   previous ones.  Add here to pass checkapi tests.
-+(type new_objects)
-+(typeattribute new_objects)
-+(typeattributeset new_objects
-+  ( new_objects
-+    activity_task_service
-+    adb_service
-+    apex_data_file
-+    apex_metadata_file
-+    apex_mnt_dir
-+    apex_service
-+    apexd
-+    apexd_exec
-+    apexd_prop
-+    apexd_tmpfs
-+    appdomain_tmpfs
-+    app_binding_service
-+    app_prediction_service
-+    app_zygote
-+    app_zygote_tmpfs
-+    ashmemd
-+    ashmem_device_service
-+    attention_service
-+    biometric_service
-+    bluetooth_audio_hal_prop
-+    bpf_progs_loaded_prop
-+    bugreport_service
-+    cgroup_desc_file
-+    cgroup_rc_file
-+    charger_exec
-+    content_capture_service
-+    content_suggestions_service
-+    cpu_variant_prop
-+    ctl_gsid_prop
-+    dev_cpu_variant
-+    device_config_activity_manager_native_boot_prop
-+    device_config_boot_count_prop
-+    device_config_input_native_boot_prop
-+    device_config_netd_native_prop
-+    device_config_reset_performed_prop
-+    device_config_runtime_native_boot_prop
-+    device_config_runtime_native_prop
-+    device_config_media_native_prop
-+    device_config_service
-+    dnsresolver_service
-+    dynamic_system_service
-+    dynamic_system_prop
-+    face_service
-+    face_vendor_data_file
-+    sota_prop
-+    fastbootd
-+    flags_health_check
-+    flags_health_check_exec
-+    fwk_bufferhub_hwservice
-+    fwk_camera_hwservice
-+    fwk_stats_hwservice
-+    gpuservice
-+    gsi_data_file
-+    gsi_metadata_file
-+    gsi_service
-+    gsid
-+    gsid_exec
-+    gsid_prop
-+    color_display_service
-+    external_vibrator_service
-+    hal_atrace_hwservice
-+    hal_face_hwservice
-+    hal_graphics_composer_server_tmpfs
-+    hal_health_storage_hwservice
-+    hal_input_classifier_hwservice
-+    hal_power_stats_hwservice
-+    heapprofd
-+    heapprofd_enabled_prop
-+    heapprofd_exec
-+    heapprofd_prop
-+    heapprofd_socket
-+    idmap_service
-+    iris_service
-+    iris_vendor_data_file
-+    llkd
-+    llkd_exec
-+    llkd_prop
-+    llkd_tmpfs
-+    looper_stats_service
-+    lpdumpd
-+    lpdumpd_exec
-+    lpdumpd_prop
-+    lpdump_service
-+    iorapd
-+    iorapd_exec
-+    iorapd_data_file
-+    iorapd_service
-+    iorapd_tmpfs
-+    mediaswcodec
-+    mediaswcodec_exec
-+    mediaswcodec_tmpfs
-+    mnt_product_file
-+    network_stack
-+    network_stack_service
-+    network_stack_tmpfs
-+    nnapi_ext_deny_product_prop
-+    overlayfs_file
-+    password_slot_metadata_file
-+    permissionmgr_service
-+    postinstall_apex_mnt_dir
-+    recovery_socket
-+    role_service
-+    rollback_service
-+    rs
-+    rs_exec
-+    rss_hwm_reset
-+    rss_hwm_reset_exec
-+    runas_app
-+    runas_app_tmpfs
-+    runtime_service
-+    sdcard_block_device
-+    sensor_privacy_service
-+    server_configurable_flags_data_file
-+    simpleperf_app_runner
-+    simpleperf_app_runner_exec
-+    su_tmpfs
-+    super_block_device
-+    sysfs_fs_f2fs
-+    system_bootstrap_lib_file
-+    system_event_log_tags_file
-+    system_lmk_prop
-+    system_suspend_hwservice
-+    system_suspend_control_service
-+    system_trace_prop
-+    staging_data_file
-+    task_profiles_file
-+    testharness_service
-+    test_harness_prop
-+    theme_prop
-+    time_prop
-+    timedetector_service
-+    timezonedetector_service
-+    traced_lazy_prop
-+    uri_grants_service
-+    use_memfd_prop
-+    vendor_cgroup_desc_file
-+    vendor_idc_file
-+    vendor_keychars_file
-+    vendor_keylayout_file
-+    vendor_misc_writer
-+    vendor_misc_writer_exec
-+    vendor_task_profiles_file
-+    vrflinger_vsync_service
-+    watchdogd_tmpfs))
-diff --git a/prebuilts/api/30.0/private/compat/28.0/28.0.cil b/prebuilts/api/30.0/private/compat/28.0/28.0.cil
-new file mode 100644
-index 000000000..321e9387e
---- /dev/null
-+++ b/prebuilts/api/30.0/private/compat/28.0/28.0.cil
-@@ -0,0 +1,1744 @@
-+;; attributes removed from current policy
-+(typeattribute hal_wifi_offload)
-+(typeattribute hal_wifi_offload_client)
-+(typeattribute hal_wifi_offload_server)
-+
-+;; types removed from current policy
-+(type alarm_device)
-+(type audio_seq_device)
-+(type audio_timer_device)
-+(type commontime_management_service)
-+(type cpuctl_device)
-+(type full_device)
-+(type hal_wifi_offload_hwservice)
-+(type i2c_device)
-+(type kmem_device)
-+(type mediacodec)
-+(type mediacodec_exec)
-+(type mediaextractor_update_service)
-+(type mtd_device)
-+(type netd_socket)
-+(type qtaguid_proc)
-+(type thermalcallback_hwservice)
-+(type thermalserviced)
-+(type thermalserviced_exec)
-+(type untrusted_v2_app)
-+(type vcs_device)
-+
-+;; Public 28.0 SEPolicy is divergent on different devices w.r.t
-+;; exported_audio_prop type. We need this typeattribute declaration so that the
-+;; mapping file compiles with vendor policies without exported_audio_prop type.
-+(typeattribute exported_audio_prop_28_0)
-+
-+(expandtypeattribute (accessibility_service_28_0) true)
-+(expandtypeattribute (account_service_28_0) true)
-+(expandtypeattribute (activity_service_28_0) true)
-+(expandtypeattribute (adbd_28_0) true)
-+(expandtypeattribute (adb_data_file_28_0) true)
-+(expandtypeattribute (adbd_exec_28_0) true)
-+(expandtypeattribute (adbd_socket_28_0) true)
-+(expandtypeattribute (adb_keys_file_28_0) true)
-+(expandtypeattribute (alarm_device_28_0) true)
-+(expandtypeattribute (alarm_service_28_0) true)
-+(expandtypeattribute (anr_data_file_28_0) true)
-+(expandtypeattribute (apk_data_file_28_0) true)
-+(expandtypeattribute (apk_private_data_file_28_0) true)
-+(expandtypeattribute (apk_private_tmp_file_28_0) true)
-+(expandtypeattribute (apk_tmp_file_28_0) true)
-+(expandtypeattribute (app_data_file_28_0) true)
-+(expandtypeattribute (app_fuse_file_28_0) true)
-+(expandtypeattribute (app_fusefs_28_0) true)
-+(expandtypeattribute (appops_service_28_0) true)
-+(expandtypeattribute (appwidget_service_28_0) true)
-+(expandtypeattribute (asec_apk_file_28_0) true)
-+(expandtypeattribute (asec_image_file_28_0) true)
-+(expandtypeattribute (asec_public_file_28_0) true)
-+(expandtypeattribute (ashmem_device_28_0) true)
-+(expandtypeattribute (assetatlas_service_28_0) true)
-+(expandtypeattribute (audio_data_file_28_0) true)
-+(expandtypeattribute (audio_device_28_0) true)
-+(expandtypeattribute (audiohal_data_file_28_0) true)
-+(expandtypeattribute (audio_prop_28_0) true)
-+(expandtypeattribute (audio_seq_device_28_0) true)
-+(expandtypeattribute (audioserver_28_0) true)
-+(expandtypeattribute (audioserver_data_file_28_0) true)
-+(expandtypeattribute (audioserver_service_28_0) true)
-+(expandtypeattribute (audio_service_28_0) true)
-+(expandtypeattribute (audio_timer_device_28_0) true)
-+(expandtypeattribute (autofill_service_28_0) true)
-+(expandtypeattribute (backup_data_file_28_0) true)
-+(expandtypeattribute (backup_service_28_0) true)
-+(expandtypeattribute (batteryproperties_service_28_0) true)
-+(expandtypeattribute (battery_service_28_0) true)
-+(expandtypeattribute (batterystats_service_28_0) true)
-+(expandtypeattribute (binder_calls_stats_service_28_0) true)
-+(expandtypeattribute (binder_device_28_0) true)
-+(expandtypeattribute (binfmt_miscfs_28_0) true)
-+(expandtypeattribute (blkid_28_0) true)
-+(expandtypeattribute (blkid_untrusted_28_0) true)
-+(expandtypeattribute (block_device_28_0) true)
-+(expandtypeattribute (bluetooth_28_0) true)
-+(expandtypeattribute (bluetooth_a2dp_offload_prop_28_0) true)
-+(expandtypeattribute (bluetooth_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_efs_file_28_0) true)
-+(expandtypeattribute (bluetooth_logs_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_manager_service_28_0) true)
-+(expandtypeattribute (bluetooth_prop_28_0) true)
-+(expandtypeattribute (bluetooth_service_28_0) true)
-+(expandtypeattribute (bluetooth_socket_28_0) true)
-+(expandtypeattribute (bootanim_28_0) true)
-+(expandtypeattribute (bootanim_exec_28_0) true)
-+(expandtypeattribute (boot_block_device_28_0) true)
-+(expandtypeattribute (bootchart_data_file_28_0) true)
-+(expandtypeattribute (bootloader_boot_reason_prop_28_0) true)
-+(expandtypeattribute (bootstat_28_0) true)
-+(expandtypeattribute (bootstat_data_file_28_0) true)
-+(expandtypeattribute (bootstat_exec_28_0) true)
-+(expandtypeattribute (boottime_prop_28_0) true)
-+(expandtypeattribute (boottrace_data_file_28_0) true)
-+(expandtypeattribute (broadcastradio_service_28_0) true)
-+(expandtypeattribute (bufferhubd_28_0) true)
-+(expandtypeattribute (bufferhubd_exec_28_0) true)
-+(expandtypeattribute (cache_backup_file_28_0) true)
-+(expandtypeattribute (cache_block_device_28_0) true)
-+(expandtypeattribute (cache_file_28_0) true)
-+(expandtypeattribute (cache_private_backup_file_28_0) true)
-+(expandtypeattribute (cache_recovery_file_28_0) true)
-+(expandtypeattribute (camera_data_file_28_0) true)
-+(expandtypeattribute (camera_device_28_0) true)
-+(expandtypeattribute (cameraproxy_service_28_0) true)
-+(expandtypeattribute (cameraserver_28_0) true)
-+(expandtypeattribute (cameraserver_exec_28_0) true)
-+(expandtypeattribute (cameraserver_service_28_0) true)
-+(expandtypeattribute (cgroup_28_0) true)
-+(expandtypeattribute (cgroup_bpf_28_0) true)
-+(expandtypeattribute (charger_28_0) true)
-+(expandtypeattribute (clatd_28_0) true)
-+(expandtypeattribute (clatd_exec_28_0) true)
-+(expandtypeattribute (clipboard_service_28_0) true)
-+(expandtypeattribute (commontime_management_service_28_0) true)
-+(expandtypeattribute (companion_device_service_28_0) true)
-+(expandtypeattribute (configfs_28_0) true)
-+(expandtypeattribute (config_prop_28_0) true)
-+(expandtypeattribute (connectivity_service_28_0) true)
-+(expandtypeattribute (connmetrics_service_28_0) true)
-+(expandtypeattribute (console_device_28_0) true)
-+(expandtypeattribute (consumer_ir_service_28_0) true)
-+(expandtypeattribute (content_service_28_0) true)
-+(expandtypeattribute (contexthub_service_28_0) true)
-+(expandtypeattribute (coredump_file_28_0) true)
-+(expandtypeattribute (country_detector_service_28_0) true)
-+(expandtypeattribute (coverage_service_28_0) true)
-+(expandtypeattribute (cppreopt_prop_28_0) true)
-+(expandtypeattribute (cppreopts_28_0) true)
-+(expandtypeattribute (cppreopts_exec_28_0) true)
-+(expandtypeattribute (cpuctl_device_28_0) true)
-+(expandtypeattribute (cpuinfo_service_28_0) true)
-+(expandtypeattribute (crash_dump_28_0) true)
-+(expandtypeattribute (crash_dump_exec_28_0) true)
-+(expandtypeattribute (crossprofileapps_service_28_0) true)
-+(expandtypeattribute (ctl_bootanim_prop_28_0) true)
-+(expandtypeattribute (ctl_bugreport_prop_28_0) true)
-+(expandtypeattribute (ctl_console_prop_28_0) true)
-+(expandtypeattribute (ctl_default_prop_28_0) true)
-+(expandtypeattribute (ctl_dumpstate_prop_28_0) true)
-+(expandtypeattribute (ctl_fuse_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_start_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_stop_prop_28_0) true)
-+(expandtypeattribute (ctl_mdnsd_prop_28_0) true)
-+(expandtypeattribute (ctl_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_rildaemon_prop_28_0) true)
-+(expandtypeattribute (ctl_sigstop_prop_28_0) true)
-+(expandtypeattribute (ctl_start_prop_28_0) true)
-+(expandtypeattribute (ctl_stop_prop_28_0) true)
-+(expandtypeattribute (dalvikcache_data_file_28_0) true)
-+(expandtypeattribute (dalvik_prop_28_0) true)
-+(expandtypeattribute (dbinfo_service_28_0) true)
-+(expandtypeattribute (debugfs_28_0) true)
-+(expandtypeattribute (debugfs_mmc_28_0) true)
-+(expandtypeattribute (debugfs_trace_marker_28_0) true)
-+(expandtypeattribute (debugfs_tracing_28_0) true)
-+(expandtypeattribute (debugfs_tracing_debug_28_0) true)
-+(expandtypeattribute (debugfs_tracing_instances_28_0) true)
-+(expandtypeattribute (debugfs_wakeup_sources_28_0) true)
-+(expandtypeattribute (debugfs_wifi_tracing_28_0) true)
-+(expandtypeattribute (debuggerd_prop_28_0) true)
-+(expandtypeattribute (debug_prop_28_0) true)
-+(expandtypeattribute (default_android_hwservice_28_0) true)
-+(expandtypeattribute (default_android_service_28_0) true)
-+(expandtypeattribute (default_android_vndservice_28_0) true)
-+(expandtypeattribute (default_prop_28_0) true)
-+(expandtypeattribute (device_28_0) true)
-+(expandtypeattribute (device_identifiers_service_28_0) true)
-+(expandtypeattribute (deviceidle_service_28_0) true)
-+(expandtypeattribute (device_logging_prop_28_0) true)
-+(expandtypeattribute (device_policy_service_28_0) true)
-+(expandtypeattribute (devicestoragemonitor_service_28_0) true)
-+(expandtypeattribute (devpts_28_0) true)
-+(expandtypeattribute (dex2oat_28_0) true)
-+(expandtypeattribute (dex2oat_exec_28_0) true)
-+(expandtypeattribute (dhcp_28_0) true)
-+(expandtypeattribute (dhcp_data_file_28_0) true)
-+(expandtypeattribute (dhcp_exec_28_0) true)
-+(expandtypeattribute (dhcp_prop_28_0) true)
-+(expandtypeattribute (diskstats_service_28_0) true)
-+(expandtypeattribute (display_service_28_0) true)
-+(expandtypeattribute (dm_device_28_0) true)
-+(expandtypeattribute (dnsmasq_28_0) true)
-+(expandtypeattribute (dnsmasq_exec_28_0) true)
-+(expandtypeattribute (dnsproxyd_socket_28_0) true)
-+(expandtypeattribute (DockObserver_service_28_0) true)
-+(expandtypeattribute (dreams_service_28_0) true)
-+(expandtypeattribute (drm_data_file_28_0) true)
-+(expandtypeattribute (drmserver_28_0) true)
-+(expandtypeattribute (drmserver_exec_28_0) true)
-+(expandtypeattribute (drmserver_service_28_0) true)
-+(expandtypeattribute (drmserver_socket_28_0) true)
-+(expandtypeattribute (dropbox_service_28_0) true)
-+(expandtypeattribute (dumpstate_28_0) true)
-+(expandtypeattribute (dumpstate_exec_28_0) true)
-+(expandtypeattribute (dumpstate_options_prop_28_0) true)
-+(expandtypeattribute (dumpstate_prop_28_0) true)
-+(expandtypeattribute (dumpstate_service_28_0) true)
-+(expandtypeattribute (dumpstate_socket_28_0) true)
-+(expandtypeattribute (e2fs_28_0) true)
-+(expandtypeattribute (e2fs_exec_28_0) true)
-+(expandtypeattribute (efs_file_28_0) true)
-+(expandtypeattribute (ephemeral_app_28_0) true)
-+(expandtypeattribute (ethernet_service_28_0) true)
-+(expandtypeattribute (exfat_28_0) true)
-+(expandtypeattribute (exported2_config_prop_28_0) true)
-+(expandtypeattribute (exported2_default_prop_28_0) true)
-+(expandtypeattribute (exported2_radio_prop_28_0) true)
-+(expandtypeattribute (exported2_system_prop_28_0) true)
-+(expandtypeattribute (exported2_vold_prop_28_0) true)
-+(expandtypeattribute (exported3_default_prop_28_0) true)
-+(expandtypeattribute (exported3_radio_prop_28_0) true)
-+(expandtypeattribute (exported3_system_prop_28_0) true)
-+(expandtypeattribute (exported_audio_prop_28_0) true)
-+(expandtypeattribute (exported_bluetooth_prop_28_0) true)
-+(expandtypeattribute (exported_config_prop_28_0) true)
-+(expandtypeattribute (exported_dalvik_prop_28_0) true)
-+(expandtypeattribute (exported_default_prop_28_0) true)
-+(expandtypeattribute (exported_dumpstate_prop_28_0) true)
-+(expandtypeattribute (exported_ffs_prop_28_0) true)
-+(expandtypeattribute (exported_fingerprint_prop_28_0) true)
-+(expandtypeattribute (exported_overlay_prop_28_0) true)
-+(expandtypeattribute (exported_pm_prop_28_0) true)
-+(expandtypeattribute (exported_radio_prop_28_0) true)
-+(expandtypeattribute (exported_secure_prop_28_0) true)
-+(expandtypeattribute (exported_system_prop_28_0) true)
-+(expandtypeattribute (exported_system_radio_prop_28_0) true)
-+(expandtypeattribute (exported_vold_prop_28_0) true)
-+(expandtypeattribute (exported_wifi_prop_28_0) true)
-+(expandtypeattribute (ffs_prop_28_0) true)
-+(expandtypeattribute (file_contexts_file_28_0) true)
-+(expandtypeattribute (fingerprintd_28_0) true)
-+(expandtypeattribute (fingerprintd_data_file_28_0) true)
-+(expandtypeattribute (fingerprintd_exec_28_0) true)
-+(expandtypeattribute (fingerprintd_service_28_0) true)
-+(expandtypeattribute (fingerprint_prop_28_0) true)
-+(expandtypeattribute (fingerprint_service_28_0) true)
-+(expandtypeattribute (fingerprint_vendor_data_file_28_0) true)
-+(expandtypeattribute (firstboot_prop_28_0) true)
-+(expandtypeattribute (font_service_28_0) true)
-+(expandtypeattribute (frp_block_device_28_0) true)
-+(expandtypeattribute (fs_bpf_28_0) true)
-+(expandtypeattribute (fsck_28_0) true)
-+(expandtypeattribute (fsck_exec_28_0) true)
-+(expandtypeattribute (fscklogs_28_0) true)
-+(expandtypeattribute (fsck_untrusted_28_0) true)
-+(expandtypeattribute (full_device_28_0) true)
-+(expandtypeattribute (functionfs_28_0) true)
-+(expandtypeattribute (fuse_28_0) true)
-+(expandtypeattribute (fuse_device_28_0) true)
-+(expandtypeattribute (fwk_display_hwservice_28_0) true)
-+(expandtypeattribute (fwk_scheduler_hwservice_28_0) true)
-+(expandtypeattribute (fwk_sensor_hwservice_28_0) true)
-+(expandtypeattribute (fwmarkd_socket_28_0) true)
-+(expandtypeattribute (gatekeeperd_28_0) true)
-+(expandtypeattribute (gatekeeper_data_file_28_0) true)
-+(expandtypeattribute (gatekeeperd_exec_28_0) true)
-+(expandtypeattribute (gatekeeper_service_28_0) true)
-+(expandtypeattribute (gfxinfo_service_28_0) true)
-+(expandtypeattribute (gps_control_28_0) true)
-+(expandtypeattribute (gpu_device_28_0) true)
-+(expandtypeattribute (gpu_service_28_0) true)
-+(expandtypeattribute (graphics_device_28_0) true)
-+(expandtypeattribute (graphicsstats_service_28_0) true)
-+(expandtypeattribute (hal_audiocontrol_hwservice_28_0) true)
-+(expandtypeattribute (hal_audio_hwservice_28_0) true)
-+(expandtypeattribute (hal_authsecret_hwservice_28_0) true)
-+(expandtypeattribute (hal_bluetooth_hwservice_28_0) true)
-+(expandtypeattribute (hal_bootctl_hwservice_28_0) true)
-+(expandtypeattribute (hal_broadcastradio_hwservice_28_0) true)
-+(expandtypeattribute (hal_camera_hwservice_28_0) true)
-+(expandtypeattribute (hal_cas_hwservice_28_0) true)
-+(expandtypeattribute (hal_codec2_hwservice_28_0) true)
-+(expandtypeattribute (hal_configstore_ISurfaceFlingerConfigs_28_0) true)
-+(expandtypeattribute (hal_confirmationui_hwservice_28_0) true)
-+(expandtypeattribute (hal_contexthub_hwservice_28_0) true)
-+(expandtypeattribute (hal_drm_hwservice_28_0) true)
-+(expandtypeattribute (hal_dumpstate_hwservice_28_0) true)
-+(expandtypeattribute (hal_evs_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_service_28_0) true)
-+(expandtypeattribute (hal_gatekeeper_hwservice_28_0) true)
-+(expandtypeattribute (hal_gnss_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_composer_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_mapper_hwservice_28_0) true)
-+(expandtypeattribute (hal_health_hwservice_28_0) true)
-+(expandtypeattribute (hal_ir_hwservice_28_0) true)
-+(expandtypeattribute (hal_keymaster_hwservice_28_0) true)
-+(expandtypeattribute (hal_light_hwservice_28_0) true)
-+(expandtypeattribute (hal_lowpan_hwservice_28_0) true)
-+(expandtypeattribute (hal_memtrack_hwservice_28_0) true)
-+(expandtypeattribute (hal_neuralnetworks_hwservice_28_0) true)
-+(expandtypeattribute (hal_nfc_hwservice_28_0) true)
-+(expandtypeattribute (hal_oemlock_hwservice_28_0) true)
-+(expandtypeattribute (hal_omx_hwservice_28_0) true)
-+(expandtypeattribute (hal_power_hwservice_28_0) true)
-+(expandtypeattribute (hal_renderscript_hwservice_28_0) true)
-+(expandtypeattribute (hal_secure_element_hwservice_28_0) true)
-+(expandtypeattribute (hal_sensors_hwservice_28_0) true)
-+(expandtypeattribute (hal_telephony_hwservice_28_0) true)
-+(expandtypeattribute (hal_tetheroffload_hwservice_28_0) true)
-+(expandtypeattribute (hal_thermal_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_cec_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_input_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_gadget_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_hwservice_28_0) true)
-+(expandtypeattribute (hal_vehicle_hwservice_28_0) true)
-+(expandtypeattribute (hal_vibrator_hwservice_28_0) true)
-+(expandtypeattribute (hal_vr_hwservice_28_0) true)
-+(expandtypeattribute (hal_weaver_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hostapd_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_offload_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_supplicant_hwservice_28_0) true)
-+(expandtypeattribute (hardware_properties_service_28_0) true)
-+(expandtypeattribute (hardware_service_28_0) true)
-+(expandtypeattribute (hci_attach_dev_28_0) true)
-+(expandtypeattribute (hdmi_control_service_28_0) true)
-+(expandtypeattribute (healthd_28_0) true)
-+(expandtypeattribute (healthd_exec_28_0) true)
-+(expandtypeattribute (heapdump_data_file_28_0) true)
-+(expandtypeattribute (hidl_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hidl_base_hwservice_28_0) true)
-+(expandtypeattribute (hidl_manager_hwservice_28_0) true)
-+(expandtypeattribute (hidl_memory_hwservice_28_0) true)
-+(expandtypeattribute (hidl_token_hwservice_28_0) true)
-+(expandtypeattribute (hwbinder_device_28_0) true)
-+(expandtypeattribute (hw_random_device_28_0) true)
-+(expandtypeattribute (hwservice_contexts_file_28_0) true)
-+(expandtypeattribute (hwservicemanager_28_0) true)
-+(expandtypeattribute (hwservicemanager_exec_28_0) true)
-+(expandtypeattribute (hwservicemanager_prop_28_0) true)
-+(expandtypeattribute (i2c_device_28_0) true)
-+(expandtypeattribute (icon_file_28_0) true)
-+(expandtypeattribute (idmap_28_0) true)
-+(expandtypeattribute (idmap_exec_28_0) true)
-+(expandtypeattribute (iio_device_28_0) true)
-+(expandtypeattribute (imms_service_28_0) true)
-+(expandtypeattribute (incident_28_0) true)
-+(expandtypeattribute (incidentd_28_0) true)
-+(expandtypeattribute (incident_data_file_28_0) true)
-+(expandtypeattribute (incident_helper_28_0) true)
-+(expandtypeattribute (incident_service_28_0) true)
-+(expandtypeattribute (init_28_0) true)
-+(expandtypeattribute (init_exec_28_0) true)
-+(expandtypeattribute (inotify_28_0) true)
-+(expandtypeattribute (input_device_28_0) true)
-+(expandtypeattribute (inputflinger_28_0) true)
-+(expandtypeattribute (inputflinger_exec_28_0) true)
-+(expandtypeattribute (inputflinger_service_28_0) true)
-+(expandtypeattribute (input_method_service_28_0) true)
-+(expandtypeattribute (input_service_28_0) true)
-+(expandtypeattribute (installd_28_0) true)
-+(expandtypeattribute (install_data_file_28_0) true)
-+(expandtypeattribute (installd_exec_28_0) true)
-+(expandtypeattribute (installd_service_28_0) true)
-+(expandtypeattribute (install_recovery_28_0) true)
-+(expandtypeattribute (install_recovery_exec_28_0) true)
-+(expandtypeattribute (ion_device_28_0) true)
-+(expandtypeattribute (IProxyService_service_28_0) true)
-+(expandtypeattribute (ipsec_service_28_0) true)
-+(expandtypeattribute (isolated_app_28_0) true)
-+(expandtypeattribute (jobscheduler_service_28_0) true)
-+(expandtypeattribute (kernel_28_0) true)
-+(expandtypeattribute (keychain_data_file_28_0) true)
-+(expandtypeattribute (keychord_device_28_0) true)
-+(expandtypeattribute (keystore_28_0) true)
-+(expandtypeattribute (keystore_data_file_28_0) true)
-+(expandtypeattribute (keystore_exec_28_0) true)
-+(expandtypeattribute (keystore_service_28_0) true)
-+(expandtypeattribute (kmem_device_28_0) true)
-+(expandtypeattribute (kmsg_debug_device_28_0) true)
-+(expandtypeattribute (kmsg_device_28_0) true)
-+(expandtypeattribute (labeledfs_28_0) true)
-+(expandtypeattribute (last_boot_reason_prop_28_0) true)
-+(expandtypeattribute (launcherapps_service_28_0) true)
-+(expandtypeattribute (lmkd_28_0) true)
-+(expandtypeattribute (lmkd_exec_28_0) true)
-+(expandtypeattribute (lmkd_socket_28_0) true)
-+(expandtypeattribute (location_service_28_0) true)
-+(expandtypeattribute (lock_settings_service_28_0) true)
-+(expandtypeattribute (logcat_exec_28_0) true)
-+(expandtypeattribute (logd_28_0) true)
-+(expandtypeattribute (logd_exec_28_0) true)
-+(expandtypeattribute (logd_prop_28_0) true)
-+(expandtypeattribute (logdr_socket_28_0) true)
-+(expandtypeattribute (logd_socket_28_0) true)
-+(expandtypeattribute (logdw_socket_28_0) true)
-+(expandtypeattribute (logpersist_28_0) true)
-+(expandtypeattribute (logpersistd_logging_prop_28_0) true)
-+(expandtypeattribute (log_prop_28_0) true)
-+(expandtypeattribute (log_tag_prop_28_0) true)
-+(expandtypeattribute (loop_control_device_28_0) true)
-+(expandtypeattribute (loop_device_28_0) true)
-+(expandtypeattribute (lowpan_device_28_0) true)
-+(expandtypeattribute (lowpan_prop_28_0) true)
-+(expandtypeattribute (lowpan_service_28_0) true)
-+(expandtypeattribute (mac_perms_file_28_0) true)
-+(expandtypeattribute (mdnsd_28_0) true)
-+(expandtypeattribute (mdnsd_socket_28_0) true)
-+(expandtypeattribute (mdns_socket_28_0) true)
-+(expandtypeattribute (mediacodec_28_0) true)
-+(expandtypeattribute (mediacodec_exec_28_0) true)
-+(expandtypeattribute (mediacodec_service_28_0) true)
-+(expandtypeattribute (media_data_file_28_0) true)
-+(expandtypeattribute (mediadrmserver_28_0) true)
-+(expandtypeattribute (mediadrmserver_exec_28_0) true)
-+(expandtypeattribute (mediadrmserver_service_28_0) true)
-+(expandtypeattribute (mediaextractor_28_0) true)
-+(expandtypeattribute (mediaextractor_exec_28_0) true)
-+(expandtypeattribute (mediaextractor_service_28_0) true)
-+(expandtypeattribute (mediaextractor_update_service_28_0) true)
-+(expandtypeattribute (mediametrics_28_0) true)
-+(expandtypeattribute (mediametrics_exec_28_0) true)
-+(expandtypeattribute (mediametrics_service_28_0) true)
-+(expandtypeattribute (media_projection_service_28_0) true)
-+(expandtypeattribute (mediaprovider_28_0) true)
-+(expandtypeattribute (media_router_service_28_0) true)
-+(expandtypeattribute (media_rw_data_file_28_0) true)
-+(expandtypeattribute (mediaserver_28_0) true)
-+(expandtypeattribute (mediaserver_exec_28_0) true)
-+(expandtypeattribute (mediaserver_service_28_0) true)
-+(expandtypeattribute (media_session_service_28_0) true)
-+(expandtypeattribute (meminfo_service_28_0) true)
-+(expandtypeattribute (metadata_block_device_28_0) true)
-+(expandtypeattribute (metadata_file_28_0) true)
-+(expandtypeattribute (method_trace_data_file_28_0) true)
-+(expandtypeattribute (midi_service_28_0) true)
-+(expandtypeattribute (misc_block_device_28_0) true)
-+(expandtypeattribute (misc_logd_file_28_0) true)
-+(expandtypeattribute (misc_user_data_file_28_0) true)
-+(expandtypeattribute (mmc_prop_28_0) true)
-+(expandtypeattribute (mnt_expand_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_stub_file_28_0) true)
-+(expandtypeattribute (mnt_user_file_28_0) true)
-+(expandtypeattribute (mnt_vendor_file_28_0) true)
-+(expandtypeattribute (modprobe_28_0) true)
-+(expandtypeattribute (mount_service_28_0) true)
-+(expandtypeattribute (mqueue_28_0) true)
-+(expandtypeattribute (mtd_device_28_0) true)
-+(expandtypeattribute (mtp_28_0) true)
-+(expandtypeattribute (mtp_device_28_0) true)
-+(expandtypeattribute (mtpd_socket_28_0) true)
-+(expandtypeattribute (mtp_exec_28_0) true)
-+(expandtypeattribute (nativetest_data_file_28_0) true)
-+(expandtypeattribute (netd_28_0) true)
-+(expandtypeattribute (net_data_file_28_0) true)
-+(expandtypeattribute (netd_exec_28_0) true)
-+(expandtypeattribute (netd_listener_service_28_0) true)
-+(expandtypeattribute (net_dns_prop_28_0) true)
-+(expandtypeattribute (netd_service_28_0) true)
-+(expandtypeattribute (netd_socket_28_0) true)
-+(expandtypeattribute (netd_stable_secret_prop_28_0) true)
-+(expandtypeattribute (netif_28_0) true)
-+(expandtypeattribute (netpolicy_service_28_0) true)
-+(expandtypeattribute (net_radio_prop_28_0) true)
-+(expandtypeattribute (netstats_service_28_0) true)
-+(expandtypeattribute (netutils_wrapper_28_0) true)
-+(expandtypeattribute (netutils_wrapper_exec_28_0) true)
-+(expandtypeattribute (network_management_service_28_0) true)
-+(expandtypeattribute (network_score_service_28_0) true)
-+(expandtypeattribute (network_time_update_service_28_0) true)
-+(expandtypeattribute (network_watchlist_data_file_28_0) true)
-+(expandtypeattribute (network_watchlist_service_28_0) true)
-+(expandtypeattribute (nfc_28_0) true)
-+(expandtypeattribute (nfc_data_file_28_0) true)
-+(expandtypeattribute (nfc_device_28_0) true)
-+(expandtypeattribute (nfc_prop_28_0) true)
-+(expandtypeattribute (nfc_service_28_0) true)
-+(expandtypeattribute (node_28_0) true)
-+(expandtypeattribute (nonplat_service_contexts_file_28_0) true)
-+(expandtypeattribute (notification_service_28_0) true)
-+(expandtypeattribute (null_device_28_0) true)
-+(expandtypeattribute (oemfs_28_0) true)
-+(expandtypeattribute (oem_lock_service_28_0) true)
-+(expandtypeattribute (ota_data_file_28_0) true)
-+(expandtypeattribute (otadexopt_service_28_0) true)
-+(expandtypeattribute (ota_package_file_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_exec_28_0) true)
-+(expandtypeattribute (otapreopt_slot_28_0) true)
-+(expandtypeattribute (otapreopt_slot_exec_28_0) true)
-+(expandtypeattribute (overlay_prop_28_0) true)
-+(expandtypeattribute (overlay_service_28_0) true)
-+(expandtypeattribute (owntty_device_28_0) true)
-+(expandtypeattribute (package_native_service_28_0) true)
-+(expandtypeattribute (package_service_28_0) true)
-+(expandtypeattribute (pan_result_prop_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_dir_28_0) true)
-+(expandtypeattribute (pdx_display_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_dir_28_0) true)
-+(expandtypeattribute (pdx_display_manager_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_manager_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_dir_28_0) true)
-+(expandtypeattribute (performanced_28_0) true)
-+(expandtypeattribute (performanced_exec_28_0) true)
-+(expandtypeattribute (permission_service_28_0) true)
-+(expandtypeattribute (persist_debug_prop_28_0) true)
-+(expandtypeattribute (persistent_data_block_service_28_0) true)
-+(expandtypeattribute (persistent_properties_ready_prop_28_0) true)
-+(expandtypeattribute (pinner_service_28_0) true)
-+(expandtypeattribute (pipefs_28_0) true)
-+(expandtypeattribute (platform_app_28_0) true)
-+(expandtypeattribute (pm_prop_28_0) true)
-+(expandtypeattribute (pmsg_device_28_0) true)
-+(expandtypeattribute (port_28_0) true)
-+(expandtypeattribute (port_device_28_0) true)
-+(expandtypeattribute (postinstall_28_0) true)
-+(expandtypeattribute (postinstall_dexopt_28_0) true)
-+(expandtypeattribute (postinstall_file_28_0) true)
-+(expandtypeattribute (postinstall_mnt_dir_28_0) true)
-+(expandtypeattribute (powerctl_prop_28_0) true)
-+(expandtypeattribute (power_service_28_0) true)
-+(expandtypeattribute (ppp_28_0) true)
-+(expandtypeattribute (ppp_device_28_0) true)
-+(expandtypeattribute (ppp_exec_28_0) true)
-+(expandtypeattribute (preloads_data_file_28_0) true)
-+(expandtypeattribute (preloads_media_file_28_0) true)
-+(expandtypeattribute (preopt2cachename_28_0) true)
-+(expandtypeattribute (preopt2cachename_exec_28_0) true)
-+(expandtypeattribute (print_service_28_0) true)
-+(expandtypeattribute (priv_app_28_0) true)
-+(expandtypeattribute (proc_28_0) true)
-+(expandtypeattribute (proc_abi_28_0) true)
-+(expandtypeattribute (proc_asound_28_0) true)
-+(expandtypeattribute (proc_bluetooth_writable_28_0) true)
-+(expandtypeattribute (proc_buddyinfo_28_0) true)
-+(expandtypeattribute (proc_cmdline_28_0) true)
-+(expandtypeattribute (proc_cpuinfo_28_0) true)
-+(expandtypeattribute (proc_dirty_28_0) true)
-+(expandtypeattribute (proc_diskstats_28_0) true)
-+(expandtypeattribute (proc_drop_caches_28_0) true)
-+(expandtypeattribute (processinfo_service_28_0) true)
-+(expandtypeattribute (proc_extra_free_kbytes_28_0) true)
-+(expandtypeattribute (proc_filesystems_28_0) true)
-+(expandtypeattribute (proc_hostname_28_0) true)
-+(expandtypeattribute (proc_hung_task_28_0) true)
-+(expandtypeattribute (proc_interrupts_28_0) true)
-+(expandtypeattribute (proc_iomem_28_0) true)
-+(expandtypeattribute (proc_kmsg_28_0) true)
-+(expandtypeattribute (proc_loadavg_28_0) true)
-+(expandtypeattribute (proc_max_map_count_28_0) true)
-+(expandtypeattribute (proc_meminfo_28_0) true)
-+(expandtypeattribute (proc_min_free_order_shift_28_0) true)
-+(expandtypeattribute (proc_misc_28_0) true)
-+(expandtypeattribute (proc_modules_28_0) true)
-+(expandtypeattribute (proc_mounts_28_0) true)
-+(expandtypeattribute (proc_net_28_0) true)
-+(expandtypeattribute (proc_overcommit_memory_28_0) true)
-+(expandtypeattribute (proc_page_cluster_28_0) true)
-+(expandtypeattribute (proc_pagetypeinfo_28_0) true)
-+(expandtypeattribute (proc_panic_28_0) true)
-+(expandtypeattribute (proc_perf_28_0) true)
-+(expandtypeattribute (proc_pid_max_28_0) true)
-+(expandtypeattribute (proc_pipe_conf_28_0) true)
-+(expandtypeattribute (proc_qtaguid_stat_28_0) true)
-+(expandtypeattribute (proc_random_28_0) true)
-+(expandtypeattribute (proc_sched_28_0) true)
-+(expandtypeattribute (proc_security_28_0) true)
-+(expandtypeattribute (proc_stat_28_0) true)
-+(expandtypeattribute (procstats_service_28_0) true)
-+(expandtypeattribute (proc_swaps_28_0) true)
-+(expandtypeattribute (proc_sysrq_28_0) true)
-+(expandtypeattribute (proc_timer_28_0) true)
-+(expandtypeattribute (proc_tty_drivers_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_active_time_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_policy_time_28_0) true)
-+(expandtypeattribute (proc_uid_cpupower_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_removeuid_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_showstat_28_0) true)
-+(expandtypeattribute (proc_uid_io_stats_28_0) true)
-+(expandtypeattribute (proc_uid_procstat_set_28_0) true)
-+(expandtypeattribute (proc_uid_time_in_state_28_0) true)
-+(expandtypeattribute (proc_uptime_28_0) true)
-+(expandtypeattribute (proc_version_28_0) true)
-+(expandtypeattribute (proc_vmallocinfo_28_0) true)
-+(expandtypeattribute (proc_vmstat_28_0) true)
-+(expandtypeattribute (proc_zoneinfo_28_0) true)
-+(expandtypeattribute (profman_28_0) true)
-+(expandtypeattribute (profman_dump_data_file_28_0) true)
-+(expandtypeattribute (profman_exec_28_0) true)
-+(expandtypeattribute (properties_device_28_0) true)
-+(expandtypeattribute (properties_serial_28_0) true)
-+(expandtypeattribute (property_contexts_file_28_0) true)
-+(expandtypeattribute (property_data_file_28_0) true)
-+(expandtypeattribute (property_info_28_0) true)
-+(expandtypeattribute (property_socket_28_0) true)
-+(expandtypeattribute (pstorefs_28_0) true)
-+(expandtypeattribute (ptmx_device_28_0) true)
-+(expandtypeattribute (qtaguid_device_28_0) true)
-+(expandtypeattribute (qtaguid_proc_28_0) true)
-+(expandtypeattribute (racoon_28_0) true)
-+(expandtypeattribute (racoon_exec_28_0) true)
-+(expandtypeattribute (racoon_socket_28_0) true)
-+(expandtypeattribute (radio_28_0) true)
-+(expandtypeattribute (radio_data_file_28_0) true)
-+(expandtypeattribute (radio_device_28_0) true)
-+(expandtypeattribute (radio_prop_28_0) true)
-+(expandtypeattribute (radio_service_28_0) true)
-+(expandtypeattribute (ram_device_28_0) true)
-+(expandtypeattribute (random_device_28_0) true)
-+(expandtypeattribute (recovery_28_0) true)
-+(expandtypeattribute (recovery_block_device_28_0) true)
-+(expandtypeattribute (recovery_data_file_28_0) true)
-+(expandtypeattribute (recovery_persist_28_0) true)
-+(expandtypeattribute (recovery_persist_exec_28_0) true)
-+(expandtypeattribute (recovery_refresh_28_0) true)
-+(expandtypeattribute (recovery_refresh_exec_28_0) true)
-+(expandtypeattribute (recovery_service_28_0) true)
-+(expandtypeattribute (registry_service_28_0) true)
-+(expandtypeattribute (resourcecache_data_file_28_0) true)
-+(expandtypeattribute (restorecon_prop_28_0) true)
-+(expandtypeattribute (restrictions_service_28_0) true)
-+(expandtypeattribute (rild_debug_socket_28_0) true)
-+(expandtypeattribute (rild_socket_28_0) true)
-+(expandtypeattribute (ringtone_file_28_0) true)
-+(expandtypeattribute (root_block_device_28_0) true)
-+(expandtypeattribute (rootfs_28_0) true)
-+(expandtypeattribute (rpmsg_device_28_0) true)
-+(expandtypeattribute (rtc_device_28_0) true)
-+(expandtypeattribute (rttmanager_service_28_0) true)
-+(expandtypeattribute (runas_28_0) true)
-+(expandtypeattribute (runas_exec_28_0) true)
-+(expandtypeattribute (runtime_event_log_tags_file_28_0) true)
-+(expandtypeattribute (safemode_prop_28_0) true)
-+(expandtypeattribute (same_process_hal_file_28_0) true)
-+(expandtypeattribute (samplingprofiler_service_28_0) true)
-+(expandtypeattribute (scheduling_policy_service_28_0) true)
-+(expandtypeattribute (sdcardd_28_0) true)
-+(expandtypeattribute (sdcardd_exec_28_0) true)
-+(expandtypeattribute (sdcardfs_28_0) true)
-+(expandtypeattribute (seapp_contexts_file_28_0) true)
-+(expandtypeattribute (search_service_28_0) true)
-+(expandtypeattribute (sec_key_att_app_id_provider_service_28_0) true)
-+(expandtypeattribute (secure_element_28_0) true)
-+(expandtypeattribute (secure_element_device_28_0) true)
-+(expandtypeattribute (secure_element_service_28_0) true)
-+(expandtypeattribute (selinuxfs_28_0) true)
-+(expandtypeattribute (sensors_device_28_0) true)
-+(expandtypeattribute (sensorservice_service_28_0) true)
-+(expandtypeattribute (sepolicy_file_28_0) true)
-+(expandtypeattribute (serial_device_28_0) true)
-+(expandtypeattribute (serialno_prop_28_0) true)
-+(expandtypeattribute (serial_service_28_0) true)
-+(expandtypeattribute (service_contexts_file_28_0) true)
-+(expandtypeattribute (servicediscovery_service_28_0) true)
-+(expandtypeattribute (servicemanager_28_0) true)
-+(expandtypeattribute (servicemanager_exec_28_0) true)
-+(expandtypeattribute (settings_service_28_0) true)
-+(expandtypeattribute (sgdisk_28_0) true)
-+(expandtypeattribute (sgdisk_exec_28_0) true)
-+(expandtypeattribute (shared_relro_28_0) true)
-+(expandtypeattribute (shared_relro_file_28_0) true)
-+(expandtypeattribute (shell_28_0) true)
-+(expandtypeattribute (shell_data_file_28_0) true)
-+(expandtypeattribute (shell_exec_28_0) true)
-+(expandtypeattribute (shell_prop_28_0) true)
-+(expandtypeattribute (shm_28_0) true)
-+(expandtypeattribute (shortcut_manager_icons_28_0) true)
-+(expandtypeattribute (shortcut_service_28_0) true)
-+(expandtypeattribute (slice_service_28_0) true)
-+(expandtypeattribute (slideshow_28_0) true)
-+(expandtypeattribute (socket_device_28_0) true)
-+(expandtypeattribute (sockfs_28_0) true)
-+(expandtypeattribute (statusbar_service_28_0) true)
-+(expandtypeattribute (storaged_service_28_0) true)
-+(expandtypeattribute (storage_file_28_0) true)
-+(expandtypeattribute (storagestats_service_28_0) true)
-+(expandtypeattribute (storage_stub_file_28_0) true)
-+(expandtypeattribute (su_28_0) true)
-+(expandtypeattribute (su_exec_28_0) true)
-+(expandtypeattribute (surfaceflinger_28_0) true)
-+(expandtypeattribute (surfaceflinger_service_28_0) true)
-+(expandtypeattribute (swap_block_device_28_0) true)
-+(expandtypeattribute (sysfs_28_0) true)
-+(expandtypeattribute (sysfs_android_usb_28_0) true)
-+(expandtypeattribute (sysfs_batteryinfo_28_0) true)
-+(expandtypeattribute (sysfs_bluetooth_writable_28_0) true)
-+(expandtypeattribute (sysfs_devices_system_cpu_28_0) true)
-+(expandtypeattribute (sysfs_dm_28_0) true)
-+(expandtypeattribute (sysfs_dt_firmware_android_28_0) true)
-+(expandtypeattribute (sysfs_fs_ext4_features_28_0) true)
-+(expandtypeattribute (sysfs_hwrandom_28_0) true)
-+(expandtypeattribute (sysfs_ipv4_28_0) true)
-+(expandtypeattribute (sysfs_kernel_notes_28_0) true)
-+(expandtypeattribute (sysfs_leds_28_0) true)
-+(expandtypeattribute (sysfs_lowmemorykiller_28_0) true)
-+(expandtypeattribute (sysfs_mac_address_28_0) true)
-+(expandtypeattribute (sysfs_net_28_0) true)
-+(expandtypeattribute (sysfs_nfc_power_writable_28_0) true)
-+(expandtypeattribute (sysfs_power_28_0) true)
-+(expandtypeattribute (sysfs_rtc_28_0) true)
-+(expandtypeattribute (sysfs_switch_28_0) true)
-+(expandtypeattribute (sysfs_thermal_28_0) true)
-+(expandtypeattribute (sysfs_uio_28_0) true)
-+(expandtypeattribute (sysfs_usb_28_0) true)
-+(expandtypeattribute (sysfs_usermodehelper_28_0) true)
-+(expandtypeattribute (sysfs_vibrator_28_0) true)
-+(expandtypeattribute (sysfs_wake_lock_28_0) true)
-+(expandtypeattribute (sysfs_wakeup_reasons_28_0) true)
-+(expandtypeattribute (sysfs_wlan_fwpath_28_0) true)
-+(expandtypeattribute (sysfs_zram_28_0) true)
-+(expandtypeattribute (sysfs_zram_uevent_28_0) true)
-+(expandtypeattribute (system_app_28_0) true)
-+(expandtypeattribute (system_app_data_file_28_0) true)
-+(expandtypeattribute (system_app_service_28_0) true)
-+(expandtypeattribute (system_block_device_28_0) true)
-+(expandtypeattribute (system_boot_reason_prop_28_0) true)
-+(expandtypeattribute (system_data_file_28_0) true)
-+(expandtypeattribute (system_file_28_0) true)
-+(expandtypeattribute (systemkeys_data_file_28_0) true)
-+(expandtypeattribute (system_ndebug_socket_28_0) true)
-+(expandtypeattribute (system_net_netd_hwservice_28_0) true)
-+(expandtypeattribute (system_prop_28_0) true)
-+(expandtypeattribute (system_radio_prop_28_0) true)
-+(expandtypeattribute (system_server_28_0) true)
-+(expandtypeattribute (system_update_service_28_0) true)
-+(expandtypeattribute (system_wifi_keystore_hwservice_28_0) true)
-+(expandtypeattribute (system_wpa_socket_28_0) true)
-+(expandtypeattribute (task_service_28_0) true)
-+(expandtypeattribute (tee_28_0) true)
-+(expandtypeattribute (tee_data_file_28_0) true)
-+(expandtypeattribute (tee_device_28_0) true)
-+(expandtypeattribute (telecom_service_28_0) true)
-+(expandtypeattribute (test_boot_reason_prop_28_0) true)
-+(expandtypeattribute (textclassification_service_28_0) true)
-+(expandtypeattribute (textclassifier_data_file_28_0) true)
-+(expandtypeattribute (textservices_service_28_0) true)
-+(expandtypeattribute (thermalcallback_hwservice_28_0) true)
-+(expandtypeattribute (thermal_service_28_0) true)
-+(expandtypeattribute (timezone_service_28_0) true)
-+(expandtypeattribute (tmpfs_28_0) true)
-+(expandtypeattribute (tombstoned_28_0) true)
-+(expandtypeattribute (tombstone_data_file_28_0) true)
-+(expandtypeattribute (tombstoned_crash_socket_28_0) true)
-+(expandtypeattribute (tombstoned_exec_28_0) true)
-+(expandtypeattribute (tombstoned_intercept_socket_28_0) true)
-+(expandtypeattribute (tombstoned_java_trace_socket_28_0) true)
-+(expandtypeattribute (tombstone_wifi_data_file_28_0) true)
-+(expandtypeattribute (toolbox_28_0) true)
-+(expandtypeattribute (toolbox_exec_28_0) true)
-+(expandtypeattribute (trace_data_file_28_0) true)
-+(expandtypeattribute (traced_consumer_socket_28_0) true)
-+(expandtypeattribute (traced_enabled_prop_28_0) true)
-+(expandtypeattribute (traced_probes_28_0) true)
-+(expandtypeattribute (traced_producer_socket_28_0) true)
-+(expandtypeattribute (traceur_app_28_0) true)
-+(expandtypeattribute (trust_service_28_0) true)
-+(expandtypeattribute (tty_device_28_0) true)
-+(expandtypeattribute (tun_device_28_0) true)
-+(expandtypeattribute (tv_input_service_28_0) true)
-+(expandtypeattribute (tzdatacheck_28_0) true)
-+(expandtypeattribute (tzdatacheck_exec_28_0) true)
-+(expandtypeattribute (ueventd_28_0) true)
-+(expandtypeattribute (uhid_device_28_0) true)
-+(expandtypeattribute (uimode_service_28_0) true)
-+(expandtypeattribute (uio_device_28_0) true)
-+(expandtypeattribute (uncrypt_28_0) true)
-+(expandtypeattribute (uncrypt_exec_28_0) true)
-+(expandtypeattribute (uncrypt_socket_28_0) true)
-+(expandtypeattribute (unencrypted_data_file_28_0) true)
-+(expandtypeattribute (unlabeled_28_0) true)
-+(expandtypeattribute (untrusted_app_25_28_0) true)
-+(expandtypeattribute (untrusted_app_27_28_0) true)
-+(expandtypeattribute (untrusted_app_28_0) true)
-+(expandtypeattribute (untrusted_v2_app_28_0) true)
-+(expandtypeattribute (update_engine_28_0) true)
-+(expandtypeattribute (update_engine_data_file_28_0) true)
-+(expandtypeattribute (update_engine_exec_28_0) true)
-+(expandtypeattribute (update_engine_log_data_file_28_0) true)
-+(expandtypeattribute (update_engine_service_28_0) true)
-+(expandtypeattribute (updatelock_service_28_0) true)
-+(expandtypeattribute (update_verifier_28_0) true)
-+(expandtypeattribute (update_verifier_exec_28_0) true)
-+(expandtypeattribute (usagestats_service_28_0) true)
-+(expandtypeattribute (usbaccessory_device_28_0) true)
-+(expandtypeattribute (usbd_28_0) true)
-+(expandtypeattribute (usb_device_28_0) true)
-+(expandtypeattribute (usbd_exec_28_0) true)
-+(expandtypeattribute (usbfs_28_0) true)
-+(expandtypeattribute (usb_service_28_0) true)
-+(expandtypeattribute (userdata_block_device_28_0) true)
-+(expandtypeattribute (usermodehelper_28_0) true)
-+(expandtypeattribute (user_profile_data_file_28_0) true)
-+(expandtypeattribute (user_service_28_0) true)
-+(expandtypeattribute (vcs_device_28_0) true)
-+(expandtypeattribute (vdc_28_0) true)
-+(expandtypeattribute (vdc_exec_28_0) true)
-+(expandtypeattribute (vendor_app_file_28_0) true)
-+(expandtypeattribute (vendor_configs_file_28_0) true)
-+(expandtypeattribute (vendor_data_file_28_0) true)
-+(expandtypeattribute (vendor_default_prop_28_0) true)
-+(expandtypeattribute (vendor_file_28_0) true)
-+(expandtypeattribute (vendor_framework_file_28_0) true)
-+(expandtypeattribute (vendor_hal_file_28_0) true)
-+(expandtypeattribute (vendor_init_28_0) true)
-+(expandtypeattribute (vendor_overlay_file_28_0) true)
-+(expandtypeattribute (vendor_security_patch_level_prop_28_0) true)
-+(expandtypeattribute (vendor_shell_28_0) true)
-+(expandtypeattribute (vendor_shell_exec_28_0) true)
-+(expandtypeattribute (vendor_toolbox_exec_28_0) true)
-+(expandtypeattribute (vfat_28_0) true)
-+(expandtypeattribute (vibrator_service_28_0) true)
-+(expandtypeattribute (video_device_28_0) true)
-+(expandtypeattribute (virtual_touchpad_28_0) true)
-+(expandtypeattribute (virtual_touchpad_exec_28_0) true)
-+(expandtypeattribute (virtual_touchpad_service_28_0) true)
-+(expandtypeattribute (vndbinder_device_28_0) true)
-+(expandtypeattribute (vndk_sp_file_28_0) true)
-+(expandtypeattribute (vndservice_contexts_file_28_0) true)
-+(expandtypeattribute (vndservicemanager_28_0) true)
-+(expandtypeattribute (voiceinteraction_service_28_0) true)
-+(expandtypeattribute (vold_28_0) true)
-+(expandtypeattribute (vold_data_file_28_0) true)
-+(expandtypeattribute (vold_device_28_0) true)
-+(expandtypeattribute (vold_exec_28_0) true)
-+(expandtypeattribute (vold_metadata_file_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_exec_28_0) true)
-+(expandtypeattribute (vold_prop_28_0) true)
-+(expandtypeattribute (vold_service_28_0) true)
-+(expandtypeattribute (vpn_data_file_28_0) true)
-+(expandtypeattribute (vr_hwc_28_0) true)
-+(expandtypeattribute (vr_hwc_exec_28_0) true)
-+(expandtypeattribute (vr_hwc_service_28_0) true)
-+(expandtypeattribute (vr_manager_service_28_0) true)
-+(expandtypeattribute (wallpaper_file_28_0) true)
-+(expandtypeattribute (wallpaper_service_28_0) true)
-+(expandtypeattribute (watchdogd_28_0) true)
-+(expandtypeattribute (watchdog_device_28_0) true)
-+(expandtypeattribute (webviewupdate_service_28_0) true)
-+(expandtypeattribute (webview_zygote_28_0) true)
-+(expandtypeattribute (webview_zygote_exec_28_0) true)
-+(expandtypeattribute (wifiaware_service_28_0) true)
-+(expandtypeattribute (wificond_28_0) true)
-+(expandtypeattribute (wificond_exec_28_0) true)
-+(expandtypeattribute (wificond_service_28_0) true)
-+(expandtypeattribute (wifi_data_file_28_0) true)
-+(expandtypeattribute (wifi_log_prop_28_0) true)
-+(expandtypeattribute (wifip2p_service_28_0) true)
-+(expandtypeattribute (wifi_prop_28_0) true)
-+(expandtypeattribute (wifiscanner_service_28_0) true)
-+(expandtypeattribute (wifi_service_28_0) true)
-+(expandtypeattribute (window_service_28_0) true)
-+(expandtypeattribute (wpantund_28_0) true)
-+(expandtypeattribute (wpantund_exec_28_0) true)
-+(expandtypeattribute (wpantund_service_28_0) true)
-+(expandtypeattribute (wpa_socket_28_0) true)
-+(expandtypeattribute (zero_device_28_0) true)
-+(expandtypeattribute (zoneinfo_data_file_28_0) true)
-+(expandtypeattribute (zygote_28_0) true)
-+(expandtypeattribute (zygote_exec_28_0) true)
-+(expandtypeattribute (zygote_socket_28_0) true)
-+(typeattributeset accessibility_service_28_0 (accessibility_service))
-+(typeattributeset account_service_28_0 (account_service))
-+(typeattributeset activity_service_28_0 (activity_service))
-+(typeattributeset adbd_28_0 (adbd))
-+(typeattributeset adb_data_file_28_0 (adb_data_file))
-+(typeattributeset adbd_exec_28_0 (adbd_exec))
-+(typeattributeset adbd_socket_28_0 (adbd_socket))
-+(typeattributeset adb_keys_file_28_0 (adb_keys_file))
-+(typeattributeset alarm_device_28_0 (alarm_device))
-+(typeattributeset alarm_service_28_0 (alarm_service))
-+(typeattributeset anr_data_file_28_0 (anr_data_file))
-+(typeattributeset apk_data_file_28_0 (apk_data_file))
-+(typeattributeset apk_private_data_file_28_0 (apk_private_data_file))
-+(typeattributeset apk_private_tmp_file_28_0 (apk_private_tmp_file))
-+(typeattributeset apk_tmp_file_28_0 (apk_tmp_file))
-+(typeattributeset app_data_file_28_0 (app_data_file privapp_data_file))
-+(typeattributeset app_fuse_file_28_0 (app_fuse_file))
-+(typeattributeset app_fusefs_28_0 (app_fusefs))
-+(typeattributeset appops_service_28_0 (appops_service))
-+(typeattributeset appwidget_service_28_0 (appwidget_service))
-+(typeattributeset asec_apk_file_28_0 (asec_apk_file))
-+(typeattributeset asec_image_file_28_0 (asec_image_file))
-+(typeattributeset asec_public_file_28_0 (asec_public_file))
-+(typeattributeset ashmem_device_28_0 (ashmem_device))
-+(typeattributeset assetatlas_service_28_0 (assetatlas_service))
-+(typeattributeset audio_data_file_28_0 (audio_data_file))
-+(typeattributeset audio_device_28_0 (audio_device))
-+(typeattributeset audiohal_data_file_28_0 (audiohal_data_file))
-+(typeattributeset audio_prop_28_0 (audio_prop))
-+(typeattributeset audio_seq_device_28_0 (audio_seq_device))
-+(typeattributeset audioserver_28_0 (audioserver))
-+(typeattributeset audioserver_data_file_28_0 (audioserver_data_file))
-+(typeattributeset audioserver_service_28_0 (audioserver_service))
-+(typeattributeset audio_service_28_0 (audio_service))
-+(typeattributeset audio_timer_device_28_0 (audio_timer_device))
-+(typeattributeset autofill_service_28_0 (autofill_service))
-+(typeattributeset backup_data_file_28_0 (backup_data_file))
-+(typeattributeset backup_service_28_0 (backup_service))
-+(typeattributeset batteryproperties_service_28_0 (batteryproperties_service))
-+(typeattributeset battery_service_28_0 (battery_service))
-+(typeattributeset batterystats_service_28_0 (batterystats_service))
-+(typeattributeset binder_calls_stats_service_28_0 (binder_calls_stats_service))
-+(typeattributeset binder_device_28_0 (binder_device))
-+(typeattributeset binfmt_miscfs_28_0 (binfmt_miscfs))
-+(typeattributeset blkid_28_0 (blkid))
-+(typeattributeset blkid_untrusted_28_0 (blkid_untrusted))
-+(typeattributeset block_device_28_0 (block_device))
-+(typeattributeset bluetooth_28_0 (bluetooth))
-+(typeattributeset bluetooth_a2dp_offload_prop_28_0 (bluetooth_a2dp_offload_prop))
-+(typeattributeset bluetooth_data_file_28_0 (bluetooth_data_file))
-+(typeattributeset bluetooth_efs_file_28_0 (bluetooth_efs_file))
-+(typeattributeset bluetooth_logs_data_file_28_0 (bluetooth_logs_data_file))
-+(typeattributeset bluetooth_manager_service_28_0 (bluetooth_manager_service))
-+(typeattributeset bluetooth_prop_28_0 (bluetooth_prop))
-+(typeattributeset bluetooth_service_28_0 (bluetooth_service))
-+(typeattributeset bluetooth_socket_28_0 (bluetooth_socket))
-+(typeattributeset bootanim_28_0 (bootanim))
-+(typeattributeset bootanim_exec_28_0 (bootanim_exec))
-+(typeattributeset boot_block_device_28_0 (boot_block_device))
-+(typeattributeset bootchart_data_file_28_0 (bootchart_data_file))
-+(typeattributeset bootloader_boot_reason_prop_28_0 (bootloader_boot_reason_prop))
-+(typeattributeset bootstat_28_0 (bootstat))
-+(typeattributeset bootstat_data_file_28_0 (bootstat_data_file))
-+(typeattributeset bootstat_exec_28_0 (bootstat_exec))
-+(typeattributeset boottime_prop_28_0 (boottime_prop))
-+(typeattributeset boottrace_data_file_28_0 (boottrace_data_file))
-+(typeattributeset broadcastradio_service_28_0 (broadcastradio_service))
-+(typeattributeset bufferhubd_28_0 (bufferhubd))
-+(typeattributeset bufferhubd_exec_28_0 (bufferhubd_exec))
-+(typeattributeset cache_backup_file_28_0 (cache_backup_file))
-+(typeattributeset cache_block_device_28_0 (cache_block_device))
-+(typeattributeset cache_file_28_0 (cache_file))
-+(typeattributeset cache_private_backup_file_28_0 (cache_private_backup_file))
-+(typeattributeset cache_recovery_file_28_0 (cache_recovery_file))
-+(typeattributeset camera_data_file_28_0 (camera_data_file))
-+(typeattributeset camera_device_28_0 (camera_device))
-+(typeattributeset cameraproxy_service_28_0 (cameraproxy_service))
-+(typeattributeset cameraserver_28_0 (cameraserver))
-+(typeattributeset cameraserver_exec_28_0 (cameraserver_exec))
-+(typeattributeset cameraserver_service_28_0 (cameraserver_service))
-+(typeattributeset cgroup_28_0 (cgroup))
-+(typeattributeset cgroup_bpf_28_0 (cgroup_bpf))
-+(typeattributeset charger_28_0 (charger))
-+(typeattributeset clatd_28_0 (clatd))
-+(typeattributeset clatd_exec_28_0 (clatd_exec))
-+(typeattributeset clipboard_service_28_0 (clipboard_service))
-+(typeattributeset commontime_management_service_28_0 (commontime_management_service))
-+(typeattributeset companion_device_service_28_0 (companion_device_service))
-+(typeattributeset configfs_28_0 (configfs))
-+(typeattributeset config_prop_28_0 (config_prop))
-+(typeattributeset connectivity_service_28_0 (connectivity_service))
-+(typeattributeset connmetrics_service_28_0 (connmetrics_service))
-+(typeattributeset console_device_28_0 (console_device))
-+(typeattributeset consumer_ir_service_28_0 (consumer_ir_service))
-+(typeattributeset content_service_28_0 (content_service))
-+(typeattributeset contexthub_service_28_0 (contexthub_service))
-+(typeattributeset coredump_file_28_0 (coredump_file))
-+(typeattributeset country_detector_service_28_0 (country_detector_service))
-+(typeattributeset coverage_service_28_0 (coverage_service))
-+(typeattributeset cppreopt_prop_28_0 (cppreopt_prop))
-+(typeattributeset cppreopts_28_0 (cppreopts))
-+(typeattributeset cppreopts_exec_28_0 (cppreopts_exec))
-+(typeattributeset cpuctl_device_28_0 (cpuctl_device))
-+(typeattributeset cpuinfo_service_28_0 (cpuinfo_service))
-+(typeattributeset crash_dump_28_0 (crash_dump))
-+(typeattributeset crash_dump_exec_28_0 (crash_dump_exec))
-+(typeattributeset crossprofileapps_service_28_0 (crossprofileapps_service))
-+(typeattributeset ctl_bootanim_prop_28_0 (ctl_bootanim_prop))
-+(typeattributeset ctl_bugreport_prop_28_0 (ctl_bugreport_prop))
-+(typeattributeset ctl_console_prop_28_0 (ctl_console_prop))
-+(typeattributeset ctl_default_prop_28_0
-+  ( ctl_adbd_prop
-+    ctl_default_prop))
-+(typeattributeset ctl_dumpstate_prop_28_0 (ctl_dumpstate_prop))
-+(typeattributeset ctl_fuse_prop_28_0 (ctl_fuse_prop))
-+(typeattributeset ctl_interface_restart_prop_28_0 (ctl_interface_restart_prop))
-+(typeattributeset ctl_interface_start_prop_28_0 (ctl_interface_start_prop))
-+(typeattributeset ctl_interface_stop_prop_28_0 (ctl_interface_stop_prop))
-+(typeattributeset ctl_mdnsd_prop_28_0 (ctl_mdnsd_prop))
-+(typeattributeset ctl_restart_prop_28_0 (ctl_restart_prop))
-+(typeattributeset ctl_rildaemon_prop_28_0 (ctl_rildaemon_prop))
-+(typeattributeset ctl_sigstop_prop_28_0 (ctl_sigstop_prop))
-+(typeattributeset ctl_start_prop_28_0 (ctl_start_prop))
-+(typeattributeset ctl_stop_prop_28_0 (ctl_stop_prop))
-+(typeattributeset dalvikcache_data_file_28_0 (dalvikcache_data_file))
-+(typeattributeset dalvik_prop_28_0 (dalvik_prop))
-+(typeattributeset dbinfo_service_28_0 (dbinfo_service))
-+(typeattributeset debugfs_28_0 (debugfs))
-+(typeattributeset debugfs_mmc_28_0 (debugfs_mmc))
-+(typeattributeset debugfs_trace_marker_28_0 (debugfs_trace_marker))
-+(typeattributeset debugfs_tracing_28_0 (debugfs_tracing))
-+(typeattributeset debugfs_tracing_debug_28_0 (debugfs_tracing_debug))
-+(typeattributeset debugfs_tracing_instances_28_0 (debugfs_tracing_instances))
-+(typeattributeset debugfs_wakeup_sources_28_0 (debugfs_wakeup_sources))
-+(typeattributeset debugfs_wifi_tracing_28_0 (debugfs_wifi_tracing))
-+(typeattributeset debuggerd_prop_28_0 (debuggerd_prop))
-+(typeattributeset debug_prop_28_0 (debug_prop))
-+(typeattributeset default_android_hwservice_28_0 (default_android_hwservice))
-+(typeattributeset default_android_service_28_0 (default_android_service))
-+(typeattributeset default_android_vndservice_28_0 (default_android_vndservice))
-+(typeattributeset default_prop_28_0 (default_prop))
-+(typeattributeset device_28_0 (device))
-+(typeattributeset device_identifiers_service_28_0 (device_identifiers_service))
-+(typeattributeset deviceidle_service_28_0 (deviceidle_service))
-+(typeattributeset device_logging_prop_28_0 (device_logging_prop))
-+(typeattributeset device_policy_service_28_0 (device_policy_service))
-+(typeattributeset devicestoragemonitor_service_28_0 (devicestoragemonitor_service))
-+(typeattributeset devpts_28_0 (devpts))
-+(typeattributeset dex2oat_28_0 (dex2oat))
-+(typeattributeset dex2oat_exec_28_0 (dex2oat_exec))
-+(typeattributeset dhcp_28_0 (dhcp))
-+(typeattributeset dhcp_data_file_28_0 (dhcp_data_file))
-+(typeattributeset dhcp_exec_28_0 (dhcp_exec))
-+(typeattributeset dhcp_prop_28_0 (dhcp_prop))
-+(typeattributeset diskstats_service_28_0 (diskstats_service))
-+(typeattributeset display_service_28_0 (display_service))
-+(typeattributeset dm_device_28_0 (dm_device))
-+(typeattributeset dnsmasq_28_0 (dnsmasq))
-+(typeattributeset dnsmasq_exec_28_0 (dnsmasq_exec))
-+(typeattributeset dnsproxyd_socket_28_0 (dnsproxyd_socket))
-+(typeattributeset DockObserver_service_28_0 (DockObserver_service))
-+(typeattributeset dreams_service_28_0 (dreams_service))
-+(typeattributeset drm_data_file_28_0 (drm_data_file))
-+(typeattributeset drmserver_28_0 (drmserver))
-+(typeattributeset drmserver_exec_28_0 (drmserver_exec))
-+(typeattributeset drmserver_service_28_0 (drmserver_service))
-+(typeattributeset drmserver_socket_28_0 (drmserver_socket))
-+(typeattributeset dropbox_service_28_0 (dropbox_service))
-+(typeattributeset dumpstate_28_0 (dumpstate))
-+(typeattributeset dumpstate_exec_28_0 (dumpstate_exec))
-+(typeattributeset dumpstate_options_prop_28_0 (dumpstate_options_prop))
-+(typeattributeset dumpstate_prop_28_0 (dumpstate_prop))
-+(typeattributeset dumpstate_service_28_0 (dumpstate_service))
-+(typeattributeset dumpstate_socket_28_0 (dumpstate_socket))
-+(typeattributeset e2fs_28_0 (e2fs))
-+(typeattributeset e2fs_exec_28_0 (e2fs_exec))
-+(typeattributeset efs_file_28_0 (efs_file))
-+(typeattributeset ephemeral_app_28_0 (ephemeral_app))
-+(typeattributeset ethernet_service_28_0 (ethernet_service))
-+(typeattributeset exfat_28_0 (exfat))
-+(typeattributeset exported2_config_prop_28_0 (exported2_config_prop))
-+(typeattributeset exported2_default_prop_28_0 (exported2_default_prop))
-+(typeattributeset exported2_radio_prop_28_0 (exported2_radio_prop))
-+(typeattributeset exported2_system_prop_28_0 (exported2_system_prop))
-+(typeattributeset exported2_vold_prop_28_0 (exported2_vold_prop))
-+(typeattributeset exported3_default_prop_28_0 (exported3_default_prop))
-+(typeattributeset exported3_radio_prop_28_0 (exported3_radio_prop))
-+(typeattributeset exported3_system_prop_28_0 (exported3_system_prop))
-+(typeattributeset exported_audio_prop_28_0 (exported_audio_prop))
-+(typeattributeset exported_bluetooth_prop_28_0 (exported_bluetooth_prop))
-+(typeattributeset exported_config_prop_28_0 (exported_config_prop))
-+(typeattributeset exported_dalvik_prop_28_0 (exported_dalvik_prop))
-+(typeattributeset exported_default_prop_28_0 (exported_default_prop))
-+(typeattributeset exported_dumpstate_prop_28_0 (exported_dumpstate_prop))
-+(typeattributeset exported_ffs_prop_28_0 (exported_ffs_prop))
-+(typeattributeset exported_fingerprint_prop_28_0 (exported_fingerprint_prop))
-+(typeattributeset exported_overlay_prop_28_0 (exported_overlay_prop))
-+(typeattributeset exported_pm_prop_28_0 (exported_pm_prop))
-+(typeattributeset exported_radio_prop_28_0 (exported_radio_prop))
-+(typeattributeset exported_secure_prop_28_0 (exported_secure_prop))
-+(typeattributeset exported_system_prop_28_0 (exported_system_prop))
-+(typeattributeset exported_system_radio_prop_28_0 (exported_system_radio_prop))
-+(typeattributeset exported_vold_prop_28_0 (exported_vold_prop))
-+(typeattributeset exported_wifi_prop_28_0 (exported_wifi_prop))
-+(typeattributeset ffs_prop_28_0 (ffs_prop))
-+(typeattributeset file_contexts_file_28_0 (file_contexts_file))
-+(typeattributeset fingerprintd_28_0 (fingerprintd))
-+(typeattributeset fingerprintd_data_file_28_0 (fingerprintd_data_file))
-+(typeattributeset fingerprintd_exec_28_0 (fingerprintd_exec))
-+(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
-+(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
-+(typeattributeset fingerprint_service_28_0 (fingerprint_service))
-+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
-+(typeattributeset firstboot_prop_28_0 (firstboot_prop))
-+(typeattributeset font_service_28_0 (font_service))
-+(typeattributeset frp_block_device_28_0 (frp_block_device))
-+(typeattributeset fs_bpf_28_0 (fs_bpf))
-+(typeattributeset fsck_28_0 (fsck))
-+(typeattributeset fsck_exec_28_0 (fsck_exec))
-+(typeattributeset fscklogs_28_0 (fscklogs))
-+(typeattributeset fsck_untrusted_28_0 (fsck_untrusted))
-+(typeattributeset full_device_28_0 (full_device))
-+(typeattributeset functionfs_28_0 (functionfs))
-+(typeattributeset fuse_28_0 (fuse))
-+(typeattributeset fuse_device_28_0 (fuse_device))
-+(typeattributeset fwk_display_hwservice_28_0 (fwk_display_hwservice))
-+(typeattributeset fwk_scheduler_hwservice_28_0 (fwk_scheduler_hwservice))
-+(typeattributeset fwk_sensor_hwservice_28_0 (fwk_sensor_hwservice))
-+(typeattributeset fwmarkd_socket_28_0 (fwmarkd_socket))
-+(typeattributeset gatekeeperd_28_0 (gatekeeperd))
-+(typeattributeset gatekeeper_data_file_28_0 (gatekeeper_data_file))
-+(typeattributeset gatekeeperd_exec_28_0 (gatekeeperd_exec))
-+(typeattributeset gatekeeper_service_28_0 (gatekeeper_service))
-+(typeattributeset gfxinfo_service_28_0 (gfxinfo_service))
-+(typeattributeset gps_control_28_0 (gps_control))
-+(typeattributeset gpu_device_28_0 (gpu_device))
-+(typeattributeset gpu_service_28_0 (gpu_service))
-+(typeattributeset graphics_device_28_0 (graphics_device))
-+(typeattributeset graphicsstats_service_28_0 (graphicsstats_service))
-+(typeattributeset hal_audiocontrol_hwservice_28_0 (hal_audiocontrol_hwservice))
-+(typeattributeset hal_audio_hwservice_28_0 (hal_audio_hwservice))
-+(typeattributeset hal_authsecret_hwservice_28_0 (hal_authsecret_hwservice))
-+(typeattributeset hal_bluetooth_hwservice_28_0 (hal_bluetooth_hwservice))
-+(typeattributeset hal_bootctl_hwservice_28_0 (hal_bootctl_hwservice))
-+(typeattributeset hal_broadcastradio_hwservice_28_0 (hal_broadcastradio_hwservice))
-+(typeattributeset hal_camera_hwservice_28_0 (hal_camera_hwservice))
-+(typeattributeset hal_cas_hwservice_28_0 (hal_cas_hwservice))
-+(typeattributeset hal_codec2_hwservice_28_0 (hal_codec2_hwservice))
-+(typeattributeset hal_configstore_ISurfaceFlingerConfigs_28_0 (hal_configstore_ISurfaceFlingerConfigs))
-+(typeattributeset hal_confirmationui_hwservice_28_0 (hal_confirmationui_hwservice))
-+(typeattributeset hal_contexthub_hwservice_28_0 (hal_contexthub_hwservice))
-+(typeattributeset hal_drm_hwservice_28_0 (hal_drm_hwservice))
-+(typeattributeset hal_dumpstate_hwservice_28_0 (hal_dumpstate_hwservice))
-+(typeattributeset hal_evs_hwservice_28_0 (hal_evs_hwservice))
-+(typeattributeset hal_fingerprint_hwservice_28_0 (hal_fingerprint_hwservice))
-+(typeattributeset hal_fingerprint_service_28_0 (hal_fingerprint_service))
-+(typeattributeset hal_gatekeeper_hwservice_28_0 (hal_gatekeeper_hwservice))
-+(typeattributeset hal_gnss_hwservice_28_0 (hal_gnss_hwservice))
-+(typeattributeset hal_graphics_allocator_hwservice_28_0 (hal_graphics_allocator_hwservice))
-+(typeattributeset hal_graphics_composer_hwservice_28_0 (hal_graphics_composer_hwservice))
-+(typeattributeset hal_graphics_mapper_hwservice_28_0 (hal_graphics_mapper_hwservice))
-+(typeattributeset hal_health_hwservice_28_0 (hal_health_hwservice))
-+(typeattributeset hal_ir_hwservice_28_0 (hal_ir_hwservice))
-+(typeattributeset hal_keymaster_hwservice_28_0 (hal_keymaster_hwservice))
-+(typeattributeset hal_light_hwservice_28_0 (hal_light_hwservice))
-+(typeattributeset hal_lowpan_hwservice_28_0 (hal_lowpan_hwservice))
-+(typeattributeset hal_memtrack_hwservice_28_0 (hal_memtrack_hwservice))
-+(typeattributeset hal_neuralnetworks_hwservice_28_0 (hal_neuralnetworks_hwservice))
-+(typeattributeset hal_nfc_hwservice_28_0 (hal_nfc_hwservice))
-+(typeattributeset hal_oemlock_hwservice_28_0 (hal_oemlock_hwservice))
-+(typeattributeset hal_omx_hwservice_28_0 (hal_omx_hwservice))
-+(typeattributeset hal_power_hwservice_28_0 (hal_power_hwservice))
-+(typeattributeset hal_renderscript_hwservice_28_0 (hal_renderscript_hwservice))
-+(typeattributeset hal_secure_element_hwservice_28_0 (hal_secure_element_hwservice))
-+(typeattributeset hal_sensors_hwservice_28_0 (hal_sensors_hwservice))
-+(typeattributeset hal_telephony_hwservice_28_0 (hal_telephony_hwservice))
-+(typeattributeset hal_tetheroffload_hwservice_28_0 (hal_tetheroffload_hwservice))
-+(typeattributeset hal_thermal_hwservice_28_0 (hal_thermal_hwservice))
-+(typeattributeset hal_tv_cec_hwservice_28_0 (hal_tv_cec_hwservice))
-+(typeattributeset hal_tv_input_hwservice_28_0 (hal_tv_input_hwservice))
-+(typeattributeset hal_usb_gadget_hwservice_28_0 (hal_usb_gadget_hwservice))
-+(typeattributeset hal_usb_hwservice_28_0 (hal_usb_hwservice))
-+(typeattributeset hal_vehicle_hwservice_28_0 (hal_vehicle_hwservice))
-+(typeattributeset hal_vibrator_hwservice_28_0 (hal_vibrator_hwservice))
-+(typeattributeset hal_vr_hwservice_28_0 (hal_vr_hwservice))
-+(typeattributeset hal_weaver_hwservice_28_0 (hal_weaver_hwservice))
-+(typeattributeset hal_wifi_hostapd_hwservice_28_0 (hal_wifi_hostapd_hwservice))
-+(typeattributeset hal_wifi_hwservice_28_0 (hal_wifi_hwservice))
-+(typeattributeset hal_wifi_offload_hwservice_28_0 (hal_wifi_offload_hwservice))
-+(typeattributeset hal_wifi_supplicant_hwservice_28_0 (hal_wifi_supplicant_hwservice))
-+(typeattributeset hardware_properties_service_28_0 (hardware_properties_service))
-+(typeattributeset hardware_service_28_0 (hardware_service))
-+(typeattributeset hci_attach_dev_28_0 (hci_attach_dev))
-+(typeattributeset hdmi_control_service_28_0 (hdmi_control_service))
-+(typeattributeset healthd_28_0 (healthd))
-+(typeattributeset healthd_exec_28_0 (healthd_exec))
-+(typeattributeset heapdump_data_file_28_0 (heapdump_data_file))
-+(typeattributeset hidl_allocator_hwservice_28_0 (hidl_allocator_hwservice))
-+(typeattributeset hidl_base_hwservice_28_0 (hidl_base_hwservice))
-+(typeattributeset hidl_manager_hwservice_28_0 (hidl_manager_hwservice))
-+(typeattributeset hidl_memory_hwservice_28_0 (hidl_memory_hwservice))
-+(typeattributeset hidl_token_hwservice_28_0 (hidl_token_hwservice))
-+(typeattributeset hwbinder_device_28_0 (hwbinder_device))
-+(typeattributeset hw_random_device_28_0 (hw_random_device))
-+(typeattributeset hwservice_contexts_file_28_0 (hwservice_contexts_file))
-+(typeattributeset hwservicemanager_28_0 (hwservicemanager))
-+(typeattributeset hwservicemanager_exec_28_0 (hwservicemanager_exec))
-+(typeattributeset hwservicemanager_prop_28_0 (hwservicemanager_prop))
-+(typeattributeset i2c_device_28_0 (i2c_device))
-+(typeattributeset icon_file_28_0 (icon_file))
-+(typeattributeset idmap_28_0 (idmap))
-+(typeattributeset idmap_exec_28_0 (idmap_exec))
-+(typeattributeset iio_device_28_0 (iio_device))
-+(typeattributeset imms_service_28_0 (imms_service))
-+(typeattributeset incident_28_0 (incident))
-+(typeattributeset incidentd_28_0 (incidentd))
-+(typeattributeset incident_data_file_28_0 (incident_data_file))
-+(typeattributeset incident_helper_28_0 (incident_helper))
-+(typeattributeset incident_service_28_0 (incident_service))
-+(typeattributeset init_28_0 (init))
-+(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
-+(typeattributeset inotify_28_0 (inotify))
-+(typeattributeset input_device_28_0 (input_device))
-+(typeattributeset inputflinger_28_0 (inputflinger))
-+(typeattributeset inputflinger_exec_28_0 (inputflinger_exec))
-+(typeattributeset inputflinger_service_28_0 (inputflinger_service))
-+(typeattributeset input_method_service_28_0 (input_method_service))
-+(typeattributeset input_service_28_0 (input_service))
-+(typeattributeset installd_28_0 (installd))
-+(typeattributeset install_data_file_28_0 (install_data_file))
-+(typeattributeset installd_exec_28_0 (installd_exec))
-+(typeattributeset installd_service_28_0 (installd_service))
-+(typeattributeset install_recovery_28_0 (install_recovery))
-+(typeattributeset install_recovery_exec_28_0 (install_recovery_exec))
-+(typeattributeset ion_device_28_0 (ion_device))
-+(typeattributeset IProxyService_service_28_0 (IProxyService_service))
-+(typeattributeset ipsec_service_28_0 (ipsec_service))
-+(typeattributeset isolated_app_28_0 (isolated_app))
-+(typeattributeset jobscheduler_service_28_0 (jobscheduler_service))
-+(typeattributeset kernel_28_0 (kernel))
-+(typeattributeset keychain_data_file_28_0 (keychain_data_file))
-+(typeattributeset keychord_device_28_0 (keychord_device))
-+(typeattributeset keystore_28_0 (keystore))
-+(typeattributeset keystore_data_file_28_0 (keystore_data_file))
-+(typeattributeset keystore_exec_28_0 (keystore_exec))
-+(typeattributeset keystore_service_28_0 (keystore_service))
-+(typeattributeset kmem_device_28_0 (kmem_device))
-+(typeattributeset kmsg_debug_device_28_0 (kmsg_debug_device))
-+(typeattributeset kmsg_device_28_0 (kmsg_device))
-+(typeattributeset labeledfs_28_0 (labeledfs))
-+(typeattributeset last_boot_reason_prop_28_0 (last_boot_reason_prop))
-+(typeattributeset launcherapps_service_28_0 (launcherapps_service))
-+(typeattributeset lmkd_28_0 (lmkd))
-+(typeattributeset lmkd_exec_28_0 (lmkd_exec))
-+(typeattributeset lmkd_socket_28_0 (lmkd_socket))
-+(typeattributeset location_service_28_0 (location_service))
-+(typeattributeset lock_settings_service_28_0 (lock_settings_service))
-+(typeattributeset logcat_exec_28_0 (logcat_exec))
-+(typeattributeset logd_28_0 (logd))
-+(typeattributeset logd_exec_28_0 (logd_exec))
-+(typeattributeset logd_prop_28_0 (logd_prop))
-+(typeattributeset logdr_socket_28_0 (logdr_socket))
-+(typeattributeset logd_socket_28_0 (logd_socket))
-+(typeattributeset logdw_socket_28_0 (logdw_socket))
-+(typeattributeset logpersist_28_0 (logpersist))
-+(typeattributeset logpersistd_logging_prop_28_0 (logpersistd_logging_prop))
-+(typeattributeset log_prop_28_0 (log_prop))
-+(typeattributeset log_tag_prop_28_0 (log_tag_prop))
-+(typeattributeset loop_control_device_28_0 (loop_control_device))
-+(typeattributeset loop_device_28_0 (loop_device))
-+(typeattributeset lowpan_device_28_0 (lowpan_device))
-+(typeattributeset lowpan_prop_28_0 (lowpan_prop))
-+(typeattributeset lowpan_service_28_0 (lowpan_service))
-+(typeattributeset mac_perms_file_28_0 (mac_perms_file))
-+(typeattributeset mdnsd_28_0 (mdnsd))
-+(typeattributeset mdnsd_socket_28_0 (mdnsd_socket))
-+(typeattributeset mdns_socket_28_0 (mdns_socket))
-+(typeattributeset hal_omx_server (mediacodec_28_0))
-+(typeattributeset mediacodec_28_0 (mediacodec))
-+(typeattributeset mediacodec_exec_28_0 (mediacodec_exec))
-+(typeattributeset mediacodec_service_28_0 (mediacodec_service))
-+(typeattributeset media_data_file_28_0 (media_data_file))
-+(typeattributeset mediadrmserver_28_0 (mediadrmserver))
-+(typeattributeset mediadrmserver_exec_28_0 (mediadrmserver_exec))
-+(typeattributeset mediadrmserver_service_28_0 (mediadrmserver_service))
-+(typeattributeset mediaextractor_28_0 (mediaextractor))
-+(typeattributeset mediaextractor_exec_28_0 (mediaextractor_exec))
-+(typeattributeset mediaextractor_service_28_0 (mediaextractor_service))
-+(typeattributeset mediaextractor_update_service_28_0 (mediaextractor_update_service))
-+(typeattributeset mediametrics_28_0 (mediametrics))
-+(typeattributeset mediametrics_exec_28_0 (mediametrics_exec))
-+(typeattributeset mediametrics_service_28_0 (mediametrics_service))
-+(typeattributeset media_projection_service_28_0 (media_projection_service))
-+(typeattributeset mediaprovider_28_0 (mediaprovider))
-+(typeattributeset media_router_service_28_0 (media_router_service))
-+(typeattributeset media_rw_data_file_28_0 (media_rw_data_file))
-+(typeattributeset mediaserver_28_0 (mediaserver))
-+(typeattributeset mediaserver_exec_28_0 (mediaserver_exec))
-+(typeattributeset mediaserver_service_28_0 (mediaserver_service))
-+(typeattributeset media_session_service_28_0 (media_session_service))
-+(typeattributeset meminfo_service_28_0 (meminfo_service))
-+(typeattributeset metadata_block_device_28_0 (metadata_block_device))
-+(typeattributeset metadata_file_28_0 (metadata_file))
-+(typeattributeset method_trace_data_file_28_0 (method_trace_data_file))
-+(typeattributeset midi_service_28_0 (midi_service))
-+(typeattributeset misc_block_device_28_0 (misc_block_device))
-+(typeattributeset misc_logd_file_28_0 (misc_logd_file))
-+(typeattributeset misc_user_data_file_28_0 (misc_user_data_file))
-+(typeattributeset mmc_prop_28_0 (mmc_prop))
-+(typeattributeset mnt_expand_file_28_0 (mnt_expand_file))
-+(typeattributeset mnt_media_rw_file_28_0 (mnt_media_rw_file))
-+(typeattributeset mnt_media_rw_stub_file_28_0 (mnt_media_rw_stub_file))
-+(typeattributeset mnt_user_file_28_0 (mnt_user_file))
-+(typeattributeset mnt_vendor_file_28_0 (mnt_vendor_file))
-+(typeattributeset modprobe_28_0 (modprobe))
-+(typeattributeset mount_service_28_0 (mount_service))
-+(typeattributeset mqueue_28_0 (mqueue))
-+(typeattributeset mtd_device_28_0 (mtd_device))
-+(typeattributeset mtp_28_0 (mtp))
-+(typeattributeset mtp_device_28_0 (mtp_device))
-+(typeattributeset mtpd_socket_28_0 (mtpd_socket))
-+(typeattributeset mtp_exec_28_0 (mtp_exec))
-+(typeattributeset nativetest_data_file_28_0 (nativetest_data_file))
-+(typeattributeset netd_28_0 (netd))
-+(typeattributeset net_data_file_28_0 (net_data_file))
-+(typeattributeset netd_exec_28_0 (netd_exec))
-+(typeattributeset netd_listener_service_28_0 (netd_listener_service))
-+(typeattributeset net_dns_prop_28_0 (net_dns_prop))
-+(typeattributeset netd_service_28_0 (netd_service))
-+(typeattributeset netd_socket_28_0 (netd_socket))
-+(typeattributeset netd_stable_secret_prop_28_0 (netd_stable_secret_prop))
-+(typeattributeset netif_28_0 (netif))
-+(typeattributeset netpolicy_service_28_0 (netpolicy_service))
-+(typeattributeset net_radio_prop_28_0 (net_radio_prop))
-+(typeattributeset netstats_service_28_0 (netstats_service))
-+(typeattributeset netutils_wrapper_28_0 (netutils_wrapper))
-+(typeattributeset netutils_wrapper_exec_28_0 (netutils_wrapper_exec))
-+(typeattributeset network_management_service_28_0 (network_management_service))
-+(typeattributeset network_score_service_28_0 (network_score_service))
-+(typeattributeset network_time_update_service_28_0 (network_time_update_service))
-+(typeattributeset network_watchlist_data_file_28_0 (network_watchlist_data_file))
-+(typeattributeset network_watchlist_service_28_0 (network_watchlist_service))
-+(typeattributeset nfc_28_0 (nfc))
-+(typeattributeset nfc_data_file_28_0 (nfc_data_file))
-+(typeattributeset nfc_device_28_0 (nfc_device))
-+(typeattributeset nfc_prop_28_0 (nfc_prop))
-+(typeattributeset nfc_service_28_0 (nfc_service))
-+(typeattributeset node_28_0 (node))
-+(typeattributeset nonplat_service_contexts_file_28_0 (nonplat_service_contexts_file))
-+(typeattributeset notification_service_28_0 (notification_service))
-+(typeattributeset null_device_28_0 (null_device))
-+(typeattributeset oemfs_28_0 (oemfs))
-+(typeattributeset oem_lock_service_28_0 (oem_lock_service))
-+(typeattributeset ota_data_file_28_0 (ota_data_file))
-+(typeattributeset otadexopt_service_28_0 (otadexopt_service))
-+(typeattributeset ota_package_file_28_0 (ota_package_file))
-+(typeattributeset otapreopt_chroot_28_0 (otapreopt_chroot))
-+(typeattributeset otapreopt_chroot_exec_28_0 (otapreopt_chroot_exec))
-+(typeattributeset otapreopt_slot_28_0 (otapreopt_slot))
-+(typeattributeset otapreopt_slot_exec_28_0 (otapreopt_slot_exec))
-+(typeattributeset overlay_prop_28_0 (overlay_prop))
-+(typeattributeset overlay_service_28_0 (overlay_service))
-+(typeattributeset owntty_device_28_0 (owntty_device))
-+(typeattributeset package_native_service_28_0 (package_native_service))
-+(typeattributeset package_service_28_0 (package_service))
-+(typeattributeset pan_result_prop_28_0 (pan_result_prop))
-+(typeattributeset pdx_bufferhub_client_channel_socket_28_0 (pdx_bufferhub_client_channel_socket))
-+(typeattributeset pdx_bufferhub_client_endpoint_socket_28_0 (pdx_bufferhub_client_endpoint_socket))
-+(typeattributeset pdx_bufferhub_dir_28_0 (pdx_bufferhub_dir))
-+(typeattributeset pdx_display_client_channel_socket_28_0 (pdx_display_client_channel_socket))
-+(typeattributeset pdx_display_client_endpoint_socket_28_0 (pdx_display_client_endpoint_socket))
-+(typeattributeset pdx_display_dir_28_0 (pdx_display_dir))
-+(typeattributeset pdx_display_manager_channel_socket_28_0 (pdx_display_manager_channel_socket))
-+(typeattributeset pdx_display_manager_endpoint_socket_28_0 (pdx_display_manager_endpoint_socket))
-+(typeattributeset pdx_display_screenshot_channel_socket_28_0 (pdx_display_screenshot_channel_socket))
-+(typeattributeset pdx_display_screenshot_endpoint_socket_28_0 (pdx_display_screenshot_endpoint_socket))
-+(typeattributeset pdx_display_vsync_channel_socket_28_0 (pdx_display_vsync_channel_socket))
-+(typeattributeset pdx_display_vsync_endpoint_socket_28_0 (pdx_display_vsync_endpoint_socket))
-+(typeattributeset pdx_performance_client_channel_socket_28_0 (pdx_performance_client_channel_socket))
-+(typeattributeset pdx_performance_client_endpoint_socket_28_0 (pdx_performance_client_endpoint_socket))
-+(typeattributeset pdx_performance_dir_28_0 (pdx_performance_dir))
-+(typeattributeset performanced_28_0 (performanced))
-+(typeattributeset performanced_exec_28_0 (performanced_exec))
-+(typeattributeset permission_service_28_0 (permission_service))
-+(typeattributeset persist_debug_prop_28_0 (persist_debug_prop))
-+(typeattributeset persistent_data_block_service_28_0 (persistent_data_block_service))
-+(typeattributeset persistent_properties_ready_prop_28_0 (persistent_properties_ready_prop))
-+(typeattributeset pinner_service_28_0 (pinner_service))
-+(typeattributeset pipefs_28_0 (pipefs))
-+(typeattributeset platform_app_28_0 (platform_app))
-+(typeattributeset pm_prop_28_0 (pm_prop))
-+(typeattributeset pmsg_device_28_0 (pmsg_device))
-+(typeattributeset port_28_0 (port))
-+(typeattributeset port_device_28_0 (port_device))
-+(typeattributeset postinstall_28_0 (postinstall))
-+(typeattributeset postinstall_dexopt_28_0 (postinstall_dexopt))
-+(typeattributeset postinstall_file_28_0 (postinstall_file))
-+(typeattributeset postinstall_mnt_dir_28_0 (postinstall_mnt_dir))
-+(typeattributeset powerctl_prop_28_0 (powerctl_prop))
-+(typeattributeset power_service_28_0 (power_service))
-+(typeattributeset ppp_28_0 (ppp))
-+(typeattributeset ppp_device_28_0 (ppp_device))
-+(typeattributeset ppp_exec_28_0 (ppp_exec))
-+(typeattributeset preloads_data_file_28_0 (preloads_data_file))
-+(typeattributeset preloads_media_file_28_0 (preloads_media_file))
-+(typeattributeset preopt2cachename_28_0 (preopt2cachename))
-+(typeattributeset preopt2cachename_exec_28_0 (preopt2cachename_exec))
-+(typeattributeset print_service_28_0 (print_service))
-+(typeattributeset priv_app_28_0 (priv_app))
-+(typeattributeset proc_28_0
-+  ( proc
-+    proc_fs_verity
-+    proc_keys
-+    proc_kpageflags
-+    proc_lowmemorykiller
-+    proc_pressure_cpu
-+    proc_pressure_io
-+    proc_pressure_mem
-+    proc_slabinfo))
-+(typeattributeset proc_abi_28_0 (proc_abi))
-+(typeattributeset proc_asound_28_0 (proc_asound))
-+(typeattributeset proc_bluetooth_writable_28_0 (proc_bluetooth_writable))
-+(typeattributeset proc_buddyinfo_28_0 (proc_buddyinfo))
-+(typeattributeset proc_cmdline_28_0 (proc_cmdline))
-+(typeattributeset proc_cpuinfo_28_0 (proc_cpuinfo))
-+(typeattributeset proc_dirty_28_0 (proc_dirty))
-+(typeattributeset proc_diskstats_28_0 (proc_diskstats))
-+(typeattributeset proc_drop_caches_28_0 (proc_drop_caches))
-+(typeattributeset processinfo_service_28_0 (processinfo_service))
-+(typeattributeset proc_extra_free_kbytes_28_0 (proc_extra_free_kbytes))
-+(typeattributeset proc_filesystems_28_0 (proc_filesystems))
-+(typeattributeset proc_hostname_28_0 (proc_hostname))
-+(typeattributeset proc_hung_task_28_0 (proc_hung_task))
-+(typeattributeset proc_interrupts_28_0 (proc_interrupts))
-+(typeattributeset proc_iomem_28_0 (proc_iomem))
-+(typeattributeset proc_kmsg_28_0 (proc_kmsg))
-+(typeattributeset proc_loadavg_28_0 (proc_loadavg))
-+(typeattributeset proc_max_map_count_28_0 (proc_max_map_count))
-+(typeattributeset proc_meminfo_28_0 (proc_meminfo))
-+(typeattributeset proc_min_free_order_shift_28_0 (proc_min_free_order_shift))
-+(typeattributeset proc_misc_28_0 (proc_misc))
-+(typeattributeset proc_modules_28_0 (proc_modules))
-+(typeattributeset proc_mounts_28_0 (proc_mounts))
-+(typeattributeset proc_net_28_0
-+  ( proc_net
-+    proc_net_tcp_udp))
-+(typeattributeset proc_overcommit_memory_28_0 (proc_overcommit_memory))
-+(typeattributeset proc_page_cluster_28_0 (proc_page_cluster))
-+(typeattributeset proc_pagetypeinfo_28_0 (proc_pagetypeinfo))
-+(typeattributeset proc_panic_28_0 (proc_panic))
-+(typeattributeset proc_perf_28_0 (proc_perf))
-+(typeattributeset proc_pid_max_28_0 (proc_pid_max))
-+(typeattributeset proc_pipe_conf_28_0 (proc_pipe_conf))
-+(typeattributeset proc_qtaguid_stat_28_0 (proc_qtaguid_stat))
-+(typeattributeset proc_random_28_0 (proc_random))
-+(typeattributeset proc_sched_28_0 (proc_sched))
-+(typeattributeset proc_security_28_0 (proc_security))
-+(typeattributeset proc_stat_28_0 (proc_stat))
-+(typeattributeset procstats_service_28_0 (procstats_service))
-+(typeattributeset proc_swaps_28_0 (proc_swaps))
-+(typeattributeset proc_sysrq_28_0 (proc_sysrq))
-+(typeattributeset proc_timer_28_0 (proc_timer))
-+(typeattributeset proc_tty_drivers_28_0 (proc_tty_drivers))
-+(typeattributeset proc_uid_concurrent_active_time_28_0 (proc_uid_concurrent_active_time))
-+(typeattributeset proc_uid_concurrent_policy_time_28_0 (proc_uid_concurrent_policy_time))
-+(typeattributeset proc_uid_cpupower_28_0 (proc_uid_cpupower))
-+(typeattributeset proc_uid_cputime_removeuid_28_0 (proc_uid_cputime_removeuid))
-+(typeattributeset proc_uid_cputime_showstat_28_0 (proc_uid_cputime_showstat))
-+(typeattributeset proc_uid_io_stats_28_0 (proc_uid_io_stats))
-+(typeattributeset proc_uid_procstat_set_28_0 (proc_uid_procstat_set))
-+(typeattributeset proc_uid_time_in_state_28_0 (proc_uid_time_in_state))
-+(typeattributeset proc_uptime_28_0 (proc_uptime))
-+(typeattributeset proc_version_28_0 (proc_version))
-+(typeattributeset proc_vmallocinfo_28_0 (proc_vmallocinfo))
-+(typeattributeset proc_vmstat_28_0 (proc_vmstat))
-+(typeattributeset proc_zoneinfo_28_0 (proc_zoneinfo))
-+(typeattributeset profman_28_0 (profman))
-+(typeattributeset profman_dump_data_file_28_0 (profman_dump_data_file))
-+(typeattributeset profman_exec_28_0 (profman_exec))
-+(typeattributeset properties_device_28_0 (properties_device))
-+(typeattributeset properties_serial_28_0 (properties_serial))
-+(typeattributeset property_contexts_file_28_0 (property_contexts_file))
-+(typeattributeset property_data_file_28_0 (property_data_file))
-+(typeattributeset property_info_28_0 (property_info))
-+(typeattributeset property_socket_28_0 (property_socket))
-+(typeattributeset pstorefs_28_0 (pstorefs))
-+(typeattributeset ptmx_device_28_0 (ptmx_device))
-+(typeattributeset qtaguid_device_28_0 (qtaguid_device))
-+(typeattributeset qtaguid_proc_28_0
-+  ( proc_qtaguid_ctrl
-+    qtaguid_proc))
-+(typeattributeset racoon_28_0 (racoon))
-+(typeattributeset racoon_exec_28_0 (racoon_exec))
-+(typeattributeset racoon_socket_28_0 (racoon_socket))
-+(typeattributeset radio_28_0 (radio))
-+(typeattributeset radio_data_file_28_0 (radio_data_file))
-+(typeattributeset radio_device_28_0 (radio_device))
-+(typeattributeset radio_prop_28_0 (radio_prop))
-+(typeattributeset radio_service_28_0 (radio_service))
-+(typeattributeset ram_device_28_0 (ram_device))
-+(typeattributeset random_device_28_0 (random_device))
-+(typeattributeset recovery_28_0 (recovery))
-+(typeattributeset recovery_block_device_28_0 (recovery_block_device))
-+(typeattributeset recovery_data_file_28_0 (recovery_data_file))
-+(typeattributeset recovery_persist_28_0 (recovery_persist))
-+(typeattributeset recovery_persist_exec_28_0 (recovery_persist_exec))
-+(typeattributeset recovery_refresh_28_0 (recovery_refresh))
-+(typeattributeset recovery_refresh_exec_28_0 (recovery_refresh_exec))
-+(typeattributeset recovery_service_28_0 (recovery_service))
-+(typeattributeset registry_service_28_0 (registry_service))
-+(typeattributeset resourcecache_data_file_28_0 (resourcecache_data_file))
-+(typeattributeset restorecon_prop_28_0 (restorecon_prop))
-+(typeattributeset restrictions_service_28_0 (restrictions_service))
-+(typeattributeset rild_debug_socket_28_0 (rild_debug_socket))
-+(typeattributeset rild_socket_28_0 (rild_socket))
-+(typeattributeset ringtone_file_28_0 (ringtone_file))
-+(typeattributeset root_block_device_28_0 (root_block_device))
-+(typeattributeset rootfs_28_0 (rootfs))
-+(typeattributeset rpmsg_device_28_0 (rpmsg_device))
-+(typeattributeset rtc_device_28_0 (rtc_device))
-+(typeattributeset rttmanager_service_28_0 (rttmanager_service))
-+(typeattributeset runas_28_0 (runas))
-+(typeattributeset runas_exec_28_0 (runas_exec))
-+(typeattributeset runtime_event_log_tags_file_28_0 (runtime_event_log_tags_file))
-+(typeattributeset safemode_prop_28_0 (safemode_prop))
-+(typeattributeset same_process_hal_file_28_0
-+  ( same_process_hal_file
-+    vendor_public_lib_file))
-+(typeattributeset samplingprofiler_service_28_0 (samplingprofiler_service))
-+(typeattributeset scheduling_policy_service_28_0 (scheduling_policy_service))
-+(typeattributeset sdcardd_28_0 (sdcardd))
-+(typeattributeset sdcardd_exec_28_0 (sdcardd_exec))
-+(typeattributeset sdcardfs_28_0 (sdcardfs))
-+(typeattributeset seapp_contexts_file_28_0 (seapp_contexts_file))
-+(typeattributeset search_service_28_0 (search_service))
-+(typeattributeset sec_key_att_app_id_provider_service_28_0 (sec_key_att_app_id_provider_service))
-+(typeattributeset secure_element_28_0 (secure_element))
-+(typeattributeset secure_element_device_28_0 (secure_element_device))
-+(typeattributeset secure_element_service_28_0 (secure_element_service))
-+(typeattributeset selinuxfs_28_0 (selinuxfs))
-+(typeattributeset sensors_device_28_0 (sensors_device))
-+(typeattributeset sensorservice_service_28_0 (sensorservice_service))
-+(typeattributeset sepolicy_file_28_0 (sepolicy_file))
-+(typeattributeset serial_device_28_0 (serial_device))
-+(typeattributeset serialno_prop_28_0 (serialno_prop))
-+(typeattributeset serial_service_28_0 (serial_service))
-+(typeattributeset service_contexts_file_28_0 (service_contexts_file))
-+(typeattributeset servicediscovery_service_28_0 (servicediscovery_service))
-+(typeattributeset servicemanager_28_0 (servicemanager))
-+(typeattributeset servicemanager_exec_28_0 (servicemanager_exec))
-+(typeattributeset settings_service_28_0 (settings_service))
-+(typeattributeset sgdisk_28_0 (sgdisk))
-+(typeattributeset sgdisk_exec_28_0 (sgdisk_exec))
-+(typeattributeset shared_relro_28_0 (shared_relro))
-+(typeattributeset shared_relro_file_28_0 (shared_relro_file))
-+(typeattributeset shell_28_0 (shell))
-+(typeattributeset shell_data_file_28_0 (shell_data_file))
-+(typeattributeset shell_exec_28_0 (shell_exec))
-+(typeattributeset shell_prop_28_0 (shell_prop))
-+(typeattributeset shm_28_0 (shm))
-+(typeattributeset shortcut_manager_icons_28_0 (shortcut_manager_icons))
-+(typeattributeset shortcut_service_28_0 (shortcut_service))
-+(typeattributeset slice_service_28_0 (slice_service))
-+(typeattributeset slideshow_28_0 (slideshow))
-+(typeattributeset socket_device_28_0 (socket_device))
-+(typeattributeset sockfs_28_0 (sockfs))
-+(typeattributeset statusbar_service_28_0 (statusbar_service))
-+(typeattributeset storaged_service_28_0 (storaged_service))
-+(typeattributeset storage_file_28_0 (storage_file))
-+(typeattributeset storagestats_service_28_0 (storagestats_service))
-+(typeattributeset storage_stub_file_28_0 (storage_stub_file))
-+(typeattributeset su_28_0 (su))
-+(typeattributeset su_exec_28_0 (su_exec))
-+(typeattributeset surfaceflinger_28_0 (surfaceflinger))
-+(typeattributeset surfaceflinger_service_28_0 (surfaceflinger_service))
-+(typeattributeset swap_block_device_28_0 (swap_block_device))
-+(typeattributeset sysfs_28_0
-+  ( sysfs
-+    sysfs_devices_block
-+    sysfs_extcon
-+    sysfs_loop
-+    sysfs_transparent_hugepage))
-+(typeattributeset sysfs_android_usb_28_0 (sysfs_android_usb))
-+(typeattributeset sysfs_batteryinfo_28_0 (sysfs_batteryinfo))
-+(typeattributeset sysfs_bluetooth_writable_28_0 (sysfs_bluetooth_writable))
-+(typeattributeset sysfs_devices_system_cpu_28_0 (sysfs_devices_system_cpu))
-+(typeattributeset sysfs_dm_28_0 (sysfs_dm))
-+(typeattributeset sysfs_dt_firmware_android_28_0 (sysfs_dt_firmware_android))
-+(typeattributeset sysfs_fs_ext4_features_28_0 (sysfs_fs_ext4_features))
-+(typeattributeset sysfs_hwrandom_28_0 (sysfs_hwrandom))
-+(typeattributeset sysfs_ipv4_28_0 (sysfs_ipv4))
-+(typeattributeset sysfs_kernel_notes_28_0 (sysfs_kernel_notes))
-+(typeattributeset sysfs_leds_28_0 (sysfs_leds))
-+(typeattributeset sysfs_lowmemorykiller_28_0 (sysfs_lowmemorykiller))
-+(typeattributeset sysfs_mac_address_28_0 (sysfs_mac_address))
-+(typeattributeset sysfs_net_28_0 (sysfs_net))
-+(typeattributeset sysfs_nfc_power_writable_28_0 (sysfs_nfc_power_writable))
-+(typeattributeset sysfs_power_28_0 (sysfs_power))
-+(typeattributeset sysfs_rtc_28_0 (sysfs_rtc))
-+(typeattributeset sysfs_switch_28_0 (sysfs_switch))
-+(typeattributeset sysfs_thermal_28_0 (sysfs_thermal))
-+(typeattributeset sysfs_uio_28_0 (sysfs_uio))
-+(typeattributeset sysfs_usb_28_0 (sysfs_usb))
-+(typeattributeset sysfs_usermodehelper_28_0 (sysfs_usermodehelper))
-+(typeattributeset sysfs_vibrator_28_0 (sysfs_vibrator))
-+(typeattributeset sysfs_wake_lock_28_0 (sysfs_wake_lock))
-+(typeattributeset sysfs_wakeup_reasons_28_0 (sysfs_wakeup_reasons))
-+(typeattributeset sysfs_wlan_fwpath_28_0 (sysfs_wlan_fwpath))
-+(typeattributeset sysfs_zram_28_0 (sysfs_zram))
-+(typeattributeset sysfs_zram_uevent_28_0 (sysfs_zram_uevent))
-+(typeattributeset system_app_28_0 (system_app))
-+(typeattributeset system_app_data_file_28_0 (system_app_data_file))
-+(typeattributeset system_app_service_28_0 (system_app_service))
-+(typeattributeset system_block_device_28_0 (system_block_device))
-+(typeattributeset system_boot_reason_prop_28_0 (system_boot_reason_prop))
-+(typeattributeset system_data_file_28_0
-+  ( dropbox_data_file
-+    system_data_file
-+    packages_list_file))
-+(typeattributeset system_file_28_0
-+  ( system_file
-+    system_asan_options_file
-+    system_lib_file
-+    system_linker_config_file
-+    system_linker_exec
-+    system_seccomp_policy_file
-+    system_security_cacerts_file
-+    tcpdump_exec
-+    system_zoneinfo_file
-+))
-+(typeattributeset systemkeys_data_file_28_0 (systemkeys_data_file))
-+(typeattributeset system_ndebug_socket_28_0 (system_ndebug_socket))
-+(typeattributeset system_net_netd_hwservice_28_0 (system_net_netd_hwservice))
-+(typeattributeset system_prop_28_0 (system_prop))
-+(typeattributeset system_radio_prop_28_0 (system_radio_prop))
-+(typeattributeset system_server_28_0 (system_server))
-+(typeattributeset system_update_service_28_0 (system_update_service))
-+(typeattributeset system_wifi_keystore_hwservice_28_0 (system_wifi_keystore_hwservice))
-+(typeattributeset system_wpa_socket_28_0 (system_wpa_socket))
-+(typeattributeset task_service_28_0 (task_service))
-+(typeattributeset tee_28_0 (tee))
-+(typeattributeset tee_data_file_28_0 (tee_data_file))
-+(typeattributeset tee_device_28_0 (tee_device))
-+(typeattributeset telecom_service_28_0 (telecom_service))
-+(typeattributeset test_boot_reason_prop_28_0 (test_boot_reason_prop))
-+(typeattributeset textclassification_service_28_0 (textclassification_service))
-+(typeattributeset textclassifier_data_file_28_0 (textclassifier_data_file))
-+(typeattributeset textservices_service_28_0 (textservices_service))
-+(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
-+(typeattributeset thermal_service_28_0 (thermal_service))
-+(typeattributeset timezone_service_28_0 (timezone_service))
-+(typeattributeset tmpfs_28_0
-+  ( mnt_sdcard_file
-+    tmpfs))
-+(typeattributeset tombstoned_28_0 (tombstoned))
-+(typeattributeset tombstone_data_file_28_0 (tombstone_data_file))
-+(typeattributeset tombstoned_crash_socket_28_0 (tombstoned_crash_socket))
-+(typeattributeset tombstoned_exec_28_0 (tombstoned_exec))
-+(typeattributeset tombstoned_intercept_socket_28_0 (tombstoned_intercept_socket))
-+(typeattributeset tombstoned_java_trace_socket_28_0 (tombstoned_java_trace_socket))
-+(typeattributeset tombstone_wifi_data_file_28_0 (tombstone_wifi_data_file))
-+(typeattributeset toolbox_28_0 (toolbox))
-+(typeattributeset toolbox_exec_28_0 (toolbox_exec))
-+(typeattributeset trace_data_file_28_0 (trace_data_file))
-+(typeattributeset traced_consumer_socket_28_0 (traced_consumer_socket))
-+(typeattributeset traced_enabled_prop_28_0 (traced_enabled_prop))
-+(typeattributeset traced_probes_28_0 (traced_probes))
-+(typeattributeset traced_producer_socket_28_0 (traced_producer_socket))
-+(typeattributeset traceur_app_28_0 (traceur_app))
-+(typeattributeset trust_service_28_0 (trust_service))
-+(typeattributeset tty_device_28_0 (tty_device))
-+(typeattributeset tun_device_28_0 (tun_device))
-+(typeattributeset tv_input_service_28_0 (tv_input_service))
-+(typeattributeset tzdatacheck_28_0 (tzdatacheck))
-+(typeattributeset tzdatacheck_exec_28_0 (tzdatacheck_exec))
-+(typeattributeset ueventd_28_0 (ueventd))
-+(typeattributeset uhid_device_28_0 (uhid_device))
-+(typeattributeset uimode_service_28_0 (uimode_service))
-+(typeattributeset uio_device_28_0 (uio_device))
-+(typeattributeset uncrypt_28_0 (uncrypt))
-+(typeattributeset uncrypt_exec_28_0 (uncrypt_exec))
-+(typeattributeset uncrypt_socket_28_0 (uncrypt_socket))
-+(typeattributeset unencrypted_data_file_28_0 (unencrypted_data_file))
-+(typeattributeset unlabeled_28_0 (unlabeled))
-+(typeattributeset untrusted_app_25_28_0 (untrusted_app_25))
-+(typeattributeset untrusted_app_27_28_0 (untrusted_app_27))
-+(typeattributeset untrusted_app_28_0 (untrusted_app))
-+(typeattributeset untrusted_v2_app_28_0 (untrusted_v2_app))
-+(typeattributeset update_engine_28_0 (update_engine))
-+(typeattributeset update_engine_data_file_28_0 (update_engine_data_file))
-+(typeattributeset update_engine_exec_28_0 (update_engine_exec))
-+(typeattributeset update_engine_log_data_file_28_0 (update_engine_log_data_file))
-+(typeattributeset update_engine_service_28_0 (update_engine_service))
-+(typeattributeset updatelock_service_28_0 (updatelock_service))
-+(typeattributeset update_verifier_28_0 (update_verifier))
-+(typeattributeset update_verifier_exec_28_0 (update_verifier_exec))
-+(typeattributeset usagestats_service_28_0 (usagestats_service))
-+(typeattributeset usbaccessory_device_28_0 (usbaccessory_device))
-+(typeattributeset usbd_28_0 (usbd))
-+(typeattributeset usb_device_28_0 (usb_device))
-+(typeattributeset usbd_exec_28_0 (usbd_exec))
-+(typeattributeset usbfs_28_0 (usbfs))
-+(typeattributeset usb_service_28_0 (usb_service))
-+(typeattributeset userdata_block_device_28_0 (userdata_block_device))
-+(typeattributeset usermodehelper_28_0 (usermodehelper))
-+(typeattributeset user_profile_data_file_28_0 (user_profile_data_file))
-+(typeattributeset user_service_28_0 (user_service))
-+(typeattributeset vcs_device_28_0 (vcs_device))
-+(typeattributeset vdc_28_0 (vdc))
-+(typeattributeset vdc_exec_28_0 (vdc_exec))
-+(typeattributeset vendor_app_file_28_0 (vendor_app_file))
-+(typeattributeset vendor_configs_file_28_0 (vendor_configs_file))
-+(typeattributeset vendor_data_file_28_0 (vendor_data_file))
-+(typeattributeset vendor_default_prop_28_0 (vendor_default_prop))
-+(typeattributeset vendor_file_28_0 (vendor_file))
-+(typeattributeset vendor_framework_file_28_0 (vendor_framework_file))
-+(typeattributeset vendor_hal_file_28_0 (vendor_hal_file))
-+(typeattributeset vendor_init_28_0 (vendor_init))
-+(typeattributeset vendor_overlay_file_28_0 (vendor_overlay_file))
-+(typeattributeset vendor_security_patch_level_prop_28_0 (vendor_security_patch_level_prop))
-+(typeattributeset vendor_shell_28_0 (vendor_shell))
-+(typeattributeset vendor_shell_exec_28_0 (vendor_shell_exec))
-+(typeattributeset vendor_toolbox_exec_28_0 (vendor_toolbox_exec))
-+(typeattributeset vfat_28_0 (vfat))
-+(typeattributeset vibrator_service_28_0 (vibrator_service))
-+(typeattributeset video_device_28_0 (video_device))
-+(typeattributeset virtual_touchpad_28_0 (virtual_touchpad))
-+(typeattributeset virtual_touchpad_exec_28_0 (virtual_touchpad_exec))
-+(typeattributeset virtual_touchpad_service_28_0 (virtual_touchpad_service))
-+(typeattributeset vndbinder_device_28_0 (vndbinder_device))
-+(typeattributeset vndk_sp_file_28_0 (vndk_sp_file))
-+(typeattributeset vndservice_contexts_file_28_0 (vndservice_contexts_file))
-+(typeattributeset vndservicemanager_28_0 (vndservicemanager))
-+(typeattributeset voiceinteraction_service_28_0 (voiceinteraction_service))
-+(typeattributeset vold_28_0 (vold))
-+(typeattributeset vold_data_file_28_0 (vold_data_file))
-+(typeattributeset vold_device_28_0 (vold_device))
-+(typeattributeset vold_exec_28_0 (vold_exec))
-+(typeattributeset vold_metadata_file_28_0 (vold_metadata_file))
-+(typeattributeset vold_prepare_subdirs_28_0 (vold_prepare_subdirs))
-+(typeattributeset vold_prepare_subdirs_exec_28_0 (vold_prepare_subdirs_exec))
-+(typeattributeset vold_prop_28_0 (vold_prop))
-+(typeattributeset vold_service_28_0 (vold_service))
-+(typeattributeset vpn_data_file_28_0 (vpn_data_file))
-+(typeattributeset vr_hwc_28_0 (vr_hwc))
-+(typeattributeset vr_hwc_exec_28_0 (vr_hwc_exec))
-+(typeattributeset vr_hwc_service_28_0 (vr_hwc_service))
-+(typeattributeset vr_manager_service_28_0 (vr_manager_service))
-+(typeattributeset wallpaper_file_28_0 (wallpaper_file))
-+(typeattributeset wallpaper_service_28_0 (wallpaper_service))
-+(typeattributeset watchdogd_28_0 (watchdogd))
-+(typeattributeset watchdog_device_28_0 (watchdog_device))
-+(typeattributeset webviewupdate_service_28_0 (webviewupdate_service))
-+(typeattributeset webview_zygote_28_0 (webview_zygote))
-+(typeattributeset webview_zygote_exec_28_0 (webview_zygote_exec))
-+(typeattributeset wifiaware_service_28_0 (wifiaware_service))
-+(typeattributeset wificond_28_0 (wificond))
-+(typeattributeset wificond_exec_28_0 (wificond_exec))
-+(typeattributeset wificond_service_28_0 (wificond_service))
-+(typeattributeset wifi_data_file_28_0 (wifi_data_file))
-+(typeattributeset wifi_log_prop_28_0 (wifi_log_prop))
-+(typeattributeset wifip2p_service_28_0 (wifip2p_service))
-+(typeattributeset wifi_prop_28_0 (wifi_prop))
-+(typeattributeset wifiscanner_service_28_0 (wifiscanner_service))
-+(typeattributeset wifi_service_28_0 (wifi_service))
-+(typeattributeset window_service_28_0 (window_service))
-+(typeattributeset wpantund_28_0 (wpantund))
-+(typeattributeset wpantund_exec_28_0 (wpantund_exec))
-+(typeattributeset wpantund_service_28_0 (wpantund_service))
-+(typeattributeset wpa_socket_28_0 (wpa_socket))
-+(typeattributeset zero_device_28_0 (zero_device))
-+(typeattributeset zoneinfo_data_file_28_0 (zoneinfo_data_file))
-+(typeattributeset zygote_28_0 (zygote))
-+(typeattributeset zygote_exec_28_0 (zygote_exec))
-+(typeattributeset zygote_socket_28_0 (zygote_socket))
-diff --git a/prebuilts/api/30.0/private/compat/28.0/28.0.compat.cil b/prebuilts/api/30.0/private/compat/28.0/28.0.compat.cil
-new file mode 100644
-index 000000000..30af58c42
---- /dev/null
-+++ b/prebuilts/api/30.0/private/compat/28.0/28.0.compat.cil
-@@ -0,0 +1,5 @@
-+(typeattribute vendordomain)
-+(typeattributeset vendordomain ((and (domain) ((not (coredomain))))))
-+(allowx vendordomain dev_type (ioctl blk_file ((range 0x0000 0xffff))))
-+(allowx vendordomain file_type (ioctl file ((range 0x0000 0xffff))))
-+(allow vendordomain self (netlink_route_socket (nlmsg_readpriv)))
-diff --git a/prebuilts/api/30.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/30.0/private/compat/28.0/28.0.ignore.cil
-new file mode 100644
-index 000000000..d24d12d25
---- /dev/null
-+++ b/prebuilts/api/30.0/private/compat/28.0/28.0.ignore.cil
-@@ -0,0 +1,159 @@
-+;; new_objects - a collection of types that have been introduced that have no
-+;;   analogue in older policy.  Thus, we do not need to map these types to
-+;;   previous ones.  Add here to pass checkapi tests.
-+(type new_objects)
-+(typeattribute new_objects)
-+(typeattributeset new_objects
-+  ( new_objects
-+    activity_task_service
-+    adb_service
-+    apex_data_file
-+    apex_metadata_file
-+    apex_mnt_dir
-+    apex_service
-+    apexd
-+    apexd_exec
-+    apexd_prop
-+    apexd_tmpfs
-+    appdomain_tmpfs
-+    app_binding_service
-+    app_prediction_service
-+    app_zygote
-+    app_zygote_tmpfs
-+    ashmemd
-+    ashmem_device_service
-+    attention_service
-+    biometric_service
-+    bluetooth_audio_hal_prop
-+    bpf_progs_loaded_prop
-+    bugreport_service
-+    cgroup_desc_file
-+    cgroup_rc_file
-+    charger_exec
-+    content_capture_service
-+    content_suggestions_service
-+    cpu_variant_prop
-+    ctl_apexd_prop
-+    ctl_gsid_prop
-+    dev_cpu_variant
-+    device_config_activity_manager_native_boot_prop
-+    device_config_boot_count_prop
-+    device_config_input_native_boot_prop
-+    device_config_netd_native_prop
-+    device_config_reset_performed_prop
-+    device_config_runtime_native_boot_prop
-+    device_config_runtime_native_prop
-+    device_config_media_native_prop
-+    device_config_service
-+    device_config_sys_traced_prop
-+    dnsresolver_service
-+    dynamic_system_service
-+    dynamic_system_prop
-+    face_service
-+    face_vendor_data_file
-+    sota_prop
-+    fastbootd
-+    flags_health_check
-+    flags_health_check_exec
-+    fwk_bufferhub_hwservice
-+    fwk_camera_hwservice
-+    fwk_stats_hwservice
-+    gpuservice
-+    gsi_data_file
-+    gsi_metadata_file
-+    gsi_service
-+    gsid
-+    gsid_exec
-+    gsid_prop
-+    color_display_service
-+    external_vibrator_service
-+    hal_atrace_hwservice
-+    hal_face_hwservice
-+    hal_graphics_composer_server_tmpfs
-+    hal_health_storage_hwservice
-+    hal_input_classifier_hwservice
-+    hal_power_stats_hwservice
-+    heapprofd
-+    heapprofd_enabled_prop
-+    heapprofd_exec
-+    heapprofd_prop
-+    heapprofd_socket
-+    idmap_service
-+    iris_service
-+    iris_vendor_data_file
-+    llkd
-+    llkd_exec
-+    llkd_prop
-+    llkd_tmpfs
-+    looper_stats_service
-+    lpdumpd
-+    lpdumpd_exec
-+    lpdumpd_prop
-+    lpdump_service
-+    iorapd
-+    iorapd_exec
-+    iorapd_data_file
-+    iorapd_service
-+    iorapd_tmpfs
-+    mediaswcodec
-+    mediaswcodec_exec
-+    mediaswcodec_tmpfs
-+    metadata_bootstat_file
-+    mnt_product_file
-+    network_stack
-+    network_stack_service
-+    network_stack_tmpfs
-+    nnapi_ext_deny_product_prop
-+    overlayfs_file
-+    password_slot_metadata_file
-+    permissionmgr_service
-+    postinstall_apex_mnt_dir
-+    recovery_socket
-+    role_service
-+    rollback_service
-+    rs
-+    rs_exec
-+    rss_hwm_reset
-+    rss_hwm_reset_exec
-+    runas_app
-+    runas_app_tmpfs
-+    art_apex_dir
-+    runtime_service
-+    sdcard_block_device
-+    sensor_privacy_service
-+    server_configurable_flags_data_file
-+    simpleperf_app_runner
-+    simpleperf_app_runner_exec
-+    socket_hook_prop
-+    su_tmpfs
-+    super_block_device
-+    sysfs_fs_f2fs
-+    system_bootstrap_lib_file
-+    system_event_log_tags_file
-+    system_lmk_prop
-+    system_suspend_hwservice
-+    system_suspend_control_service
-+    system_trace_prop
-+    staging_data_file
-+    task_profiles_file
-+    testharness_service
-+    test_harness_prop
-+    theme_prop
-+    time_prop
-+    timedetector_service
-+    timezonedetector_service
-+    traced_lazy_prop
-+    uri_grants_service
-+    use_memfd_prop
-+    vendor_apex_file
-+    vendor_cgroup_desc_file
-+    vendor_idc_file
-+    vendor_keychars_file
-+    vendor_keylayout_file
-+    vendor_misc_writer
-+    vendor_misc_writer_exec
-+    vendor_socket_hook_prop
-+    vendor_task_profiles_file
-+    vndk_prop
-+    vrflinger_vsync_service
-+    watchdogd_tmpfs))
-diff --git a/prebuilts/api/31.0/private/compat/28.0/28.0.cil b/prebuilts/api/31.0/private/compat/28.0/28.0.cil
-new file mode 100644
-index 000000000..321e9387e
---- /dev/null
-+++ b/prebuilts/api/31.0/private/compat/28.0/28.0.cil
-@@ -0,0 +1,1744 @@
-+;; attributes removed from current policy
-+(typeattribute hal_wifi_offload)
-+(typeattribute hal_wifi_offload_client)
-+(typeattribute hal_wifi_offload_server)
-+
-+;; types removed from current policy
-+(type alarm_device)
-+(type audio_seq_device)
-+(type audio_timer_device)
-+(type commontime_management_service)
-+(type cpuctl_device)
-+(type full_device)
-+(type hal_wifi_offload_hwservice)
-+(type i2c_device)
-+(type kmem_device)
-+(type mediacodec)
-+(type mediacodec_exec)
-+(type mediaextractor_update_service)
-+(type mtd_device)
-+(type netd_socket)
-+(type qtaguid_proc)
-+(type thermalcallback_hwservice)
-+(type thermalserviced)
-+(type thermalserviced_exec)
-+(type untrusted_v2_app)
-+(type vcs_device)
-+
-+;; Public 28.0 SEPolicy is divergent on different devices w.r.t
-+;; exported_audio_prop type. We need this typeattribute declaration so that the
-+;; mapping file compiles with vendor policies without exported_audio_prop type.
-+(typeattribute exported_audio_prop_28_0)
-+
-+(expandtypeattribute (accessibility_service_28_0) true)
-+(expandtypeattribute (account_service_28_0) true)
-+(expandtypeattribute (activity_service_28_0) true)
-+(expandtypeattribute (adbd_28_0) true)
-+(expandtypeattribute (adb_data_file_28_0) true)
-+(expandtypeattribute (adbd_exec_28_0) true)
-+(expandtypeattribute (adbd_socket_28_0) true)
-+(expandtypeattribute (adb_keys_file_28_0) true)
-+(expandtypeattribute (alarm_device_28_0) true)
-+(expandtypeattribute (alarm_service_28_0) true)
-+(expandtypeattribute (anr_data_file_28_0) true)
-+(expandtypeattribute (apk_data_file_28_0) true)
-+(expandtypeattribute (apk_private_data_file_28_0) true)
-+(expandtypeattribute (apk_private_tmp_file_28_0) true)
-+(expandtypeattribute (apk_tmp_file_28_0) true)
-+(expandtypeattribute (app_data_file_28_0) true)
-+(expandtypeattribute (app_fuse_file_28_0) true)
-+(expandtypeattribute (app_fusefs_28_0) true)
-+(expandtypeattribute (appops_service_28_0) true)
-+(expandtypeattribute (appwidget_service_28_0) true)
-+(expandtypeattribute (asec_apk_file_28_0) true)
-+(expandtypeattribute (asec_image_file_28_0) true)
-+(expandtypeattribute (asec_public_file_28_0) true)
-+(expandtypeattribute (ashmem_device_28_0) true)
-+(expandtypeattribute (assetatlas_service_28_0) true)
-+(expandtypeattribute (audio_data_file_28_0) true)
-+(expandtypeattribute (audio_device_28_0) true)
-+(expandtypeattribute (audiohal_data_file_28_0) true)
-+(expandtypeattribute (audio_prop_28_0) true)
-+(expandtypeattribute (audio_seq_device_28_0) true)
-+(expandtypeattribute (audioserver_28_0) true)
-+(expandtypeattribute (audioserver_data_file_28_0) true)
-+(expandtypeattribute (audioserver_service_28_0) true)
-+(expandtypeattribute (audio_service_28_0) true)
-+(expandtypeattribute (audio_timer_device_28_0) true)
-+(expandtypeattribute (autofill_service_28_0) true)
-+(expandtypeattribute (backup_data_file_28_0) true)
-+(expandtypeattribute (backup_service_28_0) true)
-+(expandtypeattribute (batteryproperties_service_28_0) true)
-+(expandtypeattribute (battery_service_28_0) true)
-+(expandtypeattribute (batterystats_service_28_0) true)
-+(expandtypeattribute (binder_calls_stats_service_28_0) true)
-+(expandtypeattribute (binder_device_28_0) true)
-+(expandtypeattribute (binfmt_miscfs_28_0) true)
-+(expandtypeattribute (blkid_28_0) true)
-+(expandtypeattribute (blkid_untrusted_28_0) true)
-+(expandtypeattribute (block_device_28_0) true)
-+(expandtypeattribute (bluetooth_28_0) true)
-+(expandtypeattribute (bluetooth_a2dp_offload_prop_28_0) true)
-+(expandtypeattribute (bluetooth_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_efs_file_28_0) true)
-+(expandtypeattribute (bluetooth_logs_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_manager_service_28_0) true)
-+(expandtypeattribute (bluetooth_prop_28_0) true)
-+(expandtypeattribute (bluetooth_service_28_0) true)
-+(expandtypeattribute (bluetooth_socket_28_0) true)
-+(expandtypeattribute (bootanim_28_0) true)
-+(expandtypeattribute (bootanim_exec_28_0) true)
-+(expandtypeattribute (boot_block_device_28_0) true)
-+(expandtypeattribute (bootchart_data_file_28_0) true)
-+(expandtypeattribute (bootloader_boot_reason_prop_28_0) true)
-+(expandtypeattribute (bootstat_28_0) true)
-+(expandtypeattribute (bootstat_data_file_28_0) true)
-+(expandtypeattribute (bootstat_exec_28_0) true)
-+(expandtypeattribute (boottime_prop_28_0) true)
-+(expandtypeattribute (boottrace_data_file_28_0) true)
-+(expandtypeattribute (broadcastradio_service_28_0) true)
-+(expandtypeattribute (bufferhubd_28_0) true)
-+(expandtypeattribute (bufferhubd_exec_28_0) true)
-+(expandtypeattribute (cache_backup_file_28_0) true)
-+(expandtypeattribute (cache_block_device_28_0) true)
-+(expandtypeattribute (cache_file_28_0) true)
-+(expandtypeattribute (cache_private_backup_file_28_0) true)
-+(expandtypeattribute (cache_recovery_file_28_0) true)
-+(expandtypeattribute (camera_data_file_28_0) true)
-+(expandtypeattribute (camera_device_28_0) true)
-+(expandtypeattribute (cameraproxy_service_28_0) true)
-+(expandtypeattribute (cameraserver_28_0) true)
-+(expandtypeattribute (cameraserver_exec_28_0) true)
-+(expandtypeattribute (cameraserver_service_28_0) true)
-+(expandtypeattribute (cgroup_28_0) true)
-+(expandtypeattribute (cgroup_bpf_28_0) true)
-+(expandtypeattribute (charger_28_0) true)
-+(expandtypeattribute (clatd_28_0) true)
-+(expandtypeattribute (clatd_exec_28_0) true)
-+(expandtypeattribute (clipboard_service_28_0) true)
-+(expandtypeattribute (commontime_management_service_28_0) true)
-+(expandtypeattribute (companion_device_service_28_0) true)
-+(expandtypeattribute (configfs_28_0) true)
-+(expandtypeattribute (config_prop_28_0) true)
-+(expandtypeattribute (connectivity_service_28_0) true)
-+(expandtypeattribute (connmetrics_service_28_0) true)
-+(expandtypeattribute (console_device_28_0) true)
-+(expandtypeattribute (consumer_ir_service_28_0) true)
-+(expandtypeattribute (content_service_28_0) true)
-+(expandtypeattribute (contexthub_service_28_0) true)
-+(expandtypeattribute (coredump_file_28_0) true)
-+(expandtypeattribute (country_detector_service_28_0) true)
-+(expandtypeattribute (coverage_service_28_0) true)
-+(expandtypeattribute (cppreopt_prop_28_0) true)
-+(expandtypeattribute (cppreopts_28_0) true)
-+(expandtypeattribute (cppreopts_exec_28_0) true)
-+(expandtypeattribute (cpuctl_device_28_0) true)
-+(expandtypeattribute (cpuinfo_service_28_0) true)
-+(expandtypeattribute (crash_dump_28_0) true)
-+(expandtypeattribute (crash_dump_exec_28_0) true)
-+(expandtypeattribute (crossprofileapps_service_28_0) true)
-+(expandtypeattribute (ctl_bootanim_prop_28_0) true)
-+(expandtypeattribute (ctl_bugreport_prop_28_0) true)
-+(expandtypeattribute (ctl_console_prop_28_0) true)
-+(expandtypeattribute (ctl_default_prop_28_0) true)
-+(expandtypeattribute (ctl_dumpstate_prop_28_0) true)
-+(expandtypeattribute (ctl_fuse_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_start_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_stop_prop_28_0) true)
-+(expandtypeattribute (ctl_mdnsd_prop_28_0) true)
-+(expandtypeattribute (ctl_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_rildaemon_prop_28_0) true)
-+(expandtypeattribute (ctl_sigstop_prop_28_0) true)
-+(expandtypeattribute (ctl_start_prop_28_0) true)
-+(expandtypeattribute (ctl_stop_prop_28_0) true)
-+(expandtypeattribute (dalvikcache_data_file_28_0) true)
-+(expandtypeattribute (dalvik_prop_28_0) true)
-+(expandtypeattribute (dbinfo_service_28_0) true)
-+(expandtypeattribute (debugfs_28_0) true)
-+(expandtypeattribute (debugfs_mmc_28_0) true)
-+(expandtypeattribute (debugfs_trace_marker_28_0) true)
-+(expandtypeattribute (debugfs_tracing_28_0) true)
-+(expandtypeattribute (debugfs_tracing_debug_28_0) true)
-+(expandtypeattribute (debugfs_tracing_instances_28_0) true)
-+(expandtypeattribute (debugfs_wakeup_sources_28_0) true)
-+(expandtypeattribute (debugfs_wifi_tracing_28_0) true)
-+(expandtypeattribute (debuggerd_prop_28_0) true)
-+(expandtypeattribute (debug_prop_28_0) true)
-+(expandtypeattribute (default_android_hwservice_28_0) true)
-+(expandtypeattribute (default_android_service_28_0) true)
-+(expandtypeattribute (default_android_vndservice_28_0) true)
-+(expandtypeattribute (default_prop_28_0) true)
-+(expandtypeattribute (device_28_0) true)
-+(expandtypeattribute (device_identifiers_service_28_0) true)
-+(expandtypeattribute (deviceidle_service_28_0) true)
-+(expandtypeattribute (device_logging_prop_28_0) true)
-+(expandtypeattribute (device_policy_service_28_0) true)
-+(expandtypeattribute (devicestoragemonitor_service_28_0) true)
-+(expandtypeattribute (devpts_28_0) true)
-+(expandtypeattribute (dex2oat_28_0) true)
-+(expandtypeattribute (dex2oat_exec_28_0) true)
-+(expandtypeattribute (dhcp_28_0) true)
-+(expandtypeattribute (dhcp_data_file_28_0) true)
-+(expandtypeattribute (dhcp_exec_28_0) true)
-+(expandtypeattribute (dhcp_prop_28_0) true)
-+(expandtypeattribute (diskstats_service_28_0) true)
-+(expandtypeattribute (display_service_28_0) true)
-+(expandtypeattribute (dm_device_28_0) true)
-+(expandtypeattribute (dnsmasq_28_0) true)
-+(expandtypeattribute (dnsmasq_exec_28_0) true)
-+(expandtypeattribute (dnsproxyd_socket_28_0) true)
-+(expandtypeattribute (DockObserver_service_28_0) true)
-+(expandtypeattribute (dreams_service_28_0) true)
-+(expandtypeattribute (drm_data_file_28_0) true)
-+(expandtypeattribute (drmserver_28_0) true)
-+(expandtypeattribute (drmserver_exec_28_0) true)
-+(expandtypeattribute (drmserver_service_28_0) true)
-+(expandtypeattribute (drmserver_socket_28_0) true)
-+(expandtypeattribute (dropbox_service_28_0) true)
-+(expandtypeattribute (dumpstate_28_0) true)
-+(expandtypeattribute (dumpstate_exec_28_0) true)
-+(expandtypeattribute (dumpstate_options_prop_28_0) true)
-+(expandtypeattribute (dumpstate_prop_28_0) true)
-+(expandtypeattribute (dumpstate_service_28_0) true)
-+(expandtypeattribute (dumpstate_socket_28_0) true)
-+(expandtypeattribute (e2fs_28_0) true)
-+(expandtypeattribute (e2fs_exec_28_0) true)
-+(expandtypeattribute (efs_file_28_0) true)
-+(expandtypeattribute (ephemeral_app_28_0) true)
-+(expandtypeattribute (ethernet_service_28_0) true)
-+(expandtypeattribute (exfat_28_0) true)
-+(expandtypeattribute (exported2_config_prop_28_0) true)
-+(expandtypeattribute (exported2_default_prop_28_0) true)
-+(expandtypeattribute (exported2_radio_prop_28_0) true)
-+(expandtypeattribute (exported2_system_prop_28_0) true)
-+(expandtypeattribute (exported2_vold_prop_28_0) true)
-+(expandtypeattribute (exported3_default_prop_28_0) true)
-+(expandtypeattribute (exported3_radio_prop_28_0) true)
-+(expandtypeattribute (exported3_system_prop_28_0) true)
-+(expandtypeattribute (exported_audio_prop_28_0) true)
-+(expandtypeattribute (exported_bluetooth_prop_28_0) true)
-+(expandtypeattribute (exported_config_prop_28_0) true)
-+(expandtypeattribute (exported_dalvik_prop_28_0) true)
-+(expandtypeattribute (exported_default_prop_28_0) true)
-+(expandtypeattribute (exported_dumpstate_prop_28_0) true)
-+(expandtypeattribute (exported_ffs_prop_28_0) true)
-+(expandtypeattribute (exported_fingerprint_prop_28_0) true)
-+(expandtypeattribute (exported_overlay_prop_28_0) true)
-+(expandtypeattribute (exported_pm_prop_28_0) true)
-+(expandtypeattribute (exported_radio_prop_28_0) true)
-+(expandtypeattribute (exported_secure_prop_28_0) true)
-+(expandtypeattribute (exported_system_prop_28_0) true)
-+(expandtypeattribute (exported_system_radio_prop_28_0) true)
-+(expandtypeattribute (exported_vold_prop_28_0) true)
-+(expandtypeattribute (exported_wifi_prop_28_0) true)
-+(expandtypeattribute (ffs_prop_28_0) true)
-+(expandtypeattribute (file_contexts_file_28_0) true)
-+(expandtypeattribute (fingerprintd_28_0) true)
-+(expandtypeattribute (fingerprintd_data_file_28_0) true)
-+(expandtypeattribute (fingerprintd_exec_28_0) true)
-+(expandtypeattribute (fingerprintd_service_28_0) true)
-+(expandtypeattribute (fingerprint_prop_28_0) true)
-+(expandtypeattribute (fingerprint_service_28_0) true)
-+(expandtypeattribute (fingerprint_vendor_data_file_28_0) true)
-+(expandtypeattribute (firstboot_prop_28_0) true)
-+(expandtypeattribute (font_service_28_0) true)
-+(expandtypeattribute (frp_block_device_28_0) true)
-+(expandtypeattribute (fs_bpf_28_0) true)
-+(expandtypeattribute (fsck_28_0) true)
-+(expandtypeattribute (fsck_exec_28_0) true)
-+(expandtypeattribute (fscklogs_28_0) true)
-+(expandtypeattribute (fsck_untrusted_28_0) true)
-+(expandtypeattribute (full_device_28_0) true)
-+(expandtypeattribute (functionfs_28_0) true)
-+(expandtypeattribute (fuse_28_0) true)
-+(expandtypeattribute (fuse_device_28_0) true)
-+(expandtypeattribute (fwk_display_hwservice_28_0) true)
-+(expandtypeattribute (fwk_scheduler_hwservice_28_0) true)
-+(expandtypeattribute (fwk_sensor_hwservice_28_0) true)
-+(expandtypeattribute (fwmarkd_socket_28_0) true)
-+(expandtypeattribute (gatekeeperd_28_0) true)
-+(expandtypeattribute (gatekeeper_data_file_28_0) true)
-+(expandtypeattribute (gatekeeperd_exec_28_0) true)
-+(expandtypeattribute (gatekeeper_service_28_0) true)
-+(expandtypeattribute (gfxinfo_service_28_0) true)
-+(expandtypeattribute (gps_control_28_0) true)
-+(expandtypeattribute (gpu_device_28_0) true)
-+(expandtypeattribute (gpu_service_28_0) true)
-+(expandtypeattribute (graphics_device_28_0) true)
-+(expandtypeattribute (graphicsstats_service_28_0) true)
-+(expandtypeattribute (hal_audiocontrol_hwservice_28_0) true)
-+(expandtypeattribute (hal_audio_hwservice_28_0) true)
-+(expandtypeattribute (hal_authsecret_hwservice_28_0) true)
-+(expandtypeattribute (hal_bluetooth_hwservice_28_0) true)
-+(expandtypeattribute (hal_bootctl_hwservice_28_0) true)
-+(expandtypeattribute (hal_broadcastradio_hwservice_28_0) true)
-+(expandtypeattribute (hal_camera_hwservice_28_0) true)
-+(expandtypeattribute (hal_cas_hwservice_28_0) true)
-+(expandtypeattribute (hal_codec2_hwservice_28_0) true)
-+(expandtypeattribute (hal_configstore_ISurfaceFlingerConfigs_28_0) true)
-+(expandtypeattribute (hal_confirmationui_hwservice_28_0) true)
-+(expandtypeattribute (hal_contexthub_hwservice_28_0) true)
-+(expandtypeattribute (hal_drm_hwservice_28_0) true)
-+(expandtypeattribute (hal_dumpstate_hwservice_28_0) true)
-+(expandtypeattribute (hal_evs_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_service_28_0) true)
-+(expandtypeattribute (hal_gatekeeper_hwservice_28_0) true)
-+(expandtypeattribute (hal_gnss_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_composer_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_mapper_hwservice_28_0) true)
-+(expandtypeattribute (hal_health_hwservice_28_0) true)
-+(expandtypeattribute (hal_ir_hwservice_28_0) true)
-+(expandtypeattribute (hal_keymaster_hwservice_28_0) true)
-+(expandtypeattribute (hal_light_hwservice_28_0) true)
-+(expandtypeattribute (hal_lowpan_hwservice_28_0) true)
-+(expandtypeattribute (hal_memtrack_hwservice_28_0) true)
-+(expandtypeattribute (hal_neuralnetworks_hwservice_28_0) true)
-+(expandtypeattribute (hal_nfc_hwservice_28_0) true)
-+(expandtypeattribute (hal_oemlock_hwservice_28_0) true)
-+(expandtypeattribute (hal_omx_hwservice_28_0) true)
-+(expandtypeattribute (hal_power_hwservice_28_0) true)
-+(expandtypeattribute (hal_renderscript_hwservice_28_0) true)
-+(expandtypeattribute (hal_secure_element_hwservice_28_0) true)
-+(expandtypeattribute (hal_sensors_hwservice_28_0) true)
-+(expandtypeattribute (hal_telephony_hwservice_28_0) true)
-+(expandtypeattribute (hal_tetheroffload_hwservice_28_0) true)
-+(expandtypeattribute (hal_thermal_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_cec_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_input_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_gadget_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_hwservice_28_0) true)
-+(expandtypeattribute (hal_vehicle_hwservice_28_0) true)
-+(expandtypeattribute (hal_vibrator_hwservice_28_0) true)
-+(expandtypeattribute (hal_vr_hwservice_28_0) true)
-+(expandtypeattribute (hal_weaver_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hostapd_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_offload_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_supplicant_hwservice_28_0) true)
-+(expandtypeattribute (hardware_properties_service_28_0) true)
-+(expandtypeattribute (hardware_service_28_0) true)
-+(expandtypeattribute (hci_attach_dev_28_0) true)
-+(expandtypeattribute (hdmi_control_service_28_0) true)
-+(expandtypeattribute (healthd_28_0) true)
-+(expandtypeattribute (healthd_exec_28_0) true)
-+(expandtypeattribute (heapdump_data_file_28_0) true)
-+(expandtypeattribute (hidl_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hidl_base_hwservice_28_0) true)
-+(expandtypeattribute (hidl_manager_hwservice_28_0) true)
-+(expandtypeattribute (hidl_memory_hwservice_28_0) true)
-+(expandtypeattribute (hidl_token_hwservice_28_0) true)
-+(expandtypeattribute (hwbinder_device_28_0) true)
-+(expandtypeattribute (hw_random_device_28_0) true)
-+(expandtypeattribute (hwservice_contexts_file_28_0) true)
-+(expandtypeattribute (hwservicemanager_28_0) true)
-+(expandtypeattribute (hwservicemanager_exec_28_0) true)
-+(expandtypeattribute (hwservicemanager_prop_28_0) true)
-+(expandtypeattribute (i2c_device_28_0) true)
-+(expandtypeattribute (icon_file_28_0) true)
-+(expandtypeattribute (idmap_28_0) true)
-+(expandtypeattribute (idmap_exec_28_0) true)
-+(expandtypeattribute (iio_device_28_0) true)
-+(expandtypeattribute (imms_service_28_0) true)
-+(expandtypeattribute (incident_28_0) true)
-+(expandtypeattribute (incidentd_28_0) true)
-+(expandtypeattribute (incident_data_file_28_0) true)
-+(expandtypeattribute (incident_helper_28_0) true)
-+(expandtypeattribute (incident_service_28_0) true)
-+(expandtypeattribute (init_28_0) true)
-+(expandtypeattribute (init_exec_28_0) true)
-+(expandtypeattribute (inotify_28_0) true)
-+(expandtypeattribute (input_device_28_0) true)
-+(expandtypeattribute (inputflinger_28_0) true)
-+(expandtypeattribute (inputflinger_exec_28_0) true)
-+(expandtypeattribute (inputflinger_service_28_0) true)
-+(expandtypeattribute (input_method_service_28_0) true)
-+(expandtypeattribute (input_service_28_0) true)
-+(expandtypeattribute (installd_28_0) true)
-+(expandtypeattribute (install_data_file_28_0) true)
-+(expandtypeattribute (installd_exec_28_0) true)
-+(expandtypeattribute (installd_service_28_0) true)
-+(expandtypeattribute (install_recovery_28_0) true)
-+(expandtypeattribute (install_recovery_exec_28_0) true)
-+(expandtypeattribute (ion_device_28_0) true)
-+(expandtypeattribute (IProxyService_service_28_0) true)
-+(expandtypeattribute (ipsec_service_28_0) true)
-+(expandtypeattribute (isolated_app_28_0) true)
-+(expandtypeattribute (jobscheduler_service_28_0) true)
-+(expandtypeattribute (kernel_28_0) true)
-+(expandtypeattribute (keychain_data_file_28_0) true)
-+(expandtypeattribute (keychord_device_28_0) true)
-+(expandtypeattribute (keystore_28_0) true)
-+(expandtypeattribute (keystore_data_file_28_0) true)
-+(expandtypeattribute (keystore_exec_28_0) true)
-+(expandtypeattribute (keystore_service_28_0) true)
-+(expandtypeattribute (kmem_device_28_0) true)
-+(expandtypeattribute (kmsg_debug_device_28_0) true)
-+(expandtypeattribute (kmsg_device_28_0) true)
-+(expandtypeattribute (labeledfs_28_0) true)
-+(expandtypeattribute (last_boot_reason_prop_28_0) true)
-+(expandtypeattribute (launcherapps_service_28_0) true)
-+(expandtypeattribute (lmkd_28_0) true)
-+(expandtypeattribute (lmkd_exec_28_0) true)
-+(expandtypeattribute (lmkd_socket_28_0) true)
-+(expandtypeattribute (location_service_28_0) true)
-+(expandtypeattribute (lock_settings_service_28_0) true)
-+(expandtypeattribute (logcat_exec_28_0) true)
-+(expandtypeattribute (logd_28_0) true)
-+(expandtypeattribute (logd_exec_28_0) true)
-+(expandtypeattribute (logd_prop_28_0) true)
-+(expandtypeattribute (logdr_socket_28_0) true)
-+(expandtypeattribute (logd_socket_28_0) true)
-+(expandtypeattribute (logdw_socket_28_0) true)
-+(expandtypeattribute (logpersist_28_0) true)
-+(expandtypeattribute (logpersistd_logging_prop_28_0) true)
-+(expandtypeattribute (log_prop_28_0) true)
-+(expandtypeattribute (log_tag_prop_28_0) true)
-+(expandtypeattribute (loop_control_device_28_0) true)
-+(expandtypeattribute (loop_device_28_0) true)
-+(expandtypeattribute (lowpan_device_28_0) true)
-+(expandtypeattribute (lowpan_prop_28_0) true)
-+(expandtypeattribute (lowpan_service_28_0) true)
-+(expandtypeattribute (mac_perms_file_28_0) true)
-+(expandtypeattribute (mdnsd_28_0) true)
-+(expandtypeattribute (mdnsd_socket_28_0) true)
-+(expandtypeattribute (mdns_socket_28_0) true)
-+(expandtypeattribute (mediacodec_28_0) true)
-+(expandtypeattribute (mediacodec_exec_28_0) true)
-+(expandtypeattribute (mediacodec_service_28_0) true)
-+(expandtypeattribute (media_data_file_28_0) true)
-+(expandtypeattribute (mediadrmserver_28_0) true)
-+(expandtypeattribute (mediadrmserver_exec_28_0) true)
-+(expandtypeattribute (mediadrmserver_service_28_0) true)
-+(expandtypeattribute (mediaextractor_28_0) true)
-+(expandtypeattribute (mediaextractor_exec_28_0) true)
-+(expandtypeattribute (mediaextractor_service_28_0) true)
-+(expandtypeattribute (mediaextractor_update_service_28_0) true)
-+(expandtypeattribute (mediametrics_28_0) true)
-+(expandtypeattribute (mediametrics_exec_28_0) true)
-+(expandtypeattribute (mediametrics_service_28_0) true)
-+(expandtypeattribute (media_projection_service_28_0) true)
-+(expandtypeattribute (mediaprovider_28_0) true)
-+(expandtypeattribute (media_router_service_28_0) true)
-+(expandtypeattribute (media_rw_data_file_28_0) true)
-+(expandtypeattribute (mediaserver_28_0) true)
-+(expandtypeattribute (mediaserver_exec_28_0) true)
-+(expandtypeattribute (mediaserver_service_28_0) true)
-+(expandtypeattribute (media_session_service_28_0) true)
-+(expandtypeattribute (meminfo_service_28_0) true)
-+(expandtypeattribute (metadata_block_device_28_0) true)
-+(expandtypeattribute (metadata_file_28_0) true)
-+(expandtypeattribute (method_trace_data_file_28_0) true)
-+(expandtypeattribute (midi_service_28_0) true)
-+(expandtypeattribute (misc_block_device_28_0) true)
-+(expandtypeattribute (misc_logd_file_28_0) true)
-+(expandtypeattribute (misc_user_data_file_28_0) true)
-+(expandtypeattribute (mmc_prop_28_0) true)
-+(expandtypeattribute (mnt_expand_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_stub_file_28_0) true)
-+(expandtypeattribute (mnt_user_file_28_0) true)
-+(expandtypeattribute (mnt_vendor_file_28_0) true)
-+(expandtypeattribute (modprobe_28_0) true)
-+(expandtypeattribute (mount_service_28_0) true)
-+(expandtypeattribute (mqueue_28_0) true)
-+(expandtypeattribute (mtd_device_28_0) true)
-+(expandtypeattribute (mtp_28_0) true)
-+(expandtypeattribute (mtp_device_28_0) true)
-+(expandtypeattribute (mtpd_socket_28_0) true)
-+(expandtypeattribute (mtp_exec_28_0) true)
-+(expandtypeattribute (nativetest_data_file_28_0) true)
-+(expandtypeattribute (netd_28_0) true)
-+(expandtypeattribute (net_data_file_28_0) true)
-+(expandtypeattribute (netd_exec_28_0) true)
-+(expandtypeattribute (netd_listener_service_28_0) true)
-+(expandtypeattribute (net_dns_prop_28_0) true)
-+(expandtypeattribute (netd_service_28_0) true)
-+(expandtypeattribute (netd_socket_28_0) true)
-+(expandtypeattribute (netd_stable_secret_prop_28_0) true)
-+(expandtypeattribute (netif_28_0) true)
-+(expandtypeattribute (netpolicy_service_28_0) true)
-+(expandtypeattribute (net_radio_prop_28_0) true)
-+(expandtypeattribute (netstats_service_28_0) true)
-+(expandtypeattribute (netutils_wrapper_28_0) true)
-+(expandtypeattribute (netutils_wrapper_exec_28_0) true)
-+(expandtypeattribute (network_management_service_28_0) true)
-+(expandtypeattribute (network_score_service_28_0) true)
-+(expandtypeattribute (network_time_update_service_28_0) true)
-+(expandtypeattribute (network_watchlist_data_file_28_0) true)
-+(expandtypeattribute (network_watchlist_service_28_0) true)
-+(expandtypeattribute (nfc_28_0) true)
-+(expandtypeattribute (nfc_data_file_28_0) true)
-+(expandtypeattribute (nfc_device_28_0) true)
-+(expandtypeattribute (nfc_prop_28_0) true)
-+(expandtypeattribute (nfc_service_28_0) true)
-+(expandtypeattribute (node_28_0) true)
-+(expandtypeattribute (nonplat_service_contexts_file_28_0) true)
-+(expandtypeattribute (notification_service_28_0) true)
-+(expandtypeattribute (null_device_28_0) true)
-+(expandtypeattribute (oemfs_28_0) true)
-+(expandtypeattribute (oem_lock_service_28_0) true)
-+(expandtypeattribute (ota_data_file_28_0) true)
-+(expandtypeattribute (otadexopt_service_28_0) true)
-+(expandtypeattribute (ota_package_file_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_exec_28_0) true)
-+(expandtypeattribute (otapreopt_slot_28_0) true)
-+(expandtypeattribute (otapreopt_slot_exec_28_0) true)
-+(expandtypeattribute (overlay_prop_28_0) true)
-+(expandtypeattribute (overlay_service_28_0) true)
-+(expandtypeattribute (owntty_device_28_0) true)
-+(expandtypeattribute (package_native_service_28_0) true)
-+(expandtypeattribute (package_service_28_0) true)
-+(expandtypeattribute (pan_result_prop_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_dir_28_0) true)
-+(expandtypeattribute (pdx_display_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_dir_28_0) true)
-+(expandtypeattribute (pdx_display_manager_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_manager_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_dir_28_0) true)
-+(expandtypeattribute (performanced_28_0) true)
-+(expandtypeattribute (performanced_exec_28_0) true)
-+(expandtypeattribute (permission_service_28_0) true)
-+(expandtypeattribute (persist_debug_prop_28_0) true)
-+(expandtypeattribute (persistent_data_block_service_28_0) true)
-+(expandtypeattribute (persistent_properties_ready_prop_28_0) true)
-+(expandtypeattribute (pinner_service_28_0) true)
-+(expandtypeattribute (pipefs_28_0) true)
-+(expandtypeattribute (platform_app_28_0) true)
-+(expandtypeattribute (pm_prop_28_0) true)
-+(expandtypeattribute (pmsg_device_28_0) true)
-+(expandtypeattribute (port_28_0) true)
-+(expandtypeattribute (port_device_28_0) true)
-+(expandtypeattribute (postinstall_28_0) true)
-+(expandtypeattribute (postinstall_dexopt_28_0) true)
-+(expandtypeattribute (postinstall_file_28_0) true)
-+(expandtypeattribute (postinstall_mnt_dir_28_0) true)
-+(expandtypeattribute (powerctl_prop_28_0) true)
-+(expandtypeattribute (power_service_28_0) true)
-+(expandtypeattribute (ppp_28_0) true)
-+(expandtypeattribute (ppp_device_28_0) true)
-+(expandtypeattribute (ppp_exec_28_0) true)
-+(expandtypeattribute (preloads_data_file_28_0) true)
-+(expandtypeattribute (preloads_media_file_28_0) true)
-+(expandtypeattribute (preopt2cachename_28_0) true)
-+(expandtypeattribute (preopt2cachename_exec_28_0) true)
-+(expandtypeattribute (print_service_28_0) true)
-+(expandtypeattribute (priv_app_28_0) true)
-+(expandtypeattribute (proc_28_0) true)
-+(expandtypeattribute (proc_abi_28_0) true)
-+(expandtypeattribute (proc_asound_28_0) true)
-+(expandtypeattribute (proc_bluetooth_writable_28_0) true)
-+(expandtypeattribute (proc_buddyinfo_28_0) true)
-+(expandtypeattribute (proc_cmdline_28_0) true)
-+(expandtypeattribute (proc_cpuinfo_28_0) true)
-+(expandtypeattribute (proc_dirty_28_0) true)
-+(expandtypeattribute (proc_diskstats_28_0) true)
-+(expandtypeattribute (proc_drop_caches_28_0) true)
-+(expandtypeattribute (processinfo_service_28_0) true)
-+(expandtypeattribute (proc_extra_free_kbytes_28_0) true)
-+(expandtypeattribute (proc_filesystems_28_0) true)
-+(expandtypeattribute (proc_hostname_28_0) true)
-+(expandtypeattribute (proc_hung_task_28_0) true)
-+(expandtypeattribute (proc_interrupts_28_0) true)
-+(expandtypeattribute (proc_iomem_28_0) true)
-+(expandtypeattribute (proc_kmsg_28_0) true)
-+(expandtypeattribute (proc_loadavg_28_0) true)
-+(expandtypeattribute (proc_max_map_count_28_0) true)
-+(expandtypeattribute (proc_meminfo_28_0) true)
-+(expandtypeattribute (proc_min_free_order_shift_28_0) true)
-+(expandtypeattribute (proc_misc_28_0) true)
-+(expandtypeattribute (proc_modules_28_0) true)
-+(expandtypeattribute (proc_mounts_28_0) true)
-+(expandtypeattribute (proc_net_28_0) true)
-+(expandtypeattribute (proc_overcommit_memory_28_0) true)
-+(expandtypeattribute (proc_page_cluster_28_0) true)
-+(expandtypeattribute (proc_pagetypeinfo_28_0) true)
-+(expandtypeattribute (proc_panic_28_0) true)
-+(expandtypeattribute (proc_perf_28_0) true)
-+(expandtypeattribute (proc_pid_max_28_0) true)
-+(expandtypeattribute (proc_pipe_conf_28_0) true)
-+(expandtypeattribute (proc_qtaguid_stat_28_0) true)
-+(expandtypeattribute (proc_random_28_0) true)
-+(expandtypeattribute (proc_sched_28_0) true)
-+(expandtypeattribute (proc_security_28_0) true)
-+(expandtypeattribute (proc_stat_28_0) true)
-+(expandtypeattribute (procstats_service_28_0) true)
-+(expandtypeattribute (proc_swaps_28_0) true)
-+(expandtypeattribute (proc_sysrq_28_0) true)
-+(expandtypeattribute (proc_timer_28_0) true)
-+(expandtypeattribute (proc_tty_drivers_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_active_time_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_policy_time_28_0) true)
-+(expandtypeattribute (proc_uid_cpupower_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_removeuid_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_showstat_28_0) true)
-+(expandtypeattribute (proc_uid_io_stats_28_0) true)
-+(expandtypeattribute (proc_uid_procstat_set_28_0) true)
-+(expandtypeattribute (proc_uid_time_in_state_28_0) true)
-+(expandtypeattribute (proc_uptime_28_0) true)
-+(expandtypeattribute (proc_version_28_0) true)
-+(expandtypeattribute (proc_vmallocinfo_28_0) true)
-+(expandtypeattribute (proc_vmstat_28_0) true)
-+(expandtypeattribute (proc_zoneinfo_28_0) true)
-+(expandtypeattribute (profman_28_0) true)
-+(expandtypeattribute (profman_dump_data_file_28_0) true)
-+(expandtypeattribute (profman_exec_28_0) true)
-+(expandtypeattribute (properties_device_28_0) true)
-+(expandtypeattribute (properties_serial_28_0) true)
-+(expandtypeattribute (property_contexts_file_28_0) true)
-+(expandtypeattribute (property_data_file_28_0) true)
-+(expandtypeattribute (property_info_28_0) true)
-+(expandtypeattribute (property_socket_28_0) true)
-+(expandtypeattribute (pstorefs_28_0) true)
-+(expandtypeattribute (ptmx_device_28_0) true)
-+(expandtypeattribute (qtaguid_device_28_0) true)
-+(expandtypeattribute (qtaguid_proc_28_0) true)
-+(expandtypeattribute (racoon_28_0) true)
-+(expandtypeattribute (racoon_exec_28_0) true)
-+(expandtypeattribute (racoon_socket_28_0) true)
-+(expandtypeattribute (radio_28_0) true)
-+(expandtypeattribute (radio_data_file_28_0) true)
-+(expandtypeattribute (radio_device_28_0) true)
-+(expandtypeattribute (radio_prop_28_0) true)
-+(expandtypeattribute (radio_service_28_0) true)
-+(expandtypeattribute (ram_device_28_0) true)
-+(expandtypeattribute (random_device_28_0) true)
-+(expandtypeattribute (recovery_28_0) true)
-+(expandtypeattribute (recovery_block_device_28_0) true)
-+(expandtypeattribute (recovery_data_file_28_0) true)
-+(expandtypeattribute (recovery_persist_28_0) true)
-+(expandtypeattribute (recovery_persist_exec_28_0) true)
-+(expandtypeattribute (recovery_refresh_28_0) true)
-+(expandtypeattribute (recovery_refresh_exec_28_0) true)
-+(expandtypeattribute (recovery_service_28_0) true)
-+(expandtypeattribute (registry_service_28_0) true)
-+(expandtypeattribute (resourcecache_data_file_28_0) true)
-+(expandtypeattribute (restorecon_prop_28_0) true)
-+(expandtypeattribute (restrictions_service_28_0) true)
-+(expandtypeattribute (rild_debug_socket_28_0) true)
-+(expandtypeattribute (rild_socket_28_0) true)
-+(expandtypeattribute (ringtone_file_28_0) true)
-+(expandtypeattribute (root_block_device_28_0) true)
-+(expandtypeattribute (rootfs_28_0) true)
-+(expandtypeattribute (rpmsg_device_28_0) true)
-+(expandtypeattribute (rtc_device_28_0) true)
-+(expandtypeattribute (rttmanager_service_28_0) true)
-+(expandtypeattribute (runas_28_0) true)
-+(expandtypeattribute (runas_exec_28_0) true)
-+(expandtypeattribute (runtime_event_log_tags_file_28_0) true)
-+(expandtypeattribute (safemode_prop_28_0) true)
-+(expandtypeattribute (same_process_hal_file_28_0) true)
-+(expandtypeattribute (samplingprofiler_service_28_0) true)
-+(expandtypeattribute (scheduling_policy_service_28_0) true)
-+(expandtypeattribute (sdcardd_28_0) true)
-+(expandtypeattribute (sdcardd_exec_28_0) true)
-+(expandtypeattribute (sdcardfs_28_0) true)
-+(expandtypeattribute (seapp_contexts_file_28_0) true)
-+(expandtypeattribute (search_service_28_0) true)
-+(expandtypeattribute (sec_key_att_app_id_provider_service_28_0) true)
-+(expandtypeattribute (secure_element_28_0) true)
-+(expandtypeattribute (secure_element_device_28_0) true)
-+(expandtypeattribute (secure_element_service_28_0) true)
-+(expandtypeattribute (selinuxfs_28_0) true)
-+(expandtypeattribute (sensors_device_28_0) true)
-+(expandtypeattribute (sensorservice_service_28_0) true)
-+(expandtypeattribute (sepolicy_file_28_0) true)
-+(expandtypeattribute (serial_device_28_0) true)
-+(expandtypeattribute (serialno_prop_28_0) true)
-+(expandtypeattribute (serial_service_28_0) true)
-+(expandtypeattribute (service_contexts_file_28_0) true)
-+(expandtypeattribute (servicediscovery_service_28_0) true)
-+(expandtypeattribute (servicemanager_28_0) true)
-+(expandtypeattribute (servicemanager_exec_28_0) true)
-+(expandtypeattribute (settings_service_28_0) true)
-+(expandtypeattribute (sgdisk_28_0) true)
-+(expandtypeattribute (sgdisk_exec_28_0) true)
-+(expandtypeattribute (shared_relro_28_0) true)
-+(expandtypeattribute (shared_relro_file_28_0) true)
-+(expandtypeattribute (shell_28_0) true)
-+(expandtypeattribute (shell_data_file_28_0) true)
-+(expandtypeattribute (shell_exec_28_0) true)
-+(expandtypeattribute (shell_prop_28_0) true)
-+(expandtypeattribute (shm_28_0) true)
-+(expandtypeattribute (shortcut_manager_icons_28_0) true)
-+(expandtypeattribute (shortcut_service_28_0) true)
-+(expandtypeattribute (slice_service_28_0) true)
-+(expandtypeattribute (slideshow_28_0) true)
-+(expandtypeattribute (socket_device_28_0) true)
-+(expandtypeattribute (sockfs_28_0) true)
-+(expandtypeattribute (statusbar_service_28_0) true)
-+(expandtypeattribute (storaged_service_28_0) true)
-+(expandtypeattribute (storage_file_28_0) true)
-+(expandtypeattribute (storagestats_service_28_0) true)
-+(expandtypeattribute (storage_stub_file_28_0) true)
-+(expandtypeattribute (su_28_0) true)
-+(expandtypeattribute (su_exec_28_0) true)
-+(expandtypeattribute (surfaceflinger_28_0) true)
-+(expandtypeattribute (surfaceflinger_service_28_0) true)
-+(expandtypeattribute (swap_block_device_28_0) true)
-+(expandtypeattribute (sysfs_28_0) true)
-+(expandtypeattribute (sysfs_android_usb_28_0) true)
-+(expandtypeattribute (sysfs_batteryinfo_28_0) true)
-+(expandtypeattribute (sysfs_bluetooth_writable_28_0) true)
-+(expandtypeattribute (sysfs_devices_system_cpu_28_0) true)
-+(expandtypeattribute (sysfs_dm_28_0) true)
-+(expandtypeattribute (sysfs_dt_firmware_android_28_0) true)
-+(expandtypeattribute (sysfs_fs_ext4_features_28_0) true)
-+(expandtypeattribute (sysfs_hwrandom_28_0) true)
-+(expandtypeattribute (sysfs_ipv4_28_0) true)
-+(expandtypeattribute (sysfs_kernel_notes_28_0) true)
-+(expandtypeattribute (sysfs_leds_28_0) true)
-+(expandtypeattribute (sysfs_lowmemorykiller_28_0) true)
-+(expandtypeattribute (sysfs_mac_address_28_0) true)
-+(expandtypeattribute (sysfs_net_28_0) true)
-+(expandtypeattribute (sysfs_nfc_power_writable_28_0) true)
-+(expandtypeattribute (sysfs_power_28_0) true)
-+(expandtypeattribute (sysfs_rtc_28_0) true)
-+(expandtypeattribute (sysfs_switch_28_0) true)
-+(expandtypeattribute (sysfs_thermal_28_0) true)
-+(expandtypeattribute (sysfs_uio_28_0) true)
-+(expandtypeattribute (sysfs_usb_28_0) true)
-+(expandtypeattribute (sysfs_usermodehelper_28_0) true)
-+(expandtypeattribute (sysfs_vibrator_28_0) true)
-+(expandtypeattribute (sysfs_wake_lock_28_0) true)
-+(expandtypeattribute (sysfs_wakeup_reasons_28_0) true)
-+(expandtypeattribute (sysfs_wlan_fwpath_28_0) true)
-+(expandtypeattribute (sysfs_zram_28_0) true)
-+(expandtypeattribute (sysfs_zram_uevent_28_0) true)
-+(expandtypeattribute (system_app_28_0) true)
-+(expandtypeattribute (system_app_data_file_28_0) true)
-+(expandtypeattribute (system_app_service_28_0) true)
-+(expandtypeattribute (system_block_device_28_0) true)
-+(expandtypeattribute (system_boot_reason_prop_28_0) true)
-+(expandtypeattribute (system_data_file_28_0) true)
-+(expandtypeattribute (system_file_28_0) true)
-+(expandtypeattribute (systemkeys_data_file_28_0) true)
-+(expandtypeattribute (system_ndebug_socket_28_0) true)
-+(expandtypeattribute (system_net_netd_hwservice_28_0) true)
-+(expandtypeattribute (system_prop_28_0) true)
-+(expandtypeattribute (system_radio_prop_28_0) true)
-+(expandtypeattribute (system_server_28_0) true)
-+(expandtypeattribute (system_update_service_28_0) true)
-+(expandtypeattribute (system_wifi_keystore_hwservice_28_0) true)
-+(expandtypeattribute (system_wpa_socket_28_0) true)
-+(expandtypeattribute (task_service_28_0) true)
-+(expandtypeattribute (tee_28_0) true)
-+(expandtypeattribute (tee_data_file_28_0) true)
-+(expandtypeattribute (tee_device_28_0) true)
-+(expandtypeattribute (telecom_service_28_0) true)
-+(expandtypeattribute (test_boot_reason_prop_28_0) true)
-+(expandtypeattribute (textclassification_service_28_0) true)
-+(expandtypeattribute (textclassifier_data_file_28_0) true)
-+(expandtypeattribute (textservices_service_28_0) true)
-+(expandtypeattribute (thermalcallback_hwservice_28_0) true)
-+(expandtypeattribute (thermal_service_28_0) true)
-+(expandtypeattribute (timezone_service_28_0) true)
-+(expandtypeattribute (tmpfs_28_0) true)
-+(expandtypeattribute (tombstoned_28_0) true)
-+(expandtypeattribute (tombstone_data_file_28_0) true)
-+(expandtypeattribute (tombstoned_crash_socket_28_0) true)
-+(expandtypeattribute (tombstoned_exec_28_0) true)
-+(expandtypeattribute (tombstoned_intercept_socket_28_0) true)
-+(expandtypeattribute (tombstoned_java_trace_socket_28_0) true)
-+(expandtypeattribute (tombstone_wifi_data_file_28_0) true)
-+(expandtypeattribute (toolbox_28_0) true)
-+(expandtypeattribute (toolbox_exec_28_0) true)
-+(expandtypeattribute (trace_data_file_28_0) true)
-+(expandtypeattribute (traced_consumer_socket_28_0) true)
-+(expandtypeattribute (traced_enabled_prop_28_0) true)
-+(expandtypeattribute (traced_probes_28_0) true)
-+(expandtypeattribute (traced_producer_socket_28_0) true)
-+(expandtypeattribute (traceur_app_28_0) true)
-+(expandtypeattribute (trust_service_28_0) true)
-+(expandtypeattribute (tty_device_28_0) true)
-+(expandtypeattribute (tun_device_28_0) true)
-+(expandtypeattribute (tv_input_service_28_0) true)
-+(expandtypeattribute (tzdatacheck_28_0) true)
-+(expandtypeattribute (tzdatacheck_exec_28_0) true)
-+(expandtypeattribute (ueventd_28_0) true)
-+(expandtypeattribute (uhid_device_28_0) true)
-+(expandtypeattribute (uimode_service_28_0) true)
-+(expandtypeattribute (uio_device_28_0) true)
-+(expandtypeattribute (uncrypt_28_0) true)
-+(expandtypeattribute (uncrypt_exec_28_0) true)
-+(expandtypeattribute (uncrypt_socket_28_0) true)
-+(expandtypeattribute (unencrypted_data_file_28_0) true)
-+(expandtypeattribute (unlabeled_28_0) true)
-+(expandtypeattribute (untrusted_app_25_28_0) true)
-+(expandtypeattribute (untrusted_app_27_28_0) true)
-+(expandtypeattribute (untrusted_app_28_0) true)
-+(expandtypeattribute (untrusted_v2_app_28_0) true)
-+(expandtypeattribute (update_engine_28_0) true)
-+(expandtypeattribute (update_engine_data_file_28_0) true)
-+(expandtypeattribute (update_engine_exec_28_0) true)
-+(expandtypeattribute (update_engine_log_data_file_28_0) true)
-+(expandtypeattribute (update_engine_service_28_0) true)
-+(expandtypeattribute (updatelock_service_28_0) true)
-+(expandtypeattribute (update_verifier_28_0) true)
-+(expandtypeattribute (update_verifier_exec_28_0) true)
-+(expandtypeattribute (usagestats_service_28_0) true)
-+(expandtypeattribute (usbaccessory_device_28_0) true)
-+(expandtypeattribute (usbd_28_0) true)
-+(expandtypeattribute (usb_device_28_0) true)
-+(expandtypeattribute (usbd_exec_28_0) true)
-+(expandtypeattribute (usbfs_28_0) true)
-+(expandtypeattribute (usb_service_28_0) true)
-+(expandtypeattribute (userdata_block_device_28_0) true)
-+(expandtypeattribute (usermodehelper_28_0) true)
-+(expandtypeattribute (user_profile_data_file_28_0) true)
-+(expandtypeattribute (user_service_28_0) true)
-+(expandtypeattribute (vcs_device_28_0) true)
-+(expandtypeattribute (vdc_28_0) true)
-+(expandtypeattribute (vdc_exec_28_0) true)
-+(expandtypeattribute (vendor_app_file_28_0) true)
-+(expandtypeattribute (vendor_configs_file_28_0) true)
-+(expandtypeattribute (vendor_data_file_28_0) true)
-+(expandtypeattribute (vendor_default_prop_28_0) true)
-+(expandtypeattribute (vendor_file_28_0) true)
-+(expandtypeattribute (vendor_framework_file_28_0) true)
-+(expandtypeattribute (vendor_hal_file_28_0) true)
-+(expandtypeattribute (vendor_init_28_0) true)
-+(expandtypeattribute (vendor_overlay_file_28_0) true)
-+(expandtypeattribute (vendor_security_patch_level_prop_28_0) true)
-+(expandtypeattribute (vendor_shell_28_0) true)
-+(expandtypeattribute (vendor_shell_exec_28_0) true)
-+(expandtypeattribute (vendor_toolbox_exec_28_0) true)
-+(expandtypeattribute (vfat_28_0) true)
-+(expandtypeattribute (vibrator_service_28_0) true)
-+(expandtypeattribute (video_device_28_0) true)
-+(expandtypeattribute (virtual_touchpad_28_0) true)
-+(expandtypeattribute (virtual_touchpad_exec_28_0) true)
-+(expandtypeattribute (virtual_touchpad_service_28_0) true)
-+(expandtypeattribute (vndbinder_device_28_0) true)
-+(expandtypeattribute (vndk_sp_file_28_0) true)
-+(expandtypeattribute (vndservice_contexts_file_28_0) true)
-+(expandtypeattribute (vndservicemanager_28_0) true)
-+(expandtypeattribute (voiceinteraction_service_28_0) true)
-+(expandtypeattribute (vold_28_0) true)
-+(expandtypeattribute (vold_data_file_28_0) true)
-+(expandtypeattribute (vold_device_28_0) true)
-+(expandtypeattribute (vold_exec_28_0) true)
-+(expandtypeattribute (vold_metadata_file_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_exec_28_0) true)
-+(expandtypeattribute (vold_prop_28_0) true)
-+(expandtypeattribute (vold_service_28_0) true)
-+(expandtypeattribute (vpn_data_file_28_0) true)
-+(expandtypeattribute (vr_hwc_28_0) true)
-+(expandtypeattribute (vr_hwc_exec_28_0) true)
-+(expandtypeattribute (vr_hwc_service_28_0) true)
-+(expandtypeattribute (vr_manager_service_28_0) true)
-+(expandtypeattribute (wallpaper_file_28_0) true)
-+(expandtypeattribute (wallpaper_service_28_0) true)
-+(expandtypeattribute (watchdogd_28_0) true)
-+(expandtypeattribute (watchdog_device_28_0) true)
-+(expandtypeattribute (webviewupdate_service_28_0) true)
-+(expandtypeattribute (webview_zygote_28_0) true)
-+(expandtypeattribute (webview_zygote_exec_28_0) true)
-+(expandtypeattribute (wifiaware_service_28_0) true)
-+(expandtypeattribute (wificond_28_0) true)
-+(expandtypeattribute (wificond_exec_28_0) true)
-+(expandtypeattribute (wificond_service_28_0) true)
-+(expandtypeattribute (wifi_data_file_28_0) true)
-+(expandtypeattribute (wifi_log_prop_28_0) true)
-+(expandtypeattribute (wifip2p_service_28_0) true)
-+(expandtypeattribute (wifi_prop_28_0) true)
-+(expandtypeattribute (wifiscanner_service_28_0) true)
-+(expandtypeattribute (wifi_service_28_0) true)
-+(expandtypeattribute (window_service_28_0) true)
-+(expandtypeattribute (wpantund_28_0) true)
-+(expandtypeattribute (wpantund_exec_28_0) true)
-+(expandtypeattribute (wpantund_service_28_0) true)
-+(expandtypeattribute (wpa_socket_28_0) true)
-+(expandtypeattribute (zero_device_28_0) true)
-+(expandtypeattribute (zoneinfo_data_file_28_0) true)
-+(expandtypeattribute (zygote_28_0) true)
-+(expandtypeattribute (zygote_exec_28_0) true)
-+(expandtypeattribute (zygote_socket_28_0) true)
-+(typeattributeset accessibility_service_28_0 (accessibility_service))
-+(typeattributeset account_service_28_0 (account_service))
-+(typeattributeset activity_service_28_0 (activity_service))
-+(typeattributeset adbd_28_0 (adbd))
-+(typeattributeset adb_data_file_28_0 (adb_data_file))
-+(typeattributeset adbd_exec_28_0 (adbd_exec))
-+(typeattributeset adbd_socket_28_0 (adbd_socket))
-+(typeattributeset adb_keys_file_28_0 (adb_keys_file))
-+(typeattributeset alarm_device_28_0 (alarm_device))
-+(typeattributeset alarm_service_28_0 (alarm_service))
-+(typeattributeset anr_data_file_28_0 (anr_data_file))
-+(typeattributeset apk_data_file_28_0 (apk_data_file))
-+(typeattributeset apk_private_data_file_28_0 (apk_private_data_file))
-+(typeattributeset apk_private_tmp_file_28_0 (apk_private_tmp_file))
-+(typeattributeset apk_tmp_file_28_0 (apk_tmp_file))
-+(typeattributeset app_data_file_28_0 (app_data_file privapp_data_file))
-+(typeattributeset app_fuse_file_28_0 (app_fuse_file))
-+(typeattributeset app_fusefs_28_0 (app_fusefs))
-+(typeattributeset appops_service_28_0 (appops_service))
-+(typeattributeset appwidget_service_28_0 (appwidget_service))
-+(typeattributeset asec_apk_file_28_0 (asec_apk_file))
-+(typeattributeset asec_image_file_28_0 (asec_image_file))
-+(typeattributeset asec_public_file_28_0 (asec_public_file))
-+(typeattributeset ashmem_device_28_0 (ashmem_device))
-+(typeattributeset assetatlas_service_28_0 (assetatlas_service))
-+(typeattributeset audio_data_file_28_0 (audio_data_file))
-+(typeattributeset audio_device_28_0 (audio_device))
-+(typeattributeset audiohal_data_file_28_0 (audiohal_data_file))
-+(typeattributeset audio_prop_28_0 (audio_prop))
-+(typeattributeset audio_seq_device_28_0 (audio_seq_device))
-+(typeattributeset audioserver_28_0 (audioserver))
-+(typeattributeset audioserver_data_file_28_0 (audioserver_data_file))
-+(typeattributeset audioserver_service_28_0 (audioserver_service))
-+(typeattributeset audio_service_28_0 (audio_service))
-+(typeattributeset audio_timer_device_28_0 (audio_timer_device))
-+(typeattributeset autofill_service_28_0 (autofill_service))
-+(typeattributeset backup_data_file_28_0 (backup_data_file))
-+(typeattributeset backup_service_28_0 (backup_service))
-+(typeattributeset batteryproperties_service_28_0 (batteryproperties_service))
-+(typeattributeset battery_service_28_0 (battery_service))
-+(typeattributeset batterystats_service_28_0 (batterystats_service))
-+(typeattributeset binder_calls_stats_service_28_0 (binder_calls_stats_service))
-+(typeattributeset binder_device_28_0 (binder_device))
-+(typeattributeset binfmt_miscfs_28_0 (binfmt_miscfs))
-+(typeattributeset blkid_28_0 (blkid))
-+(typeattributeset blkid_untrusted_28_0 (blkid_untrusted))
-+(typeattributeset block_device_28_0 (block_device))
-+(typeattributeset bluetooth_28_0 (bluetooth))
-+(typeattributeset bluetooth_a2dp_offload_prop_28_0 (bluetooth_a2dp_offload_prop))
-+(typeattributeset bluetooth_data_file_28_0 (bluetooth_data_file))
-+(typeattributeset bluetooth_efs_file_28_0 (bluetooth_efs_file))
-+(typeattributeset bluetooth_logs_data_file_28_0 (bluetooth_logs_data_file))
-+(typeattributeset bluetooth_manager_service_28_0 (bluetooth_manager_service))
-+(typeattributeset bluetooth_prop_28_0 (bluetooth_prop))
-+(typeattributeset bluetooth_service_28_0 (bluetooth_service))
-+(typeattributeset bluetooth_socket_28_0 (bluetooth_socket))
-+(typeattributeset bootanim_28_0 (bootanim))
-+(typeattributeset bootanim_exec_28_0 (bootanim_exec))
-+(typeattributeset boot_block_device_28_0 (boot_block_device))
-+(typeattributeset bootchart_data_file_28_0 (bootchart_data_file))
-+(typeattributeset bootloader_boot_reason_prop_28_0 (bootloader_boot_reason_prop))
-+(typeattributeset bootstat_28_0 (bootstat))
-+(typeattributeset bootstat_data_file_28_0 (bootstat_data_file))
-+(typeattributeset bootstat_exec_28_0 (bootstat_exec))
-+(typeattributeset boottime_prop_28_0 (boottime_prop))
-+(typeattributeset boottrace_data_file_28_0 (boottrace_data_file))
-+(typeattributeset broadcastradio_service_28_0 (broadcastradio_service))
-+(typeattributeset bufferhubd_28_0 (bufferhubd))
-+(typeattributeset bufferhubd_exec_28_0 (bufferhubd_exec))
-+(typeattributeset cache_backup_file_28_0 (cache_backup_file))
-+(typeattributeset cache_block_device_28_0 (cache_block_device))
-+(typeattributeset cache_file_28_0 (cache_file))
-+(typeattributeset cache_private_backup_file_28_0 (cache_private_backup_file))
-+(typeattributeset cache_recovery_file_28_0 (cache_recovery_file))
-+(typeattributeset camera_data_file_28_0 (camera_data_file))
-+(typeattributeset camera_device_28_0 (camera_device))
-+(typeattributeset cameraproxy_service_28_0 (cameraproxy_service))
-+(typeattributeset cameraserver_28_0 (cameraserver))
-+(typeattributeset cameraserver_exec_28_0 (cameraserver_exec))
-+(typeattributeset cameraserver_service_28_0 (cameraserver_service))
-+(typeattributeset cgroup_28_0 (cgroup))
-+(typeattributeset cgroup_bpf_28_0 (cgroup_bpf))
-+(typeattributeset charger_28_0 (charger))
-+(typeattributeset clatd_28_0 (clatd))
-+(typeattributeset clatd_exec_28_0 (clatd_exec))
-+(typeattributeset clipboard_service_28_0 (clipboard_service))
-+(typeattributeset commontime_management_service_28_0 (commontime_management_service))
-+(typeattributeset companion_device_service_28_0 (companion_device_service))
-+(typeattributeset configfs_28_0 (configfs))
-+(typeattributeset config_prop_28_0 (config_prop))
-+(typeattributeset connectivity_service_28_0 (connectivity_service))
-+(typeattributeset connmetrics_service_28_0 (connmetrics_service))
-+(typeattributeset console_device_28_0 (console_device))
-+(typeattributeset consumer_ir_service_28_0 (consumer_ir_service))
-+(typeattributeset content_service_28_0 (content_service))
-+(typeattributeset contexthub_service_28_0 (contexthub_service))
-+(typeattributeset coredump_file_28_0 (coredump_file))
-+(typeattributeset country_detector_service_28_0 (country_detector_service))
-+(typeattributeset coverage_service_28_0 (coverage_service))
-+(typeattributeset cppreopt_prop_28_0 (cppreopt_prop))
-+(typeattributeset cppreopts_28_0 (cppreopts))
-+(typeattributeset cppreopts_exec_28_0 (cppreopts_exec))
-+(typeattributeset cpuctl_device_28_0 (cpuctl_device))
-+(typeattributeset cpuinfo_service_28_0 (cpuinfo_service))
-+(typeattributeset crash_dump_28_0 (crash_dump))
-+(typeattributeset crash_dump_exec_28_0 (crash_dump_exec))
-+(typeattributeset crossprofileapps_service_28_0 (crossprofileapps_service))
-+(typeattributeset ctl_bootanim_prop_28_0 (ctl_bootanim_prop))
-+(typeattributeset ctl_bugreport_prop_28_0 (ctl_bugreport_prop))
-+(typeattributeset ctl_console_prop_28_0 (ctl_console_prop))
-+(typeattributeset ctl_default_prop_28_0
-+  ( ctl_adbd_prop
-+    ctl_default_prop))
-+(typeattributeset ctl_dumpstate_prop_28_0 (ctl_dumpstate_prop))
-+(typeattributeset ctl_fuse_prop_28_0 (ctl_fuse_prop))
-+(typeattributeset ctl_interface_restart_prop_28_0 (ctl_interface_restart_prop))
-+(typeattributeset ctl_interface_start_prop_28_0 (ctl_interface_start_prop))
-+(typeattributeset ctl_interface_stop_prop_28_0 (ctl_interface_stop_prop))
-+(typeattributeset ctl_mdnsd_prop_28_0 (ctl_mdnsd_prop))
-+(typeattributeset ctl_restart_prop_28_0 (ctl_restart_prop))
-+(typeattributeset ctl_rildaemon_prop_28_0 (ctl_rildaemon_prop))
-+(typeattributeset ctl_sigstop_prop_28_0 (ctl_sigstop_prop))
-+(typeattributeset ctl_start_prop_28_0 (ctl_start_prop))
-+(typeattributeset ctl_stop_prop_28_0 (ctl_stop_prop))
-+(typeattributeset dalvikcache_data_file_28_0 (dalvikcache_data_file))
-+(typeattributeset dalvik_prop_28_0 (dalvik_prop))
-+(typeattributeset dbinfo_service_28_0 (dbinfo_service))
-+(typeattributeset debugfs_28_0 (debugfs))
-+(typeattributeset debugfs_mmc_28_0 (debugfs_mmc))
-+(typeattributeset debugfs_trace_marker_28_0 (debugfs_trace_marker))
-+(typeattributeset debugfs_tracing_28_0 (debugfs_tracing))
-+(typeattributeset debugfs_tracing_debug_28_0 (debugfs_tracing_debug))
-+(typeattributeset debugfs_tracing_instances_28_0 (debugfs_tracing_instances))
-+(typeattributeset debugfs_wakeup_sources_28_0 (debugfs_wakeup_sources))
-+(typeattributeset debugfs_wifi_tracing_28_0 (debugfs_wifi_tracing))
-+(typeattributeset debuggerd_prop_28_0 (debuggerd_prop))
-+(typeattributeset debug_prop_28_0 (debug_prop))
-+(typeattributeset default_android_hwservice_28_0 (default_android_hwservice))
-+(typeattributeset default_android_service_28_0 (default_android_service))
-+(typeattributeset default_android_vndservice_28_0 (default_android_vndservice))
-+(typeattributeset default_prop_28_0 (default_prop))
-+(typeattributeset device_28_0 (device))
-+(typeattributeset device_identifiers_service_28_0 (device_identifiers_service))
-+(typeattributeset deviceidle_service_28_0 (deviceidle_service))
-+(typeattributeset device_logging_prop_28_0 (device_logging_prop))
-+(typeattributeset device_policy_service_28_0 (device_policy_service))
-+(typeattributeset devicestoragemonitor_service_28_0 (devicestoragemonitor_service))
-+(typeattributeset devpts_28_0 (devpts))
-+(typeattributeset dex2oat_28_0 (dex2oat))
-+(typeattributeset dex2oat_exec_28_0 (dex2oat_exec))
-+(typeattributeset dhcp_28_0 (dhcp))
-+(typeattributeset dhcp_data_file_28_0 (dhcp_data_file))
-+(typeattributeset dhcp_exec_28_0 (dhcp_exec))
-+(typeattributeset dhcp_prop_28_0 (dhcp_prop))
-+(typeattributeset diskstats_service_28_0 (diskstats_service))
-+(typeattributeset display_service_28_0 (display_service))
-+(typeattributeset dm_device_28_0 (dm_device))
-+(typeattributeset dnsmasq_28_0 (dnsmasq))
-+(typeattributeset dnsmasq_exec_28_0 (dnsmasq_exec))
-+(typeattributeset dnsproxyd_socket_28_0 (dnsproxyd_socket))
-+(typeattributeset DockObserver_service_28_0 (DockObserver_service))
-+(typeattributeset dreams_service_28_0 (dreams_service))
-+(typeattributeset drm_data_file_28_0 (drm_data_file))
-+(typeattributeset drmserver_28_0 (drmserver))
-+(typeattributeset drmserver_exec_28_0 (drmserver_exec))
-+(typeattributeset drmserver_service_28_0 (drmserver_service))
-+(typeattributeset drmserver_socket_28_0 (drmserver_socket))
-+(typeattributeset dropbox_service_28_0 (dropbox_service))
-+(typeattributeset dumpstate_28_0 (dumpstate))
-+(typeattributeset dumpstate_exec_28_0 (dumpstate_exec))
-+(typeattributeset dumpstate_options_prop_28_0 (dumpstate_options_prop))
-+(typeattributeset dumpstate_prop_28_0 (dumpstate_prop))
-+(typeattributeset dumpstate_service_28_0 (dumpstate_service))
-+(typeattributeset dumpstate_socket_28_0 (dumpstate_socket))
-+(typeattributeset e2fs_28_0 (e2fs))
-+(typeattributeset e2fs_exec_28_0 (e2fs_exec))
-+(typeattributeset efs_file_28_0 (efs_file))
-+(typeattributeset ephemeral_app_28_0 (ephemeral_app))
-+(typeattributeset ethernet_service_28_0 (ethernet_service))
-+(typeattributeset exfat_28_0 (exfat))
-+(typeattributeset exported2_config_prop_28_0 (exported2_config_prop))
-+(typeattributeset exported2_default_prop_28_0 (exported2_default_prop))
-+(typeattributeset exported2_radio_prop_28_0 (exported2_radio_prop))
-+(typeattributeset exported2_system_prop_28_0 (exported2_system_prop))
-+(typeattributeset exported2_vold_prop_28_0 (exported2_vold_prop))
-+(typeattributeset exported3_default_prop_28_0 (exported3_default_prop))
-+(typeattributeset exported3_radio_prop_28_0 (exported3_radio_prop))
-+(typeattributeset exported3_system_prop_28_0 (exported3_system_prop))
-+(typeattributeset exported_audio_prop_28_0 (exported_audio_prop))
-+(typeattributeset exported_bluetooth_prop_28_0 (exported_bluetooth_prop))
-+(typeattributeset exported_config_prop_28_0 (exported_config_prop))
-+(typeattributeset exported_dalvik_prop_28_0 (exported_dalvik_prop))
-+(typeattributeset exported_default_prop_28_0 (exported_default_prop))
-+(typeattributeset exported_dumpstate_prop_28_0 (exported_dumpstate_prop))
-+(typeattributeset exported_ffs_prop_28_0 (exported_ffs_prop))
-+(typeattributeset exported_fingerprint_prop_28_0 (exported_fingerprint_prop))
-+(typeattributeset exported_overlay_prop_28_0 (exported_overlay_prop))
-+(typeattributeset exported_pm_prop_28_0 (exported_pm_prop))
-+(typeattributeset exported_radio_prop_28_0 (exported_radio_prop))
-+(typeattributeset exported_secure_prop_28_0 (exported_secure_prop))
-+(typeattributeset exported_system_prop_28_0 (exported_system_prop))
-+(typeattributeset exported_system_radio_prop_28_0 (exported_system_radio_prop))
-+(typeattributeset exported_vold_prop_28_0 (exported_vold_prop))
-+(typeattributeset exported_wifi_prop_28_0 (exported_wifi_prop))
-+(typeattributeset ffs_prop_28_0 (ffs_prop))
-+(typeattributeset file_contexts_file_28_0 (file_contexts_file))
-+(typeattributeset fingerprintd_28_0 (fingerprintd))
-+(typeattributeset fingerprintd_data_file_28_0 (fingerprintd_data_file))
-+(typeattributeset fingerprintd_exec_28_0 (fingerprintd_exec))
-+(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
-+(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
-+(typeattributeset fingerprint_service_28_0 (fingerprint_service))
-+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
-+(typeattributeset firstboot_prop_28_0 (firstboot_prop))
-+(typeattributeset font_service_28_0 (font_service))
-+(typeattributeset frp_block_device_28_0 (frp_block_device))
-+(typeattributeset fs_bpf_28_0 (fs_bpf))
-+(typeattributeset fsck_28_0 (fsck))
-+(typeattributeset fsck_exec_28_0 (fsck_exec))
-+(typeattributeset fscklogs_28_0 (fscklogs))
-+(typeattributeset fsck_untrusted_28_0 (fsck_untrusted))
-+(typeattributeset full_device_28_0 (full_device))
-+(typeattributeset functionfs_28_0 (functionfs))
-+(typeattributeset fuse_28_0 (fuse))
-+(typeattributeset fuse_device_28_0 (fuse_device))
-+(typeattributeset fwk_display_hwservice_28_0 (fwk_display_hwservice))
-+(typeattributeset fwk_scheduler_hwservice_28_0 (fwk_scheduler_hwservice))
-+(typeattributeset fwk_sensor_hwservice_28_0 (fwk_sensor_hwservice))
-+(typeattributeset fwmarkd_socket_28_0 (fwmarkd_socket))
-+(typeattributeset gatekeeperd_28_0 (gatekeeperd))
-+(typeattributeset gatekeeper_data_file_28_0 (gatekeeper_data_file))
-+(typeattributeset gatekeeperd_exec_28_0 (gatekeeperd_exec))
-+(typeattributeset gatekeeper_service_28_0 (gatekeeper_service))
-+(typeattributeset gfxinfo_service_28_0 (gfxinfo_service))
-+(typeattributeset gps_control_28_0 (gps_control))
-+(typeattributeset gpu_device_28_0 (gpu_device))
-+(typeattributeset gpu_service_28_0 (gpu_service))
-+(typeattributeset graphics_device_28_0 (graphics_device))
-+(typeattributeset graphicsstats_service_28_0 (graphicsstats_service))
-+(typeattributeset hal_audiocontrol_hwservice_28_0 (hal_audiocontrol_hwservice))
-+(typeattributeset hal_audio_hwservice_28_0 (hal_audio_hwservice))
-+(typeattributeset hal_authsecret_hwservice_28_0 (hal_authsecret_hwservice))
-+(typeattributeset hal_bluetooth_hwservice_28_0 (hal_bluetooth_hwservice))
-+(typeattributeset hal_bootctl_hwservice_28_0 (hal_bootctl_hwservice))
-+(typeattributeset hal_broadcastradio_hwservice_28_0 (hal_broadcastradio_hwservice))
-+(typeattributeset hal_camera_hwservice_28_0 (hal_camera_hwservice))
-+(typeattributeset hal_cas_hwservice_28_0 (hal_cas_hwservice))
-+(typeattributeset hal_codec2_hwservice_28_0 (hal_codec2_hwservice))
-+(typeattributeset hal_configstore_ISurfaceFlingerConfigs_28_0 (hal_configstore_ISurfaceFlingerConfigs))
-+(typeattributeset hal_confirmationui_hwservice_28_0 (hal_confirmationui_hwservice))
-+(typeattributeset hal_contexthub_hwservice_28_0 (hal_contexthub_hwservice))
-+(typeattributeset hal_drm_hwservice_28_0 (hal_drm_hwservice))
-+(typeattributeset hal_dumpstate_hwservice_28_0 (hal_dumpstate_hwservice))
-+(typeattributeset hal_evs_hwservice_28_0 (hal_evs_hwservice))
-+(typeattributeset hal_fingerprint_hwservice_28_0 (hal_fingerprint_hwservice))
-+(typeattributeset hal_fingerprint_service_28_0 (hal_fingerprint_service))
-+(typeattributeset hal_gatekeeper_hwservice_28_0 (hal_gatekeeper_hwservice))
-+(typeattributeset hal_gnss_hwservice_28_0 (hal_gnss_hwservice))
-+(typeattributeset hal_graphics_allocator_hwservice_28_0 (hal_graphics_allocator_hwservice))
-+(typeattributeset hal_graphics_composer_hwservice_28_0 (hal_graphics_composer_hwservice))
-+(typeattributeset hal_graphics_mapper_hwservice_28_0 (hal_graphics_mapper_hwservice))
-+(typeattributeset hal_health_hwservice_28_0 (hal_health_hwservice))
-+(typeattributeset hal_ir_hwservice_28_0 (hal_ir_hwservice))
-+(typeattributeset hal_keymaster_hwservice_28_0 (hal_keymaster_hwservice))
-+(typeattributeset hal_light_hwservice_28_0 (hal_light_hwservice))
-+(typeattributeset hal_lowpan_hwservice_28_0 (hal_lowpan_hwservice))
-+(typeattributeset hal_memtrack_hwservice_28_0 (hal_memtrack_hwservice))
-+(typeattributeset hal_neuralnetworks_hwservice_28_0 (hal_neuralnetworks_hwservice))
-+(typeattributeset hal_nfc_hwservice_28_0 (hal_nfc_hwservice))
-+(typeattributeset hal_oemlock_hwservice_28_0 (hal_oemlock_hwservice))
-+(typeattributeset hal_omx_hwservice_28_0 (hal_omx_hwservice))
-+(typeattributeset hal_power_hwservice_28_0 (hal_power_hwservice))
-+(typeattributeset hal_renderscript_hwservice_28_0 (hal_renderscript_hwservice))
-+(typeattributeset hal_secure_element_hwservice_28_0 (hal_secure_element_hwservice))
-+(typeattributeset hal_sensors_hwservice_28_0 (hal_sensors_hwservice))
-+(typeattributeset hal_telephony_hwservice_28_0 (hal_telephony_hwservice))
-+(typeattributeset hal_tetheroffload_hwservice_28_0 (hal_tetheroffload_hwservice))
-+(typeattributeset hal_thermal_hwservice_28_0 (hal_thermal_hwservice))
-+(typeattributeset hal_tv_cec_hwservice_28_0 (hal_tv_cec_hwservice))
-+(typeattributeset hal_tv_input_hwservice_28_0 (hal_tv_input_hwservice))
-+(typeattributeset hal_usb_gadget_hwservice_28_0 (hal_usb_gadget_hwservice))
-+(typeattributeset hal_usb_hwservice_28_0 (hal_usb_hwservice))
-+(typeattributeset hal_vehicle_hwservice_28_0 (hal_vehicle_hwservice))
-+(typeattributeset hal_vibrator_hwservice_28_0 (hal_vibrator_hwservice))
-+(typeattributeset hal_vr_hwservice_28_0 (hal_vr_hwservice))
-+(typeattributeset hal_weaver_hwservice_28_0 (hal_weaver_hwservice))
-+(typeattributeset hal_wifi_hostapd_hwservice_28_0 (hal_wifi_hostapd_hwservice))
-+(typeattributeset hal_wifi_hwservice_28_0 (hal_wifi_hwservice))
-+(typeattributeset hal_wifi_offload_hwservice_28_0 (hal_wifi_offload_hwservice))
-+(typeattributeset hal_wifi_supplicant_hwservice_28_0 (hal_wifi_supplicant_hwservice))
-+(typeattributeset hardware_properties_service_28_0 (hardware_properties_service))
-+(typeattributeset hardware_service_28_0 (hardware_service))
-+(typeattributeset hci_attach_dev_28_0 (hci_attach_dev))
-+(typeattributeset hdmi_control_service_28_0 (hdmi_control_service))
-+(typeattributeset healthd_28_0 (healthd))
-+(typeattributeset healthd_exec_28_0 (healthd_exec))
-+(typeattributeset heapdump_data_file_28_0 (heapdump_data_file))
-+(typeattributeset hidl_allocator_hwservice_28_0 (hidl_allocator_hwservice))
-+(typeattributeset hidl_base_hwservice_28_0 (hidl_base_hwservice))
-+(typeattributeset hidl_manager_hwservice_28_0 (hidl_manager_hwservice))
-+(typeattributeset hidl_memory_hwservice_28_0 (hidl_memory_hwservice))
-+(typeattributeset hidl_token_hwservice_28_0 (hidl_token_hwservice))
-+(typeattributeset hwbinder_device_28_0 (hwbinder_device))
-+(typeattributeset hw_random_device_28_0 (hw_random_device))
-+(typeattributeset hwservice_contexts_file_28_0 (hwservice_contexts_file))
-+(typeattributeset hwservicemanager_28_0 (hwservicemanager))
-+(typeattributeset hwservicemanager_exec_28_0 (hwservicemanager_exec))
-+(typeattributeset hwservicemanager_prop_28_0 (hwservicemanager_prop))
-+(typeattributeset i2c_device_28_0 (i2c_device))
-+(typeattributeset icon_file_28_0 (icon_file))
-+(typeattributeset idmap_28_0 (idmap))
-+(typeattributeset idmap_exec_28_0 (idmap_exec))
-+(typeattributeset iio_device_28_0 (iio_device))
-+(typeattributeset imms_service_28_0 (imms_service))
-+(typeattributeset incident_28_0 (incident))
-+(typeattributeset incidentd_28_0 (incidentd))
-+(typeattributeset incident_data_file_28_0 (incident_data_file))
-+(typeattributeset incident_helper_28_0 (incident_helper))
-+(typeattributeset incident_service_28_0 (incident_service))
-+(typeattributeset init_28_0 (init))
-+(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
-+(typeattributeset inotify_28_0 (inotify))
-+(typeattributeset input_device_28_0 (input_device))
-+(typeattributeset inputflinger_28_0 (inputflinger))
-+(typeattributeset inputflinger_exec_28_0 (inputflinger_exec))
-+(typeattributeset inputflinger_service_28_0 (inputflinger_service))
-+(typeattributeset input_method_service_28_0 (input_method_service))
-+(typeattributeset input_service_28_0 (input_service))
-+(typeattributeset installd_28_0 (installd))
-+(typeattributeset install_data_file_28_0 (install_data_file))
-+(typeattributeset installd_exec_28_0 (installd_exec))
-+(typeattributeset installd_service_28_0 (installd_service))
-+(typeattributeset install_recovery_28_0 (install_recovery))
-+(typeattributeset install_recovery_exec_28_0 (install_recovery_exec))
-+(typeattributeset ion_device_28_0 (ion_device))
-+(typeattributeset IProxyService_service_28_0 (IProxyService_service))
-+(typeattributeset ipsec_service_28_0 (ipsec_service))
-+(typeattributeset isolated_app_28_0 (isolated_app))
-+(typeattributeset jobscheduler_service_28_0 (jobscheduler_service))
-+(typeattributeset kernel_28_0 (kernel))
-+(typeattributeset keychain_data_file_28_0 (keychain_data_file))
-+(typeattributeset keychord_device_28_0 (keychord_device))
-+(typeattributeset keystore_28_0 (keystore))
-+(typeattributeset keystore_data_file_28_0 (keystore_data_file))
-+(typeattributeset keystore_exec_28_0 (keystore_exec))
-+(typeattributeset keystore_service_28_0 (keystore_service))
-+(typeattributeset kmem_device_28_0 (kmem_device))
-+(typeattributeset kmsg_debug_device_28_0 (kmsg_debug_device))
-+(typeattributeset kmsg_device_28_0 (kmsg_device))
-+(typeattributeset labeledfs_28_0 (labeledfs))
-+(typeattributeset last_boot_reason_prop_28_0 (last_boot_reason_prop))
-+(typeattributeset launcherapps_service_28_0 (launcherapps_service))
-+(typeattributeset lmkd_28_0 (lmkd))
-+(typeattributeset lmkd_exec_28_0 (lmkd_exec))
-+(typeattributeset lmkd_socket_28_0 (lmkd_socket))
-+(typeattributeset location_service_28_0 (location_service))
-+(typeattributeset lock_settings_service_28_0 (lock_settings_service))
-+(typeattributeset logcat_exec_28_0 (logcat_exec))
-+(typeattributeset logd_28_0 (logd))
-+(typeattributeset logd_exec_28_0 (logd_exec))
-+(typeattributeset logd_prop_28_0 (logd_prop))
-+(typeattributeset logdr_socket_28_0 (logdr_socket))
-+(typeattributeset logd_socket_28_0 (logd_socket))
-+(typeattributeset logdw_socket_28_0 (logdw_socket))
-+(typeattributeset logpersist_28_0 (logpersist))
-+(typeattributeset logpersistd_logging_prop_28_0 (logpersistd_logging_prop))
-+(typeattributeset log_prop_28_0 (log_prop))
-+(typeattributeset log_tag_prop_28_0 (log_tag_prop))
-+(typeattributeset loop_control_device_28_0 (loop_control_device))
-+(typeattributeset loop_device_28_0 (loop_device))
-+(typeattributeset lowpan_device_28_0 (lowpan_device))
-+(typeattributeset lowpan_prop_28_0 (lowpan_prop))
-+(typeattributeset lowpan_service_28_0 (lowpan_service))
-+(typeattributeset mac_perms_file_28_0 (mac_perms_file))
-+(typeattributeset mdnsd_28_0 (mdnsd))
-+(typeattributeset mdnsd_socket_28_0 (mdnsd_socket))
-+(typeattributeset mdns_socket_28_0 (mdns_socket))
-+(typeattributeset hal_omx_server (mediacodec_28_0))
-+(typeattributeset mediacodec_28_0 (mediacodec))
-+(typeattributeset mediacodec_exec_28_0 (mediacodec_exec))
-+(typeattributeset mediacodec_service_28_0 (mediacodec_service))
-+(typeattributeset media_data_file_28_0 (media_data_file))
-+(typeattributeset mediadrmserver_28_0 (mediadrmserver))
-+(typeattributeset mediadrmserver_exec_28_0 (mediadrmserver_exec))
-+(typeattributeset mediadrmserver_service_28_0 (mediadrmserver_service))
-+(typeattributeset mediaextractor_28_0 (mediaextractor))
-+(typeattributeset mediaextractor_exec_28_0 (mediaextractor_exec))
-+(typeattributeset mediaextractor_service_28_0 (mediaextractor_service))
-+(typeattributeset mediaextractor_update_service_28_0 (mediaextractor_update_service))
-+(typeattributeset mediametrics_28_0 (mediametrics))
-+(typeattributeset mediametrics_exec_28_0 (mediametrics_exec))
-+(typeattributeset mediametrics_service_28_0 (mediametrics_service))
-+(typeattributeset media_projection_service_28_0 (media_projection_service))
-+(typeattributeset mediaprovider_28_0 (mediaprovider))
-+(typeattributeset media_router_service_28_0 (media_router_service))
-+(typeattributeset media_rw_data_file_28_0 (media_rw_data_file))
-+(typeattributeset mediaserver_28_0 (mediaserver))
-+(typeattributeset mediaserver_exec_28_0 (mediaserver_exec))
-+(typeattributeset mediaserver_service_28_0 (mediaserver_service))
-+(typeattributeset media_session_service_28_0 (media_session_service))
-+(typeattributeset meminfo_service_28_0 (meminfo_service))
-+(typeattributeset metadata_block_device_28_0 (metadata_block_device))
-+(typeattributeset metadata_file_28_0 (metadata_file))
-+(typeattributeset method_trace_data_file_28_0 (method_trace_data_file))
-+(typeattributeset midi_service_28_0 (midi_service))
-+(typeattributeset misc_block_device_28_0 (misc_block_device))
-+(typeattributeset misc_logd_file_28_0 (misc_logd_file))
-+(typeattributeset misc_user_data_file_28_0 (misc_user_data_file))
-+(typeattributeset mmc_prop_28_0 (mmc_prop))
-+(typeattributeset mnt_expand_file_28_0 (mnt_expand_file))
-+(typeattributeset mnt_media_rw_file_28_0 (mnt_media_rw_file))
-+(typeattributeset mnt_media_rw_stub_file_28_0 (mnt_media_rw_stub_file))
-+(typeattributeset mnt_user_file_28_0 (mnt_user_file))
-+(typeattributeset mnt_vendor_file_28_0 (mnt_vendor_file))
-+(typeattributeset modprobe_28_0 (modprobe))
-+(typeattributeset mount_service_28_0 (mount_service))
-+(typeattributeset mqueue_28_0 (mqueue))
-+(typeattributeset mtd_device_28_0 (mtd_device))
-+(typeattributeset mtp_28_0 (mtp))
-+(typeattributeset mtp_device_28_0 (mtp_device))
-+(typeattributeset mtpd_socket_28_0 (mtpd_socket))
-+(typeattributeset mtp_exec_28_0 (mtp_exec))
-+(typeattributeset nativetest_data_file_28_0 (nativetest_data_file))
-+(typeattributeset netd_28_0 (netd))
-+(typeattributeset net_data_file_28_0 (net_data_file))
-+(typeattributeset netd_exec_28_0 (netd_exec))
-+(typeattributeset netd_listener_service_28_0 (netd_listener_service))
-+(typeattributeset net_dns_prop_28_0 (net_dns_prop))
-+(typeattributeset netd_service_28_0 (netd_service))
-+(typeattributeset netd_socket_28_0 (netd_socket))
-+(typeattributeset netd_stable_secret_prop_28_0 (netd_stable_secret_prop))
-+(typeattributeset netif_28_0 (netif))
-+(typeattributeset netpolicy_service_28_0 (netpolicy_service))
-+(typeattributeset net_radio_prop_28_0 (net_radio_prop))
-+(typeattributeset netstats_service_28_0 (netstats_service))
-+(typeattributeset netutils_wrapper_28_0 (netutils_wrapper))
-+(typeattributeset netutils_wrapper_exec_28_0 (netutils_wrapper_exec))
-+(typeattributeset network_management_service_28_0 (network_management_service))
-+(typeattributeset network_score_service_28_0 (network_score_service))
-+(typeattributeset network_time_update_service_28_0 (network_time_update_service))
-+(typeattributeset network_watchlist_data_file_28_0 (network_watchlist_data_file))
-+(typeattributeset network_watchlist_service_28_0 (network_watchlist_service))
-+(typeattributeset nfc_28_0 (nfc))
-+(typeattributeset nfc_data_file_28_0 (nfc_data_file))
-+(typeattributeset nfc_device_28_0 (nfc_device))
-+(typeattributeset nfc_prop_28_0 (nfc_prop))
-+(typeattributeset nfc_service_28_0 (nfc_service))
-+(typeattributeset node_28_0 (node))
-+(typeattributeset nonplat_service_contexts_file_28_0 (nonplat_service_contexts_file))
-+(typeattributeset notification_service_28_0 (notification_service))
-+(typeattributeset null_device_28_0 (null_device))
-+(typeattributeset oemfs_28_0 (oemfs))
-+(typeattributeset oem_lock_service_28_0 (oem_lock_service))
-+(typeattributeset ota_data_file_28_0 (ota_data_file))
-+(typeattributeset otadexopt_service_28_0 (otadexopt_service))
-+(typeattributeset ota_package_file_28_0 (ota_package_file))
-+(typeattributeset otapreopt_chroot_28_0 (otapreopt_chroot))
-+(typeattributeset otapreopt_chroot_exec_28_0 (otapreopt_chroot_exec))
-+(typeattributeset otapreopt_slot_28_0 (otapreopt_slot))
-+(typeattributeset otapreopt_slot_exec_28_0 (otapreopt_slot_exec))
-+(typeattributeset overlay_prop_28_0 (overlay_prop))
-+(typeattributeset overlay_service_28_0 (overlay_service))
-+(typeattributeset owntty_device_28_0 (owntty_device))
-+(typeattributeset package_native_service_28_0 (package_native_service))
-+(typeattributeset package_service_28_0 (package_service))
-+(typeattributeset pan_result_prop_28_0 (pan_result_prop))
-+(typeattributeset pdx_bufferhub_client_channel_socket_28_0 (pdx_bufferhub_client_channel_socket))
-+(typeattributeset pdx_bufferhub_client_endpoint_socket_28_0 (pdx_bufferhub_client_endpoint_socket))
-+(typeattributeset pdx_bufferhub_dir_28_0 (pdx_bufferhub_dir))
-+(typeattributeset pdx_display_client_channel_socket_28_0 (pdx_display_client_channel_socket))
-+(typeattributeset pdx_display_client_endpoint_socket_28_0 (pdx_display_client_endpoint_socket))
-+(typeattributeset pdx_display_dir_28_0 (pdx_display_dir))
-+(typeattributeset pdx_display_manager_channel_socket_28_0 (pdx_display_manager_channel_socket))
-+(typeattributeset pdx_display_manager_endpoint_socket_28_0 (pdx_display_manager_endpoint_socket))
-+(typeattributeset pdx_display_screenshot_channel_socket_28_0 (pdx_display_screenshot_channel_socket))
-+(typeattributeset pdx_display_screenshot_endpoint_socket_28_0 (pdx_display_screenshot_endpoint_socket))
-+(typeattributeset pdx_display_vsync_channel_socket_28_0 (pdx_display_vsync_channel_socket))
-+(typeattributeset pdx_display_vsync_endpoint_socket_28_0 (pdx_display_vsync_endpoint_socket))
-+(typeattributeset pdx_performance_client_channel_socket_28_0 (pdx_performance_client_channel_socket))
-+(typeattributeset pdx_performance_client_endpoint_socket_28_0 (pdx_performance_client_endpoint_socket))
-+(typeattributeset pdx_performance_dir_28_0 (pdx_performance_dir))
-+(typeattributeset performanced_28_0 (performanced))
-+(typeattributeset performanced_exec_28_0 (performanced_exec))
-+(typeattributeset permission_service_28_0 (permission_service))
-+(typeattributeset persist_debug_prop_28_0 (persist_debug_prop))
-+(typeattributeset persistent_data_block_service_28_0 (persistent_data_block_service))
-+(typeattributeset persistent_properties_ready_prop_28_0 (persistent_properties_ready_prop))
-+(typeattributeset pinner_service_28_0 (pinner_service))
-+(typeattributeset pipefs_28_0 (pipefs))
-+(typeattributeset platform_app_28_0 (platform_app))
-+(typeattributeset pm_prop_28_0 (pm_prop))
-+(typeattributeset pmsg_device_28_0 (pmsg_device))
-+(typeattributeset port_28_0 (port))
-+(typeattributeset port_device_28_0 (port_device))
-+(typeattributeset postinstall_28_0 (postinstall))
-+(typeattributeset postinstall_dexopt_28_0 (postinstall_dexopt))
-+(typeattributeset postinstall_file_28_0 (postinstall_file))
-+(typeattributeset postinstall_mnt_dir_28_0 (postinstall_mnt_dir))
-+(typeattributeset powerctl_prop_28_0 (powerctl_prop))
-+(typeattributeset power_service_28_0 (power_service))
-+(typeattributeset ppp_28_0 (ppp))
-+(typeattributeset ppp_device_28_0 (ppp_device))
-+(typeattributeset ppp_exec_28_0 (ppp_exec))
-+(typeattributeset preloads_data_file_28_0 (preloads_data_file))
-+(typeattributeset preloads_media_file_28_0 (preloads_media_file))
-+(typeattributeset preopt2cachename_28_0 (preopt2cachename))
-+(typeattributeset preopt2cachename_exec_28_0 (preopt2cachename_exec))
-+(typeattributeset print_service_28_0 (print_service))
-+(typeattributeset priv_app_28_0 (priv_app))
-+(typeattributeset proc_28_0
-+  ( proc
-+    proc_fs_verity
-+    proc_keys
-+    proc_kpageflags
-+    proc_lowmemorykiller
-+    proc_pressure_cpu
-+    proc_pressure_io
-+    proc_pressure_mem
-+    proc_slabinfo))
-+(typeattributeset proc_abi_28_0 (proc_abi))
-+(typeattributeset proc_asound_28_0 (proc_asound))
-+(typeattributeset proc_bluetooth_writable_28_0 (proc_bluetooth_writable))
-+(typeattributeset proc_buddyinfo_28_0 (proc_buddyinfo))
-+(typeattributeset proc_cmdline_28_0 (proc_cmdline))
-+(typeattributeset proc_cpuinfo_28_0 (proc_cpuinfo))
-+(typeattributeset proc_dirty_28_0 (proc_dirty))
-+(typeattributeset proc_diskstats_28_0 (proc_diskstats))
-+(typeattributeset proc_drop_caches_28_0 (proc_drop_caches))
-+(typeattributeset processinfo_service_28_0 (processinfo_service))
-+(typeattributeset proc_extra_free_kbytes_28_0 (proc_extra_free_kbytes))
-+(typeattributeset proc_filesystems_28_0 (proc_filesystems))
-+(typeattributeset proc_hostname_28_0 (proc_hostname))
-+(typeattributeset proc_hung_task_28_0 (proc_hung_task))
-+(typeattributeset proc_interrupts_28_0 (proc_interrupts))
-+(typeattributeset proc_iomem_28_0 (proc_iomem))
-+(typeattributeset proc_kmsg_28_0 (proc_kmsg))
-+(typeattributeset proc_loadavg_28_0 (proc_loadavg))
-+(typeattributeset proc_max_map_count_28_0 (proc_max_map_count))
-+(typeattributeset proc_meminfo_28_0 (proc_meminfo))
-+(typeattributeset proc_min_free_order_shift_28_0 (proc_min_free_order_shift))
-+(typeattributeset proc_misc_28_0 (proc_misc))
-+(typeattributeset proc_modules_28_0 (proc_modules))
-+(typeattributeset proc_mounts_28_0 (proc_mounts))
-+(typeattributeset proc_net_28_0
-+  ( proc_net
-+    proc_net_tcp_udp))
-+(typeattributeset proc_overcommit_memory_28_0 (proc_overcommit_memory))
-+(typeattributeset proc_page_cluster_28_0 (proc_page_cluster))
-+(typeattributeset proc_pagetypeinfo_28_0 (proc_pagetypeinfo))
-+(typeattributeset proc_panic_28_0 (proc_panic))
-+(typeattributeset proc_perf_28_0 (proc_perf))
-+(typeattributeset proc_pid_max_28_0 (proc_pid_max))
-+(typeattributeset proc_pipe_conf_28_0 (proc_pipe_conf))
-+(typeattributeset proc_qtaguid_stat_28_0 (proc_qtaguid_stat))
-+(typeattributeset proc_random_28_0 (proc_random))
-+(typeattributeset proc_sched_28_0 (proc_sched))
-+(typeattributeset proc_security_28_0 (proc_security))
-+(typeattributeset proc_stat_28_0 (proc_stat))
-+(typeattributeset procstats_service_28_0 (procstats_service))
-+(typeattributeset proc_swaps_28_0 (proc_swaps))
-+(typeattributeset proc_sysrq_28_0 (proc_sysrq))
-+(typeattributeset proc_timer_28_0 (proc_timer))
-+(typeattributeset proc_tty_drivers_28_0 (proc_tty_drivers))
-+(typeattributeset proc_uid_concurrent_active_time_28_0 (proc_uid_concurrent_active_time))
-+(typeattributeset proc_uid_concurrent_policy_time_28_0 (proc_uid_concurrent_policy_time))
-+(typeattributeset proc_uid_cpupower_28_0 (proc_uid_cpupower))
-+(typeattributeset proc_uid_cputime_removeuid_28_0 (proc_uid_cputime_removeuid))
-+(typeattributeset proc_uid_cputime_showstat_28_0 (proc_uid_cputime_showstat))
-+(typeattributeset proc_uid_io_stats_28_0 (proc_uid_io_stats))
-+(typeattributeset proc_uid_procstat_set_28_0 (proc_uid_procstat_set))
-+(typeattributeset proc_uid_time_in_state_28_0 (proc_uid_time_in_state))
-+(typeattributeset proc_uptime_28_0 (proc_uptime))
-+(typeattributeset proc_version_28_0 (proc_version))
-+(typeattributeset proc_vmallocinfo_28_0 (proc_vmallocinfo))
-+(typeattributeset proc_vmstat_28_0 (proc_vmstat))
-+(typeattributeset proc_zoneinfo_28_0 (proc_zoneinfo))
-+(typeattributeset profman_28_0 (profman))
-+(typeattributeset profman_dump_data_file_28_0 (profman_dump_data_file))
-+(typeattributeset profman_exec_28_0 (profman_exec))
-+(typeattributeset properties_device_28_0 (properties_device))
-+(typeattributeset properties_serial_28_0 (properties_serial))
-+(typeattributeset property_contexts_file_28_0 (property_contexts_file))
-+(typeattributeset property_data_file_28_0 (property_data_file))
-+(typeattributeset property_info_28_0 (property_info))
-+(typeattributeset property_socket_28_0 (property_socket))
-+(typeattributeset pstorefs_28_0 (pstorefs))
-+(typeattributeset ptmx_device_28_0 (ptmx_device))
-+(typeattributeset qtaguid_device_28_0 (qtaguid_device))
-+(typeattributeset qtaguid_proc_28_0
-+  ( proc_qtaguid_ctrl
-+    qtaguid_proc))
-+(typeattributeset racoon_28_0 (racoon))
-+(typeattributeset racoon_exec_28_0 (racoon_exec))
-+(typeattributeset racoon_socket_28_0 (racoon_socket))
-+(typeattributeset radio_28_0 (radio))
-+(typeattributeset radio_data_file_28_0 (radio_data_file))
-+(typeattributeset radio_device_28_0 (radio_device))
-+(typeattributeset radio_prop_28_0 (radio_prop))
-+(typeattributeset radio_service_28_0 (radio_service))
-+(typeattributeset ram_device_28_0 (ram_device))
-+(typeattributeset random_device_28_0 (random_device))
-+(typeattributeset recovery_28_0 (recovery))
-+(typeattributeset recovery_block_device_28_0 (recovery_block_device))
-+(typeattributeset recovery_data_file_28_0 (recovery_data_file))
-+(typeattributeset recovery_persist_28_0 (recovery_persist))
-+(typeattributeset recovery_persist_exec_28_0 (recovery_persist_exec))
-+(typeattributeset recovery_refresh_28_0 (recovery_refresh))
-+(typeattributeset recovery_refresh_exec_28_0 (recovery_refresh_exec))
-+(typeattributeset recovery_service_28_0 (recovery_service))
-+(typeattributeset registry_service_28_0 (registry_service))
-+(typeattributeset resourcecache_data_file_28_0 (resourcecache_data_file))
-+(typeattributeset restorecon_prop_28_0 (restorecon_prop))
-+(typeattributeset restrictions_service_28_0 (restrictions_service))
-+(typeattributeset rild_debug_socket_28_0 (rild_debug_socket))
-+(typeattributeset rild_socket_28_0 (rild_socket))
-+(typeattributeset ringtone_file_28_0 (ringtone_file))
-+(typeattributeset root_block_device_28_0 (root_block_device))
-+(typeattributeset rootfs_28_0 (rootfs))
-+(typeattributeset rpmsg_device_28_0 (rpmsg_device))
-+(typeattributeset rtc_device_28_0 (rtc_device))
-+(typeattributeset rttmanager_service_28_0 (rttmanager_service))
-+(typeattributeset runas_28_0 (runas))
-+(typeattributeset runas_exec_28_0 (runas_exec))
-+(typeattributeset runtime_event_log_tags_file_28_0 (runtime_event_log_tags_file))
-+(typeattributeset safemode_prop_28_0 (safemode_prop))
-+(typeattributeset same_process_hal_file_28_0
-+  ( same_process_hal_file
-+    vendor_public_lib_file))
-+(typeattributeset samplingprofiler_service_28_0 (samplingprofiler_service))
-+(typeattributeset scheduling_policy_service_28_0 (scheduling_policy_service))
-+(typeattributeset sdcardd_28_0 (sdcardd))
-+(typeattributeset sdcardd_exec_28_0 (sdcardd_exec))
-+(typeattributeset sdcardfs_28_0 (sdcardfs))
-+(typeattributeset seapp_contexts_file_28_0 (seapp_contexts_file))
-+(typeattributeset search_service_28_0 (search_service))
-+(typeattributeset sec_key_att_app_id_provider_service_28_0 (sec_key_att_app_id_provider_service))
-+(typeattributeset secure_element_28_0 (secure_element))
-+(typeattributeset secure_element_device_28_0 (secure_element_device))
-+(typeattributeset secure_element_service_28_0 (secure_element_service))
-+(typeattributeset selinuxfs_28_0 (selinuxfs))
-+(typeattributeset sensors_device_28_0 (sensors_device))
-+(typeattributeset sensorservice_service_28_0 (sensorservice_service))
-+(typeattributeset sepolicy_file_28_0 (sepolicy_file))
-+(typeattributeset serial_device_28_0 (serial_device))
-+(typeattributeset serialno_prop_28_0 (serialno_prop))
-+(typeattributeset serial_service_28_0 (serial_service))
-+(typeattributeset service_contexts_file_28_0 (service_contexts_file))
-+(typeattributeset servicediscovery_service_28_0 (servicediscovery_service))
-+(typeattributeset servicemanager_28_0 (servicemanager))
-+(typeattributeset servicemanager_exec_28_0 (servicemanager_exec))
-+(typeattributeset settings_service_28_0 (settings_service))
-+(typeattributeset sgdisk_28_0 (sgdisk))
-+(typeattributeset sgdisk_exec_28_0 (sgdisk_exec))
-+(typeattributeset shared_relro_28_0 (shared_relro))
-+(typeattributeset shared_relro_file_28_0 (shared_relro_file))
-+(typeattributeset shell_28_0 (shell))
-+(typeattributeset shell_data_file_28_0 (shell_data_file))
-+(typeattributeset shell_exec_28_0 (shell_exec))
-+(typeattributeset shell_prop_28_0 (shell_prop))
-+(typeattributeset shm_28_0 (shm))
-+(typeattributeset shortcut_manager_icons_28_0 (shortcut_manager_icons))
-+(typeattributeset shortcut_service_28_0 (shortcut_service))
-+(typeattributeset slice_service_28_0 (slice_service))
-+(typeattributeset slideshow_28_0 (slideshow))
-+(typeattributeset socket_device_28_0 (socket_device))
-+(typeattributeset sockfs_28_0 (sockfs))
-+(typeattributeset statusbar_service_28_0 (statusbar_service))
-+(typeattributeset storaged_service_28_0 (storaged_service))
-+(typeattributeset storage_file_28_0 (storage_file))
-+(typeattributeset storagestats_service_28_0 (storagestats_service))
-+(typeattributeset storage_stub_file_28_0 (storage_stub_file))
-+(typeattributeset su_28_0 (su))
-+(typeattributeset su_exec_28_0 (su_exec))
-+(typeattributeset surfaceflinger_28_0 (surfaceflinger))
-+(typeattributeset surfaceflinger_service_28_0 (surfaceflinger_service))
-+(typeattributeset swap_block_device_28_0 (swap_block_device))
-+(typeattributeset sysfs_28_0
-+  ( sysfs
-+    sysfs_devices_block
-+    sysfs_extcon
-+    sysfs_loop
-+    sysfs_transparent_hugepage))
-+(typeattributeset sysfs_android_usb_28_0 (sysfs_android_usb))
-+(typeattributeset sysfs_batteryinfo_28_0 (sysfs_batteryinfo))
-+(typeattributeset sysfs_bluetooth_writable_28_0 (sysfs_bluetooth_writable))
-+(typeattributeset sysfs_devices_system_cpu_28_0 (sysfs_devices_system_cpu))
-+(typeattributeset sysfs_dm_28_0 (sysfs_dm))
-+(typeattributeset sysfs_dt_firmware_android_28_0 (sysfs_dt_firmware_android))
-+(typeattributeset sysfs_fs_ext4_features_28_0 (sysfs_fs_ext4_features))
-+(typeattributeset sysfs_hwrandom_28_0 (sysfs_hwrandom))
-+(typeattributeset sysfs_ipv4_28_0 (sysfs_ipv4))
-+(typeattributeset sysfs_kernel_notes_28_0 (sysfs_kernel_notes))
-+(typeattributeset sysfs_leds_28_0 (sysfs_leds))
-+(typeattributeset sysfs_lowmemorykiller_28_0 (sysfs_lowmemorykiller))
-+(typeattributeset sysfs_mac_address_28_0 (sysfs_mac_address))
-+(typeattributeset sysfs_net_28_0 (sysfs_net))
-+(typeattributeset sysfs_nfc_power_writable_28_0 (sysfs_nfc_power_writable))
-+(typeattributeset sysfs_power_28_0 (sysfs_power))
-+(typeattributeset sysfs_rtc_28_0 (sysfs_rtc))
-+(typeattributeset sysfs_switch_28_0 (sysfs_switch))
-+(typeattributeset sysfs_thermal_28_0 (sysfs_thermal))
-+(typeattributeset sysfs_uio_28_0 (sysfs_uio))
-+(typeattributeset sysfs_usb_28_0 (sysfs_usb))
-+(typeattributeset sysfs_usermodehelper_28_0 (sysfs_usermodehelper))
-+(typeattributeset sysfs_vibrator_28_0 (sysfs_vibrator))
-+(typeattributeset sysfs_wake_lock_28_0 (sysfs_wake_lock))
-+(typeattributeset sysfs_wakeup_reasons_28_0 (sysfs_wakeup_reasons))
-+(typeattributeset sysfs_wlan_fwpath_28_0 (sysfs_wlan_fwpath))
-+(typeattributeset sysfs_zram_28_0 (sysfs_zram))
-+(typeattributeset sysfs_zram_uevent_28_0 (sysfs_zram_uevent))
-+(typeattributeset system_app_28_0 (system_app))
-+(typeattributeset system_app_data_file_28_0 (system_app_data_file))
-+(typeattributeset system_app_service_28_0 (system_app_service))
-+(typeattributeset system_block_device_28_0 (system_block_device))
-+(typeattributeset system_boot_reason_prop_28_0 (system_boot_reason_prop))
-+(typeattributeset system_data_file_28_0
-+  ( dropbox_data_file
-+    system_data_file
-+    packages_list_file))
-+(typeattributeset system_file_28_0
-+  ( system_file
-+    system_asan_options_file
-+    system_lib_file
-+    system_linker_config_file
-+    system_linker_exec
-+    system_seccomp_policy_file
-+    system_security_cacerts_file
-+    tcpdump_exec
-+    system_zoneinfo_file
-+))
-+(typeattributeset systemkeys_data_file_28_0 (systemkeys_data_file))
-+(typeattributeset system_ndebug_socket_28_0 (system_ndebug_socket))
-+(typeattributeset system_net_netd_hwservice_28_0 (system_net_netd_hwservice))
-+(typeattributeset system_prop_28_0 (system_prop))
-+(typeattributeset system_radio_prop_28_0 (system_radio_prop))
-+(typeattributeset system_server_28_0 (system_server))
-+(typeattributeset system_update_service_28_0 (system_update_service))
-+(typeattributeset system_wifi_keystore_hwservice_28_0 (system_wifi_keystore_hwservice))
-+(typeattributeset system_wpa_socket_28_0 (system_wpa_socket))
-+(typeattributeset task_service_28_0 (task_service))
-+(typeattributeset tee_28_0 (tee))
-+(typeattributeset tee_data_file_28_0 (tee_data_file))
-+(typeattributeset tee_device_28_0 (tee_device))
-+(typeattributeset telecom_service_28_0 (telecom_service))
-+(typeattributeset test_boot_reason_prop_28_0 (test_boot_reason_prop))
-+(typeattributeset textclassification_service_28_0 (textclassification_service))
-+(typeattributeset textclassifier_data_file_28_0 (textclassifier_data_file))
-+(typeattributeset textservices_service_28_0 (textservices_service))
-+(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
-+(typeattributeset thermal_service_28_0 (thermal_service))
-+(typeattributeset timezone_service_28_0 (timezone_service))
-+(typeattributeset tmpfs_28_0
-+  ( mnt_sdcard_file
-+    tmpfs))
-+(typeattributeset tombstoned_28_0 (tombstoned))
-+(typeattributeset tombstone_data_file_28_0 (tombstone_data_file))
-+(typeattributeset tombstoned_crash_socket_28_0 (tombstoned_crash_socket))
-+(typeattributeset tombstoned_exec_28_0 (tombstoned_exec))
-+(typeattributeset tombstoned_intercept_socket_28_0 (tombstoned_intercept_socket))
-+(typeattributeset tombstoned_java_trace_socket_28_0 (tombstoned_java_trace_socket))
-+(typeattributeset tombstone_wifi_data_file_28_0 (tombstone_wifi_data_file))
-+(typeattributeset toolbox_28_0 (toolbox))
-+(typeattributeset toolbox_exec_28_0 (toolbox_exec))
-+(typeattributeset trace_data_file_28_0 (trace_data_file))
-+(typeattributeset traced_consumer_socket_28_0 (traced_consumer_socket))
-+(typeattributeset traced_enabled_prop_28_0 (traced_enabled_prop))
-+(typeattributeset traced_probes_28_0 (traced_probes))
-+(typeattributeset traced_producer_socket_28_0 (traced_producer_socket))
-+(typeattributeset traceur_app_28_0 (traceur_app))
-+(typeattributeset trust_service_28_0 (trust_service))
-+(typeattributeset tty_device_28_0 (tty_device))
-+(typeattributeset tun_device_28_0 (tun_device))
-+(typeattributeset tv_input_service_28_0 (tv_input_service))
-+(typeattributeset tzdatacheck_28_0 (tzdatacheck))
-+(typeattributeset tzdatacheck_exec_28_0 (tzdatacheck_exec))
-+(typeattributeset ueventd_28_0 (ueventd))
-+(typeattributeset uhid_device_28_0 (uhid_device))
-+(typeattributeset uimode_service_28_0 (uimode_service))
-+(typeattributeset uio_device_28_0 (uio_device))
-+(typeattributeset uncrypt_28_0 (uncrypt))
-+(typeattributeset uncrypt_exec_28_0 (uncrypt_exec))
-+(typeattributeset uncrypt_socket_28_0 (uncrypt_socket))
-+(typeattributeset unencrypted_data_file_28_0 (unencrypted_data_file))
-+(typeattributeset unlabeled_28_0 (unlabeled))
-+(typeattributeset untrusted_app_25_28_0 (untrusted_app_25))
-+(typeattributeset untrusted_app_27_28_0 (untrusted_app_27))
-+(typeattributeset untrusted_app_28_0 (untrusted_app))
-+(typeattributeset untrusted_v2_app_28_0 (untrusted_v2_app))
-+(typeattributeset update_engine_28_0 (update_engine))
-+(typeattributeset update_engine_data_file_28_0 (update_engine_data_file))
-+(typeattributeset update_engine_exec_28_0 (update_engine_exec))
-+(typeattributeset update_engine_log_data_file_28_0 (update_engine_log_data_file))
-+(typeattributeset update_engine_service_28_0 (update_engine_service))
-+(typeattributeset updatelock_service_28_0 (updatelock_service))
-+(typeattributeset update_verifier_28_0 (update_verifier))
-+(typeattributeset update_verifier_exec_28_0 (update_verifier_exec))
-+(typeattributeset usagestats_service_28_0 (usagestats_service))
-+(typeattributeset usbaccessory_device_28_0 (usbaccessory_device))
-+(typeattributeset usbd_28_0 (usbd))
-+(typeattributeset usb_device_28_0 (usb_device))
-+(typeattributeset usbd_exec_28_0 (usbd_exec))
-+(typeattributeset usbfs_28_0 (usbfs))
-+(typeattributeset usb_service_28_0 (usb_service))
-+(typeattributeset userdata_block_device_28_0 (userdata_block_device))
-+(typeattributeset usermodehelper_28_0 (usermodehelper))
-+(typeattributeset user_profile_data_file_28_0 (user_profile_data_file))
-+(typeattributeset user_service_28_0 (user_service))
-+(typeattributeset vcs_device_28_0 (vcs_device))
-+(typeattributeset vdc_28_0 (vdc))
-+(typeattributeset vdc_exec_28_0 (vdc_exec))
-+(typeattributeset vendor_app_file_28_0 (vendor_app_file))
-+(typeattributeset vendor_configs_file_28_0 (vendor_configs_file))
-+(typeattributeset vendor_data_file_28_0 (vendor_data_file))
-+(typeattributeset vendor_default_prop_28_0 (vendor_default_prop))
-+(typeattributeset vendor_file_28_0 (vendor_file))
-+(typeattributeset vendor_framework_file_28_0 (vendor_framework_file))
-+(typeattributeset vendor_hal_file_28_0 (vendor_hal_file))
-+(typeattributeset vendor_init_28_0 (vendor_init))
-+(typeattributeset vendor_overlay_file_28_0 (vendor_overlay_file))
-+(typeattributeset vendor_security_patch_level_prop_28_0 (vendor_security_patch_level_prop))
-+(typeattributeset vendor_shell_28_0 (vendor_shell))
-+(typeattributeset vendor_shell_exec_28_0 (vendor_shell_exec))
-+(typeattributeset vendor_toolbox_exec_28_0 (vendor_toolbox_exec))
-+(typeattributeset vfat_28_0 (vfat))
-+(typeattributeset vibrator_service_28_0 (vibrator_service))
-+(typeattributeset video_device_28_0 (video_device))
-+(typeattributeset virtual_touchpad_28_0 (virtual_touchpad))
-+(typeattributeset virtual_touchpad_exec_28_0 (virtual_touchpad_exec))
-+(typeattributeset virtual_touchpad_service_28_0 (virtual_touchpad_service))
-+(typeattributeset vndbinder_device_28_0 (vndbinder_device))
-+(typeattributeset vndk_sp_file_28_0 (vndk_sp_file))
-+(typeattributeset vndservice_contexts_file_28_0 (vndservice_contexts_file))
-+(typeattributeset vndservicemanager_28_0 (vndservicemanager))
-+(typeattributeset voiceinteraction_service_28_0 (voiceinteraction_service))
-+(typeattributeset vold_28_0 (vold))
-+(typeattributeset vold_data_file_28_0 (vold_data_file))
-+(typeattributeset vold_device_28_0 (vold_device))
-+(typeattributeset vold_exec_28_0 (vold_exec))
-+(typeattributeset vold_metadata_file_28_0 (vold_metadata_file))
-+(typeattributeset vold_prepare_subdirs_28_0 (vold_prepare_subdirs))
-+(typeattributeset vold_prepare_subdirs_exec_28_0 (vold_prepare_subdirs_exec))
-+(typeattributeset vold_prop_28_0 (vold_prop))
-+(typeattributeset vold_service_28_0 (vold_service))
-+(typeattributeset vpn_data_file_28_0 (vpn_data_file))
-+(typeattributeset vr_hwc_28_0 (vr_hwc))
-+(typeattributeset vr_hwc_exec_28_0 (vr_hwc_exec))
-+(typeattributeset vr_hwc_service_28_0 (vr_hwc_service))
-+(typeattributeset vr_manager_service_28_0 (vr_manager_service))
-+(typeattributeset wallpaper_file_28_0 (wallpaper_file))
-+(typeattributeset wallpaper_service_28_0 (wallpaper_service))
-+(typeattributeset watchdogd_28_0 (watchdogd))
-+(typeattributeset watchdog_device_28_0 (watchdog_device))
-+(typeattributeset webviewupdate_service_28_0 (webviewupdate_service))
-+(typeattributeset webview_zygote_28_0 (webview_zygote))
-+(typeattributeset webview_zygote_exec_28_0 (webview_zygote_exec))
-+(typeattributeset wifiaware_service_28_0 (wifiaware_service))
-+(typeattributeset wificond_28_0 (wificond))
-+(typeattributeset wificond_exec_28_0 (wificond_exec))
-+(typeattributeset wificond_service_28_0 (wificond_service))
-+(typeattributeset wifi_data_file_28_0 (wifi_data_file))
-+(typeattributeset wifi_log_prop_28_0 (wifi_log_prop))
-+(typeattributeset wifip2p_service_28_0 (wifip2p_service))
-+(typeattributeset wifi_prop_28_0 (wifi_prop))
-+(typeattributeset wifiscanner_service_28_0 (wifiscanner_service))
-+(typeattributeset wifi_service_28_0 (wifi_service))
-+(typeattributeset window_service_28_0 (window_service))
-+(typeattributeset wpantund_28_0 (wpantund))
-+(typeattributeset wpantund_exec_28_0 (wpantund_exec))
-+(typeattributeset wpantund_service_28_0 (wpantund_service))
-+(typeattributeset wpa_socket_28_0 (wpa_socket))
-+(typeattributeset zero_device_28_0 (zero_device))
-+(typeattributeset zoneinfo_data_file_28_0 (zoneinfo_data_file))
-+(typeattributeset zygote_28_0 (zygote))
-+(typeattributeset zygote_exec_28_0 (zygote_exec))
-+(typeattributeset zygote_socket_28_0 (zygote_socket))
-diff --git a/prebuilts/api/31.0/private/compat/28.0/28.0.compat.cil b/prebuilts/api/31.0/private/compat/28.0/28.0.compat.cil
-new file mode 100644
-index 000000000..2e85b23fc
---- /dev/null
-+++ b/prebuilts/api/31.0/private/compat/28.0/28.0.compat.cil
-@@ -0,0 +1,11 @@
-+(typeattribute vendordomain)
-+(typeattributeset vendordomain ((and (domain) ((not (coredomain))))))
-+(allowx vendordomain dev_type (ioctl blk_file ((range 0x0000 0xffff))))
-+(allowx vendordomain file_type (ioctl file ((range 0x0000 0xffff))))
-+(allow vendordomain self (netlink_route_socket (nlmsg_readpriv)))
-+
-+(typeattributeset mlsvendorcompat (and appdomain vendordomain))
-+(allow mlsvendorcompat app_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat app_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-+(allow mlsvendorcompat privapp_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat privapp_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-diff --git a/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil
-new file mode 100644
-index 000000000..e7ddf4805
---- /dev/null
-+++ b/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil
-@@ -0,0 +1,160 @@
-+;; new_objects - a collection of types that have been introduced that have no
-+;;   analogue in older policy.  Thus, we do not need to map these types to
-+;;   previous ones.  Add here to pass checkapi tests.
-+(type new_objects)
-+(typeattribute new_objects)
-+(typeattributeset new_objects
-+  ( new_objects
-+    activity_task_service
-+    adb_service
-+    apex_data_file
-+    apex_metadata_file
-+    apex_mnt_dir
-+    apex_service
-+    apexd
-+    apexd_exec
-+    apexd_prop
-+    apexd_tmpfs
-+    appdomain_tmpfs
-+    app_binding_service
-+    app_prediction_service
-+    app_zygote
-+    app_zygote_tmpfs
-+    ashmemd
-+    ashmem_device_service
-+    attention_service
-+    biometric_service
-+    bluetooth_audio_hal_prop
-+    bpf_progs_loaded_prop
-+    bugreport_service
-+    cgroup_desc_file
-+    cgroup_rc_file
-+    charger_exec
-+    content_capture_service
-+    content_suggestions_service
-+    cpu_variant_prop
-+    ctl_apexd_prop
-+    ctl_gsid_prop
-+    dev_cpu_variant
-+    device_config_activity_manager_native_boot_prop
-+    device_config_boot_count_prop
-+    device_config_input_native_boot_prop
-+    device_config_netd_native_prop
-+    device_config_reset_performed_prop
-+    device_config_runtime_native_boot_prop
-+    device_config_runtime_native_prop
-+    device_config_media_native_prop
-+    device_config_service
-+    device_config_sys_traced_prop
-+    dnsresolver_service
-+    dynamic_system_service
-+    dynamic_system_prop
-+    face_service
-+    face_vendor_data_file
-+    sota_prop
-+    fastbootd
-+    flags_health_check
-+    flags_health_check_exec
-+    fwk_bufferhub_hwservice
-+    fwk_camera_hwservice
-+    fwk_stats_hwservice
-+    gpuservice
-+    gsi_data_file
-+    gsi_metadata_file
-+    gsi_public_metadata_file
-+    gsi_service
-+    gsid
-+    gsid_exec
-+    gsid_prop
-+    color_display_service
-+    external_vibrator_service
-+    hal_atrace_hwservice
-+    hal_face_hwservice
-+    hal_graphics_composer_server_tmpfs
-+    hal_health_storage_hwservice
-+    hal_input_classifier_hwservice
-+    hal_power_stats_hwservice
-+    heapprofd
-+    heapprofd_enabled_prop
-+    heapprofd_exec
-+    heapprofd_prop
-+    heapprofd_socket
-+    idmap_service
-+    iris_service
-+    iris_vendor_data_file
-+    llkd
-+    llkd_exec
-+    llkd_prop
-+    llkd_tmpfs
-+    looper_stats_service
-+    lpdumpd
-+    lpdumpd_exec
-+    lpdumpd_prop
-+    lpdump_service
-+    iorapd
-+    iorapd_exec
-+    iorapd_data_file
-+    iorapd_service
-+    iorapd_tmpfs
-+    mediaswcodec
-+    mediaswcodec_exec
-+    mediaswcodec_tmpfs
-+    metadata_bootstat_file
-+    mnt_product_file
-+    network_stack
-+    network_stack_service
-+    network_stack_tmpfs
-+    nnapi_ext_deny_product_prop
-+    overlayfs_file
-+    password_slot_metadata_file
-+    permissionmgr_service
-+    postinstall_apex_mnt_dir
-+    recovery_socket
-+    role_service
-+    rollback_service
-+    rs
-+    rs_exec
-+    rss_hwm_reset
-+    rss_hwm_reset_exec
-+    runas_app
-+    runas_app_tmpfs
-+    art_apex_dir
-+    runtime_service
-+    sdcard_block_device
-+    sensor_privacy_service
-+    server_configurable_flags_data_file
-+    simpleperf_app_runner
-+    simpleperf_app_runner_exec
-+    socket_hook_prop
-+    su_tmpfs
-+    super_block_device
-+    sysfs_fs_f2fs
-+    system_bootstrap_lib_file
-+    system_event_log_tags_file
-+    system_lmk_prop
-+    system_suspend_hwservice
-+    system_suspend_control_service
-+    system_trace_prop
-+    staging_data_file
-+    task_profiles_file
-+    testharness_service
-+    test_harness_prop
-+    theme_prop
-+    time_prop
-+    timedetector_service
-+    timezonedetector_service
-+    traced_lazy_prop
-+    uri_grants_service
-+    use_memfd_prop
-+    vendor_apex_file
-+    vendor_cgroup_desc_file
-+    vendor_idc_file
-+    vendor_keychars_file
-+    vendor_keylayout_file
-+    vendor_misc_writer
-+    vendor_misc_writer_exec
-+    vendor_socket_hook_prop
-+    vendor_task_profiles_file
-+    vndk_prop
-+    vrflinger_vsync_service
-+    watchdogd_tmpfs))
-diff --git a/prebuilts/api/32.0/private/compat/28.0/28.0.cil b/prebuilts/api/32.0/private/compat/28.0/28.0.cil
-new file mode 100644
-index 000000000..321e9387e
---- /dev/null
-+++ b/prebuilts/api/32.0/private/compat/28.0/28.0.cil
-@@ -0,0 +1,1744 @@
-+;; attributes removed from current policy
-+(typeattribute hal_wifi_offload)
-+(typeattribute hal_wifi_offload_client)
-+(typeattribute hal_wifi_offload_server)
-+
-+;; types removed from current policy
-+(type alarm_device)
-+(type audio_seq_device)
-+(type audio_timer_device)
-+(type commontime_management_service)
-+(type cpuctl_device)
-+(type full_device)
-+(type hal_wifi_offload_hwservice)
-+(type i2c_device)
-+(type kmem_device)
-+(type mediacodec)
-+(type mediacodec_exec)
-+(type mediaextractor_update_service)
-+(type mtd_device)
-+(type netd_socket)
-+(type qtaguid_proc)
-+(type thermalcallback_hwservice)
-+(type thermalserviced)
-+(type thermalserviced_exec)
-+(type untrusted_v2_app)
-+(type vcs_device)
-+
-+;; Public 28.0 SEPolicy is divergent on different devices w.r.t
-+;; exported_audio_prop type. We need this typeattribute declaration so that the
-+;; mapping file compiles with vendor policies without exported_audio_prop type.
-+(typeattribute exported_audio_prop_28_0)
-+
-+(expandtypeattribute (accessibility_service_28_0) true)
-+(expandtypeattribute (account_service_28_0) true)
-+(expandtypeattribute (activity_service_28_0) true)
-+(expandtypeattribute (adbd_28_0) true)
-+(expandtypeattribute (adb_data_file_28_0) true)
-+(expandtypeattribute (adbd_exec_28_0) true)
-+(expandtypeattribute (adbd_socket_28_0) true)
-+(expandtypeattribute (adb_keys_file_28_0) true)
-+(expandtypeattribute (alarm_device_28_0) true)
-+(expandtypeattribute (alarm_service_28_0) true)
-+(expandtypeattribute (anr_data_file_28_0) true)
-+(expandtypeattribute (apk_data_file_28_0) true)
-+(expandtypeattribute (apk_private_data_file_28_0) true)
-+(expandtypeattribute (apk_private_tmp_file_28_0) true)
-+(expandtypeattribute (apk_tmp_file_28_0) true)
-+(expandtypeattribute (app_data_file_28_0) true)
-+(expandtypeattribute (app_fuse_file_28_0) true)
-+(expandtypeattribute (app_fusefs_28_0) true)
-+(expandtypeattribute (appops_service_28_0) true)
-+(expandtypeattribute (appwidget_service_28_0) true)
-+(expandtypeattribute (asec_apk_file_28_0) true)
-+(expandtypeattribute (asec_image_file_28_0) true)
-+(expandtypeattribute (asec_public_file_28_0) true)
-+(expandtypeattribute (ashmem_device_28_0) true)
-+(expandtypeattribute (assetatlas_service_28_0) true)
-+(expandtypeattribute (audio_data_file_28_0) true)
-+(expandtypeattribute (audio_device_28_0) true)
-+(expandtypeattribute (audiohal_data_file_28_0) true)
-+(expandtypeattribute (audio_prop_28_0) true)
-+(expandtypeattribute (audio_seq_device_28_0) true)
-+(expandtypeattribute (audioserver_28_0) true)
-+(expandtypeattribute (audioserver_data_file_28_0) true)
-+(expandtypeattribute (audioserver_service_28_0) true)
-+(expandtypeattribute (audio_service_28_0) true)
-+(expandtypeattribute (audio_timer_device_28_0) true)
-+(expandtypeattribute (autofill_service_28_0) true)
-+(expandtypeattribute (backup_data_file_28_0) true)
-+(expandtypeattribute (backup_service_28_0) true)
-+(expandtypeattribute (batteryproperties_service_28_0) true)
-+(expandtypeattribute (battery_service_28_0) true)
-+(expandtypeattribute (batterystats_service_28_0) true)
-+(expandtypeattribute (binder_calls_stats_service_28_0) true)
-+(expandtypeattribute (binder_device_28_0) true)
-+(expandtypeattribute (binfmt_miscfs_28_0) true)
-+(expandtypeattribute (blkid_28_0) true)
-+(expandtypeattribute (blkid_untrusted_28_0) true)
-+(expandtypeattribute (block_device_28_0) true)
-+(expandtypeattribute (bluetooth_28_0) true)
-+(expandtypeattribute (bluetooth_a2dp_offload_prop_28_0) true)
-+(expandtypeattribute (bluetooth_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_efs_file_28_0) true)
-+(expandtypeattribute (bluetooth_logs_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_manager_service_28_0) true)
-+(expandtypeattribute (bluetooth_prop_28_0) true)
-+(expandtypeattribute (bluetooth_service_28_0) true)
-+(expandtypeattribute (bluetooth_socket_28_0) true)
-+(expandtypeattribute (bootanim_28_0) true)
-+(expandtypeattribute (bootanim_exec_28_0) true)
-+(expandtypeattribute (boot_block_device_28_0) true)
-+(expandtypeattribute (bootchart_data_file_28_0) true)
-+(expandtypeattribute (bootloader_boot_reason_prop_28_0) true)
-+(expandtypeattribute (bootstat_28_0) true)
-+(expandtypeattribute (bootstat_data_file_28_0) true)
-+(expandtypeattribute (bootstat_exec_28_0) true)
-+(expandtypeattribute (boottime_prop_28_0) true)
-+(expandtypeattribute (boottrace_data_file_28_0) true)
-+(expandtypeattribute (broadcastradio_service_28_0) true)
-+(expandtypeattribute (bufferhubd_28_0) true)
-+(expandtypeattribute (bufferhubd_exec_28_0) true)
-+(expandtypeattribute (cache_backup_file_28_0) true)
-+(expandtypeattribute (cache_block_device_28_0) true)
-+(expandtypeattribute (cache_file_28_0) true)
-+(expandtypeattribute (cache_private_backup_file_28_0) true)
-+(expandtypeattribute (cache_recovery_file_28_0) true)
-+(expandtypeattribute (camera_data_file_28_0) true)
-+(expandtypeattribute (camera_device_28_0) true)
-+(expandtypeattribute (cameraproxy_service_28_0) true)
-+(expandtypeattribute (cameraserver_28_0) true)
-+(expandtypeattribute (cameraserver_exec_28_0) true)
-+(expandtypeattribute (cameraserver_service_28_0) true)
-+(expandtypeattribute (cgroup_28_0) true)
-+(expandtypeattribute (cgroup_bpf_28_0) true)
-+(expandtypeattribute (charger_28_0) true)
-+(expandtypeattribute (clatd_28_0) true)
-+(expandtypeattribute (clatd_exec_28_0) true)
-+(expandtypeattribute (clipboard_service_28_0) true)
-+(expandtypeattribute (commontime_management_service_28_0) true)
-+(expandtypeattribute (companion_device_service_28_0) true)
-+(expandtypeattribute (configfs_28_0) true)
-+(expandtypeattribute (config_prop_28_0) true)
-+(expandtypeattribute (connectivity_service_28_0) true)
-+(expandtypeattribute (connmetrics_service_28_0) true)
-+(expandtypeattribute (console_device_28_0) true)
-+(expandtypeattribute (consumer_ir_service_28_0) true)
-+(expandtypeattribute (content_service_28_0) true)
-+(expandtypeattribute (contexthub_service_28_0) true)
-+(expandtypeattribute (coredump_file_28_0) true)
-+(expandtypeattribute (country_detector_service_28_0) true)
-+(expandtypeattribute (coverage_service_28_0) true)
-+(expandtypeattribute (cppreopt_prop_28_0) true)
-+(expandtypeattribute (cppreopts_28_0) true)
-+(expandtypeattribute (cppreopts_exec_28_0) true)
-+(expandtypeattribute (cpuctl_device_28_0) true)
-+(expandtypeattribute (cpuinfo_service_28_0) true)
-+(expandtypeattribute (crash_dump_28_0) true)
-+(expandtypeattribute (crash_dump_exec_28_0) true)
-+(expandtypeattribute (crossprofileapps_service_28_0) true)
-+(expandtypeattribute (ctl_bootanim_prop_28_0) true)
-+(expandtypeattribute (ctl_bugreport_prop_28_0) true)
-+(expandtypeattribute (ctl_console_prop_28_0) true)
-+(expandtypeattribute (ctl_default_prop_28_0) true)
-+(expandtypeattribute (ctl_dumpstate_prop_28_0) true)
-+(expandtypeattribute (ctl_fuse_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_start_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_stop_prop_28_0) true)
-+(expandtypeattribute (ctl_mdnsd_prop_28_0) true)
-+(expandtypeattribute (ctl_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_rildaemon_prop_28_0) true)
-+(expandtypeattribute (ctl_sigstop_prop_28_0) true)
-+(expandtypeattribute (ctl_start_prop_28_0) true)
-+(expandtypeattribute (ctl_stop_prop_28_0) true)
-+(expandtypeattribute (dalvikcache_data_file_28_0) true)
-+(expandtypeattribute (dalvik_prop_28_0) true)
-+(expandtypeattribute (dbinfo_service_28_0) true)
-+(expandtypeattribute (debugfs_28_0) true)
-+(expandtypeattribute (debugfs_mmc_28_0) true)
-+(expandtypeattribute (debugfs_trace_marker_28_0) true)
-+(expandtypeattribute (debugfs_tracing_28_0) true)
-+(expandtypeattribute (debugfs_tracing_debug_28_0) true)
-+(expandtypeattribute (debugfs_tracing_instances_28_0) true)
-+(expandtypeattribute (debugfs_wakeup_sources_28_0) true)
-+(expandtypeattribute (debugfs_wifi_tracing_28_0) true)
-+(expandtypeattribute (debuggerd_prop_28_0) true)
-+(expandtypeattribute (debug_prop_28_0) true)
-+(expandtypeattribute (default_android_hwservice_28_0) true)
-+(expandtypeattribute (default_android_service_28_0) true)
-+(expandtypeattribute (default_android_vndservice_28_0) true)
-+(expandtypeattribute (default_prop_28_0) true)
-+(expandtypeattribute (device_28_0) true)
-+(expandtypeattribute (device_identifiers_service_28_0) true)
-+(expandtypeattribute (deviceidle_service_28_0) true)
-+(expandtypeattribute (device_logging_prop_28_0) true)
-+(expandtypeattribute (device_policy_service_28_0) true)
-+(expandtypeattribute (devicestoragemonitor_service_28_0) true)
-+(expandtypeattribute (devpts_28_0) true)
-+(expandtypeattribute (dex2oat_28_0) true)
-+(expandtypeattribute (dex2oat_exec_28_0) true)
-+(expandtypeattribute (dhcp_28_0) true)
-+(expandtypeattribute (dhcp_data_file_28_0) true)
-+(expandtypeattribute (dhcp_exec_28_0) true)
-+(expandtypeattribute (dhcp_prop_28_0) true)
-+(expandtypeattribute (diskstats_service_28_0) true)
-+(expandtypeattribute (display_service_28_0) true)
-+(expandtypeattribute (dm_device_28_0) true)
-+(expandtypeattribute (dnsmasq_28_0) true)
-+(expandtypeattribute (dnsmasq_exec_28_0) true)
-+(expandtypeattribute (dnsproxyd_socket_28_0) true)
-+(expandtypeattribute (DockObserver_service_28_0) true)
-+(expandtypeattribute (dreams_service_28_0) true)
-+(expandtypeattribute (drm_data_file_28_0) true)
-+(expandtypeattribute (drmserver_28_0) true)
-+(expandtypeattribute (drmserver_exec_28_0) true)
-+(expandtypeattribute (drmserver_service_28_0) true)
-+(expandtypeattribute (drmserver_socket_28_0) true)
-+(expandtypeattribute (dropbox_service_28_0) true)
-+(expandtypeattribute (dumpstate_28_0) true)
-+(expandtypeattribute (dumpstate_exec_28_0) true)
-+(expandtypeattribute (dumpstate_options_prop_28_0) true)
-+(expandtypeattribute (dumpstate_prop_28_0) true)
-+(expandtypeattribute (dumpstate_service_28_0) true)
-+(expandtypeattribute (dumpstate_socket_28_0) true)
-+(expandtypeattribute (e2fs_28_0) true)
-+(expandtypeattribute (e2fs_exec_28_0) true)
-+(expandtypeattribute (efs_file_28_0) true)
-+(expandtypeattribute (ephemeral_app_28_0) true)
-+(expandtypeattribute (ethernet_service_28_0) true)
-+(expandtypeattribute (exfat_28_0) true)
-+(expandtypeattribute (exported2_config_prop_28_0) true)
-+(expandtypeattribute (exported2_default_prop_28_0) true)
-+(expandtypeattribute (exported2_radio_prop_28_0) true)
-+(expandtypeattribute (exported2_system_prop_28_0) true)
-+(expandtypeattribute (exported2_vold_prop_28_0) true)
-+(expandtypeattribute (exported3_default_prop_28_0) true)
-+(expandtypeattribute (exported3_radio_prop_28_0) true)
-+(expandtypeattribute (exported3_system_prop_28_0) true)
-+(expandtypeattribute (exported_audio_prop_28_0) true)
-+(expandtypeattribute (exported_bluetooth_prop_28_0) true)
-+(expandtypeattribute (exported_config_prop_28_0) true)
-+(expandtypeattribute (exported_dalvik_prop_28_0) true)
-+(expandtypeattribute (exported_default_prop_28_0) true)
-+(expandtypeattribute (exported_dumpstate_prop_28_0) true)
-+(expandtypeattribute (exported_ffs_prop_28_0) true)
-+(expandtypeattribute (exported_fingerprint_prop_28_0) true)
-+(expandtypeattribute (exported_overlay_prop_28_0) true)
-+(expandtypeattribute (exported_pm_prop_28_0) true)
-+(expandtypeattribute (exported_radio_prop_28_0) true)
-+(expandtypeattribute (exported_secure_prop_28_0) true)
-+(expandtypeattribute (exported_system_prop_28_0) true)
-+(expandtypeattribute (exported_system_radio_prop_28_0) true)
-+(expandtypeattribute (exported_vold_prop_28_0) true)
-+(expandtypeattribute (exported_wifi_prop_28_0) true)
-+(expandtypeattribute (ffs_prop_28_0) true)
-+(expandtypeattribute (file_contexts_file_28_0) true)
-+(expandtypeattribute (fingerprintd_28_0) true)
-+(expandtypeattribute (fingerprintd_data_file_28_0) true)
-+(expandtypeattribute (fingerprintd_exec_28_0) true)
-+(expandtypeattribute (fingerprintd_service_28_0) true)
-+(expandtypeattribute (fingerprint_prop_28_0) true)
-+(expandtypeattribute (fingerprint_service_28_0) true)
-+(expandtypeattribute (fingerprint_vendor_data_file_28_0) true)
-+(expandtypeattribute (firstboot_prop_28_0) true)
-+(expandtypeattribute (font_service_28_0) true)
-+(expandtypeattribute (frp_block_device_28_0) true)
-+(expandtypeattribute (fs_bpf_28_0) true)
-+(expandtypeattribute (fsck_28_0) true)
-+(expandtypeattribute (fsck_exec_28_0) true)
-+(expandtypeattribute (fscklogs_28_0) true)
-+(expandtypeattribute (fsck_untrusted_28_0) true)
-+(expandtypeattribute (full_device_28_0) true)
-+(expandtypeattribute (functionfs_28_0) true)
-+(expandtypeattribute (fuse_28_0) true)
-+(expandtypeattribute (fuse_device_28_0) true)
-+(expandtypeattribute (fwk_display_hwservice_28_0) true)
-+(expandtypeattribute (fwk_scheduler_hwservice_28_0) true)
-+(expandtypeattribute (fwk_sensor_hwservice_28_0) true)
-+(expandtypeattribute (fwmarkd_socket_28_0) true)
-+(expandtypeattribute (gatekeeperd_28_0) true)
-+(expandtypeattribute (gatekeeper_data_file_28_0) true)
-+(expandtypeattribute (gatekeeperd_exec_28_0) true)
-+(expandtypeattribute (gatekeeper_service_28_0) true)
-+(expandtypeattribute (gfxinfo_service_28_0) true)
-+(expandtypeattribute (gps_control_28_0) true)
-+(expandtypeattribute (gpu_device_28_0) true)
-+(expandtypeattribute (gpu_service_28_0) true)
-+(expandtypeattribute (graphics_device_28_0) true)
-+(expandtypeattribute (graphicsstats_service_28_0) true)
-+(expandtypeattribute (hal_audiocontrol_hwservice_28_0) true)
-+(expandtypeattribute (hal_audio_hwservice_28_0) true)
-+(expandtypeattribute (hal_authsecret_hwservice_28_0) true)
-+(expandtypeattribute (hal_bluetooth_hwservice_28_0) true)
-+(expandtypeattribute (hal_bootctl_hwservice_28_0) true)
-+(expandtypeattribute (hal_broadcastradio_hwservice_28_0) true)
-+(expandtypeattribute (hal_camera_hwservice_28_0) true)
-+(expandtypeattribute (hal_cas_hwservice_28_0) true)
-+(expandtypeattribute (hal_codec2_hwservice_28_0) true)
-+(expandtypeattribute (hal_configstore_ISurfaceFlingerConfigs_28_0) true)
-+(expandtypeattribute (hal_confirmationui_hwservice_28_0) true)
-+(expandtypeattribute (hal_contexthub_hwservice_28_0) true)
-+(expandtypeattribute (hal_drm_hwservice_28_0) true)
-+(expandtypeattribute (hal_dumpstate_hwservice_28_0) true)
-+(expandtypeattribute (hal_evs_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_service_28_0) true)
-+(expandtypeattribute (hal_gatekeeper_hwservice_28_0) true)
-+(expandtypeattribute (hal_gnss_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_composer_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_mapper_hwservice_28_0) true)
-+(expandtypeattribute (hal_health_hwservice_28_0) true)
-+(expandtypeattribute (hal_ir_hwservice_28_0) true)
-+(expandtypeattribute (hal_keymaster_hwservice_28_0) true)
-+(expandtypeattribute (hal_light_hwservice_28_0) true)
-+(expandtypeattribute (hal_lowpan_hwservice_28_0) true)
-+(expandtypeattribute (hal_memtrack_hwservice_28_0) true)
-+(expandtypeattribute (hal_neuralnetworks_hwservice_28_0) true)
-+(expandtypeattribute (hal_nfc_hwservice_28_0) true)
-+(expandtypeattribute (hal_oemlock_hwservice_28_0) true)
-+(expandtypeattribute (hal_omx_hwservice_28_0) true)
-+(expandtypeattribute (hal_power_hwservice_28_0) true)
-+(expandtypeattribute (hal_renderscript_hwservice_28_0) true)
-+(expandtypeattribute (hal_secure_element_hwservice_28_0) true)
-+(expandtypeattribute (hal_sensors_hwservice_28_0) true)
-+(expandtypeattribute (hal_telephony_hwservice_28_0) true)
-+(expandtypeattribute (hal_tetheroffload_hwservice_28_0) true)
-+(expandtypeattribute (hal_thermal_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_cec_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_input_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_gadget_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_hwservice_28_0) true)
-+(expandtypeattribute (hal_vehicle_hwservice_28_0) true)
-+(expandtypeattribute (hal_vibrator_hwservice_28_0) true)
-+(expandtypeattribute (hal_vr_hwservice_28_0) true)
-+(expandtypeattribute (hal_weaver_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hostapd_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_offload_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_supplicant_hwservice_28_0) true)
-+(expandtypeattribute (hardware_properties_service_28_0) true)
-+(expandtypeattribute (hardware_service_28_0) true)
-+(expandtypeattribute (hci_attach_dev_28_0) true)
-+(expandtypeattribute (hdmi_control_service_28_0) true)
-+(expandtypeattribute (healthd_28_0) true)
-+(expandtypeattribute (healthd_exec_28_0) true)
-+(expandtypeattribute (heapdump_data_file_28_0) true)
-+(expandtypeattribute (hidl_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hidl_base_hwservice_28_0) true)
-+(expandtypeattribute (hidl_manager_hwservice_28_0) true)
-+(expandtypeattribute (hidl_memory_hwservice_28_0) true)
-+(expandtypeattribute (hidl_token_hwservice_28_0) true)
-+(expandtypeattribute (hwbinder_device_28_0) true)
-+(expandtypeattribute (hw_random_device_28_0) true)
-+(expandtypeattribute (hwservice_contexts_file_28_0) true)
-+(expandtypeattribute (hwservicemanager_28_0) true)
-+(expandtypeattribute (hwservicemanager_exec_28_0) true)
-+(expandtypeattribute (hwservicemanager_prop_28_0) true)
-+(expandtypeattribute (i2c_device_28_0) true)
-+(expandtypeattribute (icon_file_28_0) true)
-+(expandtypeattribute (idmap_28_0) true)
-+(expandtypeattribute (idmap_exec_28_0) true)
-+(expandtypeattribute (iio_device_28_0) true)
-+(expandtypeattribute (imms_service_28_0) true)
-+(expandtypeattribute (incident_28_0) true)
-+(expandtypeattribute (incidentd_28_0) true)
-+(expandtypeattribute (incident_data_file_28_0) true)
-+(expandtypeattribute (incident_helper_28_0) true)
-+(expandtypeattribute (incident_service_28_0) true)
-+(expandtypeattribute (init_28_0) true)
-+(expandtypeattribute (init_exec_28_0) true)
-+(expandtypeattribute (inotify_28_0) true)
-+(expandtypeattribute (input_device_28_0) true)
-+(expandtypeattribute (inputflinger_28_0) true)
-+(expandtypeattribute (inputflinger_exec_28_0) true)
-+(expandtypeattribute (inputflinger_service_28_0) true)
-+(expandtypeattribute (input_method_service_28_0) true)
-+(expandtypeattribute (input_service_28_0) true)
-+(expandtypeattribute (installd_28_0) true)
-+(expandtypeattribute (install_data_file_28_0) true)
-+(expandtypeattribute (installd_exec_28_0) true)
-+(expandtypeattribute (installd_service_28_0) true)
-+(expandtypeattribute (install_recovery_28_0) true)
-+(expandtypeattribute (install_recovery_exec_28_0) true)
-+(expandtypeattribute (ion_device_28_0) true)
-+(expandtypeattribute (IProxyService_service_28_0) true)
-+(expandtypeattribute (ipsec_service_28_0) true)
-+(expandtypeattribute (isolated_app_28_0) true)
-+(expandtypeattribute (jobscheduler_service_28_0) true)
-+(expandtypeattribute (kernel_28_0) true)
-+(expandtypeattribute (keychain_data_file_28_0) true)
-+(expandtypeattribute (keychord_device_28_0) true)
-+(expandtypeattribute (keystore_28_0) true)
-+(expandtypeattribute (keystore_data_file_28_0) true)
-+(expandtypeattribute (keystore_exec_28_0) true)
-+(expandtypeattribute (keystore_service_28_0) true)
-+(expandtypeattribute (kmem_device_28_0) true)
-+(expandtypeattribute (kmsg_debug_device_28_0) true)
-+(expandtypeattribute (kmsg_device_28_0) true)
-+(expandtypeattribute (labeledfs_28_0) true)
-+(expandtypeattribute (last_boot_reason_prop_28_0) true)
-+(expandtypeattribute (launcherapps_service_28_0) true)
-+(expandtypeattribute (lmkd_28_0) true)
-+(expandtypeattribute (lmkd_exec_28_0) true)
-+(expandtypeattribute (lmkd_socket_28_0) true)
-+(expandtypeattribute (location_service_28_0) true)
-+(expandtypeattribute (lock_settings_service_28_0) true)
-+(expandtypeattribute (logcat_exec_28_0) true)
-+(expandtypeattribute (logd_28_0) true)
-+(expandtypeattribute (logd_exec_28_0) true)
-+(expandtypeattribute (logd_prop_28_0) true)
-+(expandtypeattribute (logdr_socket_28_0) true)
-+(expandtypeattribute (logd_socket_28_0) true)
-+(expandtypeattribute (logdw_socket_28_0) true)
-+(expandtypeattribute (logpersist_28_0) true)
-+(expandtypeattribute (logpersistd_logging_prop_28_0) true)
-+(expandtypeattribute (log_prop_28_0) true)
-+(expandtypeattribute (log_tag_prop_28_0) true)
-+(expandtypeattribute (loop_control_device_28_0) true)
-+(expandtypeattribute (loop_device_28_0) true)
-+(expandtypeattribute (lowpan_device_28_0) true)
-+(expandtypeattribute (lowpan_prop_28_0) true)
-+(expandtypeattribute (lowpan_service_28_0) true)
-+(expandtypeattribute (mac_perms_file_28_0) true)
-+(expandtypeattribute (mdnsd_28_0) true)
-+(expandtypeattribute (mdnsd_socket_28_0) true)
-+(expandtypeattribute (mdns_socket_28_0) true)
-+(expandtypeattribute (mediacodec_28_0) true)
-+(expandtypeattribute (mediacodec_exec_28_0) true)
-+(expandtypeattribute (mediacodec_service_28_0) true)
-+(expandtypeattribute (media_data_file_28_0) true)
-+(expandtypeattribute (mediadrmserver_28_0) true)
-+(expandtypeattribute (mediadrmserver_exec_28_0) true)
-+(expandtypeattribute (mediadrmserver_service_28_0) true)
-+(expandtypeattribute (mediaextractor_28_0) true)
-+(expandtypeattribute (mediaextractor_exec_28_0) true)
-+(expandtypeattribute (mediaextractor_service_28_0) true)
-+(expandtypeattribute (mediaextractor_update_service_28_0) true)
-+(expandtypeattribute (mediametrics_28_0) true)
-+(expandtypeattribute (mediametrics_exec_28_0) true)
-+(expandtypeattribute (mediametrics_service_28_0) true)
-+(expandtypeattribute (media_projection_service_28_0) true)
-+(expandtypeattribute (mediaprovider_28_0) true)
-+(expandtypeattribute (media_router_service_28_0) true)
-+(expandtypeattribute (media_rw_data_file_28_0) true)
-+(expandtypeattribute (mediaserver_28_0) true)
-+(expandtypeattribute (mediaserver_exec_28_0) true)
-+(expandtypeattribute (mediaserver_service_28_0) true)
-+(expandtypeattribute (media_session_service_28_0) true)
-+(expandtypeattribute (meminfo_service_28_0) true)
-+(expandtypeattribute (metadata_block_device_28_0) true)
-+(expandtypeattribute (metadata_file_28_0) true)
-+(expandtypeattribute (method_trace_data_file_28_0) true)
-+(expandtypeattribute (midi_service_28_0) true)
-+(expandtypeattribute (misc_block_device_28_0) true)
-+(expandtypeattribute (misc_logd_file_28_0) true)
-+(expandtypeattribute (misc_user_data_file_28_0) true)
-+(expandtypeattribute (mmc_prop_28_0) true)
-+(expandtypeattribute (mnt_expand_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_stub_file_28_0) true)
-+(expandtypeattribute (mnt_user_file_28_0) true)
-+(expandtypeattribute (mnt_vendor_file_28_0) true)
-+(expandtypeattribute (modprobe_28_0) true)
-+(expandtypeattribute (mount_service_28_0) true)
-+(expandtypeattribute (mqueue_28_0) true)
-+(expandtypeattribute (mtd_device_28_0) true)
-+(expandtypeattribute (mtp_28_0) true)
-+(expandtypeattribute (mtp_device_28_0) true)
-+(expandtypeattribute (mtpd_socket_28_0) true)
-+(expandtypeattribute (mtp_exec_28_0) true)
-+(expandtypeattribute (nativetest_data_file_28_0) true)
-+(expandtypeattribute (netd_28_0) true)
-+(expandtypeattribute (net_data_file_28_0) true)
-+(expandtypeattribute (netd_exec_28_0) true)
-+(expandtypeattribute (netd_listener_service_28_0) true)
-+(expandtypeattribute (net_dns_prop_28_0) true)
-+(expandtypeattribute (netd_service_28_0) true)
-+(expandtypeattribute (netd_socket_28_0) true)
-+(expandtypeattribute (netd_stable_secret_prop_28_0) true)
-+(expandtypeattribute (netif_28_0) true)
-+(expandtypeattribute (netpolicy_service_28_0) true)
-+(expandtypeattribute (net_radio_prop_28_0) true)
-+(expandtypeattribute (netstats_service_28_0) true)
-+(expandtypeattribute (netutils_wrapper_28_0) true)
-+(expandtypeattribute (netutils_wrapper_exec_28_0) true)
-+(expandtypeattribute (network_management_service_28_0) true)
-+(expandtypeattribute (network_score_service_28_0) true)
-+(expandtypeattribute (network_time_update_service_28_0) true)
-+(expandtypeattribute (network_watchlist_data_file_28_0) true)
-+(expandtypeattribute (network_watchlist_service_28_0) true)
-+(expandtypeattribute (nfc_28_0) true)
-+(expandtypeattribute (nfc_data_file_28_0) true)
-+(expandtypeattribute (nfc_device_28_0) true)
-+(expandtypeattribute (nfc_prop_28_0) true)
-+(expandtypeattribute (nfc_service_28_0) true)
-+(expandtypeattribute (node_28_0) true)
-+(expandtypeattribute (nonplat_service_contexts_file_28_0) true)
-+(expandtypeattribute (notification_service_28_0) true)
-+(expandtypeattribute (null_device_28_0) true)
-+(expandtypeattribute (oemfs_28_0) true)
-+(expandtypeattribute (oem_lock_service_28_0) true)
-+(expandtypeattribute (ota_data_file_28_0) true)
-+(expandtypeattribute (otadexopt_service_28_0) true)
-+(expandtypeattribute (ota_package_file_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_exec_28_0) true)
-+(expandtypeattribute (otapreopt_slot_28_0) true)
-+(expandtypeattribute (otapreopt_slot_exec_28_0) true)
-+(expandtypeattribute (overlay_prop_28_0) true)
-+(expandtypeattribute (overlay_service_28_0) true)
-+(expandtypeattribute (owntty_device_28_0) true)
-+(expandtypeattribute (package_native_service_28_0) true)
-+(expandtypeattribute (package_service_28_0) true)
-+(expandtypeattribute (pan_result_prop_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_dir_28_0) true)
-+(expandtypeattribute (pdx_display_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_dir_28_0) true)
-+(expandtypeattribute (pdx_display_manager_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_manager_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_dir_28_0) true)
-+(expandtypeattribute (performanced_28_0) true)
-+(expandtypeattribute (performanced_exec_28_0) true)
-+(expandtypeattribute (permission_service_28_0) true)
-+(expandtypeattribute (persist_debug_prop_28_0) true)
-+(expandtypeattribute (persistent_data_block_service_28_0) true)
-+(expandtypeattribute (persistent_properties_ready_prop_28_0) true)
-+(expandtypeattribute (pinner_service_28_0) true)
-+(expandtypeattribute (pipefs_28_0) true)
-+(expandtypeattribute (platform_app_28_0) true)
-+(expandtypeattribute (pm_prop_28_0) true)
-+(expandtypeattribute (pmsg_device_28_0) true)
-+(expandtypeattribute (port_28_0) true)
-+(expandtypeattribute (port_device_28_0) true)
-+(expandtypeattribute (postinstall_28_0) true)
-+(expandtypeattribute (postinstall_dexopt_28_0) true)
-+(expandtypeattribute (postinstall_file_28_0) true)
-+(expandtypeattribute (postinstall_mnt_dir_28_0) true)
-+(expandtypeattribute (powerctl_prop_28_0) true)
-+(expandtypeattribute (power_service_28_0) true)
-+(expandtypeattribute (ppp_28_0) true)
-+(expandtypeattribute (ppp_device_28_0) true)
-+(expandtypeattribute (ppp_exec_28_0) true)
-+(expandtypeattribute (preloads_data_file_28_0) true)
-+(expandtypeattribute (preloads_media_file_28_0) true)
-+(expandtypeattribute (preopt2cachename_28_0) true)
-+(expandtypeattribute (preopt2cachename_exec_28_0) true)
-+(expandtypeattribute (print_service_28_0) true)
-+(expandtypeattribute (priv_app_28_0) true)
-+(expandtypeattribute (proc_28_0) true)
-+(expandtypeattribute (proc_abi_28_0) true)
-+(expandtypeattribute (proc_asound_28_0) true)
-+(expandtypeattribute (proc_bluetooth_writable_28_0) true)
-+(expandtypeattribute (proc_buddyinfo_28_0) true)
-+(expandtypeattribute (proc_cmdline_28_0) true)
-+(expandtypeattribute (proc_cpuinfo_28_0) true)
-+(expandtypeattribute (proc_dirty_28_0) true)
-+(expandtypeattribute (proc_diskstats_28_0) true)
-+(expandtypeattribute (proc_drop_caches_28_0) true)
-+(expandtypeattribute (processinfo_service_28_0) true)
-+(expandtypeattribute (proc_extra_free_kbytes_28_0) true)
-+(expandtypeattribute (proc_filesystems_28_0) true)
-+(expandtypeattribute (proc_hostname_28_0) true)
-+(expandtypeattribute (proc_hung_task_28_0) true)
-+(expandtypeattribute (proc_interrupts_28_0) true)
-+(expandtypeattribute (proc_iomem_28_0) true)
-+(expandtypeattribute (proc_kmsg_28_0) true)
-+(expandtypeattribute (proc_loadavg_28_0) true)
-+(expandtypeattribute (proc_max_map_count_28_0) true)
-+(expandtypeattribute (proc_meminfo_28_0) true)
-+(expandtypeattribute (proc_min_free_order_shift_28_0) true)
-+(expandtypeattribute (proc_misc_28_0) true)
-+(expandtypeattribute (proc_modules_28_0) true)
-+(expandtypeattribute (proc_mounts_28_0) true)
-+(expandtypeattribute (proc_net_28_0) true)
-+(expandtypeattribute (proc_overcommit_memory_28_0) true)
-+(expandtypeattribute (proc_page_cluster_28_0) true)
-+(expandtypeattribute (proc_pagetypeinfo_28_0) true)
-+(expandtypeattribute (proc_panic_28_0) true)
-+(expandtypeattribute (proc_perf_28_0) true)
-+(expandtypeattribute (proc_pid_max_28_0) true)
-+(expandtypeattribute (proc_pipe_conf_28_0) true)
-+(expandtypeattribute (proc_qtaguid_stat_28_0) true)
-+(expandtypeattribute (proc_random_28_0) true)
-+(expandtypeattribute (proc_sched_28_0) true)
-+(expandtypeattribute (proc_security_28_0) true)
-+(expandtypeattribute (proc_stat_28_0) true)
-+(expandtypeattribute (procstats_service_28_0) true)
-+(expandtypeattribute (proc_swaps_28_0) true)
-+(expandtypeattribute (proc_sysrq_28_0) true)
-+(expandtypeattribute (proc_timer_28_0) true)
-+(expandtypeattribute (proc_tty_drivers_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_active_time_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_policy_time_28_0) true)
-+(expandtypeattribute (proc_uid_cpupower_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_removeuid_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_showstat_28_0) true)
-+(expandtypeattribute (proc_uid_io_stats_28_0) true)
-+(expandtypeattribute (proc_uid_procstat_set_28_0) true)
-+(expandtypeattribute (proc_uid_time_in_state_28_0) true)
-+(expandtypeattribute (proc_uptime_28_0) true)
-+(expandtypeattribute (proc_version_28_0) true)
-+(expandtypeattribute (proc_vmallocinfo_28_0) true)
-+(expandtypeattribute (proc_vmstat_28_0) true)
-+(expandtypeattribute (proc_zoneinfo_28_0) true)
-+(expandtypeattribute (profman_28_0) true)
-+(expandtypeattribute (profman_dump_data_file_28_0) true)
-+(expandtypeattribute (profman_exec_28_0) true)
-+(expandtypeattribute (properties_device_28_0) true)
-+(expandtypeattribute (properties_serial_28_0) true)
-+(expandtypeattribute (property_contexts_file_28_0) true)
-+(expandtypeattribute (property_data_file_28_0) true)
-+(expandtypeattribute (property_info_28_0) true)
-+(expandtypeattribute (property_socket_28_0) true)
-+(expandtypeattribute (pstorefs_28_0) true)
-+(expandtypeattribute (ptmx_device_28_0) true)
-+(expandtypeattribute (qtaguid_device_28_0) true)
-+(expandtypeattribute (qtaguid_proc_28_0) true)
-+(expandtypeattribute (racoon_28_0) true)
-+(expandtypeattribute (racoon_exec_28_0) true)
-+(expandtypeattribute (racoon_socket_28_0) true)
-+(expandtypeattribute (radio_28_0) true)
-+(expandtypeattribute (radio_data_file_28_0) true)
-+(expandtypeattribute (radio_device_28_0) true)
-+(expandtypeattribute (radio_prop_28_0) true)
-+(expandtypeattribute (radio_service_28_0) true)
-+(expandtypeattribute (ram_device_28_0) true)
-+(expandtypeattribute (random_device_28_0) true)
-+(expandtypeattribute (recovery_28_0) true)
-+(expandtypeattribute (recovery_block_device_28_0) true)
-+(expandtypeattribute (recovery_data_file_28_0) true)
-+(expandtypeattribute (recovery_persist_28_0) true)
-+(expandtypeattribute (recovery_persist_exec_28_0) true)
-+(expandtypeattribute (recovery_refresh_28_0) true)
-+(expandtypeattribute (recovery_refresh_exec_28_0) true)
-+(expandtypeattribute (recovery_service_28_0) true)
-+(expandtypeattribute (registry_service_28_0) true)
-+(expandtypeattribute (resourcecache_data_file_28_0) true)
-+(expandtypeattribute (restorecon_prop_28_0) true)
-+(expandtypeattribute (restrictions_service_28_0) true)
-+(expandtypeattribute (rild_debug_socket_28_0) true)
-+(expandtypeattribute (rild_socket_28_0) true)
-+(expandtypeattribute (ringtone_file_28_0) true)
-+(expandtypeattribute (root_block_device_28_0) true)
-+(expandtypeattribute (rootfs_28_0) true)
-+(expandtypeattribute (rpmsg_device_28_0) true)
-+(expandtypeattribute (rtc_device_28_0) true)
-+(expandtypeattribute (rttmanager_service_28_0) true)
-+(expandtypeattribute (runas_28_0) true)
-+(expandtypeattribute (runas_exec_28_0) true)
-+(expandtypeattribute (runtime_event_log_tags_file_28_0) true)
-+(expandtypeattribute (safemode_prop_28_0) true)
-+(expandtypeattribute (same_process_hal_file_28_0) true)
-+(expandtypeattribute (samplingprofiler_service_28_0) true)
-+(expandtypeattribute (scheduling_policy_service_28_0) true)
-+(expandtypeattribute (sdcardd_28_0) true)
-+(expandtypeattribute (sdcardd_exec_28_0) true)
-+(expandtypeattribute (sdcardfs_28_0) true)
-+(expandtypeattribute (seapp_contexts_file_28_0) true)
-+(expandtypeattribute (search_service_28_0) true)
-+(expandtypeattribute (sec_key_att_app_id_provider_service_28_0) true)
-+(expandtypeattribute (secure_element_28_0) true)
-+(expandtypeattribute (secure_element_device_28_0) true)
-+(expandtypeattribute (secure_element_service_28_0) true)
-+(expandtypeattribute (selinuxfs_28_0) true)
-+(expandtypeattribute (sensors_device_28_0) true)
-+(expandtypeattribute (sensorservice_service_28_0) true)
-+(expandtypeattribute (sepolicy_file_28_0) true)
-+(expandtypeattribute (serial_device_28_0) true)
-+(expandtypeattribute (serialno_prop_28_0) true)
-+(expandtypeattribute (serial_service_28_0) true)
-+(expandtypeattribute (service_contexts_file_28_0) true)
-+(expandtypeattribute (servicediscovery_service_28_0) true)
-+(expandtypeattribute (servicemanager_28_0) true)
-+(expandtypeattribute (servicemanager_exec_28_0) true)
-+(expandtypeattribute (settings_service_28_0) true)
-+(expandtypeattribute (sgdisk_28_0) true)
-+(expandtypeattribute (sgdisk_exec_28_0) true)
-+(expandtypeattribute (shared_relro_28_0) true)
-+(expandtypeattribute (shared_relro_file_28_0) true)
-+(expandtypeattribute (shell_28_0) true)
-+(expandtypeattribute (shell_data_file_28_0) true)
-+(expandtypeattribute (shell_exec_28_0) true)
-+(expandtypeattribute (shell_prop_28_0) true)
-+(expandtypeattribute (shm_28_0) true)
-+(expandtypeattribute (shortcut_manager_icons_28_0) true)
-+(expandtypeattribute (shortcut_service_28_0) true)
-+(expandtypeattribute (slice_service_28_0) true)
-+(expandtypeattribute (slideshow_28_0) true)
-+(expandtypeattribute (socket_device_28_0) true)
-+(expandtypeattribute (sockfs_28_0) true)
-+(expandtypeattribute (statusbar_service_28_0) true)
-+(expandtypeattribute (storaged_service_28_0) true)
-+(expandtypeattribute (storage_file_28_0) true)
-+(expandtypeattribute (storagestats_service_28_0) true)
-+(expandtypeattribute (storage_stub_file_28_0) true)
-+(expandtypeattribute (su_28_0) true)
-+(expandtypeattribute (su_exec_28_0) true)
-+(expandtypeattribute (surfaceflinger_28_0) true)
-+(expandtypeattribute (surfaceflinger_service_28_0) true)
-+(expandtypeattribute (swap_block_device_28_0) true)
-+(expandtypeattribute (sysfs_28_0) true)
-+(expandtypeattribute (sysfs_android_usb_28_0) true)
-+(expandtypeattribute (sysfs_batteryinfo_28_0) true)
-+(expandtypeattribute (sysfs_bluetooth_writable_28_0) true)
-+(expandtypeattribute (sysfs_devices_system_cpu_28_0) true)
-+(expandtypeattribute (sysfs_dm_28_0) true)
-+(expandtypeattribute (sysfs_dt_firmware_android_28_0) true)
-+(expandtypeattribute (sysfs_fs_ext4_features_28_0) true)
-+(expandtypeattribute (sysfs_hwrandom_28_0) true)
-+(expandtypeattribute (sysfs_ipv4_28_0) true)
-+(expandtypeattribute (sysfs_kernel_notes_28_0) true)
-+(expandtypeattribute (sysfs_leds_28_0) true)
-+(expandtypeattribute (sysfs_lowmemorykiller_28_0) true)
-+(expandtypeattribute (sysfs_mac_address_28_0) true)
-+(expandtypeattribute (sysfs_net_28_0) true)
-+(expandtypeattribute (sysfs_nfc_power_writable_28_0) true)
-+(expandtypeattribute (sysfs_power_28_0) true)
-+(expandtypeattribute (sysfs_rtc_28_0) true)
-+(expandtypeattribute (sysfs_switch_28_0) true)
-+(expandtypeattribute (sysfs_thermal_28_0) true)
-+(expandtypeattribute (sysfs_uio_28_0) true)
-+(expandtypeattribute (sysfs_usb_28_0) true)
-+(expandtypeattribute (sysfs_usermodehelper_28_0) true)
-+(expandtypeattribute (sysfs_vibrator_28_0) true)
-+(expandtypeattribute (sysfs_wake_lock_28_0) true)
-+(expandtypeattribute (sysfs_wakeup_reasons_28_0) true)
-+(expandtypeattribute (sysfs_wlan_fwpath_28_0) true)
-+(expandtypeattribute (sysfs_zram_28_0) true)
-+(expandtypeattribute (sysfs_zram_uevent_28_0) true)
-+(expandtypeattribute (system_app_28_0) true)
-+(expandtypeattribute (system_app_data_file_28_0) true)
-+(expandtypeattribute (system_app_service_28_0) true)
-+(expandtypeattribute (system_block_device_28_0) true)
-+(expandtypeattribute (system_boot_reason_prop_28_0) true)
-+(expandtypeattribute (system_data_file_28_0) true)
-+(expandtypeattribute (system_file_28_0) true)
-+(expandtypeattribute (systemkeys_data_file_28_0) true)
-+(expandtypeattribute (system_ndebug_socket_28_0) true)
-+(expandtypeattribute (system_net_netd_hwservice_28_0) true)
-+(expandtypeattribute (system_prop_28_0) true)
-+(expandtypeattribute (system_radio_prop_28_0) true)
-+(expandtypeattribute (system_server_28_0) true)
-+(expandtypeattribute (system_update_service_28_0) true)
-+(expandtypeattribute (system_wifi_keystore_hwservice_28_0) true)
-+(expandtypeattribute (system_wpa_socket_28_0) true)
-+(expandtypeattribute (task_service_28_0) true)
-+(expandtypeattribute (tee_28_0) true)
-+(expandtypeattribute (tee_data_file_28_0) true)
-+(expandtypeattribute (tee_device_28_0) true)
-+(expandtypeattribute (telecom_service_28_0) true)
-+(expandtypeattribute (test_boot_reason_prop_28_0) true)
-+(expandtypeattribute (textclassification_service_28_0) true)
-+(expandtypeattribute (textclassifier_data_file_28_0) true)
-+(expandtypeattribute (textservices_service_28_0) true)
-+(expandtypeattribute (thermalcallback_hwservice_28_0) true)
-+(expandtypeattribute (thermal_service_28_0) true)
-+(expandtypeattribute (timezone_service_28_0) true)
-+(expandtypeattribute (tmpfs_28_0) true)
-+(expandtypeattribute (tombstoned_28_0) true)
-+(expandtypeattribute (tombstone_data_file_28_0) true)
-+(expandtypeattribute (tombstoned_crash_socket_28_0) true)
-+(expandtypeattribute (tombstoned_exec_28_0) true)
-+(expandtypeattribute (tombstoned_intercept_socket_28_0) true)
-+(expandtypeattribute (tombstoned_java_trace_socket_28_0) true)
-+(expandtypeattribute (tombstone_wifi_data_file_28_0) true)
-+(expandtypeattribute (toolbox_28_0) true)
-+(expandtypeattribute (toolbox_exec_28_0) true)
-+(expandtypeattribute (trace_data_file_28_0) true)
-+(expandtypeattribute (traced_consumer_socket_28_0) true)
-+(expandtypeattribute (traced_enabled_prop_28_0) true)
-+(expandtypeattribute (traced_probes_28_0) true)
-+(expandtypeattribute (traced_producer_socket_28_0) true)
-+(expandtypeattribute (traceur_app_28_0) true)
-+(expandtypeattribute (trust_service_28_0) true)
-+(expandtypeattribute (tty_device_28_0) true)
-+(expandtypeattribute (tun_device_28_0) true)
-+(expandtypeattribute (tv_input_service_28_0) true)
-+(expandtypeattribute (tzdatacheck_28_0) true)
-+(expandtypeattribute (tzdatacheck_exec_28_0) true)
-+(expandtypeattribute (ueventd_28_0) true)
-+(expandtypeattribute (uhid_device_28_0) true)
-+(expandtypeattribute (uimode_service_28_0) true)
-+(expandtypeattribute (uio_device_28_0) true)
-+(expandtypeattribute (uncrypt_28_0) true)
-+(expandtypeattribute (uncrypt_exec_28_0) true)
-+(expandtypeattribute (uncrypt_socket_28_0) true)
-+(expandtypeattribute (unencrypted_data_file_28_0) true)
-+(expandtypeattribute (unlabeled_28_0) true)
-+(expandtypeattribute (untrusted_app_25_28_0) true)
-+(expandtypeattribute (untrusted_app_27_28_0) true)
-+(expandtypeattribute (untrusted_app_28_0) true)
-+(expandtypeattribute (untrusted_v2_app_28_0) true)
-+(expandtypeattribute (update_engine_28_0) true)
-+(expandtypeattribute (update_engine_data_file_28_0) true)
-+(expandtypeattribute (update_engine_exec_28_0) true)
-+(expandtypeattribute (update_engine_log_data_file_28_0) true)
-+(expandtypeattribute (update_engine_service_28_0) true)
-+(expandtypeattribute (updatelock_service_28_0) true)
-+(expandtypeattribute (update_verifier_28_0) true)
-+(expandtypeattribute (update_verifier_exec_28_0) true)
-+(expandtypeattribute (usagestats_service_28_0) true)
-+(expandtypeattribute (usbaccessory_device_28_0) true)
-+(expandtypeattribute (usbd_28_0) true)
-+(expandtypeattribute (usb_device_28_0) true)
-+(expandtypeattribute (usbd_exec_28_0) true)
-+(expandtypeattribute (usbfs_28_0) true)
-+(expandtypeattribute (usb_service_28_0) true)
-+(expandtypeattribute (userdata_block_device_28_0) true)
-+(expandtypeattribute (usermodehelper_28_0) true)
-+(expandtypeattribute (user_profile_data_file_28_0) true)
-+(expandtypeattribute (user_service_28_0) true)
-+(expandtypeattribute (vcs_device_28_0) true)
-+(expandtypeattribute (vdc_28_0) true)
-+(expandtypeattribute (vdc_exec_28_0) true)
-+(expandtypeattribute (vendor_app_file_28_0) true)
-+(expandtypeattribute (vendor_configs_file_28_0) true)
-+(expandtypeattribute (vendor_data_file_28_0) true)
-+(expandtypeattribute (vendor_default_prop_28_0) true)
-+(expandtypeattribute (vendor_file_28_0) true)
-+(expandtypeattribute (vendor_framework_file_28_0) true)
-+(expandtypeattribute (vendor_hal_file_28_0) true)
-+(expandtypeattribute (vendor_init_28_0) true)
-+(expandtypeattribute (vendor_overlay_file_28_0) true)
-+(expandtypeattribute (vendor_security_patch_level_prop_28_0) true)
-+(expandtypeattribute (vendor_shell_28_0) true)
-+(expandtypeattribute (vendor_shell_exec_28_0) true)
-+(expandtypeattribute (vendor_toolbox_exec_28_0) true)
-+(expandtypeattribute (vfat_28_0) true)
-+(expandtypeattribute (vibrator_service_28_0) true)
-+(expandtypeattribute (video_device_28_0) true)
-+(expandtypeattribute (virtual_touchpad_28_0) true)
-+(expandtypeattribute (virtual_touchpad_exec_28_0) true)
-+(expandtypeattribute (virtual_touchpad_service_28_0) true)
-+(expandtypeattribute (vndbinder_device_28_0) true)
-+(expandtypeattribute (vndk_sp_file_28_0) true)
-+(expandtypeattribute (vndservice_contexts_file_28_0) true)
-+(expandtypeattribute (vndservicemanager_28_0) true)
-+(expandtypeattribute (voiceinteraction_service_28_0) true)
-+(expandtypeattribute (vold_28_0) true)
-+(expandtypeattribute (vold_data_file_28_0) true)
-+(expandtypeattribute (vold_device_28_0) true)
-+(expandtypeattribute (vold_exec_28_0) true)
-+(expandtypeattribute (vold_metadata_file_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_exec_28_0) true)
-+(expandtypeattribute (vold_prop_28_0) true)
-+(expandtypeattribute (vold_service_28_0) true)
-+(expandtypeattribute (vpn_data_file_28_0) true)
-+(expandtypeattribute (vr_hwc_28_0) true)
-+(expandtypeattribute (vr_hwc_exec_28_0) true)
-+(expandtypeattribute (vr_hwc_service_28_0) true)
-+(expandtypeattribute (vr_manager_service_28_0) true)
-+(expandtypeattribute (wallpaper_file_28_0) true)
-+(expandtypeattribute (wallpaper_service_28_0) true)
-+(expandtypeattribute (watchdogd_28_0) true)
-+(expandtypeattribute (watchdog_device_28_0) true)
-+(expandtypeattribute (webviewupdate_service_28_0) true)
-+(expandtypeattribute (webview_zygote_28_0) true)
-+(expandtypeattribute (webview_zygote_exec_28_0) true)
-+(expandtypeattribute (wifiaware_service_28_0) true)
-+(expandtypeattribute (wificond_28_0) true)
-+(expandtypeattribute (wificond_exec_28_0) true)
-+(expandtypeattribute (wificond_service_28_0) true)
-+(expandtypeattribute (wifi_data_file_28_0) true)
-+(expandtypeattribute (wifi_log_prop_28_0) true)
-+(expandtypeattribute (wifip2p_service_28_0) true)
-+(expandtypeattribute (wifi_prop_28_0) true)
-+(expandtypeattribute (wifiscanner_service_28_0) true)
-+(expandtypeattribute (wifi_service_28_0) true)
-+(expandtypeattribute (window_service_28_0) true)
-+(expandtypeattribute (wpantund_28_0) true)
-+(expandtypeattribute (wpantund_exec_28_0) true)
-+(expandtypeattribute (wpantund_service_28_0) true)
-+(expandtypeattribute (wpa_socket_28_0) true)
-+(expandtypeattribute (zero_device_28_0) true)
-+(expandtypeattribute (zoneinfo_data_file_28_0) true)
-+(expandtypeattribute (zygote_28_0) true)
-+(expandtypeattribute (zygote_exec_28_0) true)
-+(expandtypeattribute (zygote_socket_28_0) true)
-+(typeattributeset accessibility_service_28_0 (accessibility_service))
-+(typeattributeset account_service_28_0 (account_service))
-+(typeattributeset activity_service_28_0 (activity_service))
-+(typeattributeset adbd_28_0 (adbd))
-+(typeattributeset adb_data_file_28_0 (adb_data_file))
-+(typeattributeset adbd_exec_28_0 (adbd_exec))
-+(typeattributeset adbd_socket_28_0 (adbd_socket))
-+(typeattributeset adb_keys_file_28_0 (adb_keys_file))
-+(typeattributeset alarm_device_28_0 (alarm_device))
-+(typeattributeset alarm_service_28_0 (alarm_service))
-+(typeattributeset anr_data_file_28_0 (anr_data_file))
-+(typeattributeset apk_data_file_28_0 (apk_data_file))
-+(typeattributeset apk_private_data_file_28_0 (apk_private_data_file))
-+(typeattributeset apk_private_tmp_file_28_0 (apk_private_tmp_file))
-+(typeattributeset apk_tmp_file_28_0 (apk_tmp_file))
-+(typeattributeset app_data_file_28_0 (app_data_file privapp_data_file))
-+(typeattributeset app_fuse_file_28_0 (app_fuse_file))
-+(typeattributeset app_fusefs_28_0 (app_fusefs))
-+(typeattributeset appops_service_28_0 (appops_service))
-+(typeattributeset appwidget_service_28_0 (appwidget_service))
-+(typeattributeset asec_apk_file_28_0 (asec_apk_file))
-+(typeattributeset asec_image_file_28_0 (asec_image_file))
-+(typeattributeset asec_public_file_28_0 (asec_public_file))
-+(typeattributeset ashmem_device_28_0 (ashmem_device))
-+(typeattributeset assetatlas_service_28_0 (assetatlas_service))
-+(typeattributeset audio_data_file_28_0 (audio_data_file))
-+(typeattributeset audio_device_28_0 (audio_device))
-+(typeattributeset audiohal_data_file_28_0 (audiohal_data_file))
-+(typeattributeset audio_prop_28_0 (audio_prop))
-+(typeattributeset audio_seq_device_28_0 (audio_seq_device))
-+(typeattributeset audioserver_28_0 (audioserver))
-+(typeattributeset audioserver_data_file_28_0 (audioserver_data_file))
-+(typeattributeset audioserver_service_28_0 (audioserver_service))
-+(typeattributeset audio_service_28_0 (audio_service))
-+(typeattributeset audio_timer_device_28_0 (audio_timer_device))
-+(typeattributeset autofill_service_28_0 (autofill_service))
-+(typeattributeset backup_data_file_28_0 (backup_data_file))
-+(typeattributeset backup_service_28_0 (backup_service))
-+(typeattributeset batteryproperties_service_28_0 (batteryproperties_service))
-+(typeattributeset battery_service_28_0 (battery_service))
-+(typeattributeset batterystats_service_28_0 (batterystats_service))
-+(typeattributeset binder_calls_stats_service_28_0 (binder_calls_stats_service))
-+(typeattributeset binder_device_28_0 (binder_device))
-+(typeattributeset binfmt_miscfs_28_0 (binfmt_miscfs))
-+(typeattributeset blkid_28_0 (blkid))
-+(typeattributeset blkid_untrusted_28_0 (blkid_untrusted))
-+(typeattributeset block_device_28_0 (block_device))
-+(typeattributeset bluetooth_28_0 (bluetooth))
-+(typeattributeset bluetooth_a2dp_offload_prop_28_0 (bluetooth_a2dp_offload_prop))
-+(typeattributeset bluetooth_data_file_28_0 (bluetooth_data_file))
-+(typeattributeset bluetooth_efs_file_28_0 (bluetooth_efs_file))
-+(typeattributeset bluetooth_logs_data_file_28_0 (bluetooth_logs_data_file))
-+(typeattributeset bluetooth_manager_service_28_0 (bluetooth_manager_service))
-+(typeattributeset bluetooth_prop_28_0 (bluetooth_prop))
-+(typeattributeset bluetooth_service_28_0 (bluetooth_service))
-+(typeattributeset bluetooth_socket_28_0 (bluetooth_socket))
-+(typeattributeset bootanim_28_0 (bootanim))
-+(typeattributeset bootanim_exec_28_0 (bootanim_exec))
-+(typeattributeset boot_block_device_28_0 (boot_block_device))
-+(typeattributeset bootchart_data_file_28_0 (bootchart_data_file))
-+(typeattributeset bootloader_boot_reason_prop_28_0 (bootloader_boot_reason_prop))
-+(typeattributeset bootstat_28_0 (bootstat))
-+(typeattributeset bootstat_data_file_28_0 (bootstat_data_file))
-+(typeattributeset bootstat_exec_28_0 (bootstat_exec))
-+(typeattributeset boottime_prop_28_0 (boottime_prop))
-+(typeattributeset boottrace_data_file_28_0 (boottrace_data_file))
-+(typeattributeset broadcastradio_service_28_0 (broadcastradio_service))
-+(typeattributeset bufferhubd_28_0 (bufferhubd))
-+(typeattributeset bufferhubd_exec_28_0 (bufferhubd_exec))
-+(typeattributeset cache_backup_file_28_0 (cache_backup_file))
-+(typeattributeset cache_block_device_28_0 (cache_block_device))
-+(typeattributeset cache_file_28_0 (cache_file))
-+(typeattributeset cache_private_backup_file_28_0 (cache_private_backup_file))
-+(typeattributeset cache_recovery_file_28_0 (cache_recovery_file))
-+(typeattributeset camera_data_file_28_0 (camera_data_file))
-+(typeattributeset camera_device_28_0 (camera_device))
-+(typeattributeset cameraproxy_service_28_0 (cameraproxy_service))
-+(typeattributeset cameraserver_28_0 (cameraserver))
-+(typeattributeset cameraserver_exec_28_0 (cameraserver_exec))
-+(typeattributeset cameraserver_service_28_0 (cameraserver_service))
-+(typeattributeset cgroup_28_0 (cgroup))
-+(typeattributeset cgroup_bpf_28_0 (cgroup_bpf))
-+(typeattributeset charger_28_0 (charger))
-+(typeattributeset clatd_28_0 (clatd))
-+(typeattributeset clatd_exec_28_0 (clatd_exec))
-+(typeattributeset clipboard_service_28_0 (clipboard_service))
-+(typeattributeset commontime_management_service_28_0 (commontime_management_service))
-+(typeattributeset companion_device_service_28_0 (companion_device_service))
-+(typeattributeset configfs_28_0 (configfs))
-+(typeattributeset config_prop_28_0 (config_prop))
-+(typeattributeset connectivity_service_28_0 (connectivity_service))
-+(typeattributeset connmetrics_service_28_0 (connmetrics_service))
-+(typeattributeset console_device_28_0 (console_device))
-+(typeattributeset consumer_ir_service_28_0 (consumer_ir_service))
-+(typeattributeset content_service_28_0 (content_service))
-+(typeattributeset contexthub_service_28_0 (contexthub_service))
-+(typeattributeset coredump_file_28_0 (coredump_file))
-+(typeattributeset country_detector_service_28_0 (country_detector_service))
-+(typeattributeset coverage_service_28_0 (coverage_service))
-+(typeattributeset cppreopt_prop_28_0 (cppreopt_prop))
-+(typeattributeset cppreopts_28_0 (cppreopts))
-+(typeattributeset cppreopts_exec_28_0 (cppreopts_exec))
-+(typeattributeset cpuctl_device_28_0 (cpuctl_device))
-+(typeattributeset cpuinfo_service_28_0 (cpuinfo_service))
-+(typeattributeset crash_dump_28_0 (crash_dump))
-+(typeattributeset crash_dump_exec_28_0 (crash_dump_exec))
-+(typeattributeset crossprofileapps_service_28_0 (crossprofileapps_service))
-+(typeattributeset ctl_bootanim_prop_28_0 (ctl_bootanim_prop))
-+(typeattributeset ctl_bugreport_prop_28_0 (ctl_bugreport_prop))
-+(typeattributeset ctl_console_prop_28_0 (ctl_console_prop))
-+(typeattributeset ctl_default_prop_28_0
-+  ( ctl_adbd_prop
-+    ctl_default_prop))
-+(typeattributeset ctl_dumpstate_prop_28_0 (ctl_dumpstate_prop))
-+(typeattributeset ctl_fuse_prop_28_0 (ctl_fuse_prop))
-+(typeattributeset ctl_interface_restart_prop_28_0 (ctl_interface_restart_prop))
-+(typeattributeset ctl_interface_start_prop_28_0 (ctl_interface_start_prop))
-+(typeattributeset ctl_interface_stop_prop_28_0 (ctl_interface_stop_prop))
-+(typeattributeset ctl_mdnsd_prop_28_0 (ctl_mdnsd_prop))
-+(typeattributeset ctl_restart_prop_28_0 (ctl_restart_prop))
-+(typeattributeset ctl_rildaemon_prop_28_0 (ctl_rildaemon_prop))
-+(typeattributeset ctl_sigstop_prop_28_0 (ctl_sigstop_prop))
-+(typeattributeset ctl_start_prop_28_0 (ctl_start_prop))
-+(typeattributeset ctl_stop_prop_28_0 (ctl_stop_prop))
-+(typeattributeset dalvikcache_data_file_28_0 (dalvikcache_data_file))
-+(typeattributeset dalvik_prop_28_0 (dalvik_prop))
-+(typeattributeset dbinfo_service_28_0 (dbinfo_service))
-+(typeattributeset debugfs_28_0 (debugfs))
-+(typeattributeset debugfs_mmc_28_0 (debugfs_mmc))
-+(typeattributeset debugfs_trace_marker_28_0 (debugfs_trace_marker))
-+(typeattributeset debugfs_tracing_28_0 (debugfs_tracing))
-+(typeattributeset debugfs_tracing_debug_28_0 (debugfs_tracing_debug))
-+(typeattributeset debugfs_tracing_instances_28_0 (debugfs_tracing_instances))
-+(typeattributeset debugfs_wakeup_sources_28_0 (debugfs_wakeup_sources))
-+(typeattributeset debugfs_wifi_tracing_28_0 (debugfs_wifi_tracing))
-+(typeattributeset debuggerd_prop_28_0 (debuggerd_prop))
-+(typeattributeset debug_prop_28_0 (debug_prop))
-+(typeattributeset default_android_hwservice_28_0 (default_android_hwservice))
-+(typeattributeset default_android_service_28_0 (default_android_service))
-+(typeattributeset default_android_vndservice_28_0 (default_android_vndservice))
-+(typeattributeset default_prop_28_0 (default_prop))
-+(typeattributeset device_28_0 (device))
-+(typeattributeset device_identifiers_service_28_0 (device_identifiers_service))
-+(typeattributeset deviceidle_service_28_0 (deviceidle_service))
-+(typeattributeset device_logging_prop_28_0 (device_logging_prop))
-+(typeattributeset device_policy_service_28_0 (device_policy_service))
-+(typeattributeset devicestoragemonitor_service_28_0 (devicestoragemonitor_service))
-+(typeattributeset devpts_28_0 (devpts))
-+(typeattributeset dex2oat_28_0 (dex2oat))
-+(typeattributeset dex2oat_exec_28_0 (dex2oat_exec))
-+(typeattributeset dhcp_28_0 (dhcp))
-+(typeattributeset dhcp_data_file_28_0 (dhcp_data_file))
-+(typeattributeset dhcp_exec_28_0 (dhcp_exec))
-+(typeattributeset dhcp_prop_28_0 (dhcp_prop))
-+(typeattributeset diskstats_service_28_0 (diskstats_service))
-+(typeattributeset display_service_28_0 (display_service))
-+(typeattributeset dm_device_28_0 (dm_device))
-+(typeattributeset dnsmasq_28_0 (dnsmasq))
-+(typeattributeset dnsmasq_exec_28_0 (dnsmasq_exec))
-+(typeattributeset dnsproxyd_socket_28_0 (dnsproxyd_socket))
-+(typeattributeset DockObserver_service_28_0 (DockObserver_service))
-+(typeattributeset dreams_service_28_0 (dreams_service))
-+(typeattributeset drm_data_file_28_0 (drm_data_file))
-+(typeattributeset drmserver_28_0 (drmserver))
-+(typeattributeset drmserver_exec_28_0 (drmserver_exec))
-+(typeattributeset drmserver_service_28_0 (drmserver_service))
-+(typeattributeset drmserver_socket_28_0 (drmserver_socket))
-+(typeattributeset dropbox_service_28_0 (dropbox_service))
-+(typeattributeset dumpstate_28_0 (dumpstate))
-+(typeattributeset dumpstate_exec_28_0 (dumpstate_exec))
-+(typeattributeset dumpstate_options_prop_28_0 (dumpstate_options_prop))
-+(typeattributeset dumpstate_prop_28_0 (dumpstate_prop))
-+(typeattributeset dumpstate_service_28_0 (dumpstate_service))
-+(typeattributeset dumpstate_socket_28_0 (dumpstate_socket))
-+(typeattributeset e2fs_28_0 (e2fs))
-+(typeattributeset e2fs_exec_28_0 (e2fs_exec))
-+(typeattributeset efs_file_28_0 (efs_file))
-+(typeattributeset ephemeral_app_28_0 (ephemeral_app))
-+(typeattributeset ethernet_service_28_0 (ethernet_service))
-+(typeattributeset exfat_28_0 (exfat))
-+(typeattributeset exported2_config_prop_28_0 (exported2_config_prop))
-+(typeattributeset exported2_default_prop_28_0 (exported2_default_prop))
-+(typeattributeset exported2_radio_prop_28_0 (exported2_radio_prop))
-+(typeattributeset exported2_system_prop_28_0 (exported2_system_prop))
-+(typeattributeset exported2_vold_prop_28_0 (exported2_vold_prop))
-+(typeattributeset exported3_default_prop_28_0 (exported3_default_prop))
-+(typeattributeset exported3_radio_prop_28_0 (exported3_radio_prop))
-+(typeattributeset exported3_system_prop_28_0 (exported3_system_prop))
-+(typeattributeset exported_audio_prop_28_0 (exported_audio_prop))
-+(typeattributeset exported_bluetooth_prop_28_0 (exported_bluetooth_prop))
-+(typeattributeset exported_config_prop_28_0 (exported_config_prop))
-+(typeattributeset exported_dalvik_prop_28_0 (exported_dalvik_prop))
-+(typeattributeset exported_default_prop_28_0 (exported_default_prop))
-+(typeattributeset exported_dumpstate_prop_28_0 (exported_dumpstate_prop))
-+(typeattributeset exported_ffs_prop_28_0 (exported_ffs_prop))
-+(typeattributeset exported_fingerprint_prop_28_0 (exported_fingerprint_prop))
-+(typeattributeset exported_overlay_prop_28_0 (exported_overlay_prop))
-+(typeattributeset exported_pm_prop_28_0 (exported_pm_prop))
-+(typeattributeset exported_radio_prop_28_0 (exported_radio_prop))
-+(typeattributeset exported_secure_prop_28_0 (exported_secure_prop))
-+(typeattributeset exported_system_prop_28_0 (exported_system_prop))
-+(typeattributeset exported_system_radio_prop_28_0 (exported_system_radio_prop))
-+(typeattributeset exported_vold_prop_28_0 (exported_vold_prop))
-+(typeattributeset exported_wifi_prop_28_0 (exported_wifi_prop))
-+(typeattributeset ffs_prop_28_0 (ffs_prop))
-+(typeattributeset file_contexts_file_28_0 (file_contexts_file))
-+(typeattributeset fingerprintd_28_0 (fingerprintd))
-+(typeattributeset fingerprintd_data_file_28_0 (fingerprintd_data_file))
-+(typeattributeset fingerprintd_exec_28_0 (fingerprintd_exec))
-+(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
-+(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
-+(typeattributeset fingerprint_service_28_0 (fingerprint_service))
-+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
-+(typeattributeset firstboot_prop_28_0 (firstboot_prop))
-+(typeattributeset font_service_28_0 (font_service))
-+(typeattributeset frp_block_device_28_0 (frp_block_device))
-+(typeattributeset fs_bpf_28_0 (fs_bpf))
-+(typeattributeset fsck_28_0 (fsck))
-+(typeattributeset fsck_exec_28_0 (fsck_exec))
-+(typeattributeset fscklogs_28_0 (fscklogs))
-+(typeattributeset fsck_untrusted_28_0 (fsck_untrusted))
-+(typeattributeset full_device_28_0 (full_device))
-+(typeattributeset functionfs_28_0 (functionfs))
-+(typeattributeset fuse_28_0 (fuse))
-+(typeattributeset fuse_device_28_0 (fuse_device))
-+(typeattributeset fwk_display_hwservice_28_0 (fwk_display_hwservice))
-+(typeattributeset fwk_scheduler_hwservice_28_0 (fwk_scheduler_hwservice))
-+(typeattributeset fwk_sensor_hwservice_28_0 (fwk_sensor_hwservice))
-+(typeattributeset fwmarkd_socket_28_0 (fwmarkd_socket))
-+(typeattributeset gatekeeperd_28_0 (gatekeeperd))
-+(typeattributeset gatekeeper_data_file_28_0 (gatekeeper_data_file))
-+(typeattributeset gatekeeperd_exec_28_0 (gatekeeperd_exec))
-+(typeattributeset gatekeeper_service_28_0 (gatekeeper_service))
-+(typeattributeset gfxinfo_service_28_0 (gfxinfo_service))
-+(typeattributeset gps_control_28_0 (gps_control))
-+(typeattributeset gpu_device_28_0 (gpu_device))
-+(typeattributeset gpu_service_28_0 (gpu_service))
-+(typeattributeset graphics_device_28_0 (graphics_device))
-+(typeattributeset graphicsstats_service_28_0 (graphicsstats_service))
-+(typeattributeset hal_audiocontrol_hwservice_28_0 (hal_audiocontrol_hwservice))
-+(typeattributeset hal_audio_hwservice_28_0 (hal_audio_hwservice))
-+(typeattributeset hal_authsecret_hwservice_28_0 (hal_authsecret_hwservice))
-+(typeattributeset hal_bluetooth_hwservice_28_0 (hal_bluetooth_hwservice))
-+(typeattributeset hal_bootctl_hwservice_28_0 (hal_bootctl_hwservice))
-+(typeattributeset hal_broadcastradio_hwservice_28_0 (hal_broadcastradio_hwservice))
-+(typeattributeset hal_camera_hwservice_28_0 (hal_camera_hwservice))
-+(typeattributeset hal_cas_hwservice_28_0 (hal_cas_hwservice))
-+(typeattributeset hal_codec2_hwservice_28_0 (hal_codec2_hwservice))
-+(typeattributeset hal_configstore_ISurfaceFlingerConfigs_28_0 (hal_configstore_ISurfaceFlingerConfigs))
-+(typeattributeset hal_confirmationui_hwservice_28_0 (hal_confirmationui_hwservice))
-+(typeattributeset hal_contexthub_hwservice_28_0 (hal_contexthub_hwservice))
-+(typeattributeset hal_drm_hwservice_28_0 (hal_drm_hwservice))
-+(typeattributeset hal_dumpstate_hwservice_28_0 (hal_dumpstate_hwservice))
-+(typeattributeset hal_evs_hwservice_28_0 (hal_evs_hwservice))
-+(typeattributeset hal_fingerprint_hwservice_28_0 (hal_fingerprint_hwservice))
-+(typeattributeset hal_fingerprint_service_28_0 (hal_fingerprint_service))
-+(typeattributeset hal_gatekeeper_hwservice_28_0 (hal_gatekeeper_hwservice))
-+(typeattributeset hal_gnss_hwservice_28_0 (hal_gnss_hwservice))
-+(typeattributeset hal_graphics_allocator_hwservice_28_0 (hal_graphics_allocator_hwservice))
-+(typeattributeset hal_graphics_composer_hwservice_28_0 (hal_graphics_composer_hwservice))
-+(typeattributeset hal_graphics_mapper_hwservice_28_0 (hal_graphics_mapper_hwservice))
-+(typeattributeset hal_health_hwservice_28_0 (hal_health_hwservice))
-+(typeattributeset hal_ir_hwservice_28_0 (hal_ir_hwservice))
-+(typeattributeset hal_keymaster_hwservice_28_0 (hal_keymaster_hwservice))
-+(typeattributeset hal_light_hwservice_28_0 (hal_light_hwservice))
-+(typeattributeset hal_lowpan_hwservice_28_0 (hal_lowpan_hwservice))
-+(typeattributeset hal_memtrack_hwservice_28_0 (hal_memtrack_hwservice))
-+(typeattributeset hal_neuralnetworks_hwservice_28_0 (hal_neuralnetworks_hwservice))
-+(typeattributeset hal_nfc_hwservice_28_0 (hal_nfc_hwservice))
-+(typeattributeset hal_oemlock_hwservice_28_0 (hal_oemlock_hwservice))
-+(typeattributeset hal_omx_hwservice_28_0 (hal_omx_hwservice))
-+(typeattributeset hal_power_hwservice_28_0 (hal_power_hwservice))
-+(typeattributeset hal_renderscript_hwservice_28_0 (hal_renderscript_hwservice))
-+(typeattributeset hal_secure_element_hwservice_28_0 (hal_secure_element_hwservice))
-+(typeattributeset hal_sensors_hwservice_28_0 (hal_sensors_hwservice))
-+(typeattributeset hal_telephony_hwservice_28_0 (hal_telephony_hwservice))
-+(typeattributeset hal_tetheroffload_hwservice_28_0 (hal_tetheroffload_hwservice))
-+(typeattributeset hal_thermal_hwservice_28_0 (hal_thermal_hwservice))
-+(typeattributeset hal_tv_cec_hwservice_28_0 (hal_tv_cec_hwservice))
-+(typeattributeset hal_tv_input_hwservice_28_0 (hal_tv_input_hwservice))
-+(typeattributeset hal_usb_gadget_hwservice_28_0 (hal_usb_gadget_hwservice))
-+(typeattributeset hal_usb_hwservice_28_0 (hal_usb_hwservice))
-+(typeattributeset hal_vehicle_hwservice_28_0 (hal_vehicle_hwservice))
-+(typeattributeset hal_vibrator_hwservice_28_0 (hal_vibrator_hwservice))
-+(typeattributeset hal_vr_hwservice_28_0 (hal_vr_hwservice))
-+(typeattributeset hal_weaver_hwservice_28_0 (hal_weaver_hwservice))
-+(typeattributeset hal_wifi_hostapd_hwservice_28_0 (hal_wifi_hostapd_hwservice))
-+(typeattributeset hal_wifi_hwservice_28_0 (hal_wifi_hwservice))
-+(typeattributeset hal_wifi_offload_hwservice_28_0 (hal_wifi_offload_hwservice))
-+(typeattributeset hal_wifi_supplicant_hwservice_28_0 (hal_wifi_supplicant_hwservice))
-+(typeattributeset hardware_properties_service_28_0 (hardware_properties_service))
-+(typeattributeset hardware_service_28_0 (hardware_service))
-+(typeattributeset hci_attach_dev_28_0 (hci_attach_dev))
-+(typeattributeset hdmi_control_service_28_0 (hdmi_control_service))
-+(typeattributeset healthd_28_0 (healthd))
-+(typeattributeset healthd_exec_28_0 (healthd_exec))
-+(typeattributeset heapdump_data_file_28_0 (heapdump_data_file))
-+(typeattributeset hidl_allocator_hwservice_28_0 (hidl_allocator_hwservice))
-+(typeattributeset hidl_base_hwservice_28_0 (hidl_base_hwservice))
-+(typeattributeset hidl_manager_hwservice_28_0 (hidl_manager_hwservice))
-+(typeattributeset hidl_memory_hwservice_28_0 (hidl_memory_hwservice))
-+(typeattributeset hidl_token_hwservice_28_0 (hidl_token_hwservice))
-+(typeattributeset hwbinder_device_28_0 (hwbinder_device))
-+(typeattributeset hw_random_device_28_0 (hw_random_device))
-+(typeattributeset hwservice_contexts_file_28_0 (hwservice_contexts_file))
-+(typeattributeset hwservicemanager_28_0 (hwservicemanager))
-+(typeattributeset hwservicemanager_exec_28_0 (hwservicemanager_exec))
-+(typeattributeset hwservicemanager_prop_28_0 (hwservicemanager_prop))
-+(typeattributeset i2c_device_28_0 (i2c_device))
-+(typeattributeset icon_file_28_0 (icon_file))
-+(typeattributeset idmap_28_0 (idmap))
-+(typeattributeset idmap_exec_28_0 (idmap_exec))
-+(typeattributeset iio_device_28_0 (iio_device))
-+(typeattributeset imms_service_28_0 (imms_service))
-+(typeattributeset incident_28_0 (incident))
-+(typeattributeset incidentd_28_0 (incidentd))
-+(typeattributeset incident_data_file_28_0 (incident_data_file))
-+(typeattributeset incident_helper_28_0 (incident_helper))
-+(typeattributeset incident_service_28_0 (incident_service))
-+(typeattributeset init_28_0 (init))
-+(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
-+(typeattributeset inotify_28_0 (inotify))
-+(typeattributeset input_device_28_0 (input_device))
-+(typeattributeset inputflinger_28_0 (inputflinger))
-+(typeattributeset inputflinger_exec_28_0 (inputflinger_exec))
-+(typeattributeset inputflinger_service_28_0 (inputflinger_service))
-+(typeattributeset input_method_service_28_0 (input_method_service))
-+(typeattributeset input_service_28_0 (input_service))
-+(typeattributeset installd_28_0 (installd))
-+(typeattributeset install_data_file_28_0 (install_data_file))
-+(typeattributeset installd_exec_28_0 (installd_exec))
-+(typeattributeset installd_service_28_0 (installd_service))
-+(typeattributeset install_recovery_28_0 (install_recovery))
-+(typeattributeset install_recovery_exec_28_0 (install_recovery_exec))
-+(typeattributeset ion_device_28_0 (ion_device))
-+(typeattributeset IProxyService_service_28_0 (IProxyService_service))
-+(typeattributeset ipsec_service_28_0 (ipsec_service))
-+(typeattributeset isolated_app_28_0 (isolated_app))
-+(typeattributeset jobscheduler_service_28_0 (jobscheduler_service))
-+(typeattributeset kernel_28_0 (kernel))
-+(typeattributeset keychain_data_file_28_0 (keychain_data_file))
-+(typeattributeset keychord_device_28_0 (keychord_device))
-+(typeattributeset keystore_28_0 (keystore))
-+(typeattributeset keystore_data_file_28_0 (keystore_data_file))
-+(typeattributeset keystore_exec_28_0 (keystore_exec))
-+(typeattributeset keystore_service_28_0 (keystore_service))
-+(typeattributeset kmem_device_28_0 (kmem_device))
-+(typeattributeset kmsg_debug_device_28_0 (kmsg_debug_device))
-+(typeattributeset kmsg_device_28_0 (kmsg_device))
-+(typeattributeset labeledfs_28_0 (labeledfs))
-+(typeattributeset last_boot_reason_prop_28_0 (last_boot_reason_prop))
-+(typeattributeset launcherapps_service_28_0 (launcherapps_service))
-+(typeattributeset lmkd_28_0 (lmkd))
-+(typeattributeset lmkd_exec_28_0 (lmkd_exec))
-+(typeattributeset lmkd_socket_28_0 (lmkd_socket))
-+(typeattributeset location_service_28_0 (location_service))
-+(typeattributeset lock_settings_service_28_0 (lock_settings_service))
-+(typeattributeset logcat_exec_28_0 (logcat_exec))
-+(typeattributeset logd_28_0 (logd))
-+(typeattributeset logd_exec_28_0 (logd_exec))
-+(typeattributeset logd_prop_28_0 (logd_prop))
-+(typeattributeset logdr_socket_28_0 (logdr_socket))
-+(typeattributeset logd_socket_28_0 (logd_socket))
-+(typeattributeset logdw_socket_28_0 (logdw_socket))
-+(typeattributeset logpersist_28_0 (logpersist))
-+(typeattributeset logpersistd_logging_prop_28_0 (logpersistd_logging_prop))
-+(typeattributeset log_prop_28_0 (log_prop))
-+(typeattributeset log_tag_prop_28_0 (log_tag_prop))
-+(typeattributeset loop_control_device_28_0 (loop_control_device))
-+(typeattributeset loop_device_28_0 (loop_device))
-+(typeattributeset lowpan_device_28_0 (lowpan_device))
-+(typeattributeset lowpan_prop_28_0 (lowpan_prop))
-+(typeattributeset lowpan_service_28_0 (lowpan_service))
-+(typeattributeset mac_perms_file_28_0 (mac_perms_file))
-+(typeattributeset mdnsd_28_0 (mdnsd))
-+(typeattributeset mdnsd_socket_28_0 (mdnsd_socket))
-+(typeattributeset mdns_socket_28_0 (mdns_socket))
-+(typeattributeset hal_omx_server (mediacodec_28_0))
-+(typeattributeset mediacodec_28_0 (mediacodec))
-+(typeattributeset mediacodec_exec_28_0 (mediacodec_exec))
-+(typeattributeset mediacodec_service_28_0 (mediacodec_service))
-+(typeattributeset media_data_file_28_0 (media_data_file))
-+(typeattributeset mediadrmserver_28_0 (mediadrmserver))
-+(typeattributeset mediadrmserver_exec_28_0 (mediadrmserver_exec))
-+(typeattributeset mediadrmserver_service_28_0 (mediadrmserver_service))
-+(typeattributeset mediaextractor_28_0 (mediaextractor))
-+(typeattributeset mediaextractor_exec_28_0 (mediaextractor_exec))
-+(typeattributeset mediaextractor_service_28_0 (mediaextractor_service))
-+(typeattributeset mediaextractor_update_service_28_0 (mediaextractor_update_service))
-+(typeattributeset mediametrics_28_0 (mediametrics))
-+(typeattributeset mediametrics_exec_28_0 (mediametrics_exec))
-+(typeattributeset mediametrics_service_28_0 (mediametrics_service))
-+(typeattributeset media_projection_service_28_0 (media_projection_service))
-+(typeattributeset mediaprovider_28_0 (mediaprovider))
-+(typeattributeset media_router_service_28_0 (media_router_service))
-+(typeattributeset media_rw_data_file_28_0 (media_rw_data_file))
-+(typeattributeset mediaserver_28_0 (mediaserver))
-+(typeattributeset mediaserver_exec_28_0 (mediaserver_exec))
-+(typeattributeset mediaserver_service_28_0 (mediaserver_service))
-+(typeattributeset media_session_service_28_0 (media_session_service))
-+(typeattributeset meminfo_service_28_0 (meminfo_service))
-+(typeattributeset metadata_block_device_28_0 (metadata_block_device))
-+(typeattributeset metadata_file_28_0 (metadata_file))
-+(typeattributeset method_trace_data_file_28_0 (method_trace_data_file))
-+(typeattributeset midi_service_28_0 (midi_service))
-+(typeattributeset misc_block_device_28_0 (misc_block_device))
-+(typeattributeset misc_logd_file_28_0 (misc_logd_file))
-+(typeattributeset misc_user_data_file_28_0 (misc_user_data_file))
-+(typeattributeset mmc_prop_28_0 (mmc_prop))
-+(typeattributeset mnt_expand_file_28_0 (mnt_expand_file))
-+(typeattributeset mnt_media_rw_file_28_0 (mnt_media_rw_file))
-+(typeattributeset mnt_media_rw_stub_file_28_0 (mnt_media_rw_stub_file))
-+(typeattributeset mnt_user_file_28_0 (mnt_user_file))
-+(typeattributeset mnt_vendor_file_28_0 (mnt_vendor_file))
-+(typeattributeset modprobe_28_0 (modprobe))
-+(typeattributeset mount_service_28_0 (mount_service))
-+(typeattributeset mqueue_28_0 (mqueue))
-+(typeattributeset mtd_device_28_0 (mtd_device))
-+(typeattributeset mtp_28_0 (mtp))
-+(typeattributeset mtp_device_28_0 (mtp_device))
-+(typeattributeset mtpd_socket_28_0 (mtpd_socket))
-+(typeattributeset mtp_exec_28_0 (mtp_exec))
-+(typeattributeset nativetest_data_file_28_0 (nativetest_data_file))
-+(typeattributeset netd_28_0 (netd))
-+(typeattributeset net_data_file_28_0 (net_data_file))
-+(typeattributeset netd_exec_28_0 (netd_exec))
-+(typeattributeset netd_listener_service_28_0 (netd_listener_service))
-+(typeattributeset net_dns_prop_28_0 (net_dns_prop))
-+(typeattributeset netd_service_28_0 (netd_service))
-+(typeattributeset netd_socket_28_0 (netd_socket))
-+(typeattributeset netd_stable_secret_prop_28_0 (netd_stable_secret_prop))
-+(typeattributeset netif_28_0 (netif))
-+(typeattributeset netpolicy_service_28_0 (netpolicy_service))
-+(typeattributeset net_radio_prop_28_0 (net_radio_prop))
-+(typeattributeset netstats_service_28_0 (netstats_service))
-+(typeattributeset netutils_wrapper_28_0 (netutils_wrapper))
-+(typeattributeset netutils_wrapper_exec_28_0 (netutils_wrapper_exec))
-+(typeattributeset network_management_service_28_0 (network_management_service))
-+(typeattributeset network_score_service_28_0 (network_score_service))
-+(typeattributeset network_time_update_service_28_0 (network_time_update_service))
-+(typeattributeset network_watchlist_data_file_28_0 (network_watchlist_data_file))
-+(typeattributeset network_watchlist_service_28_0 (network_watchlist_service))
-+(typeattributeset nfc_28_0 (nfc))
-+(typeattributeset nfc_data_file_28_0 (nfc_data_file))
-+(typeattributeset nfc_device_28_0 (nfc_device))
-+(typeattributeset nfc_prop_28_0 (nfc_prop))
-+(typeattributeset nfc_service_28_0 (nfc_service))
-+(typeattributeset node_28_0 (node))
-+(typeattributeset nonplat_service_contexts_file_28_0 (nonplat_service_contexts_file))
-+(typeattributeset notification_service_28_0 (notification_service))
-+(typeattributeset null_device_28_0 (null_device))
-+(typeattributeset oemfs_28_0 (oemfs))
-+(typeattributeset oem_lock_service_28_0 (oem_lock_service))
-+(typeattributeset ota_data_file_28_0 (ota_data_file))
-+(typeattributeset otadexopt_service_28_0 (otadexopt_service))
-+(typeattributeset ota_package_file_28_0 (ota_package_file))
-+(typeattributeset otapreopt_chroot_28_0 (otapreopt_chroot))
-+(typeattributeset otapreopt_chroot_exec_28_0 (otapreopt_chroot_exec))
-+(typeattributeset otapreopt_slot_28_0 (otapreopt_slot))
-+(typeattributeset otapreopt_slot_exec_28_0 (otapreopt_slot_exec))
-+(typeattributeset overlay_prop_28_0 (overlay_prop))
-+(typeattributeset overlay_service_28_0 (overlay_service))
-+(typeattributeset owntty_device_28_0 (owntty_device))
-+(typeattributeset package_native_service_28_0 (package_native_service))
-+(typeattributeset package_service_28_0 (package_service))
-+(typeattributeset pan_result_prop_28_0 (pan_result_prop))
-+(typeattributeset pdx_bufferhub_client_channel_socket_28_0 (pdx_bufferhub_client_channel_socket))
-+(typeattributeset pdx_bufferhub_client_endpoint_socket_28_0 (pdx_bufferhub_client_endpoint_socket))
-+(typeattributeset pdx_bufferhub_dir_28_0 (pdx_bufferhub_dir))
-+(typeattributeset pdx_display_client_channel_socket_28_0 (pdx_display_client_channel_socket))
-+(typeattributeset pdx_display_client_endpoint_socket_28_0 (pdx_display_client_endpoint_socket))
-+(typeattributeset pdx_display_dir_28_0 (pdx_display_dir))
-+(typeattributeset pdx_display_manager_channel_socket_28_0 (pdx_display_manager_channel_socket))
-+(typeattributeset pdx_display_manager_endpoint_socket_28_0 (pdx_display_manager_endpoint_socket))
-+(typeattributeset pdx_display_screenshot_channel_socket_28_0 (pdx_display_screenshot_channel_socket))
-+(typeattributeset pdx_display_screenshot_endpoint_socket_28_0 (pdx_display_screenshot_endpoint_socket))
-+(typeattributeset pdx_display_vsync_channel_socket_28_0 (pdx_display_vsync_channel_socket))
-+(typeattributeset pdx_display_vsync_endpoint_socket_28_0 (pdx_display_vsync_endpoint_socket))
-+(typeattributeset pdx_performance_client_channel_socket_28_0 (pdx_performance_client_channel_socket))
-+(typeattributeset pdx_performance_client_endpoint_socket_28_0 (pdx_performance_client_endpoint_socket))
-+(typeattributeset pdx_performance_dir_28_0 (pdx_performance_dir))
-+(typeattributeset performanced_28_0 (performanced))
-+(typeattributeset performanced_exec_28_0 (performanced_exec))
-+(typeattributeset permission_service_28_0 (permission_service))
-+(typeattributeset persist_debug_prop_28_0 (persist_debug_prop))
-+(typeattributeset persistent_data_block_service_28_0 (persistent_data_block_service))
-+(typeattributeset persistent_properties_ready_prop_28_0 (persistent_properties_ready_prop))
-+(typeattributeset pinner_service_28_0 (pinner_service))
-+(typeattributeset pipefs_28_0 (pipefs))
-+(typeattributeset platform_app_28_0 (platform_app))
-+(typeattributeset pm_prop_28_0 (pm_prop))
-+(typeattributeset pmsg_device_28_0 (pmsg_device))
-+(typeattributeset port_28_0 (port))
-+(typeattributeset port_device_28_0 (port_device))
-+(typeattributeset postinstall_28_0 (postinstall))
-+(typeattributeset postinstall_dexopt_28_0 (postinstall_dexopt))
-+(typeattributeset postinstall_file_28_0 (postinstall_file))
-+(typeattributeset postinstall_mnt_dir_28_0 (postinstall_mnt_dir))
-+(typeattributeset powerctl_prop_28_0 (powerctl_prop))
-+(typeattributeset power_service_28_0 (power_service))
-+(typeattributeset ppp_28_0 (ppp))
-+(typeattributeset ppp_device_28_0 (ppp_device))
-+(typeattributeset ppp_exec_28_0 (ppp_exec))
-+(typeattributeset preloads_data_file_28_0 (preloads_data_file))
-+(typeattributeset preloads_media_file_28_0 (preloads_media_file))
-+(typeattributeset preopt2cachename_28_0 (preopt2cachename))
-+(typeattributeset preopt2cachename_exec_28_0 (preopt2cachename_exec))
-+(typeattributeset print_service_28_0 (print_service))
-+(typeattributeset priv_app_28_0 (priv_app))
-+(typeattributeset proc_28_0
-+  ( proc
-+    proc_fs_verity
-+    proc_keys
-+    proc_kpageflags
-+    proc_lowmemorykiller
-+    proc_pressure_cpu
-+    proc_pressure_io
-+    proc_pressure_mem
-+    proc_slabinfo))
-+(typeattributeset proc_abi_28_0 (proc_abi))
-+(typeattributeset proc_asound_28_0 (proc_asound))
-+(typeattributeset proc_bluetooth_writable_28_0 (proc_bluetooth_writable))
-+(typeattributeset proc_buddyinfo_28_0 (proc_buddyinfo))
-+(typeattributeset proc_cmdline_28_0 (proc_cmdline))
-+(typeattributeset proc_cpuinfo_28_0 (proc_cpuinfo))
-+(typeattributeset proc_dirty_28_0 (proc_dirty))
-+(typeattributeset proc_diskstats_28_0 (proc_diskstats))
-+(typeattributeset proc_drop_caches_28_0 (proc_drop_caches))
-+(typeattributeset processinfo_service_28_0 (processinfo_service))
-+(typeattributeset proc_extra_free_kbytes_28_0 (proc_extra_free_kbytes))
-+(typeattributeset proc_filesystems_28_0 (proc_filesystems))
-+(typeattributeset proc_hostname_28_0 (proc_hostname))
-+(typeattributeset proc_hung_task_28_0 (proc_hung_task))
-+(typeattributeset proc_interrupts_28_0 (proc_interrupts))
-+(typeattributeset proc_iomem_28_0 (proc_iomem))
-+(typeattributeset proc_kmsg_28_0 (proc_kmsg))
-+(typeattributeset proc_loadavg_28_0 (proc_loadavg))
-+(typeattributeset proc_max_map_count_28_0 (proc_max_map_count))
-+(typeattributeset proc_meminfo_28_0 (proc_meminfo))
-+(typeattributeset proc_min_free_order_shift_28_0 (proc_min_free_order_shift))
-+(typeattributeset proc_misc_28_0 (proc_misc))
-+(typeattributeset proc_modules_28_0 (proc_modules))
-+(typeattributeset proc_mounts_28_0 (proc_mounts))
-+(typeattributeset proc_net_28_0
-+  ( proc_net
-+    proc_net_tcp_udp))
-+(typeattributeset proc_overcommit_memory_28_0 (proc_overcommit_memory))
-+(typeattributeset proc_page_cluster_28_0 (proc_page_cluster))
-+(typeattributeset proc_pagetypeinfo_28_0 (proc_pagetypeinfo))
-+(typeattributeset proc_panic_28_0 (proc_panic))
-+(typeattributeset proc_perf_28_0 (proc_perf))
-+(typeattributeset proc_pid_max_28_0 (proc_pid_max))
-+(typeattributeset proc_pipe_conf_28_0 (proc_pipe_conf))
-+(typeattributeset proc_qtaguid_stat_28_0 (proc_qtaguid_stat))
-+(typeattributeset proc_random_28_0 (proc_random))
-+(typeattributeset proc_sched_28_0 (proc_sched))
-+(typeattributeset proc_security_28_0 (proc_security))
-+(typeattributeset proc_stat_28_0 (proc_stat))
-+(typeattributeset procstats_service_28_0 (procstats_service))
-+(typeattributeset proc_swaps_28_0 (proc_swaps))
-+(typeattributeset proc_sysrq_28_0 (proc_sysrq))
-+(typeattributeset proc_timer_28_0 (proc_timer))
-+(typeattributeset proc_tty_drivers_28_0 (proc_tty_drivers))
-+(typeattributeset proc_uid_concurrent_active_time_28_0 (proc_uid_concurrent_active_time))
-+(typeattributeset proc_uid_concurrent_policy_time_28_0 (proc_uid_concurrent_policy_time))
-+(typeattributeset proc_uid_cpupower_28_0 (proc_uid_cpupower))
-+(typeattributeset proc_uid_cputime_removeuid_28_0 (proc_uid_cputime_removeuid))
-+(typeattributeset proc_uid_cputime_showstat_28_0 (proc_uid_cputime_showstat))
-+(typeattributeset proc_uid_io_stats_28_0 (proc_uid_io_stats))
-+(typeattributeset proc_uid_procstat_set_28_0 (proc_uid_procstat_set))
-+(typeattributeset proc_uid_time_in_state_28_0 (proc_uid_time_in_state))
-+(typeattributeset proc_uptime_28_0 (proc_uptime))
-+(typeattributeset proc_version_28_0 (proc_version))
-+(typeattributeset proc_vmallocinfo_28_0 (proc_vmallocinfo))
-+(typeattributeset proc_vmstat_28_0 (proc_vmstat))
-+(typeattributeset proc_zoneinfo_28_0 (proc_zoneinfo))
-+(typeattributeset profman_28_0 (profman))
-+(typeattributeset profman_dump_data_file_28_0 (profman_dump_data_file))
-+(typeattributeset profman_exec_28_0 (profman_exec))
-+(typeattributeset properties_device_28_0 (properties_device))
-+(typeattributeset properties_serial_28_0 (properties_serial))
-+(typeattributeset property_contexts_file_28_0 (property_contexts_file))
-+(typeattributeset property_data_file_28_0 (property_data_file))
-+(typeattributeset property_info_28_0 (property_info))
-+(typeattributeset property_socket_28_0 (property_socket))
-+(typeattributeset pstorefs_28_0 (pstorefs))
-+(typeattributeset ptmx_device_28_0 (ptmx_device))
-+(typeattributeset qtaguid_device_28_0 (qtaguid_device))
-+(typeattributeset qtaguid_proc_28_0
-+  ( proc_qtaguid_ctrl
-+    qtaguid_proc))
-+(typeattributeset racoon_28_0 (racoon))
-+(typeattributeset racoon_exec_28_0 (racoon_exec))
-+(typeattributeset racoon_socket_28_0 (racoon_socket))
-+(typeattributeset radio_28_0 (radio))
-+(typeattributeset radio_data_file_28_0 (radio_data_file))
-+(typeattributeset radio_device_28_0 (radio_device))
-+(typeattributeset radio_prop_28_0 (radio_prop))
-+(typeattributeset radio_service_28_0 (radio_service))
-+(typeattributeset ram_device_28_0 (ram_device))
-+(typeattributeset random_device_28_0 (random_device))
-+(typeattributeset recovery_28_0 (recovery))
-+(typeattributeset recovery_block_device_28_0 (recovery_block_device))
-+(typeattributeset recovery_data_file_28_0 (recovery_data_file))
-+(typeattributeset recovery_persist_28_0 (recovery_persist))
-+(typeattributeset recovery_persist_exec_28_0 (recovery_persist_exec))
-+(typeattributeset recovery_refresh_28_0 (recovery_refresh))
-+(typeattributeset recovery_refresh_exec_28_0 (recovery_refresh_exec))
-+(typeattributeset recovery_service_28_0 (recovery_service))
-+(typeattributeset registry_service_28_0 (registry_service))
-+(typeattributeset resourcecache_data_file_28_0 (resourcecache_data_file))
-+(typeattributeset restorecon_prop_28_0 (restorecon_prop))
-+(typeattributeset restrictions_service_28_0 (restrictions_service))
-+(typeattributeset rild_debug_socket_28_0 (rild_debug_socket))
-+(typeattributeset rild_socket_28_0 (rild_socket))
-+(typeattributeset ringtone_file_28_0 (ringtone_file))
-+(typeattributeset root_block_device_28_0 (root_block_device))
-+(typeattributeset rootfs_28_0 (rootfs))
-+(typeattributeset rpmsg_device_28_0 (rpmsg_device))
-+(typeattributeset rtc_device_28_0 (rtc_device))
-+(typeattributeset rttmanager_service_28_0 (rttmanager_service))
-+(typeattributeset runas_28_0 (runas))
-+(typeattributeset runas_exec_28_0 (runas_exec))
-+(typeattributeset runtime_event_log_tags_file_28_0 (runtime_event_log_tags_file))
-+(typeattributeset safemode_prop_28_0 (safemode_prop))
-+(typeattributeset same_process_hal_file_28_0
-+  ( same_process_hal_file
-+    vendor_public_lib_file))
-+(typeattributeset samplingprofiler_service_28_0 (samplingprofiler_service))
-+(typeattributeset scheduling_policy_service_28_0 (scheduling_policy_service))
-+(typeattributeset sdcardd_28_0 (sdcardd))
-+(typeattributeset sdcardd_exec_28_0 (sdcardd_exec))
-+(typeattributeset sdcardfs_28_0 (sdcardfs))
-+(typeattributeset seapp_contexts_file_28_0 (seapp_contexts_file))
-+(typeattributeset search_service_28_0 (search_service))
-+(typeattributeset sec_key_att_app_id_provider_service_28_0 (sec_key_att_app_id_provider_service))
-+(typeattributeset secure_element_28_0 (secure_element))
-+(typeattributeset secure_element_device_28_0 (secure_element_device))
-+(typeattributeset secure_element_service_28_0 (secure_element_service))
-+(typeattributeset selinuxfs_28_0 (selinuxfs))
-+(typeattributeset sensors_device_28_0 (sensors_device))
-+(typeattributeset sensorservice_service_28_0 (sensorservice_service))
-+(typeattributeset sepolicy_file_28_0 (sepolicy_file))
-+(typeattributeset serial_device_28_0 (serial_device))
-+(typeattributeset serialno_prop_28_0 (serialno_prop))
-+(typeattributeset serial_service_28_0 (serial_service))
-+(typeattributeset service_contexts_file_28_0 (service_contexts_file))
-+(typeattributeset servicediscovery_service_28_0 (servicediscovery_service))
-+(typeattributeset servicemanager_28_0 (servicemanager))
-+(typeattributeset servicemanager_exec_28_0 (servicemanager_exec))
-+(typeattributeset settings_service_28_0 (settings_service))
-+(typeattributeset sgdisk_28_0 (sgdisk))
-+(typeattributeset sgdisk_exec_28_0 (sgdisk_exec))
-+(typeattributeset shared_relro_28_0 (shared_relro))
-+(typeattributeset shared_relro_file_28_0 (shared_relro_file))
-+(typeattributeset shell_28_0 (shell))
-+(typeattributeset shell_data_file_28_0 (shell_data_file))
-+(typeattributeset shell_exec_28_0 (shell_exec))
-+(typeattributeset shell_prop_28_0 (shell_prop))
-+(typeattributeset shm_28_0 (shm))
-+(typeattributeset shortcut_manager_icons_28_0 (shortcut_manager_icons))
-+(typeattributeset shortcut_service_28_0 (shortcut_service))
-+(typeattributeset slice_service_28_0 (slice_service))
-+(typeattributeset slideshow_28_0 (slideshow))
-+(typeattributeset socket_device_28_0 (socket_device))
-+(typeattributeset sockfs_28_0 (sockfs))
-+(typeattributeset statusbar_service_28_0 (statusbar_service))
-+(typeattributeset storaged_service_28_0 (storaged_service))
-+(typeattributeset storage_file_28_0 (storage_file))
-+(typeattributeset storagestats_service_28_0 (storagestats_service))
-+(typeattributeset storage_stub_file_28_0 (storage_stub_file))
-+(typeattributeset su_28_0 (su))
-+(typeattributeset su_exec_28_0 (su_exec))
-+(typeattributeset surfaceflinger_28_0 (surfaceflinger))
-+(typeattributeset surfaceflinger_service_28_0 (surfaceflinger_service))
-+(typeattributeset swap_block_device_28_0 (swap_block_device))
-+(typeattributeset sysfs_28_0
-+  ( sysfs
-+    sysfs_devices_block
-+    sysfs_extcon
-+    sysfs_loop
-+    sysfs_transparent_hugepage))
-+(typeattributeset sysfs_android_usb_28_0 (sysfs_android_usb))
-+(typeattributeset sysfs_batteryinfo_28_0 (sysfs_batteryinfo))
-+(typeattributeset sysfs_bluetooth_writable_28_0 (sysfs_bluetooth_writable))
-+(typeattributeset sysfs_devices_system_cpu_28_0 (sysfs_devices_system_cpu))
-+(typeattributeset sysfs_dm_28_0 (sysfs_dm))
-+(typeattributeset sysfs_dt_firmware_android_28_0 (sysfs_dt_firmware_android))
-+(typeattributeset sysfs_fs_ext4_features_28_0 (sysfs_fs_ext4_features))
-+(typeattributeset sysfs_hwrandom_28_0 (sysfs_hwrandom))
-+(typeattributeset sysfs_ipv4_28_0 (sysfs_ipv4))
-+(typeattributeset sysfs_kernel_notes_28_0 (sysfs_kernel_notes))
-+(typeattributeset sysfs_leds_28_0 (sysfs_leds))
-+(typeattributeset sysfs_lowmemorykiller_28_0 (sysfs_lowmemorykiller))
-+(typeattributeset sysfs_mac_address_28_0 (sysfs_mac_address))
-+(typeattributeset sysfs_net_28_0 (sysfs_net))
-+(typeattributeset sysfs_nfc_power_writable_28_0 (sysfs_nfc_power_writable))
-+(typeattributeset sysfs_power_28_0 (sysfs_power))
-+(typeattributeset sysfs_rtc_28_0 (sysfs_rtc))
-+(typeattributeset sysfs_switch_28_0 (sysfs_switch))
-+(typeattributeset sysfs_thermal_28_0 (sysfs_thermal))
-+(typeattributeset sysfs_uio_28_0 (sysfs_uio))
-+(typeattributeset sysfs_usb_28_0 (sysfs_usb))
-+(typeattributeset sysfs_usermodehelper_28_0 (sysfs_usermodehelper))
-+(typeattributeset sysfs_vibrator_28_0 (sysfs_vibrator))
-+(typeattributeset sysfs_wake_lock_28_0 (sysfs_wake_lock))
-+(typeattributeset sysfs_wakeup_reasons_28_0 (sysfs_wakeup_reasons))
-+(typeattributeset sysfs_wlan_fwpath_28_0 (sysfs_wlan_fwpath))
-+(typeattributeset sysfs_zram_28_0 (sysfs_zram))
-+(typeattributeset sysfs_zram_uevent_28_0 (sysfs_zram_uevent))
-+(typeattributeset system_app_28_0 (system_app))
-+(typeattributeset system_app_data_file_28_0 (system_app_data_file))
-+(typeattributeset system_app_service_28_0 (system_app_service))
-+(typeattributeset system_block_device_28_0 (system_block_device))
-+(typeattributeset system_boot_reason_prop_28_0 (system_boot_reason_prop))
-+(typeattributeset system_data_file_28_0
-+  ( dropbox_data_file
-+    system_data_file
-+    packages_list_file))
-+(typeattributeset system_file_28_0
-+  ( system_file
-+    system_asan_options_file
-+    system_lib_file
-+    system_linker_config_file
-+    system_linker_exec
-+    system_seccomp_policy_file
-+    system_security_cacerts_file
-+    tcpdump_exec
-+    system_zoneinfo_file
-+))
-+(typeattributeset systemkeys_data_file_28_0 (systemkeys_data_file))
-+(typeattributeset system_ndebug_socket_28_0 (system_ndebug_socket))
-+(typeattributeset system_net_netd_hwservice_28_0 (system_net_netd_hwservice))
-+(typeattributeset system_prop_28_0 (system_prop))
-+(typeattributeset system_radio_prop_28_0 (system_radio_prop))
-+(typeattributeset system_server_28_0 (system_server))
-+(typeattributeset system_update_service_28_0 (system_update_service))
-+(typeattributeset system_wifi_keystore_hwservice_28_0 (system_wifi_keystore_hwservice))
-+(typeattributeset system_wpa_socket_28_0 (system_wpa_socket))
-+(typeattributeset task_service_28_0 (task_service))
-+(typeattributeset tee_28_0 (tee))
-+(typeattributeset tee_data_file_28_0 (tee_data_file))
-+(typeattributeset tee_device_28_0 (tee_device))
-+(typeattributeset telecom_service_28_0 (telecom_service))
-+(typeattributeset test_boot_reason_prop_28_0 (test_boot_reason_prop))
-+(typeattributeset textclassification_service_28_0 (textclassification_service))
-+(typeattributeset textclassifier_data_file_28_0 (textclassifier_data_file))
-+(typeattributeset textservices_service_28_0 (textservices_service))
-+(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
-+(typeattributeset thermal_service_28_0 (thermal_service))
-+(typeattributeset timezone_service_28_0 (timezone_service))
-+(typeattributeset tmpfs_28_0
-+  ( mnt_sdcard_file
-+    tmpfs))
-+(typeattributeset tombstoned_28_0 (tombstoned))
-+(typeattributeset tombstone_data_file_28_0 (tombstone_data_file))
-+(typeattributeset tombstoned_crash_socket_28_0 (tombstoned_crash_socket))
-+(typeattributeset tombstoned_exec_28_0 (tombstoned_exec))
-+(typeattributeset tombstoned_intercept_socket_28_0 (tombstoned_intercept_socket))
-+(typeattributeset tombstoned_java_trace_socket_28_0 (tombstoned_java_trace_socket))
-+(typeattributeset tombstone_wifi_data_file_28_0 (tombstone_wifi_data_file))
-+(typeattributeset toolbox_28_0 (toolbox))
-+(typeattributeset toolbox_exec_28_0 (toolbox_exec))
-+(typeattributeset trace_data_file_28_0 (trace_data_file))
-+(typeattributeset traced_consumer_socket_28_0 (traced_consumer_socket))
-+(typeattributeset traced_enabled_prop_28_0 (traced_enabled_prop))
-+(typeattributeset traced_probes_28_0 (traced_probes))
-+(typeattributeset traced_producer_socket_28_0 (traced_producer_socket))
-+(typeattributeset traceur_app_28_0 (traceur_app))
-+(typeattributeset trust_service_28_0 (trust_service))
-+(typeattributeset tty_device_28_0 (tty_device))
-+(typeattributeset tun_device_28_0 (tun_device))
-+(typeattributeset tv_input_service_28_0 (tv_input_service))
-+(typeattributeset tzdatacheck_28_0 (tzdatacheck))
-+(typeattributeset tzdatacheck_exec_28_0 (tzdatacheck_exec))
-+(typeattributeset ueventd_28_0 (ueventd))
-+(typeattributeset uhid_device_28_0 (uhid_device))
-+(typeattributeset uimode_service_28_0 (uimode_service))
-+(typeattributeset uio_device_28_0 (uio_device))
-+(typeattributeset uncrypt_28_0 (uncrypt))
-+(typeattributeset uncrypt_exec_28_0 (uncrypt_exec))
-+(typeattributeset uncrypt_socket_28_0 (uncrypt_socket))
-+(typeattributeset unencrypted_data_file_28_0 (unencrypted_data_file))
-+(typeattributeset unlabeled_28_0 (unlabeled))
-+(typeattributeset untrusted_app_25_28_0 (untrusted_app_25))
-+(typeattributeset untrusted_app_27_28_0 (untrusted_app_27))
-+(typeattributeset untrusted_app_28_0 (untrusted_app))
-+(typeattributeset untrusted_v2_app_28_0 (untrusted_v2_app))
-+(typeattributeset update_engine_28_0 (update_engine))
-+(typeattributeset update_engine_data_file_28_0 (update_engine_data_file))
-+(typeattributeset update_engine_exec_28_0 (update_engine_exec))
-+(typeattributeset update_engine_log_data_file_28_0 (update_engine_log_data_file))
-+(typeattributeset update_engine_service_28_0 (update_engine_service))
-+(typeattributeset updatelock_service_28_0 (updatelock_service))
-+(typeattributeset update_verifier_28_0 (update_verifier))
-+(typeattributeset update_verifier_exec_28_0 (update_verifier_exec))
-+(typeattributeset usagestats_service_28_0 (usagestats_service))
-+(typeattributeset usbaccessory_device_28_0 (usbaccessory_device))
-+(typeattributeset usbd_28_0 (usbd))
-+(typeattributeset usb_device_28_0 (usb_device))
-+(typeattributeset usbd_exec_28_0 (usbd_exec))
-+(typeattributeset usbfs_28_0 (usbfs))
-+(typeattributeset usb_service_28_0 (usb_service))
-+(typeattributeset userdata_block_device_28_0 (userdata_block_device))
-+(typeattributeset usermodehelper_28_0 (usermodehelper))
-+(typeattributeset user_profile_data_file_28_0 (user_profile_data_file))
-+(typeattributeset user_service_28_0 (user_service))
-+(typeattributeset vcs_device_28_0 (vcs_device))
-+(typeattributeset vdc_28_0 (vdc))
-+(typeattributeset vdc_exec_28_0 (vdc_exec))
-+(typeattributeset vendor_app_file_28_0 (vendor_app_file))
-+(typeattributeset vendor_configs_file_28_0 (vendor_configs_file))
-+(typeattributeset vendor_data_file_28_0 (vendor_data_file))
-+(typeattributeset vendor_default_prop_28_0 (vendor_default_prop))
-+(typeattributeset vendor_file_28_0 (vendor_file))
-+(typeattributeset vendor_framework_file_28_0 (vendor_framework_file))
-+(typeattributeset vendor_hal_file_28_0 (vendor_hal_file))
-+(typeattributeset vendor_init_28_0 (vendor_init))
-+(typeattributeset vendor_overlay_file_28_0 (vendor_overlay_file))
-+(typeattributeset vendor_security_patch_level_prop_28_0 (vendor_security_patch_level_prop))
-+(typeattributeset vendor_shell_28_0 (vendor_shell))
-+(typeattributeset vendor_shell_exec_28_0 (vendor_shell_exec))
-+(typeattributeset vendor_toolbox_exec_28_0 (vendor_toolbox_exec))
-+(typeattributeset vfat_28_0 (vfat))
-+(typeattributeset vibrator_service_28_0 (vibrator_service))
-+(typeattributeset video_device_28_0 (video_device))
-+(typeattributeset virtual_touchpad_28_0 (virtual_touchpad))
-+(typeattributeset virtual_touchpad_exec_28_0 (virtual_touchpad_exec))
-+(typeattributeset virtual_touchpad_service_28_0 (virtual_touchpad_service))
-+(typeattributeset vndbinder_device_28_0 (vndbinder_device))
-+(typeattributeset vndk_sp_file_28_0 (vndk_sp_file))
-+(typeattributeset vndservice_contexts_file_28_0 (vndservice_contexts_file))
-+(typeattributeset vndservicemanager_28_0 (vndservicemanager))
-+(typeattributeset voiceinteraction_service_28_0 (voiceinteraction_service))
-+(typeattributeset vold_28_0 (vold))
-+(typeattributeset vold_data_file_28_0 (vold_data_file))
-+(typeattributeset vold_device_28_0 (vold_device))
-+(typeattributeset vold_exec_28_0 (vold_exec))
-+(typeattributeset vold_metadata_file_28_0 (vold_metadata_file))
-+(typeattributeset vold_prepare_subdirs_28_0 (vold_prepare_subdirs))
-+(typeattributeset vold_prepare_subdirs_exec_28_0 (vold_prepare_subdirs_exec))
-+(typeattributeset vold_prop_28_0 (vold_prop))
-+(typeattributeset vold_service_28_0 (vold_service))
-+(typeattributeset vpn_data_file_28_0 (vpn_data_file))
-+(typeattributeset vr_hwc_28_0 (vr_hwc))
-+(typeattributeset vr_hwc_exec_28_0 (vr_hwc_exec))
-+(typeattributeset vr_hwc_service_28_0 (vr_hwc_service))
-+(typeattributeset vr_manager_service_28_0 (vr_manager_service))
-+(typeattributeset wallpaper_file_28_0 (wallpaper_file))
-+(typeattributeset wallpaper_service_28_0 (wallpaper_service))
-+(typeattributeset watchdogd_28_0 (watchdogd))
-+(typeattributeset watchdog_device_28_0 (watchdog_device))
-+(typeattributeset webviewupdate_service_28_0 (webviewupdate_service))
-+(typeattributeset webview_zygote_28_0 (webview_zygote))
-+(typeattributeset webview_zygote_exec_28_0 (webview_zygote_exec))
-+(typeattributeset wifiaware_service_28_0 (wifiaware_service))
-+(typeattributeset wificond_28_0 (wificond))
-+(typeattributeset wificond_exec_28_0 (wificond_exec))
-+(typeattributeset wificond_service_28_0 (wificond_service))
-+(typeattributeset wifi_data_file_28_0 (wifi_data_file))
-+(typeattributeset wifi_log_prop_28_0 (wifi_log_prop))
-+(typeattributeset wifip2p_service_28_0 (wifip2p_service))
-+(typeattributeset wifi_prop_28_0 (wifi_prop))
-+(typeattributeset wifiscanner_service_28_0 (wifiscanner_service))
-+(typeattributeset wifi_service_28_0 (wifi_service))
-+(typeattributeset window_service_28_0 (window_service))
-+(typeattributeset wpantund_28_0 (wpantund))
-+(typeattributeset wpantund_exec_28_0 (wpantund_exec))
-+(typeattributeset wpantund_service_28_0 (wpantund_service))
-+(typeattributeset wpa_socket_28_0 (wpa_socket))
-+(typeattributeset zero_device_28_0 (zero_device))
-+(typeattributeset zoneinfo_data_file_28_0 (zoneinfo_data_file))
-+(typeattributeset zygote_28_0 (zygote))
-+(typeattributeset zygote_exec_28_0 (zygote_exec))
-+(typeattributeset zygote_socket_28_0 (zygote_socket))
-diff --git a/prebuilts/api/32.0/private/compat/28.0/28.0.compat.cil b/prebuilts/api/32.0/private/compat/28.0/28.0.compat.cil
-new file mode 100644
-index 000000000..2e85b23fc
---- /dev/null
-+++ b/prebuilts/api/32.0/private/compat/28.0/28.0.compat.cil
-@@ -0,0 +1,11 @@
-+(typeattribute vendordomain)
-+(typeattributeset vendordomain ((and (domain) ((not (coredomain))))))
-+(allowx vendordomain dev_type (ioctl blk_file ((range 0x0000 0xffff))))
-+(allowx vendordomain file_type (ioctl file ((range 0x0000 0xffff))))
-+(allow vendordomain self (netlink_route_socket (nlmsg_readpriv)))
-+
-+(typeattributeset mlsvendorcompat (and appdomain vendordomain))
-+(allow mlsvendorcompat app_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat app_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-+(allow mlsvendorcompat privapp_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat privapp_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-diff --git a/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil
-new file mode 100644
-index 000000000..e7ddf4805
---- /dev/null
-+++ b/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil
-@@ -0,0 +1,160 @@
-+;; new_objects - a collection of types that have been introduced that have no
-+;;   analogue in older policy.  Thus, we do not need to map these types to
-+;;   previous ones.  Add here to pass checkapi tests.
-+(type new_objects)
-+(typeattribute new_objects)
-+(typeattributeset new_objects
-+  ( new_objects
-+    activity_task_service
-+    adb_service
-+    apex_data_file
-+    apex_metadata_file
-+    apex_mnt_dir
-+    apex_service
-+    apexd
-+    apexd_exec
-+    apexd_prop
-+    apexd_tmpfs
-+    appdomain_tmpfs
-+    app_binding_service
-+    app_prediction_service
-+    app_zygote
-+    app_zygote_tmpfs
-+    ashmemd
-+    ashmem_device_service
-+    attention_service
-+    biometric_service
-+    bluetooth_audio_hal_prop
-+    bpf_progs_loaded_prop
-+    bugreport_service
-+    cgroup_desc_file
-+    cgroup_rc_file
-+    charger_exec
-+    content_capture_service
-+    content_suggestions_service
-+    cpu_variant_prop
-+    ctl_apexd_prop
-+    ctl_gsid_prop
-+    dev_cpu_variant
-+    device_config_activity_manager_native_boot_prop
-+    device_config_boot_count_prop
-+    device_config_input_native_boot_prop
-+    device_config_netd_native_prop
-+    device_config_reset_performed_prop
-+    device_config_runtime_native_boot_prop
-+    device_config_runtime_native_prop
-+    device_config_media_native_prop
-+    device_config_service
-+    device_config_sys_traced_prop
-+    dnsresolver_service
-+    dynamic_system_service
-+    dynamic_system_prop
-+    face_service
-+    face_vendor_data_file
-+    sota_prop
-+    fastbootd
-+    flags_health_check
-+    flags_health_check_exec
-+    fwk_bufferhub_hwservice
-+    fwk_camera_hwservice
-+    fwk_stats_hwservice
-+    gpuservice
-+    gsi_data_file
-+    gsi_metadata_file
-+    gsi_public_metadata_file
-+    gsi_service
-+    gsid
-+    gsid_exec
-+    gsid_prop
-+    color_display_service
-+    external_vibrator_service
-+    hal_atrace_hwservice
-+    hal_face_hwservice
-+    hal_graphics_composer_server_tmpfs
-+    hal_health_storage_hwservice
-+    hal_input_classifier_hwservice
-+    hal_power_stats_hwservice
-+    heapprofd
-+    heapprofd_enabled_prop
-+    heapprofd_exec
-+    heapprofd_prop
-+    heapprofd_socket
-+    idmap_service
-+    iris_service
-+    iris_vendor_data_file
-+    llkd
-+    llkd_exec
-+    llkd_prop
-+    llkd_tmpfs
-+    looper_stats_service
-+    lpdumpd
-+    lpdumpd_exec
-+    lpdumpd_prop
-+    lpdump_service
-+    iorapd
-+    iorapd_exec
-+    iorapd_data_file
-+    iorapd_service
-+    iorapd_tmpfs
-+    mediaswcodec
-+    mediaswcodec_exec
-+    mediaswcodec_tmpfs
-+    metadata_bootstat_file
-+    mnt_product_file
-+    network_stack
-+    network_stack_service
-+    network_stack_tmpfs
-+    nnapi_ext_deny_product_prop
-+    overlayfs_file
-+    password_slot_metadata_file
-+    permissionmgr_service
-+    postinstall_apex_mnt_dir
-+    recovery_socket
-+    role_service
-+    rollback_service
-+    rs
-+    rs_exec
-+    rss_hwm_reset
-+    rss_hwm_reset_exec
-+    runas_app
-+    runas_app_tmpfs
-+    art_apex_dir
-+    runtime_service
-+    sdcard_block_device
-+    sensor_privacy_service
-+    server_configurable_flags_data_file
-+    simpleperf_app_runner
-+    simpleperf_app_runner_exec
-+    socket_hook_prop
-+    su_tmpfs
-+    super_block_device
-+    sysfs_fs_f2fs
-+    system_bootstrap_lib_file
-+    system_event_log_tags_file
-+    system_lmk_prop
-+    system_suspend_hwservice
-+    system_suspend_control_service
-+    system_trace_prop
-+    staging_data_file
-+    task_profiles_file
-+    testharness_service
-+    test_harness_prop
-+    theme_prop
-+    time_prop
-+    timedetector_service
-+    timezonedetector_service
-+    traced_lazy_prop
-+    uri_grants_service
-+    use_memfd_prop
-+    vendor_apex_file
-+    vendor_cgroup_desc_file
-+    vendor_idc_file
-+    vendor_keychars_file
-+    vendor_keylayout_file
-+    vendor_misc_writer
-+    vendor_misc_writer_exec
-+    vendor_socket_hook_prop
-+    vendor_task_profiles_file
-+    vndk_prop
-+    vrflinger_vsync_service
-+    watchdogd_tmpfs))
-diff --git a/prebuilts/api/33.0/private/compat/28.0/28.0.cil b/prebuilts/api/33.0/private/compat/28.0/28.0.cil
-new file mode 100644
-index 000000000..321e9387e
---- /dev/null
-+++ b/prebuilts/api/33.0/private/compat/28.0/28.0.cil
-@@ -0,0 +1,1744 @@
-+;; attributes removed from current policy
-+(typeattribute hal_wifi_offload)
-+(typeattribute hal_wifi_offload_client)
-+(typeattribute hal_wifi_offload_server)
-+
-+;; types removed from current policy
-+(type alarm_device)
-+(type audio_seq_device)
-+(type audio_timer_device)
-+(type commontime_management_service)
-+(type cpuctl_device)
-+(type full_device)
-+(type hal_wifi_offload_hwservice)
-+(type i2c_device)
-+(type kmem_device)
-+(type mediacodec)
-+(type mediacodec_exec)
-+(type mediaextractor_update_service)
-+(type mtd_device)
-+(type netd_socket)
-+(type qtaguid_proc)
-+(type thermalcallback_hwservice)
-+(type thermalserviced)
-+(type thermalserviced_exec)
-+(type untrusted_v2_app)
-+(type vcs_device)
-+
-+;; Public 28.0 SEPolicy is divergent on different devices w.r.t
-+;; exported_audio_prop type. We need this typeattribute declaration so that the
-+;; mapping file compiles with vendor policies without exported_audio_prop type.
-+(typeattribute exported_audio_prop_28_0)
-+
-+(expandtypeattribute (accessibility_service_28_0) true)
-+(expandtypeattribute (account_service_28_0) true)
-+(expandtypeattribute (activity_service_28_0) true)
-+(expandtypeattribute (adbd_28_0) true)
-+(expandtypeattribute (adb_data_file_28_0) true)
-+(expandtypeattribute (adbd_exec_28_0) true)
-+(expandtypeattribute (adbd_socket_28_0) true)
-+(expandtypeattribute (adb_keys_file_28_0) true)
-+(expandtypeattribute (alarm_device_28_0) true)
-+(expandtypeattribute (alarm_service_28_0) true)
-+(expandtypeattribute (anr_data_file_28_0) true)
-+(expandtypeattribute (apk_data_file_28_0) true)
-+(expandtypeattribute (apk_private_data_file_28_0) true)
-+(expandtypeattribute (apk_private_tmp_file_28_0) true)
-+(expandtypeattribute (apk_tmp_file_28_0) true)
-+(expandtypeattribute (app_data_file_28_0) true)
-+(expandtypeattribute (app_fuse_file_28_0) true)
-+(expandtypeattribute (app_fusefs_28_0) true)
-+(expandtypeattribute (appops_service_28_0) true)
-+(expandtypeattribute (appwidget_service_28_0) true)
-+(expandtypeattribute (asec_apk_file_28_0) true)
-+(expandtypeattribute (asec_image_file_28_0) true)
-+(expandtypeattribute (asec_public_file_28_0) true)
-+(expandtypeattribute (ashmem_device_28_0) true)
-+(expandtypeattribute (assetatlas_service_28_0) true)
-+(expandtypeattribute (audio_data_file_28_0) true)
-+(expandtypeattribute (audio_device_28_0) true)
-+(expandtypeattribute (audiohal_data_file_28_0) true)
-+(expandtypeattribute (audio_prop_28_0) true)
-+(expandtypeattribute (audio_seq_device_28_0) true)
-+(expandtypeattribute (audioserver_28_0) true)
-+(expandtypeattribute (audioserver_data_file_28_0) true)
-+(expandtypeattribute (audioserver_service_28_0) true)
-+(expandtypeattribute (audio_service_28_0) true)
-+(expandtypeattribute (audio_timer_device_28_0) true)
-+(expandtypeattribute (autofill_service_28_0) true)
-+(expandtypeattribute (backup_data_file_28_0) true)
-+(expandtypeattribute (backup_service_28_0) true)
-+(expandtypeattribute (batteryproperties_service_28_0) true)
-+(expandtypeattribute (battery_service_28_0) true)
-+(expandtypeattribute (batterystats_service_28_0) true)
-+(expandtypeattribute (binder_calls_stats_service_28_0) true)
-+(expandtypeattribute (binder_device_28_0) true)
-+(expandtypeattribute (binfmt_miscfs_28_0) true)
-+(expandtypeattribute (blkid_28_0) true)
-+(expandtypeattribute (blkid_untrusted_28_0) true)
-+(expandtypeattribute (block_device_28_0) true)
-+(expandtypeattribute (bluetooth_28_0) true)
-+(expandtypeattribute (bluetooth_a2dp_offload_prop_28_0) true)
-+(expandtypeattribute (bluetooth_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_efs_file_28_0) true)
-+(expandtypeattribute (bluetooth_logs_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_manager_service_28_0) true)
-+(expandtypeattribute (bluetooth_prop_28_0) true)
-+(expandtypeattribute (bluetooth_service_28_0) true)
-+(expandtypeattribute (bluetooth_socket_28_0) true)
-+(expandtypeattribute (bootanim_28_0) true)
-+(expandtypeattribute (bootanim_exec_28_0) true)
-+(expandtypeattribute (boot_block_device_28_0) true)
-+(expandtypeattribute (bootchart_data_file_28_0) true)
-+(expandtypeattribute (bootloader_boot_reason_prop_28_0) true)
-+(expandtypeattribute (bootstat_28_0) true)
-+(expandtypeattribute (bootstat_data_file_28_0) true)
-+(expandtypeattribute (bootstat_exec_28_0) true)
-+(expandtypeattribute (boottime_prop_28_0) true)
-+(expandtypeattribute (boottrace_data_file_28_0) true)
-+(expandtypeattribute (broadcastradio_service_28_0) true)
-+(expandtypeattribute (bufferhubd_28_0) true)
-+(expandtypeattribute (bufferhubd_exec_28_0) true)
-+(expandtypeattribute (cache_backup_file_28_0) true)
-+(expandtypeattribute (cache_block_device_28_0) true)
-+(expandtypeattribute (cache_file_28_0) true)
-+(expandtypeattribute (cache_private_backup_file_28_0) true)
-+(expandtypeattribute (cache_recovery_file_28_0) true)
-+(expandtypeattribute (camera_data_file_28_0) true)
-+(expandtypeattribute (camera_device_28_0) true)
-+(expandtypeattribute (cameraproxy_service_28_0) true)
-+(expandtypeattribute (cameraserver_28_0) true)
-+(expandtypeattribute (cameraserver_exec_28_0) true)
-+(expandtypeattribute (cameraserver_service_28_0) true)
-+(expandtypeattribute (cgroup_28_0) true)
-+(expandtypeattribute (cgroup_bpf_28_0) true)
-+(expandtypeattribute (charger_28_0) true)
-+(expandtypeattribute (clatd_28_0) true)
-+(expandtypeattribute (clatd_exec_28_0) true)
-+(expandtypeattribute (clipboard_service_28_0) true)
-+(expandtypeattribute (commontime_management_service_28_0) true)
-+(expandtypeattribute (companion_device_service_28_0) true)
-+(expandtypeattribute (configfs_28_0) true)
-+(expandtypeattribute (config_prop_28_0) true)
-+(expandtypeattribute (connectivity_service_28_0) true)
-+(expandtypeattribute (connmetrics_service_28_0) true)
-+(expandtypeattribute (console_device_28_0) true)
-+(expandtypeattribute (consumer_ir_service_28_0) true)
-+(expandtypeattribute (content_service_28_0) true)
-+(expandtypeattribute (contexthub_service_28_0) true)
-+(expandtypeattribute (coredump_file_28_0) true)
-+(expandtypeattribute (country_detector_service_28_0) true)
-+(expandtypeattribute (coverage_service_28_0) true)
-+(expandtypeattribute (cppreopt_prop_28_0) true)
-+(expandtypeattribute (cppreopts_28_0) true)
-+(expandtypeattribute (cppreopts_exec_28_0) true)
-+(expandtypeattribute (cpuctl_device_28_0) true)
-+(expandtypeattribute (cpuinfo_service_28_0) true)
-+(expandtypeattribute (crash_dump_28_0) true)
-+(expandtypeattribute (crash_dump_exec_28_0) true)
-+(expandtypeattribute (crossprofileapps_service_28_0) true)
-+(expandtypeattribute (ctl_bootanim_prop_28_0) true)
-+(expandtypeattribute (ctl_bugreport_prop_28_0) true)
-+(expandtypeattribute (ctl_console_prop_28_0) true)
-+(expandtypeattribute (ctl_default_prop_28_0) true)
-+(expandtypeattribute (ctl_dumpstate_prop_28_0) true)
-+(expandtypeattribute (ctl_fuse_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_start_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_stop_prop_28_0) true)
-+(expandtypeattribute (ctl_mdnsd_prop_28_0) true)
-+(expandtypeattribute (ctl_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_rildaemon_prop_28_0) true)
-+(expandtypeattribute (ctl_sigstop_prop_28_0) true)
-+(expandtypeattribute (ctl_start_prop_28_0) true)
-+(expandtypeattribute (ctl_stop_prop_28_0) true)
-+(expandtypeattribute (dalvikcache_data_file_28_0) true)
-+(expandtypeattribute (dalvik_prop_28_0) true)
-+(expandtypeattribute (dbinfo_service_28_0) true)
-+(expandtypeattribute (debugfs_28_0) true)
-+(expandtypeattribute (debugfs_mmc_28_0) true)
-+(expandtypeattribute (debugfs_trace_marker_28_0) true)
-+(expandtypeattribute (debugfs_tracing_28_0) true)
-+(expandtypeattribute (debugfs_tracing_debug_28_0) true)
-+(expandtypeattribute (debugfs_tracing_instances_28_0) true)
-+(expandtypeattribute (debugfs_wakeup_sources_28_0) true)
-+(expandtypeattribute (debugfs_wifi_tracing_28_0) true)
-+(expandtypeattribute (debuggerd_prop_28_0) true)
-+(expandtypeattribute (debug_prop_28_0) true)
-+(expandtypeattribute (default_android_hwservice_28_0) true)
-+(expandtypeattribute (default_android_service_28_0) true)
-+(expandtypeattribute (default_android_vndservice_28_0) true)
-+(expandtypeattribute (default_prop_28_0) true)
-+(expandtypeattribute (device_28_0) true)
-+(expandtypeattribute (device_identifiers_service_28_0) true)
-+(expandtypeattribute (deviceidle_service_28_0) true)
-+(expandtypeattribute (device_logging_prop_28_0) true)
-+(expandtypeattribute (device_policy_service_28_0) true)
-+(expandtypeattribute (devicestoragemonitor_service_28_0) true)
-+(expandtypeattribute (devpts_28_0) true)
-+(expandtypeattribute (dex2oat_28_0) true)
-+(expandtypeattribute (dex2oat_exec_28_0) true)
-+(expandtypeattribute (dhcp_28_0) true)
-+(expandtypeattribute (dhcp_data_file_28_0) true)
-+(expandtypeattribute (dhcp_exec_28_0) true)
-+(expandtypeattribute (dhcp_prop_28_0) true)
-+(expandtypeattribute (diskstats_service_28_0) true)
-+(expandtypeattribute (display_service_28_0) true)
-+(expandtypeattribute (dm_device_28_0) true)
-+(expandtypeattribute (dnsmasq_28_0) true)
-+(expandtypeattribute (dnsmasq_exec_28_0) true)
-+(expandtypeattribute (dnsproxyd_socket_28_0) true)
-+(expandtypeattribute (DockObserver_service_28_0) true)
-+(expandtypeattribute (dreams_service_28_0) true)
-+(expandtypeattribute (drm_data_file_28_0) true)
-+(expandtypeattribute (drmserver_28_0) true)
-+(expandtypeattribute (drmserver_exec_28_0) true)
-+(expandtypeattribute (drmserver_service_28_0) true)
-+(expandtypeattribute (drmserver_socket_28_0) true)
-+(expandtypeattribute (dropbox_service_28_0) true)
-+(expandtypeattribute (dumpstate_28_0) true)
-+(expandtypeattribute (dumpstate_exec_28_0) true)
-+(expandtypeattribute (dumpstate_options_prop_28_0) true)
-+(expandtypeattribute (dumpstate_prop_28_0) true)
-+(expandtypeattribute (dumpstate_service_28_0) true)
-+(expandtypeattribute (dumpstate_socket_28_0) true)
-+(expandtypeattribute (e2fs_28_0) true)
-+(expandtypeattribute (e2fs_exec_28_0) true)
-+(expandtypeattribute (efs_file_28_0) true)
-+(expandtypeattribute (ephemeral_app_28_0) true)
-+(expandtypeattribute (ethernet_service_28_0) true)
-+(expandtypeattribute (exfat_28_0) true)
-+(expandtypeattribute (exported2_config_prop_28_0) true)
-+(expandtypeattribute (exported2_default_prop_28_0) true)
-+(expandtypeattribute (exported2_radio_prop_28_0) true)
-+(expandtypeattribute (exported2_system_prop_28_0) true)
-+(expandtypeattribute (exported2_vold_prop_28_0) true)
-+(expandtypeattribute (exported3_default_prop_28_0) true)
-+(expandtypeattribute (exported3_radio_prop_28_0) true)
-+(expandtypeattribute (exported3_system_prop_28_0) true)
-+(expandtypeattribute (exported_audio_prop_28_0) true)
-+(expandtypeattribute (exported_bluetooth_prop_28_0) true)
-+(expandtypeattribute (exported_config_prop_28_0) true)
-+(expandtypeattribute (exported_dalvik_prop_28_0) true)
-+(expandtypeattribute (exported_default_prop_28_0) true)
-+(expandtypeattribute (exported_dumpstate_prop_28_0) true)
-+(expandtypeattribute (exported_ffs_prop_28_0) true)
-+(expandtypeattribute (exported_fingerprint_prop_28_0) true)
-+(expandtypeattribute (exported_overlay_prop_28_0) true)
-+(expandtypeattribute (exported_pm_prop_28_0) true)
-+(expandtypeattribute (exported_radio_prop_28_0) true)
-+(expandtypeattribute (exported_secure_prop_28_0) true)
-+(expandtypeattribute (exported_system_prop_28_0) true)
-+(expandtypeattribute (exported_system_radio_prop_28_0) true)
-+(expandtypeattribute (exported_vold_prop_28_0) true)
-+(expandtypeattribute (exported_wifi_prop_28_0) true)
-+(expandtypeattribute (ffs_prop_28_0) true)
-+(expandtypeattribute (file_contexts_file_28_0) true)
-+(expandtypeattribute (fingerprintd_28_0) true)
-+(expandtypeattribute (fingerprintd_data_file_28_0) true)
-+(expandtypeattribute (fingerprintd_exec_28_0) true)
-+(expandtypeattribute (fingerprintd_service_28_0) true)
-+(expandtypeattribute (fingerprint_prop_28_0) true)
-+(expandtypeattribute (fingerprint_service_28_0) true)
-+(expandtypeattribute (fingerprint_vendor_data_file_28_0) true)
-+(expandtypeattribute (firstboot_prop_28_0) true)
-+(expandtypeattribute (font_service_28_0) true)
-+(expandtypeattribute (frp_block_device_28_0) true)
-+(expandtypeattribute (fs_bpf_28_0) true)
-+(expandtypeattribute (fsck_28_0) true)
-+(expandtypeattribute (fsck_exec_28_0) true)
-+(expandtypeattribute (fscklogs_28_0) true)
-+(expandtypeattribute (fsck_untrusted_28_0) true)
-+(expandtypeattribute (full_device_28_0) true)
-+(expandtypeattribute (functionfs_28_0) true)
-+(expandtypeattribute (fuse_28_0) true)
-+(expandtypeattribute (fuse_device_28_0) true)
-+(expandtypeattribute (fwk_display_hwservice_28_0) true)
-+(expandtypeattribute (fwk_scheduler_hwservice_28_0) true)
-+(expandtypeattribute (fwk_sensor_hwservice_28_0) true)
-+(expandtypeattribute (fwmarkd_socket_28_0) true)
-+(expandtypeattribute (gatekeeperd_28_0) true)
-+(expandtypeattribute (gatekeeper_data_file_28_0) true)
-+(expandtypeattribute (gatekeeperd_exec_28_0) true)
-+(expandtypeattribute (gatekeeper_service_28_0) true)
-+(expandtypeattribute (gfxinfo_service_28_0) true)
-+(expandtypeattribute (gps_control_28_0) true)
-+(expandtypeattribute (gpu_device_28_0) true)
-+(expandtypeattribute (gpu_service_28_0) true)
-+(expandtypeattribute (graphics_device_28_0) true)
-+(expandtypeattribute (graphicsstats_service_28_0) true)
-+(expandtypeattribute (hal_audiocontrol_hwservice_28_0) true)
-+(expandtypeattribute (hal_audio_hwservice_28_0) true)
-+(expandtypeattribute (hal_authsecret_hwservice_28_0) true)
-+(expandtypeattribute (hal_bluetooth_hwservice_28_0) true)
-+(expandtypeattribute (hal_bootctl_hwservice_28_0) true)
-+(expandtypeattribute (hal_broadcastradio_hwservice_28_0) true)
-+(expandtypeattribute (hal_camera_hwservice_28_0) true)
-+(expandtypeattribute (hal_cas_hwservice_28_0) true)
-+(expandtypeattribute (hal_codec2_hwservice_28_0) true)
-+(expandtypeattribute (hal_configstore_ISurfaceFlingerConfigs_28_0) true)
-+(expandtypeattribute (hal_confirmationui_hwservice_28_0) true)
-+(expandtypeattribute (hal_contexthub_hwservice_28_0) true)
-+(expandtypeattribute (hal_drm_hwservice_28_0) true)
-+(expandtypeattribute (hal_dumpstate_hwservice_28_0) true)
-+(expandtypeattribute (hal_evs_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_service_28_0) true)
-+(expandtypeattribute (hal_gatekeeper_hwservice_28_0) true)
-+(expandtypeattribute (hal_gnss_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_composer_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_mapper_hwservice_28_0) true)
-+(expandtypeattribute (hal_health_hwservice_28_0) true)
-+(expandtypeattribute (hal_ir_hwservice_28_0) true)
-+(expandtypeattribute (hal_keymaster_hwservice_28_0) true)
-+(expandtypeattribute (hal_light_hwservice_28_0) true)
-+(expandtypeattribute (hal_lowpan_hwservice_28_0) true)
-+(expandtypeattribute (hal_memtrack_hwservice_28_0) true)
-+(expandtypeattribute (hal_neuralnetworks_hwservice_28_0) true)
-+(expandtypeattribute (hal_nfc_hwservice_28_0) true)
-+(expandtypeattribute (hal_oemlock_hwservice_28_0) true)
-+(expandtypeattribute (hal_omx_hwservice_28_0) true)
-+(expandtypeattribute (hal_power_hwservice_28_0) true)
-+(expandtypeattribute (hal_renderscript_hwservice_28_0) true)
-+(expandtypeattribute (hal_secure_element_hwservice_28_0) true)
-+(expandtypeattribute (hal_sensors_hwservice_28_0) true)
-+(expandtypeattribute (hal_telephony_hwservice_28_0) true)
-+(expandtypeattribute (hal_tetheroffload_hwservice_28_0) true)
-+(expandtypeattribute (hal_thermal_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_cec_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_input_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_gadget_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_hwservice_28_0) true)
-+(expandtypeattribute (hal_vehicle_hwservice_28_0) true)
-+(expandtypeattribute (hal_vibrator_hwservice_28_0) true)
-+(expandtypeattribute (hal_vr_hwservice_28_0) true)
-+(expandtypeattribute (hal_weaver_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hostapd_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_offload_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_supplicant_hwservice_28_0) true)
-+(expandtypeattribute (hardware_properties_service_28_0) true)
-+(expandtypeattribute (hardware_service_28_0) true)
-+(expandtypeattribute (hci_attach_dev_28_0) true)
-+(expandtypeattribute (hdmi_control_service_28_0) true)
-+(expandtypeattribute (healthd_28_0) true)
-+(expandtypeattribute (healthd_exec_28_0) true)
-+(expandtypeattribute (heapdump_data_file_28_0) true)
-+(expandtypeattribute (hidl_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hidl_base_hwservice_28_0) true)
-+(expandtypeattribute (hidl_manager_hwservice_28_0) true)
-+(expandtypeattribute (hidl_memory_hwservice_28_0) true)
-+(expandtypeattribute (hidl_token_hwservice_28_0) true)
-+(expandtypeattribute (hwbinder_device_28_0) true)
-+(expandtypeattribute (hw_random_device_28_0) true)
-+(expandtypeattribute (hwservice_contexts_file_28_0) true)
-+(expandtypeattribute (hwservicemanager_28_0) true)
-+(expandtypeattribute (hwservicemanager_exec_28_0) true)
-+(expandtypeattribute (hwservicemanager_prop_28_0) true)
-+(expandtypeattribute (i2c_device_28_0) true)
-+(expandtypeattribute (icon_file_28_0) true)
-+(expandtypeattribute (idmap_28_0) true)
-+(expandtypeattribute (idmap_exec_28_0) true)
-+(expandtypeattribute (iio_device_28_0) true)
-+(expandtypeattribute (imms_service_28_0) true)
-+(expandtypeattribute (incident_28_0) true)
-+(expandtypeattribute (incidentd_28_0) true)
-+(expandtypeattribute (incident_data_file_28_0) true)
-+(expandtypeattribute (incident_helper_28_0) true)
-+(expandtypeattribute (incident_service_28_0) true)
-+(expandtypeattribute (init_28_0) true)
-+(expandtypeattribute (init_exec_28_0) true)
-+(expandtypeattribute (inotify_28_0) true)
-+(expandtypeattribute (input_device_28_0) true)
-+(expandtypeattribute (inputflinger_28_0) true)
-+(expandtypeattribute (inputflinger_exec_28_0) true)
-+(expandtypeattribute (inputflinger_service_28_0) true)
-+(expandtypeattribute (input_method_service_28_0) true)
-+(expandtypeattribute (input_service_28_0) true)
-+(expandtypeattribute (installd_28_0) true)
-+(expandtypeattribute (install_data_file_28_0) true)
-+(expandtypeattribute (installd_exec_28_0) true)
-+(expandtypeattribute (installd_service_28_0) true)
-+(expandtypeattribute (install_recovery_28_0) true)
-+(expandtypeattribute (install_recovery_exec_28_0) true)
-+(expandtypeattribute (ion_device_28_0) true)
-+(expandtypeattribute (IProxyService_service_28_0) true)
-+(expandtypeattribute (ipsec_service_28_0) true)
-+(expandtypeattribute (isolated_app_28_0) true)
-+(expandtypeattribute (jobscheduler_service_28_0) true)
-+(expandtypeattribute (kernel_28_0) true)
-+(expandtypeattribute (keychain_data_file_28_0) true)
-+(expandtypeattribute (keychord_device_28_0) true)
-+(expandtypeattribute (keystore_28_0) true)
-+(expandtypeattribute (keystore_data_file_28_0) true)
-+(expandtypeattribute (keystore_exec_28_0) true)
-+(expandtypeattribute (keystore_service_28_0) true)
-+(expandtypeattribute (kmem_device_28_0) true)
-+(expandtypeattribute (kmsg_debug_device_28_0) true)
-+(expandtypeattribute (kmsg_device_28_0) true)
-+(expandtypeattribute (labeledfs_28_0) true)
-+(expandtypeattribute (last_boot_reason_prop_28_0) true)
-+(expandtypeattribute (launcherapps_service_28_0) true)
-+(expandtypeattribute (lmkd_28_0) true)
-+(expandtypeattribute (lmkd_exec_28_0) true)
-+(expandtypeattribute (lmkd_socket_28_0) true)
-+(expandtypeattribute (location_service_28_0) true)
-+(expandtypeattribute (lock_settings_service_28_0) true)
-+(expandtypeattribute (logcat_exec_28_0) true)
-+(expandtypeattribute (logd_28_0) true)
-+(expandtypeattribute (logd_exec_28_0) true)
-+(expandtypeattribute (logd_prop_28_0) true)
-+(expandtypeattribute (logdr_socket_28_0) true)
-+(expandtypeattribute (logd_socket_28_0) true)
-+(expandtypeattribute (logdw_socket_28_0) true)
-+(expandtypeattribute (logpersist_28_0) true)
-+(expandtypeattribute (logpersistd_logging_prop_28_0) true)
-+(expandtypeattribute (log_prop_28_0) true)
-+(expandtypeattribute (log_tag_prop_28_0) true)
-+(expandtypeattribute (loop_control_device_28_0) true)
-+(expandtypeattribute (loop_device_28_0) true)
-+(expandtypeattribute (lowpan_device_28_0) true)
-+(expandtypeattribute (lowpan_prop_28_0) true)
-+(expandtypeattribute (lowpan_service_28_0) true)
-+(expandtypeattribute (mac_perms_file_28_0) true)
-+(expandtypeattribute (mdnsd_28_0) true)
-+(expandtypeattribute (mdnsd_socket_28_0) true)
-+(expandtypeattribute (mdns_socket_28_0) true)
-+(expandtypeattribute (mediacodec_28_0) true)
-+(expandtypeattribute (mediacodec_exec_28_0) true)
-+(expandtypeattribute (mediacodec_service_28_0) true)
-+(expandtypeattribute (media_data_file_28_0) true)
-+(expandtypeattribute (mediadrmserver_28_0) true)
-+(expandtypeattribute (mediadrmserver_exec_28_0) true)
-+(expandtypeattribute (mediadrmserver_service_28_0) true)
-+(expandtypeattribute (mediaextractor_28_0) true)
-+(expandtypeattribute (mediaextractor_exec_28_0) true)
-+(expandtypeattribute (mediaextractor_service_28_0) true)
-+(expandtypeattribute (mediaextractor_update_service_28_0) true)
-+(expandtypeattribute (mediametrics_28_0) true)
-+(expandtypeattribute (mediametrics_exec_28_0) true)
-+(expandtypeattribute (mediametrics_service_28_0) true)
-+(expandtypeattribute (media_projection_service_28_0) true)
-+(expandtypeattribute (mediaprovider_28_0) true)
-+(expandtypeattribute (media_router_service_28_0) true)
-+(expandtypeattribute (media_rw_data_file_28_0) true)
-+(expandtypeattribute (mediaserver_28_0) true)
-+(expandtypeattribute (mediaserver_exec_28_0) true)
-+(expandtypeattribute (mediaserver_service_28_0) true)
-+(expandtypeattribute (media_session_service_28_0) true)
-+(expandtypeattribute (meminfo_service_28_0) true)
-+(expandtypeattribute (metadata_block_device_28_0) true)
-+(expandtypeattribute (metadata_file_28_0) true)
-+(expandtypeattribute (method_trace_data_file_28_0) true)
-+(expandtypeattribute (midi_service_28_0) true)
-+(expandtypeattribute (misc_block_device_28_0) true)
-+(expandtypeattribute (misc_logd_file_28_0) true)
-+(expandtypeattribute (misc_user_data_file_28_0) true)
-+(expandtypeattribute (mmc_prop_28_0) true)
-+(expandtypeattribute (mnt_expand_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_stub_file_28_0) true)
-+(expandtypeattribute (mnt_user_file_28_0) true)
-+(expandtypeattribute (mnt_vendor_file_28_0) true)
-+(expandtypeattribute (modprobe_28_0) true)
-+(expandtypeattribute (mount_service_28_0) true)
-+(expandtypeattribute (mqueue_28_0) true)
-+(expandtypeattribute (mtd_device_28_0) true)
-+(expandtypeattribute (mtp_28_0) true)
-+(expandtypeattribute (mtp_device_28_0) true)
-+(expandtypeattribute (mtpd_socket_28_0) true)
-+(expandtypeattribute (mtp_exec_28_0) true)
-+(expandtypeattribute (nativetest_data_file_28_0) true)
-+(expandtypeattribute (netd_28_0) true)
-+(expandtypeattribute (net_data_file_28_0) true)
-+(expandtypeattribute (netd_exec_28_0) true)
-+(expandtypeattribute (netd_listener_service_28_0) true)
-+(expandtypeattribute (net_dns_prop_28_0) true)
-+(expandtypeattribute (netd_service_28_0) true)
-+(expandtypeattribute (netd_socket_28_0) true)
-+(expandtypeattribute (netd_stable_secret_prop_28_0) true)
-+(expandtypeattribute (netif_28_0) true)
-+(expandtypeattribute (netpolicy_service_28_0) true)
-+(expandtypeattribute (net_radio_prop_28_0) true)
-+(expandtypeattribute (netstats_service_28_0) true)
-+(expandtypeattribute (netutils_wrapper_28_0) true)
-+(expandtypeattribute (netutils_wrapper_exec_28_0) true)
-+(expandtypeattribute (network_management_service_28_0) true)
-+(expandtypeattribute (network_score_service_28_0) true)
-+(expandtypeattribute (network_time_update_service_28_0) true)
-+(expandtypeattribute (network_watchlist_data_file_28_0) true)
-+(expandtypeattribute (network_watchlist_service_28_0) true)
-+(expandtypeattribute (nfc_28_0) true)
-+(expandtypeattribute (nfc_data_file_28_0) true)
-+(expandtypeattribute (nfc_device_28_0) true)
-+(expandtypeattribute (nfc_prop_28_0) true)
-+(expandtypeattribute (nfc_service_28_0) true)
-+(expandtypeattribute (node_28_0) true)
-+(expandtypeattribute (nonplat_service_contexts_file_28_0) true)
-+(expandtypeattribute (notification_service_28_0) true)
-+(expandtypeattribute (null_device_28_0) true)
-+(expandtypeattribute (oemfs_28_0) true)
-+(expandtypeattribute (oem_lock_service_28_0) true)
-+(expandtypeattribute (ota_data_file_28_0) true)
-+(expandtypeattribute (otadexopt_service_28_0) true)
-+(expandtypeattribute (ota_package_file_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_exec_28_0) true)
-+(expandtypeattribute (otapreopt_slot_28_0) true)
-+(expandtypeattribute (otapreopt_slot_exec_28_0) true)
-+(expandtypeattribute (overlay_prop_28_0) true)
-+(expandtypeattribute (overlay_service_28_0) true)
-+(expandtypeattribute (owntty_device_28_0) true)
-+(expandtypeattribute (package_native_service_28_0) true)
-+(expandtypeattribute (package_service_28_0) true)
-+(expandtypeattribute (pan_result_prop_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_dir_28_0) true)
-+(expandtypeattribute (pdx_display_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_dir_28_0) true)
-+(expandtypeattribute (pdx_display_manager_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_manager_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_dir_28_0) true)
-+(expandtypeattribute (performanced_28_0) true)
-+(expandtypeattribute (performanced_exec_28_0) true)
-+(expandtypeattribute (permission_service_28_0) true)
-+(expandtypeattribute (persist_debug_prop_28_0) true)
-+(expandtypeattribute (persistent_data_block_service_28_0) true)
-+(expandtypeattribute (persistent_properties_ready_prop_28_0) true)
-+(expandtypeattribute (pinner_service_28_0) true)
-+(expandtypeattribute (pipefs_28_0) true)
-+(expandtypeattribute (platform_app_28_0) true)
-+(expandtypeattribute (pm_prop_28_0) true)
-+(expandtypeattribute (pmsg_device_28_0) true)
-+(expandtypeattribute (port_28_0) true)
-+(expandtypeattribute (port_device_28_0) true)
-+(expandtypeattribute (postinstall_28_0) true)
-+(expandtypeattribute (postinstall_dexopt_28_0) true)
-+(expandtypeattribute (postinstall_file_28_0) true)
-+(expandtypeattribute (postinstall_mnt_dir_28_0) true)
-+(expandtypeattribute (powerctl_prop_28_0) true)
-+(expandtypeattribute (power_service_28_0) true)
-+(expandtypeattribute (ppp_28_0) true)
-+(expandtypeattribute (ppp_device_28_0) true)
-+(expandtypeattribute (ppp_exec_28_0) true)
-+(expandtypeattribute (preloads_data_file_28_0) true)
-+(expandtypeattribute (preloads_media_file_28_0) true)
-+(expandtypeattribute (preopt2cachename_28_0) true)
-+(expandtypeattribute (preopt2cachename_exec_28_0) true)
-+(expandtypeattribute (print_service_28_0) true)
-+(expandtypeattribute (priv_app_28_0) true)
-+(expandtypeattribute (proc_28_0) true)
-+(expandtypeattribute (proc_abi_28_0) true)
-+(expandtypeattribute (proc_asound_28_0) true)
-+(expandtypeattribute (proc_bluetooth_writable_28_0) true)
-+(expandtypeattribute (proc_buddyinfo_28_0) true)
-+(expandtypeattribute (proc_cmdline_28_0) true)
-+(expandtypeattribute (proc_cpuinfo_28_0) true)
-+(expandtypeattribute (proc_dirty_28_0) true)
-+(expandtypeattribute (proc_diskstats_28_0) true)
-+(expandtypeattribute (proc_drop_caches_28_0) true)
-+(expandtypeattribute (processinfo_service_28_0) true)
-+(expandtypeattribute (proc_extra_free_kbytes_28_0) true)
-+(expandtypeattribute (proc_filesystems_28_0) true)
-+(expandtypeattribute (proc_hostname_28_0) true)
-+(expandtypeattribute (proc_hung_task_28_0) true)
-+(expandtypeattribute (proc_interrupts_28_0) true)
-+(expandtypeattribute (proc_iomem_28_0) true)
-+(expandtypeattribute (proc_kmsg_28_0) true)
-+(expandtypeattribute (proc_loadavg_28_0) true)
-+(expandtypeattribute (proc_max_map_count_28_0) true)
-+(expandtypeattribute (proc_meminfo_28_0) true)
-+(expandtypeattribute (proc_min_free_order_shift_28_0) true)
-+(expandtypeattribute (proc_misc_28_0) true)
-+(expandtypeattribute (proc_modules_28_0) true)
-+(expandtypeattribute (proc_mounts_28_0) true)
-+(expandtypeattribute (proc_net_28_0) true)
-+(expandtypeattribute (proc_overcommit_memory_28_0) true)
-+(expandtypeattribute (proc_page_cluster_28_0) true)
-+(expandtypeattribute (proc_pagetypeinfo_28_0) true)
-+(expandtypeattribute (proc_panic_28_0) true)
-+(expandtypeattribute (proc_perf_28_0) true)
-+(expandtypeattribute (proc_pid_max_28_0) true)
-+(expandtypeattribute (proc_pipe_conf_28_0) true)
-+(expandtypeattribute (proc_qtaguid_stat_28_0) true)
-+(expandtypeattribute (proc_random_28_0) true)
-+(expandtypeattribute (proc_sched_28_0) true)
-+(expandtypeattribute (proc_security_28_0) true)
-+(expandtypeattribute (proc_stat_28_0) true)
-+(expandtypeattribute (procstats_service_28_0) true)
-+(expandtypeattribute (proc_swaps_28_0) true)
-+(expandtypeattribute (proc_sysrq_28_0) true)
-+(expandtypeattribute (proc_timer_28_0) true)
-+(expandtypeattribute (proc_tty_drivers_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_active_time_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_policy_time_28_0) true)
-+(expandtypeattribute (proc_uid_cpupower_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_removeuid_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_showstat_28_0) true)
-+(expandtypeattribute (proc_uid_io_stats_28_0) true)
-+(expandtypeattribute (proc_uid_procstat_set_28_0) true)
-+(expandtypeattribute (proc_uid_time_in_state_28_0) true)
-+(expandtypeattribute (proc_uptime_28_0) true)
-+(expandtypeattribute (proc_version_28_0) true)
-+(expandtypeattribute (proc_vmallocinfo_28_0) true)
-+(expandtypeattribute (proc_vmstat_28_0) true)
-+(expandtypeattribute (proc_zoneinfo_28_0) true)
-+(expandtypeattribute (profman_28_0) true)
-+(expandtypeattribute (profman_dump_data_file_28_0) true)
-+(expandtypeattribute (profman_exec_28_0) true)
-+(expandtypeattribute (properties_device_28_0) true)
-+(expandtypeattribute (properties_serial_28_0) true)
-+(expandtypeattribute (property_contexts_file_28_0) true)
-+(expandtypeattribute (property_data_file_28_0) true)
-+(expandtypeattribute (property_info_28_0) true)
-+(expandtypeattribute (property_socket_28_0) true)
-+(expandtypeattribute (pstorefs_28_0) true)
-+(expandtypeattribute (ptmx_device_28_0) true)
-+(expandtypeattribute (qtaguid_device_28_0) true)
-+(expandtypeattribute (qtaguid_proc_28_0) true)
-+(expandtypeattribute (racoon_28_0) true)
-+(expandtypeattribute (racoon_exec_28_0) true)
-+(expandtypeattribute (racoon_socket_28_0) true)
-+(expandtypeattribute (radio_28_0) true)
-+(expandtypeattribute (radio_data_file_28_0) true)
-+(expandtypeattribute (radio_device_28_0) true)
-+(expandtypeattribute (radio_prop_28_0) true)
-+(expandtypeattribute (radio_service_28_0) true)
-+(expandtypeattribute (ram_device_28_0) true)
-+(expandtypeattribute (random_device_28_0) true)
-+(expandtypeattribute (recovery_28_0) true)
-+(expandtypeattribute (recovery_block_device_28_0) true)
-+(expandtypeattribute (recovery_data_file_28_0) true)
-+(expandtypeattribute (recovery_persist_28_0) true)
-+(expandtypeattribute (recovery_persist_exec_28_0) true)
-+(expandtypeattribute (recovery_refresh_28_0) true)
-+(expandtypeattribute (recovery_refresh_exec_28_0) true)
-+(expandtypeattribute (recovery_service_28_0) true)
-+(expandtypeattribute (registry_service_28_0) true)
-+(expandtypeattribute (resourcecache_data_file_28_0) true)
-+(expandtypeattribute (restorecon_prop_28_0) true)
-+(expandtypeattribute (restrictions_service_28_0) true)
-+(expandtypeattribute (rild_debug_socket_28_0) true)
-+(expandtypeattribute (rild_socket_28_0) true)
-+(expandtypeattribute (ringtone_file_28_0) true)
-+(expandtypeattribute (root_block_device_28_0) true)
-+(expandtypeattribute (rootfs_28_0) true)
-+(expandtypeattribute (rpmsg_device_28_0) true)
-+(expandtypeattribute (rtc_device_28_0) true)
-+(expandtypeattribute (rttmanager_service_28_0) true)
-+(expandtypeattribute (runas_28_0) true)
-+(expandtypeattribute (runas_exec_28_0) true)
-+(expandtypeattribute (runtime_event_log_tags_file_28_0) true)
-+(expandtypeattribute (safemode_prop_28_0) true)
-+(expandtypeattribute (same_process_hal_file_28_0) true)
-+(expandtypeattribute (samplingprofiler_service_28_0) true)
-+(expandtypeattribute (scheduling_policy_service_28_0) true)
-+(expandtypeattribute (sdcardd_28_0) true)
-+(expandtypeattribute (sdcardd_exec_28_0) true)
-+(expandtypeattribute (sdcardfs_28_0) true)
-+(expandtypeattribute (seapp_contexts_file_28_0) true)
-+(expandtypeattribute (search_service_28_0) true)
-+(expandtypeattribute (sec_key_att_app_id_provider_service_28_0) true)
-+(expandtypeattribute (secure_element_28_0) true)
-+(expandtypeattribute (secure_element_device_28_0) true)
-+(expandtypeattribute (secure_element_service_28_0) true)
-+(expandtypeattribute (selinuxfs_28_0) true)
-+(expandtypeattribute (sensors_device_28_0) true)
-+(expandtypeattribute (sensorservice_service_28_0) true)
-+(expandtypeattribute (sepolicy_file_28_0) true)
-+(expandtypeattribute (serial_device_28_0) true)
-+(expandtypeattribute (serialno_prop_28_0) true)
-+(expandtypeattribute (serial_service_28_0) true)
-+(expandtypeattribute (service_contexts_file_28_0) true)
-+(expandtypeattribute (servicediscovery_service_28_0) true)
-+(expandtypeattribute (servicemanager_28_0) true)
-+(expandtypeattribute (servicemanager_exec_28_0) true)
-+(expandtypeattribute (settings_service_28_0) true)
-+(expandtypeattribute (sgdisk_28_0) true)
-+(expandtypeattribute (sgdisk_exec_28_0) true)
-+(expandtypeattribute (shared_relro_28_0) true)
-+(expandtypeattribute (shared_relro_file_28_0) true)
-+(expandtypeattribute (shell_28_0) true)
-+(expandtypeattribute (shell_data_file_28_0) true)
-+(expandtypeattribute (shell_exec_28_0) true)
-+(expandtypeattribute (shell_prop_28_0) true)
-+(expandtypeattribute (shm_28_0) true)
-+(expandtypeattribute (shortcut_manager_icons_28_0) true)
-+(expandtypeattribute (shortcut_service_28_0) true)
-+(expandtypeattribute (slice_service_28_0) true)
-+(expandtypeattribute (slideshow_28_0) true)
-+(expandtypeattribute (socket_device_28_0) true)
-+(expandtypeattribute (sockfs_28_0) true)
-+(expandtypeattribute (statusbar_service_28_0) true)
-+(expandtypeattribute (storaged_service_28_0) true)
-+(expandtypeattribute (storage_file_28_0) true)
-+(expandtypeattribute (storagestats_service_28_0) true)
-+(expandtypeattribute (storage_stub_file_28_0) true)
-+(expandtypeattribute (su_28_0) true)
-+(expandtypeattribute (su_exec_28_0) true)
-+(expandtypeattribute (surfaceflinger_28_0) true)
-+(expandtypeattribute (surfaceflinger_service_28_0) true)
-+(expandtypeattribute (swap_block_device_28_0) true)
-+(expandtypeattribute (sysfs_28_0) true)
-+(expandtypeattribute (sysfs_android_usb_28_0) true)
-+(expandtypeattribute (sysfs_batteryinfo_28_0) true)
-+(expandtypeattribute (sysfs_bluetooth_writable_28_0) true)
-+(expandtypeattribute (sysfs_devices_system_cpu_28_0) true)
-+(expandtypeattribute (sysfs_dm_28_0) true)
-+(expandtypeattribute (sysfs_dt_firmware_android_28_0) true)
-+(expandtypeattribute (sysfs_fs_ext4_features_28_0) true)
-+(expandtypeattribute (sysfs_hwrandom_28_0) true)
-+(expandtypeattribute (sysfs_ipv4_28_0) true)
-+(expandtypeattribute (sysfs_kernel_notes_28_0) true)
-+(expandtypeattribute (sysfs_leds_28_0) true)
-+(expandtypeattribute (sysfs_lowmemorykiller_28_0) true)
-+(expandtypeattribute (sysfs_mac_address_28_0) true)
-+(expandtypeattribute (sysfs_net_28_0) true)
-+(expandtypeattribute (sysfs_nfc_power_writable_28_0) true)
-+(expandtypeattribute (sysfs_power_28_0) true)
-+(expandtypeattribute (sysfs_rtc_28_0) true)
-+(expandtypeattribute (sysfs_switch_28_0) true)
-+(expandtypeattribute (sysfs_thermal_28_0) true)
-+(expandtypeattribute (sysfs_uio_28_0) true)
-+(expandtypeattribute (sysfs_usb_28_0) true)
-+(expandtypeattribute (sysfs_usermodehelper_28_0) true)
-+(expandtypeattribute (sysfs_vibrator_28_0) true)
-+(expandtypeattribute (sysfs_wake_lock_28_0) true)
-+(expandtypeattribute (sysfs_wakeup_reasons_28_0) true)
-+(expandtypeattribute (sysfs_wlan_fwpath_28_0) true)
-+(expandtypeattribute (sysfs_zram_28_0) true)
-+(expandtypeattribute (sysfs_zram_uevent_28_0) true)
-+(expandtypeattribute (system_app_28_0) true)
-+(expandtypeattribute (system_app_data_file_28_0) true)
-+(expandtypeattribute (system_app_service_28_0) true)
-+(expandtypeattribute (system_block_device_28_0) true)
-+(expandtypeattribute (system_boot_reason_prop_28_0) true)
-+(expandtypeattribute (system_data_file_28_0) true)
-+(expandtypeattribute (system_file_28_0) true)
-+(expandtypeattribute (systemkeys_data_file_28_0) true)
-+(expandtypeattribute (system_ndebug_socket_28_0) true)
-+(expandtypeattribute (system_net_netd_hwservice_28_0) true)
-+(expandtypeattribute (system_prop_28_0) true)
-+(expandtypeattribute (system_radio_prop_28_0) true)
-+(expandtypeattribute (system_server_28_0) true)
-+(expandtypeattribute (system_update_service_28_0) true)
-+(expandtypeattribute (system_wifi_keystore_hwservice_28_0) true)
-+(expandtypeattribute (system_wpa_socket_28_0) true)
-+(expandtypeattribute (task_service_28_0) true)
-+(expandtypeattribute (tee_28_0) true)
-+(expandtypeattribute (tee_data_file_28_0) true)
-+(expandtypeattribute (tee_device_28_0) true)
-+(expandtypeattribute (telecom_service_28_0) true)
-+(expandtypeattribute (test_boot_reason_prop_28_0) true)
-+(expandtypeattribute (textclassification_service_28_0) true)
-+(expandtypeattribute (textclassifier_data_file_28_0) true)
-+(expandtypeattribute (textservices_service_28_0) true)
-+(expandtypeattribute (thermalcallback_hwservice_28_0) true)
-+(expandtypeattribute (thermal_service_28_0) true)
-+(expandtypeattribute (timezone_service_28_0) true)
-+(expandtypeattribute (tmpfs_28_0) true)
-+(expandtypeattribute (tombstoned_28_0) true)
-+(expandtypeattribute (tombstone_data_file_28_0) true)
-+(expandtypeattribute (tombstoned_crash_socket_28_0) true)
-+(expandtypeattribute (tombstoned_exec_28_0) true)
-+(expandtypeattribute (tombstoned_intercept_socket_28_0) true)
-+(expandtypeattribute (tombstoned_java_trace_socket_28_0) true)
-+(expandtypeattribute (tombstone_wifi_data_file_28_0) true)
-+(expandtypeattribute (toolbox_28_0) true)
-+(expandtypeattribute (toolbox_exec_28_0) true)
-+(expandtypeattribute (trace_data_file_28_0) true)
-+(expandtypeattribute (traced_consumer_socket_28_0) true)
-+(expandtypeattribute (traced_enabled_prop_28_0) true)
-+(expandtypeattribute (traced_probes_28_0) true)
-+(expandtypeattribute (traced_producer_socket_28_0) true)
-+(expandtypeattribute (traceur_app_28_0) true)
-+(expandtypeattribute (trust_service_28_0) true)
-+(expandtypeattribute (tty_device_28_0) true)
-+(expandtypeattribute (tun_device_28_0) true)
-+(expandtypeattribute (tv_input_service_28_0) true)
-+(expandtypeattribute (tzdatacheck_28_0) true)
-+(expandtypeattribute (tzdatacheck_exec_28_0) true)
-+(expandtypeattribute (ueventd_28_0) true)
-+(expandtypeattribute (uhid_device_28_0) true)
-+(expandtypeattribute (uimode_service_28_0) true)
-+(expandtypeattribute (uio_device_28_0) true)
-+(expandtypeattribute (uncrypt_28_0) true)
-+(expandtypeattribute (uncrypt_exec_28_0) true)
-+(expandtypeattribute (uncrypt_socket_28_0) true)
-+(expandtypeattribute (unencrypted_data_file_28_0) true)
-+(expandtypeattribute (unlabeled_28_0) true)
-+(expandtypeattribute (untrusted_app_25_28_0) true)
-+(expandtypeattribute (untrusted_app_27_28_0) true)
-+(expandtypeattribute (untrusted_app_28_0) true)
-+(expandtypeattribute (untrusted_v2_app_28_0) true)
-+(expandtypeattribute (update_engine_28_0) true)
-+(expandtypeattribute (update_engine_data_file_28_0) true)
-+(expandtypeattribute (update_engine_exec_28_0) true)
-+(expandtypeattribute (update_engine_log_data_file_28_0) true)
-+(expandtypeattribute (update_engine_service_28_0) true)
-+(expandtypeattribute (updatelock_service_28_0) true)
-+(expandtypeattribute (update_verifier_28_0) true)
-+(expandtypeattribute (update_verifier_exec_28_0) true)
-+(expandtypeattribute (usagestats_service_28_0) true)
-+(expandtypeattribute (usbaccessory_device_28_0) true)
-+(expandtypeattribute (usbd_28_0) true)
-+(expandtypeattribute (usb_device_28_0) true)
-+(expandtypeattribute (usbd_exec_28_0) true)
-+(expandtypeattribute (usbfs_28_0) true)
-+(expandtypeattribute (usb_service_28_0) true)
-+(expandtypeattribute (userdata_block_device_28_0) true)
-+(expandtypeattribute (usermodehelper_28_0) true)
-+(expandtypeattribute (user_profile_data_file_28_0) true)
-+(expandtypeattribute (user_service_28_0) true)
-+(expandtypeattribute (vcs_device_28_0) true)
-+(expandtypeattribute (vdc_28_0) true)
-+(expandtypeattribute (vdc_exec_28_0) true)
-+(expandtypeattribute (vendor_app_file_28_0) true)
-+(expandtypeattribute (vendor_configs_file_28_0) true)
-+(expandtypeattribute (vendor_data_file_28_0) true)
-+(expandtypeattribute (vendor_default_prop_28_0) true)
-+(expandtypeattribute (vendor_file_28_0) true)
-+(expandtypeattribute (vendor_framework_file_28_0) true)
-+(expandtypeattribute (vendor_hal_file_28_0) true)
-+(expandtypeattribute (vendor_init_28_0) true)
-+(expandtypeattribute (vendor_overlay_file_28_0) true)
-+(expandtypeattribute (vendor_security_patch_level_prop_28_0) true)
-+(expandtypeattribute (vendor_shell_28_0) true)
-+(expandtypeattribute (vendor_shell_exec_28_0) true)
-+(expandtypeattribute (vendor_toolbox_exec_28_0) true)
-+(expandtypeattribute (vfat_28_0) true)
-+(expandtypeattribute (vibrator_service_28_0) true)
-+(expandtypeattribute (video_device_28_0) true)
-+(expandtypeattribute (virtual_touchpad_28_0) true)
-+(expandtypeattribute (virtual_touchpad_exec_28_0) true)
-+(expandtypeattribute (virtual_touchpad_service_28_0) true)
-+(expandtypeattribute (vndbinder_device_28_0) true)
-+(expandtypeattribute (vndk_sp_file_28_0) true)
-+(expandtypeattribute (vndservice_contexts_file_28_0) true)
-+(expandtypeattribute (vndservicemanager_28_0) true)
-+(expandtypeattribute (voiceinteraction_service_28_0) true)
-+(expandtypeattribute (vold_28_0) true)
-+(expandtypeattribute (vold_data_file_28_0) true)
-+(expandtypeattribute (vold_device_28_0) true)
-+(expandtypeattribute (vold_exec_28_0) true)
-+(expandtypeattribute (vold_metadata_file_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_exec_28_0) true)
-+(expandtypeattribute (vold_prop_28_0) true)
-+(expandtypeattribute (vold_service_28_0) true)
-+(expandtypeattribute (vpn_data_file_28_0) true)
-+(expandtypeattribute (vr_hwc_28_0) true)
-+(expandtypeattribute (vr_hwc_exec_28_0) true)
-+(expandtypeattribute (vr_hwc_service_28_0) true)
-+(expandtypeattribute (vr_manager_service_28_0) true)
-+(expandtypeattribute (wallpaper_file_28_0) true)
-+(expandtypeattribute (wallpaper_service_28_0) true)
-+(expandtypeattribute (watchdogd_28_0) true)
-+(expandtypeattribute (watchdog_device_28_0) true)
-+(expandtypeattribute (webviewupdate_service_28_0) true)
-+(expandtypeattribute (webview_zygote_28_0) true)
-+(expandtypeattribute (webview_zygote_exec_28_0) true)
-+(expandtypeattribute (wifiaware_service_28_0) true)
-+(expandtypeattribute (wificond_28_0) true)
-+(expandtypeattribute (wificond_exec_28_0) true)
-+(expandtypeattribute (wificond_service_28_0) true)
-+(expandtypeattribute (wifi_data_file_28_0) true)
-+(expandtypeattribute (wifi_log_prop_28_0) true)
-+(expandtypeattribute (wifip2p_service_28_0) true)
-+(expandtypeattribute (wifi_prop_28_0) true)
-+(expandtypeattribute (wifiscanner_service_28_0) true)
-+(expandtypeattribute (wifi_service_28_0) true)
-+(expandtypeattribute (window_service_28_0) true)
-+(expandtypeattribute (wpantund_28_0) true)
-+(expandtypeattribute (wpantund_exec_28_0) true)
-+(expandtypeattribute (wpantund_service_28_0) true)
-+(expandtypeattribute (wpa_socket_28_0) true)
-+(expandtypeattribute (zero_device_28_0) true)
-+(expandtypeattribute (zoneinfo_data_file_28_0) true)
-+(expandtypeattribute (zygote_28_0) true)
-+(expandtypeattribute (zygote_exec_28_0) true)
-+(expandtypeattribute (zygote_socket_28_0) true)
-+(typeattributeset accessibility_service_28_0 (accessibility_service))
-+(typeattributeset account_service_28_0 (account_service))
-+(typeattributeset activity_service_28_0 (activity_service))
-+(typeattributeset adbd_28_0 (adbd))
-+(typeattributeset adb_data_file_28_0 (adb_data_file))
-+(typeattributeset adbd_exec_28_0 (adbd_exec))
-+(typeattributeset adbd_socket_28_0 (adbd_socket))
-+(typeattributeset adb_keys_file_28_0 (adb_keys_file))
-+(typeattributeset alarm_device_28_0 (alarm_device))
-+(typeattributeset alarm_service_28_0 (alarm_service))
-+(typeattributeset anr_data_file_28_0 (anr_data_file))
-+(typeattributeset apk_data_file_28_0 (apk_data_file))
-+(typeattributeset apk_private_data_file_28_0 (apk_private_data_file))
-+(typeattributeset apk_private_tmp_file_28_0 (apk_private_tmp_file))
-+(typeattributeset apk_tmp_file_28_0 (apk_tmp_file))
-+(typeattributeset app_data_file_28_0 (app_data_file privapp_data_file))
-+(typeattributeset app_fuse_file_28_0 (app_fuse_file))
-+(typeattributeset app_fusefs_28_0 (app_fusefs))
-+(typeattributeset appops_service_28_0 (appops_service))
-+(typeattributeset appwidget_service_28_0 (appwidget_service))
-+(typeattributeset asec_apk_file_28_0 (asec_apk_file))
-+(typeattributeset asec_image_file_28_0 (asec_image_file))
-+(typeattributeset asec_public_file_28_0 (asec_public_file))
-+(typeattributeset ashmem_device_28_0 (ashmem_device))
-+(typeattributeset assetatlas_service_28_0 (assetatlas_service))
-+(typeattributeset audio_data_file_28_0 (audio_data_file))
-+(typeattributeset audio_device_28_0 (audio_device))
-+(typeattributeset audiohal_data_file_28_0 (audiohal_data_file))
-+(typeattributeset audio_prop_28_0 (audio_prop))
-+(typeattributeset audio_seq_device_28_0 (audio_seq_device))
-+(typeattributeset audioserver_28_0 (audioserver))
-+(typeattributeset audioserver_data_file_28_0 (audioserver_data_file))
-+(typeattributeset audioserver_service_28_0 (audioserver_service))
-+(typeattributeset audio_service_28_0 (audio_service))
-+(typeattributeset audio_timer_device_28_0 (audio_timer_device))
-+(typeattributeset autofill_service_28_0 (autofill_service))
-+(typeattributeset backup_data_file_28_0 (backup_data_file))
-+(typeattributeset backup_service_28_0 (backup_service))
-+(typeattributeset batteryproperties_service_28_0 (batteryproperties_service))
-+(typeattributeset battery_service_28_0 (battery_service))
-+(typeattributeset batterystats_service_28_0 (batterystats_service))
-+(typeattributeset binder_calls_stats_service_28_0 (binder_calls_stats_service))
-+(typeattributeset binder_device_28_0 (binder_device))
-+(typeattributeset binfmt_miscfs_28_0 (binfmt_miscfs))
-+(typeattributeset blkid_28_0 (blkid))
-+(typeattributeset blkid_untrusted_28_0 (blkid_untrusted))
-+(typeattributeset block_device_28_0 (block_device))
-+(typeattributeset bluetooth_28_0 (bluetooth))
-+(typeattributeset bluetooth_a2dp_offload_prop_28_0 (bluetooth_a2dp_offload_prop))
-+(typeattributeset bluetooth_data_file_28_0 (bluetooth_data_file))
-+(typeattributeset bluetooth_efs_file_28_0 (bluetooth_efs_file))
-+(typeattributeset bluetooth_logs_data_file_28_0 (bluetooth_logs_data_file))
-+(typeattributeset bluetooth_manager_service_28_0 (bluetooth_manager_service))
-+(typeattributeset bluetooth_prop_28_0 (bluetooth_prop))
-+(typeattributeset bluetooth_service_28_0 (bluetooth_service))
-+(typeattributeset bluetooth_socket_28_0 (bluetooth_socket))
-+(typeattributeset bootanim_28_0 (bootanim))
-+(typeattributeset bootanim_exec_28_0 (bootanim_exec))
-+(typeattributeset boot_block_device_28_0 (boot_block_device))
-+(typeattributeset bootchart_data_file_28_0 (bootchart_data_file))
-+(typeattributeset bootloader_boot_reason_prop_28_0 (bootloader_boot_reason_prop))
-+(typeattributeset bootstat_28_0 (bootstat))
-+(typeattributeset bootstat_data_file_28_0 (bootstat_data_file))
-+(typeattributeset bootstat_exec_28_0 (bootstat_exec))
-+(typeattributeset boottime_prop_28_0 (boottime_prop))
-+(typeattributeset boottrace_data_file_28_0 (boottrace_data_file))
-+(typeattributeset broadcastradio_service_28_0 (broadcastradio_service))
-+(typeattributeset bufferhubd_28_0 (bufferhubd))
-+(typeattributeset bufferhubd_exec_28_0 (bufferhubd_exec))
-+(typeattributeset cache_backup_file_28_0 (cache_backup_file))
-+(typeattributeset cache_block_device_28_0 (cache_block_device))
-+(typeattributeset cache_file_28_0 (cache_file))
-+(typeattributeset cache_private_backup_file_28_0 (cache_private_backup_file))
-+(typeattributeset cache_recovery_file_28_0 (cache_recovery_file))
-+(typeattributeset camera_data_file_28_0 (camera_data_file))
-+(typeattributeset camera_device_28_0 (camera_device))
-+(typeattributeset cameraproxy_service_28_0 (cameraproxy_service))
-+(typeattributeset cameraserver_28_0 (cameraserver))
-+(typeattributeset cameraserver_exec_28_0 (cameraserver_exec))
-+(typeattributeset cameraserver_service_28_0 (cameraserver_service))
-+(typeattributeset cgroup_28_0 (cgroup))
-+(typeattributeset cgroup_bpf_28_0 (cgroup_bpf))
-+(typeattributeset charger_28_0 (charger))
-+(typeattributeset clatd_28_0 (clatd))
-+(typeattributeset clatd_exec_28_0 (clatd_exec))
-+(typeattributeset clipboard_service_28_0 (clipboard_service))
-+(typeattributeset commontime_management_service_28_0 (commontime_management_service))
-+(typeattributeset companion_device_service_28_0 (companion_device_service))
-+(typeattributeset configfs_28_0 (configfs))
-+(typeattributeset config_prop_28_0 (config_prop))
-+(typeattributeset connectivity_service_28_0 (connectivity_service))
-+(typeattributeset connmetrics_service_28_0 (connmetrics_service))
-+(typeattributeset console_device_28_0 (console_device))
-+(typeattributeset consumer_ir_service_28_0 (consumer_ir_service))
-+(typeattributeset content_service_28_0 (content_service))
-+(typeattributeset contexthub_service_28_0 (contexthub_service))
-+(typeattributeset coredump_file_28_0 (coredump_file))
-+(typeattributeset country_detector_service_28_0 (country_detector_service))
-+(typeattributeset coverage_service_28_0 (coverage_service))
-+(typeattributeset cppreopt_prop_28_0 (cppreopt_prop))
-+(typeattributeset cppreopts_28_0 (cppreopts))
-+(typeattributeset cppreopts_exec_28_0 (cppreopts_exec))
-+(typeattributeset cpuctl_device_28_0 (cpuctl_device))
-+(typeattributeset cpuinfo_service_28_0 (cpuinfo_service))
-+(typeattributeset crash_dump_28_0 (crash_dump))
-+(typeattributeset crash_dump_exec_28_0 (crash_dump_exec))
-+(typeattributeset crossprofileapps_service_28_0 (crossprofileapps_service))
-+(typeattributeset ctl_bootanim_prop_28_0 (ctl_bootanim_prop))
-+(typeattributeset ctl_bugreport_prop_28_0 (ctl_bugreport_prop))
-+(typeattributeset ctl_console_prop_28_0 (ctl_console_prop))
-+(typeattributeset ctl_default_prop_28_0
-+  ( ctl_adbd_prop
-+    ctl_default_prop))
-+(typeattributeset ctl_dumpstate_prop_28_0 (ctl_dumpstate_prop))
-+(typeattributeset ctl_fuse_prop_28_0 (ctl_fuse_prop))
-+(typeattributeset ctl_interface_restart_prop_28_0 (ctl_interface_restart_prop))
-+(typeattributeset ctl_interface_start_prop_28_0 (ctl_interface_start_prop))
-+(typeattributeset ctl_interface_stop_prop_28_0 (ctl_interface_stop_prop))
-+(typeattributeset ctl_mdnsd_prop_28_0 (ctl_mdnsd_prop))
-+(typeattributeset ctl_restart_prop_28_0 (ctl_restart_prop))
-+(typeattributeset ctl_rildaemon_prop_28_0 (ctl_rildaemon_prop))
-+(typeattributeset ctl_sigstop_prop_28_0 (ctl_sigstop_prop))
-+(typeattributeset ctl_start_prop_28_0 (ctl_start_prop))
-+(typeattributeset ctl_stop_prop_28_0 (ctl_stop_prop))
-+(typeattributeset dalvikcache_data_file_28_0 (dalvikcache_data_file))
-+(typeattributeset dalvik_prop_28_0 (dalvik_prop))
-+(typeattributeset dbinfo_service_28_0 (dbinfo_service))
-+(typeattributeset debugfs_28_0 (debugfs))
-+(typeattributeset debugfs_mmc_28_0 (debugfs_mmc))
-+(typeattributeset debugfs_trace_marker_28_0 (debugfs_trace_marker))
-+(typeattributeset debugfs_tracing_28_0 (debugfs_tracing))
-+(typeattributeset debugfs_tracing_debug_28_0 (debugfs_tracing_debug))
-+(typeattributeset debugfs_tracing_instances_28_0 (debugfs_tracing_instances))
-+(typeattributeset debugfs_wakeup_sources_28_0 (debugfs_wakeup_sources))
-+(typeattributeset debugfs_wifi_tracing_28_0 (debugfs_wifi_tracing))
-+(typeattributeset debuggerd_prop_28_0 (debuggerd_prop))
-+(typeattributeset debug_prop_28_0 (debug_prop))
-+(typeattributeset default_android_hwservice_28_0 (default_android_hwservice))
-+(typeattributeset default_android_service_28_0 (default_android_service))
-+(typeattributeset default_android_vndservice_28_0 (default_android_vndservice))
-+(typeattributeset default_prop_28_0 (default_prop))
-+(typeattributeset device_28_0 (device))
-+(typeattributeset device_identifiers_service_28_0 (device_identifiers_service))
-+(typeattributeset deviceidle_service_28_0 (deviceidle_service))
-+(typeattributeset device_logging_prop_28_0 (device_logging_prop))
-+(typeattributeset device_policy_service_28_0 (device_policy_service))
-+(typeattributeset devicestoragemonitor_service_28_0 (devicestoragemonitor_service))
-+(typeattributeset devpts_28_0 (devpts))
-+(typeattributeset dex2oat_28_0 (dex2oat))
-+(typeattributeset dex2oat_exec_28_0 (dex2oat_exec))
-+(typeattributeset dhcp_28_0 (dhcp))
-+(typeattributeset dhcp_data_file_28_0 (dhcp_data_file))
-+(typeattributeset dhcp_exec_28_0 (dhcp_exec))
-+(typeattributeset dhcp_prop_28_0 (dhcp_prop))
-+(typeattributeset diskstats_service_28_0 (diskstats_service))
-+(typeattributeset display_service_28_0 (display_service))
-+(typeattributeset dm_device_28_0 (dm_device))
-+(typeattributeset dnsmasq_28_0 (dnsmasq))
-+(typeattributeset dnsmasq_exec_28_0 (dnsmasq_exec))
-+(typeattributeset dnsproxyd_socket_28_0 (dnsproxyd_socket))
-+(typeattributeset DockObserver_service_28_0 (DockObserver_service))
-+(typeattributeset dreams_service_28_0 (dreams_service))
-+(typeattributeset drm_data_file_28_0 (drm_data_file))
-+(typeattributeset drmserver_28_0 (drmserver))
-+(typeattributeset drmserver_exec_28_0 (drmserver_exec))
-+(typeattributeset drmserver_service_28_0 (drmserver_service))
-+(typeattributeset drmserver_socket_28_0 (drmserver_socket))
-+(typeattributeset dropbox_service_28_0 (dropbox_service))
-+(typeattributeset dumpstate_28_0 (dumpstate))
-+(typeattributeset dumpstate_exec_28_0 (dumpstate_exec))
-+(typeattributeset dumpstate_options_prop_28_0 (dumpstate_options_prop))
-+(typeattributeset dumpstate_prop_28_0 (dumpstate_prop))
-+(typeattributeset dumpstate_service_28_0 (dumpstate_service))
-+(typeattributeset dumpstate_socket_28_0 (dumpstate_socket))
-+(typeattributeset e2fs_28_0 (e2fs))
-+(typeattributeset e2fs_exec_28_0 (e2fs_exec))
-+(typeattributeset efs_file_28_0 (efs_file))
-+(typeattributeset ephemeral_app_28_0 (ephemeral_app))
-+(typeattributeset ethernet_service_28_0 (ethernet_service))
-+(typeattributeset exfat_28_0 (exfat))
-+(typeattributeset exported2_config_prop_28_0 (exported2_config_prop))
-+(typeattributeset exported2_default_prop_28_0 (exported2_default_prop))
-+(typeattributeset exported2_radio_prop_28_0 (exported2_radio_prop))
-+(typeattributeset exported2_system_prop_28_0 (exported2_system_prop))
-+(typeattributeset exported2_vold_prop_28_0 (exported2_vold_prop))
-+(typeattributeset exported3_default_prop_28_0 (exported3_default_prop))
-+(typeattributeset exported3_radio_prop_28_0 (exported3_radio_prop))
-+(typeattributeset exported3_system_prop_28_0 (exported3_system_prop))
-+(typeattributeset exported_audio_prop_28_0 (exported_audio_prop))
-+(typeattributeset exported_bluetooth_prop_28_0 (exported_bluetooth_prop))
-+(typeattributeset exported_config_prop_28_0 (exported_config_prop))
-+(typeattributeset exported_dalvik_prop_28_0 (exported_dalvik_prop))
-+(typeattributeset exported_default_prop_28_0 (exported_default_prop))
-+(typeattributeset exported_dumpstate_prop_28_0 (exported_dumpstate_prop))
-+(typeattributeset exported_ffs_prop_28_0 (exported_ffs_prop))
-+(typeattributeset exported_fingerprint_prop_28_0 (exported_fingerprint_prop))
-+(typeattributeset exported_overlay_prop_28_0 (exported_overlay_prop))
-+(typeattributeset exported_pm_prop_28_0 (exported_pm_prop))
-+(typeattributeset exported_radio_prop_28_0 (exported_radio_prop))
-+(typeattributeset exported_secure_prop_28_0 (exported_secure_prop))
-+(typeattributeset exported_system_prop_28_0 (exported_system_prop))
-+(typeattributeset exported_system_radio_prop_28_0 (exported_system_radio_prop))
-+(typeattributeset exported_vold_prop_28_0 (exported_vold_prop))
-+(typeattributeset exported_wifi_prop_28_0 (exported_wifi_prop))
-+(typeattributeset ffs_prop_28_0 (ffs_prop))
-+(typeattributeset file_contexts_file_28_0 (file_contexts_file))
-+(typeattributeset fingerprintd_28_0 (fingerprintd))
-+(typeattributeset fingerprintd_data_file_28_0 (fingerprintd_data_file))
-+(typeattributeset fingerprintd_exec_28_0 (fingerprintd_exec))
-+(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
-+(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
-+(typeattributeset fingerprint_service_28_0 (fingerprint_service))
-+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
-+(typeattributeset firstboot_prop_28_0 (firstboot_prop))
-+(typeattributeset font_service_28_0 (font_service))
-+(typeattributeset frp_block_device_28_0 (frp_block_device))
-+(typeattributeset fs_bpf_28_0 (fs_bpf))
-+(typeattributeset fsck_28_0 (fsck))
-+(typeattributeset fsck_exec_28_0 (fsck_exec))
-+(typeattributeset fscklogs_28_0 (fscklogs))
-+(typeattributeset fsck_untrusted_28_0 (fsck_untrusted))
-+(typeattributeset full_device_28_0 (full_device))
-+(typeattributeset functionfs_28_0 (functionfs))
-+(typeattributeset fuse_28_0 (fuse))
-+(typeattributeset fuse_device_28_0 (fuse_device))
-+(typeattributeset fwk_display_hwservice_28_0 (fwk_display_hwservice))
-+(typeattributeset fwk_scheduler_hwservice_28_0 (fwk_scheduler_hwservice))
-+(typeattributeset fwk_sensor_hwservice_28_0 (fwk_sensor_hwservice))
-+(typeattributeset fwmarkd_socket_28_0 (fwmarkd_socket))
-+(typeattributeset gatekeeperd_28_0 (gatekeeperd))
-+(typeattributeset gatekeeper_data_file_28_0 (gatekeeper_data_file))
-+(typeattributeset gatekeeperd_exec_28_0 (gatekeeperd_exec))
-+(typeattributeset gatekeeper_service_28_0 (gatekeeper_service))
-+(typeattributeset gfxinfo_service_28_0 (gfxinfo_service))
-+(typeattributeset gps_control_28_0 (gps_control))
-+(typeattributeset gpu_device_28_0 (gpu_device))
-+(typeattributeset gpu_service_28_0 (gpu_service))
-+(typeattributeset graphics_device_28_0 (graphics_device))
-+(typeattributeset graphicsstats_service_28_0 (graphicsstats_service))
-+(typeattributeset hal_audiocontrol_hwservice_28_0 (hal_audiocontrol_hwservice))
-+(typeattributeset hal_audio_hwservice_28_0 (hal_audio_hwservice))
-+(typeattributeset hal_authsecret_hwservice_28_0 (hal_authsecret_hwservice))
-+(typeattributeset hal_bluetooth_hwservice_28_0 (hal_bluetooth_hwservice))
-+(typeattributeset hal_bootctl_hwservice_28_0 (hal_bootctl_hwservice))
-+(typeattributeset hal_broadcastradio_hwservice_28_0 (hal_broadcastradio_hwservice))
-+(typeattributeset hal_camera_hwservice_28_0 (hal_camera_hwservice))
-+(typeattributeset hal_cas_hwservice_28_0 (hal_cas_hwservice))
-+(typeattributeset hal_codec2_hwservice_28_0 (hal_codec2_hwservice))
-+(typeattributeset hal_configstore_ISurfaceFlingerConfigs_28_0 (hal_configstore_ISurfaceFlingerConfigs))
-+(typeattributeset hal_confirmationui_hwservice_28_0 (hal_confirmationui_hwservice))
-+(typeattributeset hal_contexthub_hwservice_28_0 (hal_contexthub_hwservice))
-+(typeattributeset hal_drm_hwservice_28_0 (hal_drm_hwservice))
-+(typeattributeset hal_dumpstate_hwservice_28_0 (hal_dumpstate_hwservice))
-+(typeattributeset hal_evs_hwservice_28_0 (hal_evs_hwservice))
-+(typeattributeset hal_fingerprint_hwservice_28_0 (hal_fingerprint_hwservice))
-+(typeattributeset hal_fingerprint_service_28_0 (hal_fingerprint_service))
-+(typeattributeset hal_gatekeeper_hwservice_28_0 (hal_gatekeeper_hwservice))
-+(typeattributeset hal_gnss_hwservice_28_0 (hal_gnss_hwservice))
-+(typeattributeset hal_graphics_allocator_hwservice_28_0 (hal_graphics_allocator_hwservice))
-+(typeattributeset hal_graphics_composer_hwservice_28_0 (hal_graphics_composer_hwservice))
-+(typeattributeset hal_graphics_mapper_hwservice_28_0 (hal_graphics_mapper_hwservice))
-+(typeattributeset hal_health_hwservice_28_0 (hal_health_hwservice))
-+(typeattributeset hal_ir_hwservice_28_0 (hal_ir_hwservice))
-+(typeattributeset hal_keymaster_hwservice_28_0 (hal_keymaster_hwservice))
-+(typeattributeset hal_light_hwservice_28_0 (hal_light_hwservice))
-+(typeattributeset hal_lowpan_hwservice_28_0 (hal_lowpan_hwservice))
-+(typeattributeset hal_memtrack_hwservice_28_0 (hal_memtrack_hwservice))
-+(typeattributeset hal_neuralnetworks_hwservice_28_0 (hal_neuralnetworks_hwservice))
-+(typeattributeset hal_nfc_hwservice_28_0 (hal_nfc_hwservice))
-+(typeattributeset hal_oemlock_hwservice_28_0 (hal_oemlock_hwservice))
-+(typeattributeset hal_omx_hwservice_28_0 (hal_omx_hwservice))
-+(typeattributeset hal_power_hwservice_28_0 (hal_power_hwservice))
-+(typeattributeset hal_renderscript_hwservice_28_0 (hal_renderscript_hwservice))
-+(typeattributeset hal_secure_element_hwservice_28_0 (hal_secure_element_hwservice))
-+(typeattributeset hal_sensors_hwservice_28_0 (hal_sensors_hwservice))
-+(typeattributeset hal_telephony_hwservice_28_0 (hal_telephony_hwservice))
-+(typeattributeset hal_tetheroffload_hwservice_28_0 (hal_tetheroffload_hwservice))
-+(typeattributeset hal_thermal_hwservice_28_0 (hal_thermal_hwservice))
-+(typeattributeset hal_tv_cec_hwservice_28_0 (hal_tv_cec_hwservice))
-+(typeattributeset hal_tv_input_hwservice_28_0 (hal_tv_input_hwservice))
-+(typeattributeset hal_usb_gadget_hwservice_28_0 (hal_usb_gadget_hwservice))
-+(typeattributeset hal_usb_hwservice_28_0 (hal_usb_hwservice))
-+(typeattributeset hal_vehicle_hwservice_28_0 (hal_vehicle_hwservice))
-+(typeattributeset hal_vibrator_hwservice_28_0 (hal_vibrator_hwservice))
-+(typeattributeset hal_vr_hwservice_28_0 (hal_vr_hwservice))
-+(typeattributeset hal_weaver_hwservice_28_0 (hal_weaver_hwservice))
-+(typeattributeset hal_wifi_hostapd_hwservice_28_0 (hal_wifi_hostapd_hwservice))
-+(typeattributeset hal_wifi_hwservice_28_0 (hal_wifi_hwservice))
-+(typeattributeset hal_wifi_offload_hwservice_28_0 (hal_wifi_offload_hwservice))
-+(typeattributeset hal_wifi_supplicant_hwservice_28_0 (hal_wifi_supplicant_hwservice))
-+(typeattributeset hardware_properties_service_28_0 (hardware_properties_service))
-+(typeattributeset hardware_service_28_0 (hardware_service))
-+(typeattributeset hci_attach_dev_28_0 (hci_attach_dev))
-+(typeattributeset hdmi_control_service_28_0 (hdmi_control_service))
-+(typeattributeset healthd_28_0 (healthd))
-+(typeattributeset healthd_exec_28_0 (healthd_exec))
-+(typeattributeset heapdump_data_file_28_0 (heapdump_data_file))
-+(typeattributeset hidl_allocator_hwservice_28_0 (hidl_allocator_hwservice))
-+(typeattributeset hidl_base_hwservice_28_0 (hidl_base_hwservice))
-+(typeattributeset hidl_manager_hwservice_28_0 (hidl_manager_hwservice))
-+(typeattributeset hidl_memory_hwservice_28_0 (hidl_memory_hwservice))
-+(typeattributeset hidl_token_hwservice_28_0 (hidl_token_hwservice))
-+(typeattributeset hwbinder_device_28_0 (hwbinder_device))
-+(typeattributeset hw_random_device_28_0 (hw_random_device))
-+(typeattributeset hwservice_contexts_file_28_0 (hwservice_contexts_file))
-+(typeattributeset hwservicemanager_28_0 (hwservicemanager))
-+(typeattributeset hwservicemanager_exec_28_0 (hwservicemanager_exec))
-+(typeattributeset hwservicemanager_prop_28_0 (hwservicemanager_prop))
-+(typeattributeset i2c_device_28_0 (i2c_device))
-+(typeattributeset icon_file_28_0 (icon_file))
-+(typeattributeset idmap_28_0 (idmap))
-+(typeattributeset idmap_exec_28_0 (idmap_exec))
-+(typeattributeset iio_device_28_0 (iio_device))
-+(typeattributeset imms_service_28_0 (imms_service))
-+(typeattributeset incident_28_0 (incident))
-+(typeattributeset incidentd_28_0 (incidentd))
-+(typeattributeset incident_data_file_28_0 (incident_data_file))
-+(typeattributeset incident_helper_28_0 (incident_helper))
-+(typeattributeset incident_service_28_0 (incident_service))
-+(typeattributeset init_28_0 (init))
-+(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
-+(typeattributeset inotify_28_0 (inotify))
-+(typeattributeset input_device_28_0 (input_device))
-+(typeattributeset inputflinger_28_0 (inputflinger))
-+(typeattributeset inputflinger_exec_28_0 (inputflinger_exec))
-+(typeattributeset inputflinger_service_28_0 (inputflinger_service))
-+(typeattributeset input_method_service_28_0 (input_method_service))
-+(typeattributeset input_service_28_0 (input_service))
-+(typeattributeset installd_28_0 (installd))
-+(typeattributeset install_data_file_28_0 (install_data_file))
-+(typeattributeset installd_exec_28_0 (installd_exec))
-+(typeattributeset installd_service_28_0 (installd_service))
-+(typeattributeset install_recovery_28_0 (install_recovery))
-+(typeattributeset install_recovery_exec_28_0 (install_recovery_exec))
-+(typeattributeset ion_device_28_0 (ion_device))
-+(typeattributeset IProxyService_service_28_0 (IProxyService_service))
-+(typeattributeset ipsec_service_28_0 (ipsec_service))
-+(typeattributeset isolated_app_28_0 (isolated_app))
-+(typeattributeset jobscheduler_service_28_0 (jobscheduler_service))
-+(typeattributeset kernel_28_0 (kernel))
-+(typeattributeset keychain_data_file_28_0 (keychain_data_file))
-+(typeattributeset keychord_device_28_0 (keychord_device))
-+(typeattributeset keystore_28_0 (keystore))
-+(typeattributeset keystore_data_file_28_0 (keystore_data_file))
-+(typeattributeset keystore_exec_28_0 (keystore_exec))
-+(typeattributeset keystore_service_28_0 (keystore_service))
-+(typeattributeset kmem_device_28_0 (kmem_device))
-+(typeattributeset kmsg_debug_device_28_0 (kmsg_debug_device))
-+(typeattributeset kmsg_device_28_0 (kmsg_device))
-+(typeattributeset labeledfs_28_0 (labeledfs))
-+(typeattributeset last_boot_reason_prop_28_0 (last_boot_reason_prop))
-+(typeattributeset launcherapps_service_28_0 (launcherapps_service))
-+(typeattributeset lmkd_28_0 (lmkd))
-+(typeattributeset lmkd_exec_28_0 (lmkd_exec))
-+(typeattributeset lmkd_socket_28_0 (lmkd_socket))
-+(typeattributeset location_service_28_0 (location_service))
-+(typeattributeset lock_settings_service_28_0 (lock_settings_service))
-+(typeattributeset logcat_exec_28_0 (logcat_exec))
-+(typeattributeset logd_28_0 (logd))
-+(typeattributeset logd_exec_28_0 (logd_exec))
-+(typeattributeset logd_prop_28_0 (logd_prop))
-+(typeattributeset logdr_socket_28_0 (logdr_socket))
-+(typeattributeset logd_socket_28_0 (logd_socket))
-+(typeattributeset logdw_socket_28_0 (logdw_socket))
-+(typeattributeset logpersist_28_0 (logpersist))
-+(typeattributeset logpersistd_logging_prop_28_0 (logpersistd_logging_prop))
-+(typeattributeset log_prop_28_0 (log_prop))
-+(typeattributeset log_tag_prop_28_0 (log_tag_prop))
-+(typeattributeset loop_control_device_28_0 (loop_control_device))
-+(typeattributeset loop_device_28_0 (loop_device))
-+(typeattributeset lowpan_device_28_0 (lowpan_device))
-+(typeattributeset lowpan_prop_28_0 (lowpan_prop))
-+(typeattributeset lowpan_service_28_0 (lowpan_service))
-+(typeattributeset mac_perms_file_28_0 (mac_perms_file))
-+(typeattributeset mdnsd_28_0 (mdnsd))
-+(typeattributeset mdnsd_socket_28_0 (mdnsd_socket))
-+(typeattributeset mdns_socket_28_0 (mdns_socket))
-+(typeattributeset hal_omx_server (mediacodec_28_0))
-+(typeattributeset mediacodec_28_0 (mediacodec))
-+(typeattributeset mediacodec_exec_28_0 (mediacodec_exec))
-+(typeattributeset mediacodec_service_28_0 (mediacodec_service))
-+(typeattributeset media_data_file_28_0 (media_data_file))
-+(typeattributeset mediadrmserver_28_0 (mediadrmserver))
-+(typeattributeset mediadrmserver_exec_28_0 (mediadrmserver_exec))
-+(typeattributeset mediadrmserver_service_28_0 (mediadrmserver_service))
-+(typeattributeset mediaextractor_28_0 (mediaextractor))
-+(typeattributeset mediaextractor_exec_28_0 (mediaextractor_exec))
-+(typeattributeset mediaextractor_service_28_0 (mediaextractor_service))
-+(typeattributeset mediaextractor_update_service_28_0 (mediaextractor_update_service))
-+(typeattributeset mediametrics_28_0 (mediametrics))
-+(typeattributeset mediametrics_exec_28_0 (mediametrics_exec))
-+(typeattributeset mediametrics_service_28_0 (mediametrics_service))
-+(typeattributeset media_projection_service_28_0 (media_projection_service))
-+(typeattributeset mediaprovider_28_0 (mediaprovider))
-+(typeattributeset media_router_service_28_0 (media_router_service))
-+(typeattributeset media_rw_data_file_28_0 (media_rw_data_file))
-+(typeattributeset mediaserver_28_0 (mediaserver))
-+(typeattributeset mediaserver_exec_28_0 (mediaserver_exec))
-+(typeattributeset mediaserver_service_28_0 (mediaserver_service))
-+(typeattributeset media_session_service_28_0 (media_session_service))
-+(typeattributeset meminfo_service_28_0 (meminfo_service))
-+(typeattributeset metadata_block_device_28_0 (metadata_block_device))
-+(typeattributeset metadata_file_28_0 (metadata_file))
-+(typeattributeset method_trace_data_file_28_0 (method_trace_data_file))
-+(typeattributeset midi_service_28_0 (midi_service))
-+(typeattributeset misc_block_device_28_0 (misc_block_device))
-+(typeattributeset misc_logd_file_28_0 (misc_logd_file))
-+(typeattributeset misc_user_data_file_28_0 (misc_user_data_file))
-+(typeattributeset mmc_prop_28_0 (mmc_prop))
-+(typeattributeset mnt_expand_file_28_0 (mnt_expand_file))
-+(typeattributeset mnt_media_rw_file_28_0 (mnt_media_rw_file))
-+(typeattributeset mnt_media_rw_stub_file_28_0 (mnt_media_rw_stub_file))
-+(typeattributeset mnt_user_file_28_0 (mnt_user_file))
-+(typeattributeset mnt_vendor_file_28_0 (mnt_vendor_file))
-+(typeattributeset modprobe_28_0 (modprobe))
-+(typeattributeset mount_service_28_0 (mount_service))
-+(typeattributeset mqueue_28_0 (mqueue))
-+(typeattributeset mtd_device_28_0 (mtd_device))
-+(typeattributeset mtp_28_0 (mtp))
-+(typeattributeset mtp_device_28_0 (mtp_device))
-+(typeattributeset mtpd_socket_28_0 (mtpd_socket))
-+(typeattributeset mtp_exec_28_0 (mtp_exec))
-+(typeattributeset nativetest_data_file_28_0 (nativetest_data_file))
-+(typeattributeset netd_28_0 (netd))
-+(typeattributeset net_data_file_28_0 (net_data_file))
-+(typeattributeset netd_exec_28_0 (netd_exec))
-+(typeattributeset netd_listener_service_28_0 (netd_listener_service))
-+(typeattributeset net_dns_prop_28_0 (net_dns_prop))
-+(typeattributeset netd_service_28_0 (netd_service))
-+(typeattributeset netd_socket_28_0 (netd_socket))
-+(typeattributeset netd_stable_secret_prop_28_0 (netd_stable_secret_prop))
-+(typeattributeset netif_28_0 (netif))
-+(typeattributeset netpolicy_service_28_0 (netpolicy_service))
-+(typeattributeset net_radio_prop_28_0 (net_radio_prop))
-+(typeattributeset netstats_service_28_0 (netstats_service))
-+(typeattributeset netutils_wrapper_28_0 (netutils_wrapper))
-+(typeattributeset netutils_wrapper_exec_28_0 (netutils_wrapper_exec))
-+(typeattributeset network_management_service_28_0 (network_management_service))
-+(typeattributeset network_score_service_28_0 (network_score_service))
-+(typeattributeset network_time_update_service_28_0 (network_time_update_service))
-+(typeattributeset network_watchlist_data_file_28_0 (network_watchlist_data_file))
-+(typeattributeset network_watchlist_service_28_0 (network_watchlist_service))
-+(typeattributeset nfc_28_0 (nfc))
-+(typeattributeset nfc_data_file_28_0 (nfc_data_file))
-+(typeattributeset nfc_device_28_0 (nfc_device))
-+(typeattributeset nfc_prop_28_0 (nfc_prop))
-+(typeattributeset nfc_service_28_0 (nfc_service))
-+(typeattributeset node_28_0 (node))
-+(typeattributeset nonplat_service_contexts_file_28_0 (nonplat_service_contexts_file))
-+(typeattributeset notification_service_28_0 (notification_service))
-+(typeattributeset null_device_28_0 (null_device))
-+(typeattributeset oemfs_28_0 (oemfs))
-+(typeattributeset oem_lock_service_28_0 (oem_lock_service))
-+(typeattributeset ota_data_file_28_0 (ota_data_file))
-+(typeattributeset otadexopt_service_28_0 (otadexopt_service))
-+(typeattributeset ota_package_file_28_0 (ota_package_file))
-+(typeattributeset otapreopt_chroot_28_0 (otapreopt_chroot))
-+(typeattributeset otapreopt_chroot_exec_28_0 (otapreopt_chroot_exec))
-+(typeattributeset otapreopt_slot_28_0 (otapreopt_slot))
-+(typeattributeset otapreopt_slot_exec_28_0 (otapreopt_slot_exec))
-+(typeattributeset overlay_prop_28_0 (overlay_prop))
-+(typeattributeset overlay_service_28_0 (overlay_service))
-+(typeattributeset owntty_device_28_0 (owntty_device))
-+(typeattributeset package_native_service_28_0 (package_native_service))
-+(typeattributeset package_service_28_0 (package_service))
-+(typeattributeset pan_result_prop_28_0 (pan_result_prop))
-+(typeattributeset pdx_bufferhub_client_channel_socket_28_0 (pdx_bufferhub_client_channel_socket))
-+(typeattributeset pdx_bufferhub_client_endpoint_socket_28_0 (pdx_bufferhub_client_endpoint_socket))
-+(typeattributeset pdx_bufferhub_dir_28_0 (pdx_bufferhub_dir))
-+(typeattributeset pdx_display_client_channel_socket_28_0 (pdx_display_client_channel_socket))
-+(typeattributeset pdx_display_client_endpoint_socket_28_0 (pdx_display_client_endpoint_socket))
-+(typeattributeset pdx_display_dir_28_0 (pdx_display_dir))
-+(typeattributeset pdx_display_manager_channel_socket_28_0 (pdx_display_manager_channel_socket))
-+(typeattributeset pdx_display_manager_endpoint_socket_28_0 (pdx_display_manager_endpoint_socket))
-+(typeattributeset pdx_display_screenshot_channel_socket_28_0 (pdx_display_screenshot_channel_socket))
-+(typeattributeset pdx_display_screenshot_endpoint_socket_28_0 (pdx_display_screenshot_endpoint_socket))
-+(typeattributeset pdx_display_vsync_channel_socket_28_0 (pdx_display_vsync_channel_socket))
-+(typeattributeset pdx_display_vsync_endpoint_socket_28_0 (pdx_display_vsync_endpoint_socket))
-+(typeattributeset pdx_performance_client_channel_socket_28_0 (pdx_performance_client_channel_socket))
-+(typeattributeset pdx_performance_client_endpoint_socket_28_0 (pdx_performance_client_endpoint_socket))
-+(typeattributeset pdx_performance_dir_28_0 (pdx_performance_dir))
-+(typeattributeset performanced_28_0 (performanced))
-+(typeattributeset performanced_exec_28_0 (performanced_exec))
-+(typeattributeset permission_service_28_0 (permission_service))
-+(typeattributeset persist_debug_prop_28_0 (persist_debug_prop))
-+(typeattributeset persistent_data_block_service_28_0 (persistent_data_block_service))
-+(typeattributeset persistent_properties_ready_prop_28_0 (persistent_properties_ready_prop))
-+(typeattributeset pinner_service_28_0 (pinner_service))
-+(typeattributeset pipefs_28_0 (pipefs))
-+(typeattributeset platform_app_28_0 (platform_app))
-+(typeattributeset pm_prop_28_0 (pm_prop))
-+(typeattributeset pmsg_device_28_0 (pmsg_device))
-+(typeattributeset port_28_0 (port))
-+(typeattributeset port_device_28_0 (port_device))
-+(typeattributeset postinstall_28_0 (postinstall))
-+(typeattributeset postinstall_dexopt_28_0 (postinstall_dexopt))
-+(typeattributeset postinstall_file_28_0 (postinstall_file))
-+(typeattributeset postinstall_mnt_dir_28_0 (postinstall_mnt_dir))
-+(typeattributeset powerctl_prop_28_0 (powerctl_prop))
-+(typeattributeset power_service_28_0 (power_service))
-+(typeattributeset ppp_28_0 (ppp))
-+(typeattributeset ppp_device_28_0 (ppp_device))
-+(typeattributeset ppp_exec_28_0 (ppp_exec))
-+(typeattributeset preloads_data_file_28_0 (preloads_data_file))
-+(typeattributeset preloads_media_file_28_0 (preloads_media_file))
-+(typeattributeset preopt2cachename_28_0 (preopt2cachename))
-+(typeattributeset preopt2cachename_exec_28_0 (preopt2cachename_exec))
-+(typeattributeset print_service_28_0 (print_service))
-+(typeattributeset priv_app_28_0 (priv_app))
-+(typeattributeset proc_28_0
-+  ( proc
-+    proc_fs_verity
-+    proc_keys
-+    proc_kpageflags
-+    proc_lowmemorykiller
-+    proc_pressure_cpu
-+    proc_pressure_io
-+    proc_pressure_mem
-+    proc_slabinfo))
-+(typeattributeset proc_abi_28_0 (proc_abi))
-+(typeattributeset proc_asound_28_0 (proc_asound))
-+(typeattributeset proc_bluetooth_writable_28_0 (proc_bluetooth_writable))
-+(typeattributeset proc_buddyinfo_28_0 (proc_buddyinfo))
-+(typeattributeset proc_cmdline_28_0 (proc_cmdline))
-+(typeattributeset proc_cpuinfo_28_0 (proc_cpuinfo))
-+(typeattributeset proc_dirty_28_0 (proc_dirty))
-+(typeattributeset proc_diskstats_28_0 (proc_diskstats))
-+(typeattributeset proc_drop_caches_28_0 (proc_drop_caches))
-+(typeattributeset processinfo_service_28_0 (processinfo_service))
-+(typeattributeset proc_extra_free_kbytes_28_0 (proc_extra_free_kbytes))
-+(typeattributeset proc_filesystems_28_0 (proc_filesystems))
-+(typeattributeset proc_hostname_28_0 (proc_hostname))
-+(typeattributeset proc_hung_task_28_0 (proc_hung_task))
-+(typeattributeset proc_interrupts_28_0 (proc_interrupts))
-+(typeattributeset proc_iomem_28_0 (proc_iomem))
-+(typeattributeset proc_kmsg_28_0 (proc_kmsg))
-+(typeattributeset proc_loadavg_28_0 (proc_loadavg))
-+(typeattributeset proc_max_map_count_28_0 (proc_max_map_count))
-+(typeattributeset proc_meminfo_28_0 (proc_meminfo))
-+(typeattributeset proc_min_free_order_shift_28_0 (proc_min_free_order_shift))
-+(typeattributeset proc_misc_28_0 (proc_misc))
-+(typeattributeset proc_modules_28_0 (proc_modules))
-+(typeattributeset proc_mounts_28_0 (proc_mounts))
-+(typeattributeset proc_net_28_0
-+  ( proc_net
-+    proc_net_tcp_udp))
-+(typeattributeset proc_overcommit_memory_28_0 (proc_overcommit_memory))
-+(typeattributeset proc_page_cluster_28_0 (proc_page_cluster))
-+(typeattributeset proc_pagetypeinfo_28_0 (proc_pagetypeinfo))
-+(typeattributeset proc_panic_28_0 (proc_panic))
-+(typeattributeset proc_perf_28_0 (proc_perf))
-+(typeattributeset proc_pid_max_28_0 (proc_pid_max))
-+(typeattributeset proc_pipe_conf_28_0 (proc_pipe_conf))
-+(typeattributeset proc_qtaguid_stat_28_0 (proc_qtaguid_stat))
-+(typeattributeset proc_random_28_0 (proc_random))
-+(typeattributeset proc_sched_28_0 (proc_sched))
-+(typeattributeset proc_security_28_0 (proc_security))
-+(typeattributeset proc_stat_28_0 (proc_stat))
-+(typeattributeset procstats_service_28_0 (procstats_service))
-+(typeattributeset proc_swaps_28_0 (proc_swaps))
-+(typeattributeset proc_sysrq_28_0 (proc_sysrq))
-+(typeattributeset proc_timer_28_0 (proc_timer))
-+(typeattributeset proc_tty_drivers_28_0 (proc_tty_drivers))
-+(typeattributeset proc_uid_concurrent_active_time_28_0 (proc_uid_concurrent_active_time))
-+(typeattributeset proc_uid_concurrent_policy_time_28_0 (proc_uid_concurrent_policy_time))
-+(typeattributeset proc_uid_cpupower_28_0 (proc_uid_cpupower))
-+(typeattributeset proc_uid_cputime_removeuid_28_0 (proc_uid_cputime_removeuid))
-+(typeattributeset proc_uid_cputime_showstat_28_0 (proc_uid_cputime_showstat))
-+(typeattributeset proc_uid_io_stats_28_0 (proc_uid_io_stats))
-+(typeattributeset proc_uid_procstat_set_28_0 (proc_uid_procstat_set))
-+(typeattributeset proc_uid_time_in_state_28_0 (proc_uid_time_in_state))
-+(typeattributeset proc_uptime_28_0 (proc_uptime))
-+(typeattributeset proc_version_28_0 (proc_version))
-+(typeattributeset proc_vmallocinfo_28_0 (proc_vmallocinfo))
-+(typeattributeset proc_vmstat_28_0 (proc_vmstat))
-+(typeattributeset proc_zoneinfo_28_0 (proc_zoneinfo))
-+(typeattributeset profman_28_0 (profman))
-+(typeattributeset profman_dump_data_file_28_0 (profman_dump_data_file))
-+(typeattributeset profman_exec_28_0 (profman_exec))
-+(typeattributeset properties_device_28_0 (properties_device))
-+(typeattributeset properties_serial_28_0 (properties_serial))
-+(typeattributeset property_contexts_file_28_0 (property_contexts_file))
-+(typeattributeset property_data_file_28_0 (property_data_file))
-+(typeattributeset property_info_28_0 (property_info))
-+(typeattributeset property_socket_28_0 (property_socket))
-+(typeattributeset pstorefs_28_0 (pstorefs))
-+(typeattributeset ptmx_device_28_0 (ptmx_device))
-+(typeattributeset qtaguid_device_28_0 (qtaguid_device))
-+(typeattributeset qtaguid_proc_28_0
-+  ( proc_qtaguid_ctrl
-+    qtaguid_proc))
-+(typeattributeset racoon_28_0 (racoon))
-+(typeattributeset racoon_exec_28_0 (racoon_exec))
-+(typeattributeset racoon_socket_28_0 (racoon_socket))
-+(typeattributeset radio_28_0 (radio))
-+(typeattributeset radio_data_file_28_0 (radio_data_file))
-+(typeattributeset radio_device_28_0 (radio_device))
-+(typeattributeset radio_prop_28_0 (radio_prop))
-+(typeattributeset radio_service_28_0 (radio_service))
-+(typeattributeset ram_device_28_0 (ram_device))
-+(typeattributeset random_device_28_0 (random_device))
-+(typeattributeset recovery_28_0 (recovery))
-+(typeattributeset recovery_block_device_28_0 (recovery_block_device))
-+(typeattributeset recovery_data_file_28_0 (recovery_data_file))
-+(typeattributeset recovery_persist_28_0 (recovery_persist))
-+(typeattributeset recovery_persist_exec_28_0 (recovery_persist_exec))
-+(typeattributeset recovery_refresh_28_0 (recovery_refresh))
-+(typeattributeset recovery_refresh_exec_28_0 (recovery_refresh_exec))
-+(typeattributeset recovery_service_28_0 (recovery_service))
-+(typeattributeset registry_service_28_0 (registry_service))
-+(typeattributeset resourcecache_data_file_28_0 (resourcecache_data_file))
-+(typeattributeset restorecon_prop_28_0 (restorecon_prop))
-+(typeattributeset restrictions_service_28_0 (restrictions_service))
-+(typeattributeset rild_debug_socket_28_0 (rild_debug_socket))
-+(typeattributeset rild_socket_28_0 (rild_socket))
-+(typeattributeset ringtone_file_28_0 (ringtone_file))
-+(typeattributeset root_block_device_28_0 (root_block_device))
-+(typeattributeset rootfs_28_0 (rootfs))
-+(typeattributeset rpmsg_device_28_0 (rpmsg_device))
-+(typeattributeset rtc_device_28_0 (rtc_device))
-+(typeattributeset rttmanager_service_28_0 (rttmanager_service))
-+(typeattributeset runas_28_0 (runas))
-+(typeattributeset runas_exec_28_0 (runas_exec))
-+(typeattributeset runtime_event_log_tags_file_28_0 (runtime_event_log_tags_file))
-+(typeattributeset safemode_prop_28_0 (safemode_prop))
-+(typeattributeset same_process_hal_file_28_0
-+  ( same_process_hal_file
-+    vendor_public_lib_file))
-+(typeattributeset samplingprofiler_service_28_0 (samplingprofiler_service))
-+(typeattributeset scheduling_policy_service_28_0 (scheduling_policy_service))
-+(typeattributeset sdcardd_28_0 (sdcardd))
-+(typeattributeset sdcardd_exec_28_0 (sdcardd_exec))
-+(typeattributeset sdcardfs_28_0 (sdcardfs))
-+(typeattributeset seapp_contexts_file_28_0 (seapp_contexts_file))
-+(typeattributeset search_service_28_0 (search_service))
-+(typeattributeset sec_key_att_app_id_provider_service_28_0 (sec_key_att_app_id_provider_service))
-+(typeattributeset secure_element_28_0 (secure_element))
-+(typeattributeset secure_element_device_28_0 (secure_element_device))
-+(typeattributeset secure_element_service_28_0 (secure_element_service))
-+(typeattributeset selinuxfs_28_0 (selinuxfs))
-+(typeattributeset sensors_device_28_0 (sensors_device))
-+(typeattributeset sensorservice_service_28_0 (sensorservice_service))
-+(typeattributeset sepolicy_file_28_0 (sepolicy_file))
-+(typeattributeset serial_device_28_0 (serial_device))
-+(typeattributeset serialno_prop_28_0 (serialno_prop))
-+(typeattributeset serial_service_28_0 (serial_service))
-+(typeattributeset service_contexts_file_28_0 (service_contexts_file))
-+(typeattributeset servicediscovery_service_28_0 (servicediscovery_service))
-+(typeattributeset servicemanager_28_0 (servicemanager))
-+(typeattributeset servicemanager_exec_28_0 (servicemanager_exec))
-+(typeattributeset settings_service_28_0 (settings_service))
-+(typeattributeset sgdisk_28_0 (sgdisk))
-+(typeattributeset sgdisk_exec_28_0 (sgdisk_exec))
-+(typeattributeset shared_relro_28_0 (shared_relro))
-+(typeattributeset shared_relro_file_28_0 (shared_relro_file))
-+(typeattributeset shell_28_0 (shell))
-+(typeattributeset shell_data_file_28_0 (shell_data_file))
-+(typeattributeset shell_exec_28_0 (shell_exec))
-+(typeattributeset shell_prop_28_0 (shell_prop))
-+(typeattributeset shm_28_0 (shm))
-+(typeattributeset shortcut_manager_icons_28_0 (shortcut_manager_icons))
-+(typeattributeset shortcut_service_28_0 (shortcut_service))
-+(typeattributeset slice_service_28_0 (slice_service))
-+(typeattributeset slideshow_28_0 (slideshow))
-+(typeattributeset socket_device_28_0 (socket_device))
-+(typeattributeset sockfs_28_0 (sockfs))
-+(typeattributeset statusbar_service_28_0 (statusbar_service))
-+(typeattributeset storaged_service_28_0 (storaged_service))
-+(typeattributeset storage_file_28_0 (storage_file))
-+(typeattributeset storagestats_service_28_0 (storagestats_service))
-+(typeattributeset storage_stub_file_28_0 (storage_stub_file))
-+(typeattributeset su_28_0 (su))
-+(typeattributeset su_exec_28_0 (su_exec))
-+(typeattributeset surfaceflinger_28_0 (surfaceflinger))
-+(typeattributeset surfaceflinger_service_28_0 (surfaceflinger_service))
-+(typeattributeset swap_block_device_28_0 (swap_block_device))
-+(typeattributeset sysfs_28_0
-+  ( sysfs
-+    sysfs_devices_block
-+    sysfs_extcon
-+    sysfs_loop
-+    sysfs_transparent_hugepage))
-+(typeattributeset sysfs_android_usb_28_0 (sysfs_android_usb))
-+(typeattributeset sysfs_batteryinfo_28_0 (sysfs_batteryinfo))
-+(typeattributeset sysfs_bluetooth_writable_28_0 (sysfs_bluetooth_writable))
-+(typeattributeset sysfs_devices_system_cpu_28_0 (sysfs_devices_system_cpu))
-+(typeattributeset sysfs_dm_28_0 (sysfs_dm))
-+(typeattributeset sysfs_dt_firmware_android_28_0 (sysfs_dt_firmware_android))
-+(typeattributeset sysfs_fs_ext4_features_28_0 (sysfs_fs_ext4_features))
-+(typeattributeset sysfs_hwrandom_28_0 (sysfs_hwrandom))
-+(typeattributeset sysfs_ipv4_28_0 (sysfs_ipv4))
-+(typeattributeset sysfs_kernel_notes_28_0 (sysfs_kernel_notes))
-+(typeattributeset sysfs_leds_28_0 (sysfs_leds))
-+(typeattributeset sysfs_lowmemorykiller_28_0 (sysfs_lowmemorykiller))
-+(typeattributeset sysfs_mac_address_28_0 (sysfs_mac_address))
-+(typeattributeset sysfs_net_28_0 (sysfs_net))
-+(typeattributeset sysfs_nfc_power_writable_28_0 (sysfs_nfc_power_writable))
-+(typeattributeset sysfs_power_28_0 (sysfs_power))
-+(typeattributeset sysfs_rtc_28_0 (sysfs_rtc))
-+(typeattributeset sysfs_switch_28_0 (sysfs_switch))
-+(typeattributeset sysfs_thermal_28_0 (sysfs_thermal))
-+(typeattributeset sysfs_uio_28_0 (sysfs_uio))
-+(typeattributeset sysfs_usb_28_0 (sysfs_usb))
-+(typeattributeset sysfs_usermodehelper_28_0 (sysfs_usermodehelper))
-+(typeattributeset sysfs_vibrator_28_0 (sysfs_vibrator))
-+(typeattributeset sysfs_wake_lock_28_0 (sysfs_wake_lock))
-+(typeattributeset sysfs_wakeup_reasons_28_0 (sysfs_wakeup_reasons))
-+(typeattributeset sysfs_wlan_fwpath_28_0 (sysfs_wlan_fwpath))
-+(typeattributeset sysfs_zram_28_0 (sysfs_zram))
-+(typeattributeset sysfs_zram_uevent_28_0 (sysfs_zram_uevent))
-+(typeattributeset system_app_28_0 (system_app))
-+(typeattributeset system_app_data_file_28_0 (system_app_data_file))
-+(typeattributeset system_app_service_28_0 (system_app_service))
-+(typeattributeset system_block_device_28_0 (system_block_device))
-+(typeattributeset system_boot_reason_prop_28_0 (system_boot_reason_prop))
-+(typeattributeset system_data_file_28_0
-+  ( dropbox_data_file
-+    system_data_file
-+    packages_list_file))
-+(typeattributeset system_file_28_0
-+  ( system_file
-+    system_asan_options_file
-+    system_lib_file
-+    system_linker_config_file
-+    system_linker_exec
-+    system_seccomp_policy_file
-+    system_security_cacerts_file
-+    tcpdump_exec
-+    system_zoneinfo_file
-+))
-+(typeattributeset systemkeys_data_file_28_0 (systemkeys_data_file))
-+(typeattributeset system_ndebug_socket_28_0 (system_ndebug_socket))
-+(typeattributeset system_net_netd_hwservice_28_0 (system_net_netd_hwservice))
-+(typeattributeset system_prop_28_0 (system_prop))
-+(typeattributeset system_radio_prop_28_0 (system_radio_prop))
-+(typeattributeset system_server_28_0 (system_server))
-+(typeattributeset system_update_service_28_0 (system_update_service))
-+(typeattributeset system_wifi_keystore_hwservice_28_0 (system_wifi_keystore_hwservice))
-+(typeattributeset system_wpa_socket_28_0 (system_wpa_socket))
-+(typeattributeset task_service_28_0 (task_service))
-+(typeattributeset tee_28_0 (tee))
-+(typeattributeset tee_data_file_28_0 (tee_data_file))
-+(typeattributeset tee_device_28_0 (tee_device))
-+(typeattributeset telecom_service_28_0 (telecom_service))
-+(typeattributeset test_boot_reason_prop_28_0 (test_boot_reason_prop))
-+(typeattributeset textclassification_service_28_0 (textclassification_service))
-+(typeattributeset textclassifier_data_file_28_0 (textclassifier_data_file))
-+(typeattributeset textservices_service_28_0 (textservices_service))
-+(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
-+(typeattributeset thermal_service_28_0 (thermal_service))
-+(typeattributeset timezone_service_28_0 (timezone_service))
-+(typeattributeset tmpfs_28_0
-+  ( mnt_sdcard_file
-+    tmpfs))
-+(typeattributeset tombstoned_28_0 (tombstoned))
-+(typeattributeset tombstone_data_file_28_0 (tombstone_data_file))
-+(typeattributeset tombstoned_crash_socket_28_0 (tombstoned_crash_socket))
-+(typeattributeset tombstoned_exec_28_0 (tombstoned_exec))
-+(typeattributeset tombstoned_intercept_socket_28_0 (tombstoned_intercept_socket))
-+(typeattributeset tombstoned_java_trace_socket_28_0 (tombstoned_java_trace_socket))
-+(typeattributeset tombstone_wifi_data_file_28_0 (tombstone_wifi_data_file))
-+(typeattributeset toolbox_28_0 (toolbox))
-+(typeattributeset toolbox_exec_28_0 (toolbox_exec))
-+(typeattributeset trace_data_file_28_0 (trace_data_file))
-+(typeattributeset traced_consumer_socket_28_0 (traced_consumer_socket))
-+(typeattributeset traced_enabled_prop_28_0 (traced_enabled_prop))
-+(typeattributeset traced_probes_28_0 (traced_probes))
-+(typeattributeset traced_producer_socket_28_0 (traced_producer_socket))
-+(typeattributeset traceur_app_28_0 (traceur_app))
-+(typeattributeset trust_service_28_0 (trust_service))
-+(typeattributeset tty_device_28_0 (tty_device))
-+(typeattributeset tun_device_28_0 (tun_device))
-+(typeattributeset tv_input_service_28_0 (tv_input_service))
-+(typeattributeset tzdatacheck_28_0 (tzdatacheck))
-+(typeattributeset tzdatacheck_exec_28_0 (tzdatacheck_exec))
-+(typeattributeset ueventd_28_0 (ueventd))
-+(typeattributeset uhid_device_28_0 (uhid_device))
-+(typeattributeset uimode_service_28_0 (uimode_service))
-+(typeattributeset uio_device_28_0 (uio_device))
-+(typeattributeset uncrypt_28_0 (uncrypt))
-+(typeattributeset uncrypt_exec_28_0 (uncrypt_exec))
-+(typeattributeset uncrypt_socket_28_0 (uncrypt_socket))
-+(typeattributeset unencrypted_data_file_28_0 (unencrypted_data_file))
-+(typeattributeset unlabeled_28_0 (unlabeled))
-+(typeattributeset untrusted_app_25_28_0 (untrusted_app_25))
-+(typeattributeset untrusted_app_27_28_0 (untrusted_app_27))
-+(typeattributeset untrusted_app_28_0 (untrusted_app))
-+(typeattributeset untrusted_v2_app_28_0 (untrusted_v2_app))
-+(typeattributeset update_engine_28_0 (update_engine))
-+(typeattributeset update_engine_data_file_28_0 (update_engine_data_file))
-+(typeattributeset update_engine_exec_28_0 (update_engine_exec))
-+(typeattributeset update_engine_log_data_file_28_0 (update_engine_log_data_file))
-+(typeattributeset update_engine_service_28_0 (update_engine_service))
-+(typeattributeset updatelock_service_28_0 (updatelock_service))
-+(typeattributeset update_verifier_28_0 (update_verifier))
-+(typeattributeset update_verifier_exec_28_0 (update_verifier_exec))
-+(typeattributeset usagestats_service_28_0 (usagestats_service))
-+(typeattributeset usbaccessory_device_28_0 (usbaccessory_device))
-+(typeattributeset usbd_28_0 (usbd))
-+(typeattributeset usb_device_28_0 (usb_device))
-+(typeattributeset usbd_exec_28_0 (usbd_exec))
-+(typeattributeset usbfs_28_0 (usbfs))
-+(typeattributeset usb_service_28_0 (usb_service))
-+(typeattributeset userdata_block_device_28_0 (userdata_block_device))
-+(typeattributeset usermodehelper_28_0 (usermodehelper))
-+(typeattributeset user_profile_data_file_28_0 (user_profile_data_file))
-+(typeattributeset user_service_28_0 (user_service))
-+(typeattributeset vcs_device_28_0 (vcs_device))
-+(typeattributeset vdc_28_0 (vdc))
-+(typeattributeset vdc_exec_28_0 (vdc_exec))
-+(typeattributeset vendor_app_file_28_0 (vendor_app_file))
-+(typeattributeset vendor_configs_file_28_0 (vendor_configs_file))
-+(typeattributeset vendor_data_file_28_0 (vendor_data_file))
-+(typeattributeset vendor_default_prop_28_0 (vendor_default_prop))
-+(typeattributeset vendor_file_28_0 (vendor_file))
-+(typeattributeset vendor_framework_file_28_0 (vendor_framework_file))
-+(typeattributeset vendor_hal_file_28_0 (vendor_hal_file))
-+(typeattributeset vendor_init_28_0 (vendor_init))
-+(typeattributeset vendor_overlay_file_28_0 (vendor_overlay_file))
-+(typeattributeset vendor_security_patch_level_prop_28_0 (vendor_security_patch_level_prop))
-+(typeattributeset vendor_shell_28_0 (vendor_shell))
-+(typeattributeset vendor_shell_exec_28_0 (vendor_shell_exec))
-+(typeattributeset vendor_toolbox_exec_28_0 (vendor_toolbox_exec))
-+(typeattributeset vfat_28_0 (vfat))
-+(typeattributeset vibrator_service_28_0 (vibrator_service))
-+(typeattributeset video_device_28_0 (video_device))
-+(typeattributeset virtual_touchpad_28_0 (virtual_touchpad))
-+(typeattributeset virtual_touchpad_exec_28_0 (virtual_touchpad_exec))
-+(typeattributeset virtual_touchpad_service_28_0 (virtual_touchpad_service))
-+(typeattributeset vndbinder_device_28_0 (vndbinder_device))
-+(typeattributeset vndk_sp_file_28_0 (vndk_sp_file))
-+(typeattributeset vndservice_contexts_file_28_0 (vndservice_contexts_file))
-+(typeattributeset vndservicemanager_28_0 (vndservicemanager))
-+(typeattributeset voiceinteraction_service_28_0 (voiceinteraction_service))
-+(typeattributeset vold_28_0 (vold))
-+(typeattributeset vold_data_file_28_0 (vold_data_file))
-+(typeattributeset vold_device_28_0 (vold_device))
-+(typeattributeset vold_exec_28_0 (vold_exec))
-+(typeattributeset vold_metadata_file_28_0 (vold_metadata_file))
-+(typeattributeset vold_prepare_subdirs_28_0 (vold_prepare_subdirs))
-+(typeattributeset vold_prepare_subdirs_exec_28_0 (vold_prepare_subdirs_exec))
-+(typeattributeset vold_prop_28_0 (vold_prop))
-+(typeattributeset vold_service_28_0 (vold_service))
-+(typeattributeset vpn_data_file_28_0 (vpn_data_file))
-+(typeattributeset vr_hwc_28_0 (vr_hwc))
-+(typeattributeset vr_hwc_exec_28_0 (vr_hwc_exec))
-+(typeattributeset vr_hwc_service_28_0 (vr_hwc_service))
-+(typeattributeset vr_manager_service_28_0 (vr_manager_service))
-+(typeattributeset wallpaper_file_28_0 (wallpaper_file))
-+(typeattributeset wallpaper_service_28_0 (wallpaper_service))
-+(typeattributeset watchdogd_28_0 (watchdogd))
-+(typeattributeset watchdog_device_28_0 (watchdog_device))
-+(typeattributeset webviewupdate_service_28_0 (webviewupdate_service))
-+(typeattributeset webview_zygote_28_0 (webview_zygote))
-+(typeattributeset webview_zygote_exec_28_0 (webview_zygote_exec))
-+(typeattributeset wifiaware_service_28_0 (wifiaware_service))
-+(typeattributeset wificond_28_0 (wificond))
-+(typeattributeset wificond_exec_28_0 (wificond_exec))
-+(typeattributeset wificond_service_28_0 (wificond_service))
-+(typeattributeset wifi_data_file_28_0 (wifi_data_file))
-+(typeattributeset wifi_log_prop_28_0 (wifi_log_prop))
-+(typeattributeset wifip2p_service_28_0 (wifip2p_service))
-+(typeattributeset wifi_prop_28_0 (wifi_prop))
-+(typeattributeset wifiscanner_service_28_0 (wifiscanner_service))
-+(typeattributeset wifi_service_28_0 (wifi_service))
-+(typeattributeset window_service_28_0 (window_service))
-+(typeattributeset wpantund_28_0 (wpantund))
-+(typeattributeset wpantund_exec_28_0 (wpantund_exec))
-+(typeattributeset wpantund_service_28_0 (wpantund_service))
-+(typeattributeset wpa_socket_28_0 (wpa_socket))
-+(typeattributeset zero_device_28_0 (zero_device))
-+(typeattributeset zoneinfo_data_file_28_0 (zoneinfo_data_file))
-+(typeattributeset zygote_28_0 (zygote))
-+(typeattributeset zygote_exec_28_0 (zygote_exec))
-+(typeattributeset zygote_socket_28_0 (zygote_socket))
-diff --git a/prebuilts/api/33.0/private/compat/28.0/28.0.compat.cil b/prebuilts/api/33.0/private/compat/28.0/28.0.compat.cil
-new file mode 100644
-index 000000000..2e85b23fc
---- /dev/null
-+++ b/prebuilts/api/33.0/private/compat/28.0/28.0.compat.cil
-@@ -0,0 +1,11 @@
-+(typeattribute vendordomain)
-+(typeattributeset vendordomain ((and (domain) ((not (coredomain))))))
-+(allowx vendordomain dev_type (ioctl blk_file ((range 0x0000 0xffff))))
-+(allowx vendordomain file_type (ioctl file ((range 0x0000 0xffff))))
-+(allow vendordomain self (netlink_route_socket (nlmsg_readpriv)))
-+
-+(typeattributeset mlsvendorcompat (and appdomain vendordomain))
-+(allow mlsvendorcompat app_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat app_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-+(allow mlsvendorcompat privapp_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat privapp_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-diff --git a/prebuilts/api/33.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/33.0/private/compat/28.0/28.0.ignore.cil
-new file mode 100644
-index 000000000..e7ddf4805
---- /dev/null
-+++ b/prebuilts/api/33.0/private/compat/28.0/28.0.ignore.cil
-@@ -0,0 +1,160 @@
-+;; new_objects - a collection of types that have been introduced that have no
-+;;   analogue in older policy.  Thus, we do not need to map these types to
-+;;   previous ones.  Add here to pass checkapi tests.
-+(type new_objects)
-+(typeattribute new_objects)
-+(typeattributeset new_objects
-+  ( new_objects
-+    activity_task_service
-+    adb_service
-+    apex_data_file
-+    apex_metadata_file
-+    apex_mnt_dir
-+    apex_service
-+    apexd
-+    apexd_exec
-+    apexd_prop
-+    apexd_tmpfs
-+    appdomain_tmpfs
-+    app_binding_service
-+    app_prediction_service
-+    app_zygote
-+    app_zygote_tmpfs
-+    ashmemd
-+    ashmem_device_service
-+    attention_service
-+    biometric_service
-+    bluetooth_audio_hal_prop
-+    bpf_progs_loaded_prop
-+    bugreport_service
-+    cgroup_desc_file
-+    cgroup_rc_file
-+    charger_exec
-+    content_capture_service
-+    content_suggestions_service
-+    cpu_variant_prop
-+    ctl_apexd_prop
-+    ctl_gsid_prop
-+    dev_cpu_variant
-+    device_config_activity_manager_native_boot_prop
-+    device_config_boot_count_prop
-+    device_config_input_native_boot_prop
-+    device_config_netd_native_prop
-+    device_config_reset_performed_prop
-+    device_config_runtime_native_boot_prop
-+    device_config_runtime_native_prop
-+    device_config_media_native_prop
-+    device_config_service
-+    device_config_sys_traced_prop
-+    dnsresolver_service
-+    dynamic_system_service
-+    dynamic_system_prop
-+    face_service
-+    face_vendor_data_file
-+    sota_prop
-+    fastbootd
-+    flags_health_check
-+    flags_health_check_exec
-+    fwk_bufferhub_hwservice
-+    fwk_camera_hwservice
-+    fwk_stats_hwservice
-+    gpuservice
-+    gsi_data_file
-+    gsi_metadata_file
-+    gsi_public_metadata_file
-+    gsi_service
-+    gsid
-+    gsid_exec
-+    gsid_prop
-+    color_display_service
-+    external_vibrator_service
-+    hal_atrace_hwservice
-+    hal_face_hwservice
-+    hal_graphics_composer_server_tmpfs
-+    hal_health_storage_hwservice
-+    hal_input_classifier_hwservice
-+    hal_power_stats_hwservice
-+    heapprofd
-+    heapprofd_enabled_prop
-+    heapprofd_exec
-+    heapprofd_prop
-+    heapprofd_socket
-+    idmap_service
-+    iris_service
-+    iris_vendor_data_file
-+    llkd
-+    llkd_exec
-+    llkd_prop
-+    llkd_tmpfs
-+    looper_stats_service
-+    lpdumpd
-+    lpdumpd_exec
-+    lpdumpd_prop
-+    lpdump_service
-+    iorapd
-+    iorapd_exec
-+    iorapd_data_file
-+    iorapd_service
-+    iorapd_tmpfs
-+    mediaswcodec
-+    mediaswcodec_exec
-+    mediaswcodec_tmpfs
-+    metadata_bootstat_file
-+    mnt_product_file
-+    network_stack
-+    network_stack_service
-+    network_stack_tmpfs
-+    nnapi_ext_deny_product_prop
-+    overlayfs_file
-+    password_slot_metadata_file
-+    permissionmgr_service
-+    postinstall_apex_mnt_dir
-+    recovery_socket
-+    role_service
-+    rollback_service
-+    rs
-+    rs_exec
-+    rss_hwm_reset
-+    rss_hwm_reset_exec
-+    runas_app
-+    runas_app_tmpfs
-+    art_apex_dir
-+    runtime_service
-+    sdcard_block_device
-+    sensor_privacy_service
-+    server_configurable_flags_data_file
-+    simpleperf_app_runner
-+    simpleperf_app_runner_exec
-+    socket_hook_prop
-+    su_tmpfs
-+    super_block_device
-+    sysfs_fs_f2fs
-+    system_bootstrap_lib_file
-+    system_event_log_tags_file
-+    system_lmk_prop
-+    system_suspend_hwservice
-+    system_suspend_control_service
-+    system_trace_prop
-+    staging_data_file
-+    task_profiles_file
-+    testharness_service
-+    test_harness_prop
-+    theme_prop
-+    time_prop
-+    timedetector_service
-+    timezonedetector_service
-+    traced_lazy_prop
-+    uri_grants_service
-+    use_memfd_prop
-+    vendor_apex_file
-+    vendor_cgroup_desc_file
-+    vendor_idc_file
-+    vendor_keychars_file
-+    vendor_keylayout_file
-+    vendor_misc_writer
-+    vendor_misc_writer_exec
-+    vendor_socket_hook_prop
-+    vendor_task_profiles_file
-+    vndk_prop
-+    vrflinger_vsync_service
-+    watchdogd_tmpfs))
-diff --git a/private/compat/28.0/28.0.cil b/private/compat/28.0/28.0.cil
-new file mode 100644
-index 000000000..d79d2f8c9
---- /dev/null
-+++ b/private/compat/28.0/28.0.cil
-@@ -0,0 +1,1745 @@
-+;; attributes removed from current policy
-+(typeattribute hal_wifi_offload)
-+(typeattribute hal_wifi_offload_client)
-+(typeattribute hal_wifi_offload_server)
-+
-+;; types removed from current policy
-+(type alarm_device)
-+(type audio_seq_device)
-+(type audio_timer_device)
-+(type commontime_management_service)
-+(type cpuctl_device)
-+(type full_device)
-+(type hal_wifi_offload_hwservice)
-+(type i2c_device)
-+(type kmem_device)
-+(type mediacodec)
-+(type mediacodec_exec)
-+(type mediaextractor_update_service)
-+(type mtd_device)
-+(type netd_socket)
-+(type qtaguid_proc)
-+(type thermalcallback_hwservice)
-+(type thermalserviced)
-+(type thermalserviced_exec)
-+(type untrusted_v2_app)
-+(type vcs_device)
-+
-+;; Public 28.0 SEPolicy is divergent on different devices w.r.t
-+;; exported_audio_prop type. We need this typeattribute declaration so that the
-+;; mapping file compiles with vendor policies without exported_audio_prop type.
-+(typeattribute exported_audio_prop_28_0)
-+
-+;; mapping information from ToT policy's types to 28.0 policy's types.
-+(expandtypeattribute (accessibility_service_28_0) true)
-+(expandtypeattribute (account_service_28_0) true)
-+(expandtypeattribute (activity_service_28_0) true)
-+(expandtypeattribute (adbd_28_0) true)
-+(expandtypeattribute (adb_data_file_28_0) true)
-+(expandtypeattribute (adbd_exec_28_0) true)
-+(expandtypeattribute (adbd_socket_28_0) true)
-+(expandtypeattribute (adb_keys_file_28_0) true)
-+(expandtypeattribute (alarm_device_28_0) true)
-+(expandtypeattribute (alarm_service_28_0) true)
-+(expandtypeattribute (anr_data_file_28_0) true)
-+(expandtypeattribute (apk_data_file_28_0) true)
-+(expandtypeattribute (apk_private_data_file_28_0) true)
-+(expandtypeattribute (apk_private_tmp_file_28_0) true)
-+(expandtypeattribute (apk_tmp_file_28_0) true)
-+(expandtypeattribute (app_data_file_28_0) true)
-+(expandtypeattribute (app_fuse_file_28_0) true)
-+(expandtypeattribute (app_fusefs_28_0) true)
-+(expandtypeattribute (appops_service_28_0) true)
-+(expandtypeattribute (appwidget_service_28_0) true)
-+(expandtypeattribute (asec_apk_file_28_0) true)
-+(expandtypeattribute (asec_image_file_28_0) true)
-+(expandtypeattribute (asec_public_file_28_0) true)
-+(expandtypeattribute (ashmem_device_28_0) true)
-+(expandtypeattribute (assetatlas_service_28_0) true)
-+(expandtypeattribute (audio_data_file_28_0) true)
-+(expandtypeattribute (audio_device_28_0) true)
-+(expandtypeattribute (audiohal_data_file_28_0) true)
-+(expandtypeattribute (audio_prop_28_0) true)
-+(expandtypeattribute (audio_seq_device_28_0) true)
-+(expandtypeattribute (audioserver_28_0) true)
-+(expandtypeattribute (audioserver_data_file_28_0) true)
-+(expandtypeattribute (audioserver_service_28_0) true)
-+(expandtypeattribute (audio_service_28_0) true)
-+(expandtypeattribute (audio_timer_device_28_0) true)
-+(expandtypeattribute (autofill_service_28_0) true)
-+(expandtypeattribute (backup_data_file_28_0) true)
-+(expandtypeattribute (backup_service_28_0) true)
-+(expandtypeattribute (batteryproperties_service_28_0) true)
-+(expandtypeattribute (battery_service_28_0) true)
-+(expandtypeattribute (batterystats_service_28_0) true)
-+(expandtypeattribute (binder_calls_stats_service_28_0) true)
-+(expandtypeattribute (binder_device_28_0) true)
-+(expandtypeattribute (binfmt_miscfs_28_0) true)
-+(expandtypeattribute (blkid_28_0) true)
-+(expandtypeattribute (blkid_untrusted_28_0) true)
-+(expandtypeattribute (block_device_28_0) true)
-+(expandtypeattribute (bluetooth_28_0) true)
-+(expandtypeattribute (bluetooth_a2dp_offload_prop_28_0) true)
-+(expandtypeattribute (bluetooth_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_efs_file_28_0) true)
-+(expandtypeattribute (bluetooth_logs_data_file_28_0) true)
-+(expandtypeattribute (bluetooth_manager_service_28_0) true)
-+(expandtypeattribute (bluetooth_prop_28_0) true)
-+(expandtypeattribute (bluetooth_service_28_0) true)
-+(expandtypeattribute (bluetooth_socket_28_0) true)
-+(expandtypeattribute (bootanim_28_0) true)
-+(expandtypeattribute (bootanim_exec_28_0) true)
-+(expandtypeattribute (boot_block_device_28_0) true)
-+(expandtypeattribute (bootchart_data_file_28_0) true)
-+(expandtypeattribute (bootloader_boot_reason_prop_28_0) true)
-+(expandtypeattribute (bootstat_28_0) true)
-+(expandtypeattribute (bootstat_data_file_28_0) true)
-+(expandtypeattribute (bootstat_exec_28_0) true)
-+(expandtypeattribute (boottime_prop_28_0) true)
-+(expandtypeattribute (boottrace_data_file_28_0) true)
-+(expandtypeattribute (broadcastradio_service_28_0) true)
-+(expandtypeattribute (bufferhubd_28_0) true)
-+(expandtypeattribute (bufferhubd_exec_28_0) true)
-+(expandtypeattribute (cache_backup_file_28_0) true)
-+(expandtypeattribute (cache_block_device_28_0) true)
-+(expandtypeattribute (cache_file_28_0) true)
-+(expandtypeattribute (cache_private_backup_file_28_0) true)
-+(expandtypeattribute (cache_recovery_file_28_0) true)
-+(expandtypeattribute (camera_data_file_28_0) true)
-+(expandtypeattribute (camera_device_28_0) true)
-+(expandtypeattribute (cameraproxy_service_28_0) true)
-+(expandtypeattribute (cameraserver_28_0) true)
-+(expandtypeattribute (cameraserver_exec_28_0) true)
-+(expandtypeattribute (cameraserver_service_28_0) true)
-+(expandtypeattribute (cgroup_28_0) true)
-+(expandtypeattribute (cgroup_bpf_28_0) true)
-+(expandtypeattribute (charger_28_0) true)
-+(expandtypeattribute (clatd_28_0) true)
-+(expandtypeattribute (clatd_exec_28_0) true)
-+(expandtypeattribute (clipboard_service_28_0) true)
-+(expandtypeattribute (commontime_management_service_28_0) true)
-+(expandtypeattribute (companion_device_service_28_0) true)
-+(expandtypeattribute (configfs_28_0) true)
-+(expandtypeattribute (config_prop_28_0) true)
-+(expandtypeattribute (connectivity_service_28_0) true)
-+(expandtypeattribute (connmetrics_service_28_0) true)
-+(expandtypeattribute (console_device_28_0) true)
-+(expandtypeattribute (consumer_ir_service_28_0) true)
-+(expandtypeattribute (content_service_28_0) true)
-+(expandtypeattribute (contexthub_service_28_0) true)
-+(expandtypeattribute (coredump_file_28_0) true)
-+(expandtypeattribute (country_detector_service_28_0) true)
-+(expandtypeattribute (coverage_service_28_0) true)
-+(expandtypeattribute (cppreopt_prop_28_0) true)
-+(expandtypeattribute (cppreopts_28_0) true)
-+(expandtypeattribute (cppreopts_exec_28_0) true)
-+(expandtypeattribute (cpuctl_device_28_0) true)
-+(expandtypeattribute (cpuinfo_service_28_0) true)
-+(expandtypeattribute (crash_dump_28_0) true)
-+(expandtypeattribute (crash_dump_exec_28_0) true)
-+(expandtypeattribute (crossprofileapps_service_28_0) true)
-+(expandtypeattribute (ctl_bootanim_prop_28_0) true)
-+(expandtypeattribute (ctl_bugreport_prop_28_0) true)
-+(expandtypeattribute (ctl_console_prop_28_0) true)
-+(expandtypeattribute (ctl_default_prop_28_0) true)
-+(expandtypeattribute (ctl_dumpstate_prop_28_0) true)
-+(expandtypeattribute (ctl_fuse_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_start_prop_28_0) true)
-+(expandtypeattribute (ctl_interface_stop_prop_28_0) true)
-+(expandtypeattribute (ctl_mdnsd_prop_28_0) true)
-+(expandtypeattribute (ctl_restart_prop_28_0) true)
-+(expandtypeattribute (ctl_rildaemon_prop_28_0) true)
-+(expandtypeattribute (ctl_sigstop_prop_28_0) true)
-+(expandtypeattribute (ctl_start_prop_28_0) true)
-+(expandtypeattribute (ctl_stop_prop_28_0) true)
-+(expandtypeattribute (dalvikcache_data_file_28_0) true)
-+(expandtypeattribute (dalvik_prop_28_0) true)
-+(expandtypeattribute (dbinfo_service_28_0) true)
-+(expandtypeattribute (debugfs_28_0) true)
-+(expandtypeattribute (debugfs_mmc_28_0) true)
-+(expandtypeattribute (debugfs_trace_marker_28_0) true)
-+(expandtypeattribute (debugfs_tracing_28_0) true)
-+(expandtypeattribute (debugfs_tracing_debug_28_0) true)
-+(expandtypeattribute (debugfs_tracing_instances_28_0) true)
-+(expandtypeattribute (debugfs_wakeup_sources_28_0) true)
-+(expandtypeattribute (debugfs_wifi_tracing_28_0) true)
-+(expandtypeattribute (debuggerd_prop_28_0) true)
-+(expandtypeattribute (debug_prop_28_0) true)
-+(expandtypeattribute (default_android_hwservice_28_0) true)
-+(expandtypeattribute (default_android_service_28_0) true)
-+(expandtypeattribute (default_android_vndservice_28_0) true)
-+(expandtypeattribute (default_prop_28_0) true)
-+(expandtypeattribute (device_28_0) true)
-+(expandtypeattribute (device_identifiers_service_28_0) true)
-+(expandtypeattribute (deviceidle_service_28_0) true)
-+(expandtypeattribute (device_logging_prop_28_0) true)
-+(expandtypeattribute (device_policy_service_28_0) true)
-+(expandtypeattribute (devicestoragemonitor_service_28_0) true)
-+(expandtypeattribute (devpts_28_0) true)
-+(expandtypeattribute (dex2oat_28_0) true)
-+(expandtypeattribute (dex2oat_exec_28_0) true)
-+(expandtypeattribute (dhcp_28_0) true)
-+(expandtypeattribute (dhcp_data_file_28_0) true)
-+(expandtypeattribute (dhcp_exec_28_0) true)
-+(expandtypeattribute (dhcp_prop_28_0) true)
-+(expandtypeattribute (diskstats_service_28_0) true)
-+(expandtypeattribute (display_service_28_0) true)
-+(expandtypeattribute (dm_device_28_0) true)
-+(expandtypeattribute (dnsmasq_28_0) true)
-+(expandtypeattribute (dnsmasq_exec_28_0) true)
-+(expandtypeattribute (dnsproxyd_socket_28_0) true)
-+(expandtypeattribute (DockObserver_service_28_0) true)
-+(expandtypeattribute (dreams_service_28_0) true)
-+(expandtypeattribute (drm_data_file_28_0) true)
-+(expandtypeattribute (drmserver_28_0) true)
-+(expandtypeattribute (drmserver_exec_28_0) true)
-+(expandtypeattribute (drmserver_service_28_0) true)
-+(expandtypeattribute (drmserver_socket_28_0) true)
-+(expandtypeattribute (dropbox_service_28_0) true)
-+(expandtypeattribute (dumpstate_28_0) true)
-+(expandtypeattribute (dumpstate_exec_28_0) true)
-+(expandtypeattribute (dumpstate_options_prop_28_0) true)
-+(expandtypeattribute (dumpstate_prop_28_0) true)
-+(expandtypeattribute (dumpstate_service_28_0) true)
-+(expandtypeattribute (dumpstate_socket_28_0) true)
-+(expandtypeattribute (e2fs_28_0) true)
-+(expandtypeattribute (e2fs_exec_28_0) true)
-+(expandtypeattribute (efs_file_28_0) true)
-+(expandtypeattribute (ephemeral_app_28_0) true)
-+(expandtypeattribute (ethernet_service_28_0) true)
-+(expandtypeattribute (exfat_28_0) true)
-+(expandtypeattribute (exported2_config_prop_28_0) true)
-+(expandtypeattribute (exported2_default_prop_28_0) true)
-+(expandtypeattribute (exported2_radio_prop_28_0) true)
-+(expandtypeattribute (exported2_system_prop_28_0) true)
-+(expandtypeattribute (exported2_vold_prop_28_0) true)
-+(expandtypeattribute (exported3_default_prop_28_0) true)
-+(expandtypeattribute (exported3_radio_prop_28_0) true)
-+(expandtypeattribute (exported3_system_prop_28_0) true)
-+(expandtypeattribute (exported_audio_prop_28_0) true)
-+(expandtypeattribute (exported_bluetooth_prop_28_0) true)
-+(expandtypeattribute (exported_config_prop_28_0) true)
-+(expandtypeattribute (exported_dalvik_prop_28_0) true)
-+(expandtypeattribute (exported_default_prop_28_0) true)
-+(expandtypeattribute (exported_dumpstate_prop_28_0) true)
-+(expandtypeattribute (exported_ffs_prop_28_0) true)
-+(expandtypeattribute (exported_fingerprint_prop_28_0) true)
-+(expandtypeattribute (exported_overlay_prop_28_0) true)
-+(expandtypeattribute (exported_pm_prop_28_0) true)
-+(expandtypeattribute (exported_radio_prop_28_0) true)
-+(expandtypeattribute (exported_secure_prop_28_0) true)
-+(expandtypeattribute (exported_system_prop_28_0) true)
-+(expandtypeattribute (exported_system_radio_prop_28_0) true)
-+(expandtypeattribute (exported_vold_prop_28_0) true)
-+(expandtypeattribute (exported_wifi_prop_28_0) true)
-+(expandtypeattribute (ffs_prop_28_0) true)
-+(expandtypeattribute (file_contexts_file_28_0) true)
-+(expandtypeattribute (fingerprintd_28_0) true)
-+(expandtypeattribute (fingerprintd_data_file_28_0) true)
-+(expandtypeattribute (fingerprintd_exec_28_0) true)
-+(expandtypeattribute (fingerprintd_service_28_0) true)
-+(expandtypeattribute (fingerprint_prop_28_0) true)
-+(expandtypeattribute (fingerprint_service_28_0) true)
-+(expandtypeattribute (fingerprint_vendor_data_file_28_0) true)
-+(expandtypeattribute (firstboot_prop_28_0) true)
-+(expandtypeattribute (font_service_28_0) true)
-+(expandtypeattribute (frp_block_device_28_0) true)
-+(expandtypeattribute (fs_bpf_28_0) true)
-+(expandtypeattribute (fsck_28_0) true)
-+(expandtypeattribute (fsck_exec_28_0) true)
-+(expandtypeattribute (fscklogs_28_0) true)
-+(expandtypeattribute (fsck_untrusted_28_0) true)
-+(expandtypeattribute (full_device_28_0) true)
-+(expandtypeattribute (functionfs_28_0) true)
-+(expandtypeattribute (fuse_28_0) true)
-+(expandtypeattribute (fuse_device_28_0) true)
-+(expandtypeattribute (fwk_display_hwservice_28_0) true)
-+(expandtypeattribute (fwk_scheduler_hwservice_28_0) true)
-+(expandtypeattribute (fwk_sensor_hwservice_28_0) true)
-+(expandtypeattribute (fwmarkd_socket_28_0) true)
-+(expandtypeattribute (gatekeeperd_28_0) true)
-+(expandtypeattribute (gatekeeper_data_file_28_0) true)
-+(expandtypeattribute (gatekeeperd_exec_28_0) true)
-+(expandtypeattribute (gatekeeper_service_28_0) true)
-+(expandtypeattribute (gfxinfo_service_28_0) true)
-+(expandtypeattribute (gps_control_28_0) true)
-+(expandtypeattribute (gpu_device_28_0) true)
-+(expandtypeattribute (gpu_service_28_0) true)
-+(expandtypeattribute (graphics_device_28_0) true)
-+(expandtypeattribute (graphicsstats_service_28_0) true)
-+(expandtypeattribute (hal_audiocontrol_hwservice_28_0) true)
-+(expandtypeattribute (hal_audio_hwservice_28_0) true)
-+(expandtypeattribute (hal_authsecret_hwservice_28_0) true)
-+(expandtypeattribute (hal_bluetooth_hwservice_28_0) true)
-+(expandtypeattribute (hal_bootctl_hwservice_28_0) true)
-+(expandtypeattribute (hal_broadcastradio_hwservice_28_0) true)
-+(expandtypeattribute (hal_camera_hwservice_28_0) true)
-+(expandtypeattribute (hal_cas_hwservice_28_0) true)
-+(expandtypeattribute (hal_codec2_hwservice_28_0) true)
-+(expandtypeattribute (hal_configstore_ISurfaceFlingerConfigs_28_0) true)
-+(expandtypeattribute (hal_confirmationui_hwservice_28_0) true)
-+(expandtypeattribute (hal_contexthub_hwservice_28_0) true)
-+(expandtypeattribute (hal_drm_hwservice_28_0) true)
-+(expandtypeattribute (hal_dumpstate_hwservice_28_0) true)
-+(expandtypeattribute (hal_evs_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_hwservice_28_0) true)
-+(expandtypeattribute (hal_fingerprint_service_28_0) true)
-+(expandtypeattribute (hal_gatekeeper_hwservice_28_0) true)
-+(expandtypeattribute (hal_gnss_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_composer_hwservice_28_0) true)
-+(expandtypeattribute (hal_graphics_mapper_hwservice_28_0) true)
-+(expandtypeattribute (hal_health_hwservice_28_0) true)
-+(expandtypeattribute (hal_ir_hwservice_28_0) true)
-+(expandtypeattribute (hal_keymaster_hwservice_28_0) true)
-+(expandtypeattribute (hal_light_hwservice_28_0) true)
-+(expandtypeattribute (hal_lowpan_hwservice_28_0) true)
-+(expandtypeattribute (hal_memtrack_hwservice_28_0) true)
-+(expandtypeattribute (hal_neuralnetworks_hwservice_28_0) true)
-+(expandtypeattribute (hal_nfc_hwservice_28_0) true)
-+(expandtypeattribute (hal_oemlock_hwservice_28_0) true)
-+(expandtypeattribute (hal_omx_hwservice_28_0) true)
-+(expandtypeattribute (hal_power_hwservice_28_0) true)
-+(expandtypeattribute (hal_renderscript_hwservice_28_0) true)
-+(expandtypeattribute (hal_secure_element_hwservice_28_0) true)
-+(expandtypeattribute (hal_sensors_hwservice_28_0) true)
-+(expandtypeattribute (hal_telephony_hwservice_28_0) true)
-+(expandtypeattribute (hal_tetheroffload_hwservice_28_0) true)
-+(expandtypeattribute (hal_thermal_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_cec_hwservice_28_0) true)
-+(expandtypeattribute (hal_tv_input_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_gadget_hwservice_28_0) true)
-+(expandtypeattribute (hal_usb_hwservice_28_0) true)
-+(expandtypeattribute (hal_vehicle_hwservice_28_0) true)
-+(expandtypeattribute (hal_vibrator_hwservice_28_0) true)
-+(expandtypeattribute (hal_vr_hwservice_28_0) true)
-+(expandtypeattribute (hal_weaver_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hostapd_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_offload_hwservice_28_0) true)
-+(expandtypeattribute (hal_wifi_supplicant_hwservice_28_0) true)
-+(expandtypeattribute (hardware_properties_service_28_0) true)
-+(expandtypeattribute (hardware_service_28_0) true)
-+(expandtypeattribute (hci_attach_dev_28_0) true)
-+(expandtypeattribute (hdmi_control_service_28_0) true)
-+(expandtypeattribute (healthd_28_0) true)
-+(expandtypeattribute (healthd_exec_28_0) true)
-+(expandtypeattribute (heapdump_data_file_28_0) true)
-+(expandtypeattribute (hidl_allocator_hwservice_28_0) true)
-+(expandtypeattribute (hidl_base_hwservice_28_0) true)
-+(expandtypeattribute (hidl_manager_hwservice_28_0) true)
-+(expandtypeattribute (hidl_memory_hwservice_28_0) true)
-+(expandtypeattribute (hidl_token_hwservice_28_0) true)
-+(expandtypeattribute (hwbinder_device_28_0) true)
-+(expandtypeattribute (hw_random_device_28_0) true)
-+(expandtypeattribute (hwservice_contexts_file_28_0) true)
-+(expandtypeattribute (hwservicemanager_28_0) true)
-+(expandtypeattribute (hwservicemanager_exec_28_0) true)
-+(expandtypeattribute (hwservicemanager_prop_28_0) true)
-+(expandtypeattribute (i2c_device_28_0) true)
-+(expandtypeattribute (icon_file_28_0) true)
-+(expandtypeattribute (idmap_28_0) true)
-+(expandtypeattribute (idmap_exec_28_0) true)
-+(expandtypeattribute (iio_device_28_0) true)
-+(expandtypeattribute (imms_service_28_0) true)
-+(expandtypeattribute (incident_28_0) true)
-+(expandtypeattribute (incidentd_28_0) true)
-+(expandtypeattribute (incident_data_file_28_0) true)
-+(expandtypeattribute (incident_helper_28_0) true)
-+(expandtypeattribute (incident_service_28_0) true)
-+(expandtypeattribute (init_28_0) true)
-+(expandtypeattribute (init_exec_28_0) true)
-+(expandtypeattribute (inotify_28_0) true)
-+(expandtypeattribute (input_device_28_0) true)
-+(expandtypeattribute (inputflinger_28_0) true)
-+(expandtypeattribute (inputflinger_exec_28_0) true)
-+(expandtypeattribute (inputflinger_service_28_0) true)
-+(expandtypeattribute (input_method_service_28_0) true)
-+(expandtypeattribute (input_service_28_0) true)
-+(expandtypeattribute (installd_28_0) true)
-+(expandtypeattribute (install_data_file_28_0) true)
-+(expandtypeattribute (installd_exec_28_0) true)
-+(expandtypeattribute (installd_service_28_0) true)
-+(expandtypeattribute (install_recovery_28_0) true)
-+(expandtypeattribute (install_recovery_exec_28_0) true)
-+(expandtypeattribute (ion_device_28_0) true)
-+(expandtypeattribute (IProxyService_service_28_0) true)
-+(expandtypeattribute (ipsec_service_28_0) true)
-+(expandtypeattribute (isolated_app_28_0) true)
-+(expandtypeattribute (jobscheduler_service_28_0) true)
-+(expandtypeattribute (kernel_28_0) true)
-+(expandtypeattribute (keychain_data_file_28_0) true)
-+(expandtypeattribute (keychord_device_28_0) true)
-+(expandtypeattribute (keystore_28_0) true)
-+(expandtypeattribute (keystore_data_file_28_0) true)
-+(expandtypeattribute (keystore_exec_28_0) true)
-+(expandtypeattribute (keystore_service_28_0) true)
-+(expandtypeattribute (kmem_device_28_0) true)
-+(expandtypeattribute (kmsg_debug_device_28_0) true)
-+(expandtypeattribute (kmsg_device_28_0) true)
-+(expandtypeattribute (labeledfs_28_0) true)
-+(expandtypeattribute (last_boot_reason_prop_28_0) true)
-+(expandtypeattribute (launcherapps_service_28_0) true)
-+(expandtypeattribute (lmkd_28_0) true)
-+(expandtypeattribute (lmkd_exec_28_0) true)
-+(expandtypeattribute (lmkd_socket_28_0) true)
-+(expandtypeattribute (location_service_28_0) true)
-+(expandtypeattribute (lock_settings_service_28_0) true)
-+(expandtypeattribute (logcat_exec_28_0) true)
-+(expandtypeattribute (logd_28_0) true)
-+(expandtypeattribute (logd_exec_28_0) true)
-+(expandtypeattribute (logd_prop_28_0) true)
-+(expandtypeattribute (logdr_socket_28_0) true)
-+(expandtypeattribute (logd_socket_28_0) true)
-+(expandtypeattribute (logdw_socket_28_0) true)
-+(expandtypeattribute (logpersist_28_0) true)
-+(expandtypeattribute (logpersistd_logging_prop_28_0) true)
-+(expandtypeattribute (log_prop_28_0) true)
-+(expandtypeattribute (log_tag_prop_28_0) true)
-+(expandtypeattribute (loop_control_device_28_0) true)
-+(expandtypeattribute (loop_device_28_0) true)
-+(expandtypeattribute (lowpan_device_28_0) true)
-+(expandtypeattribute (lowpan_prop_28_0) true)
-+(expandtypeattribute (lowpan_service_28_0) true)
-+(expandtypeattribute (mac_perms_file_28_0) true)
-+(expandtypeattribute (mdnsd_28_0) true)
-+(expandtypeattribute (mdnsd_socket_28_0) true)
-+(expandtypeattribute (mdns_socket_28_0) true)
-+(expandtypeattribute (mediacodec_28_0) true)
-+(expandtypeattribute (mediacodec_exec_28_0) true)
-+(expandtypeattribute (mediacodec_service_28_0) true)
-+(expandtypeattribute (media_data_file_28_0) true)
-+(expandtypeattribute (mediadrmserver_28_0) true)
-+(expandtypeattribute (mediadrmserver_exec_28_0) true)
-+(expandtypeattribute (mediadrmserver_service_28_0) true)
-+(expandtypeattribute (mediaextractor_28_0) true)
-+(expandtypeattribute (mediaextractor_exec_28_0) true)
-+(expandtypeattribute (mediaextractor_service_28_0) true)
-+(expandtypeattribute (mediaextractor_update_service_28_0) true)
-+(expandtypeattribute (mediametrics_28_0) true)
-+(expandtypeattribute (mediametrics_exec_28_0) true)
-+(expandtypeattribute (mediametrics_service_28_0) true)
-+(expandtypeattribute (media_projection_service_28_0) true)
-+(expandtypeattribute (mediaprovider_28_0) true)
-+(expandtypeattribute (media_router_service_28_0) true)
-+(expandtypeattribute (media_rw_data_file_28_0) true)
-+(expandtypeattribute (mediaserver_28_0) true)
-+(expandtypeattribute (mediaserver_exec_28_0) true)
-+(expandtypeattribute (mediaserver_service_28_0) true)
-+(expandtypeattribute (media_session_service_28_0) true)
-+(expandtypeattribute (meminfo_service_28_0) true)
-+(expandtypeattribute (metadata_block_device_28_0) true)
-+(expandtypeattribute (metadata_file_28_0) true)
-+(expandtypeattribute (method_trace_data_file_28_0) true)
-+(expandtypeattribute (midi_service_28_0) true)
-+(expandtypeattribute (misc_block_device_28_0) true)
-+(expandtypeattribute (misc_logd_file_28_0) true)
-+(expandtypeattribute (misc_user_data_file_28_0) true)
-+(expandtypeattribute (mmc_prop_28_0) true)
-+(expandtypeattribute (mnt_expand_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_file_28_0) true)
-+(expandtypeattribute (mnt_media_rw_stub_file_28_0) true)
-+(expandtypeattribute (mnt_user_file_28_0) true)
-+(expandtypeattribute (mnt_vendor_file_28_0) true)
-+(expandtypeattribute (modprobe_28_0) true)
-+(expandtypeattribute (mount_service_28_0) true)
-+(expandtypeattribute (mqueue_28_0) true)
-+(expandtypeattribute (mtd_device_28_0) true)
-+(expandtypeattribute (mtp_28_0) true)
-+(expandtypeattribute (mtp_device_28_0) true)
-+(expandtypeattribute (mtpd_socket_28_0) true)
-+(expandtypeattribute (mtp_exec_28_0) true)
-+(expandtypeattribute (nativetest_data_file_28_0) true)
-+(expandtypeattribute (netd_28_0) true)
-+(expandtypeattribute (net_data_file_28_0) true)
-+(expandtypeattribute (netd_exec_28_0) true)
-+(expandtypeattribute (netd_listener_service_28_0) true)
-+(expandtypeattribute (net_dns_prop_28_0) true)
-+(expandtypeattribute (netd_service_28_0) true)
-+(expandtypeattribute (netd_socket_28_0) true)
-+(expandtypeattribute (netd_stable_secret_prop_28_0) true)
-+(expandtypeattribute (netif_28_0) true)
-+(expandtypeattribute (netpolicy_service_28_0) true)
-+(expandtypeattribute (net_radio_prop_28_0) true)
-+(expandtypeattribute (netstats_service_28_0) true)
-+(expandtypeattribute (netutils_wrapper_28_0) true)
-+(expandtypeattribute (netutils_wrapper_exec_28_0) true)
-+(expandtypeattribute (network_management_service_28_0) true)
-+(expandtypeattribute (network_score_service_28_0) true)
-+(expandtypeattribute (network_time_update_service_28_0) true)
-+(expandtypeattribute (network_watchlist_data_file_28_0) true)
-+(expandtypeattribute (network_watchlist_service_28_0) true)
-+(expandtypeattribute (nfc_28_0) true)
-+(expandtypeattribute (nfc_data_file_28_0) true)
-+(expandtypeattribute (nfc_device_28_0) true)
-+(expandtypeattribute (nfc_prop_28_0) true)
-+(expandtypeattribute (nfc_service_28_0) true)
-+(expandtypeattribute (node_28_0) true)
-+(expandtypeattribute (nonplat_service_contexts_file_28_0) true)
-+(expandtypeattribute (notification_service_28_0) true)
-+(expandtypeattribute (null_device_28_0) true)
-+(expandtypeattribute (oemfs_28_0) true)
-+(expandtypeattribute (oem_lock_service_28_0) true)
-+(expandtypeattribute (ota_data_file_28_0) true)
-+(expandtypeattribute (otadexopt_service_28_0) true)
-+(expandtypeattribute (ota_package_file_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_28_0) true)
-+(expandtypeattribute (otapreopt_chroot_exec_28_0) true)
-+(expandtypeattribute (otapreopt_slot_28_0) true)
-+(expandtypeattribute (otapreopt_slot_exec_28_0) true)
-+(expandtypeattribute (overlay_prop_28_0) true)
-+(expandtypeattribute (overlay_service_28_0) true)
-+(expandtypeattribute (owntty_device_28_0) true)
-+(expandtypeattribute (package_native_service_28_0) true)
-+(expandtypeattribute (package_service_28_0) true)
-+(expandtypeattribute (pan_result_prop_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_bufferhub_dir_28_0) true)
-+(expandtypeattribute (pdx_display_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_dir_28_0) true)
-+(expandtypeattribute (pdx_display_manager_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_manager_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_screenshot_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_display_vsync_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_channel_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_client_endpoint_socket_28_0) true)
-+(expandtypeattribute (pdx_performance_dir_28_0) true)
-+(expandtypeattribute (performanced_28_0) true)
-+(expandtypeattribute (performanced_exec_28_0) true)
-+(expandtypeattribute (permission_service_28_0) true)
-+(expandtypeattribute (persist_debug_prop_28_0) true)
-+(expandtypeattribute (persistent_data_block_service_28_0) true)
-+(expandtypeattribute (persistent_properties_ready_prop_28_0) true)
-+(expandtypeattribute (pinner_service_28_0) true)
-+(expandtypeattribute (pipefs_28_0) true)
-+(expandtypeattribute (platform_app_28_0) true)
-+(expandtypeattribute (pm_prop_28_0) true)
-+(expandtypeattribute (pmsg_device_28_0) true)
-+(expandtypeattribute (port_28_0) true)
-+(expandtypeattribute (port_device_28_0) true)
-+(expandtypeattribute (postinstall_28_0) true)
-+(expandtypeattribute (postinstall_dexopt_28_0) true)
-+(expandtypeattribute (postinstall_file_28_0) true)
-+(expandtypeattribute (postinstall_mnt_dir_28_0) true)
-+(expandtypeattribute (powerctl_prop_28_0) true)
-+(expandtypeattribute (power_service_28_0) true)
-+(expandtypeattribute (ppp_28_0) true)
-+(expandtypeattribute (ppp_device_28_0) true)
-+(expandtypeattribute (ppp_exec_28_0) true)
-+(expandtypeattribute (preloads_data_file_28_0) true)
-+(expandtypeattribute (preloads_media_file_28_0) true)
-+(expandtypeattribute (preopt2cachename_28_0) true)
-+(expandtypeattribute (preopt2cachename_exec_28_0) true)
-+(expandtypeattribute (print_service_28_0) true)
-+(expandtypeattribute (priv_app_28_0) true)
-+(expandtypeattribute (proc_28_0) true)
-+(expandtypeattribute (proc_abi_28_0) true)
-+(expandtypeattribute (proc_asound_28_0) true)
-+(expandtypeattribute (proc_bluetooth_writable_28_0) true)
-+(expandtypeattribute (proc_buddyinfo_28_0) true)
-+(expandtypeattribute (proc_cmdline_28_0) true)
-+(expandtypeattribute (proc_cpuinfo_28_0) true)
-+(expandtypeattribute (proc_dirty_28_0) true)
-+(expandtypeattribute (proc_diskstats_28_0) true)
-+(expandtypeattribute (proc_drop_caches_28_0) true)
-+(expandtypeattribute (processinfo_service_28_0) true)
-+(expandtypeattribute (proc_extra_free_kbytes_28_0) true)
-+(expandtypeattribute (proc_filesystems_28_0) true)
-+(expandtypeattribute (proc_hostname_28_0) true)
-+(expandtypeattribute (proc_hung_task_28_0) true)
-+(expandtypeattribute (proc_interrupts_28_0) true)
-+(expandtypeattribute (proc_iomem_28_0) true)
-+(expandtypeattribute (proc_kmsg_28_0) true)
-+(expandtypeattribute (proc_loadavg_28_0) true)
-+(expandtypeattribute (proc_max_map_count_28_0) true)
-+(expandtypeattribute (proc_meminfo_28_0) true)
-+(expandtypeattribute (proc_min_free_order_shift_28_0) true)
-+(expandtypeattribute (proc_misc_28_0) true)
-+(expandtypeattribute (proc_modules_28_0) true)
-+(expandtypeattribute (proc_mounts_28_0) true)
-+(expandtypeattribute (proc_net_28_0) true)
-+(expandtypeattribute (proc_overcommit_memory_28_0) true)
-+(expandtypeattribute (proc_page_cluster_28_0) true)
-+(expandtypeattribute (proc_pagetypeinfo_28_0) true)
-+(expandtypeattribute (proc_panic_28_0) true)
-+(expandtypeattribute (proc_perf_28_0) true)
-+(expandtypeattribute (proc_pid_max_28_0) true)
-+(expandtypeattribute (proc_pipe_conf_28_0) true)
-+(expandtypeattribute (proc_qtaguid_stat_28_0) true)
-+(expandtypeattribute (proc_random_28_0) true)
-+(expandtypeattribute (proc_sched_28_0) true)
-+(expandtypeattribute (proc_security_28_0) true)
-+(expandtypeattribute (proc_stat_28_0) true)
-+(expandtypeattribute (procstats_service_28_0) true)
-+(expandtypeattribute (proc_swaps_28_0) true)
-+(expandtypeattribute (proc_sysrq_28_0) true)
-+(expandtypeattribute (proc_timer_28_0) true)
-+(expandtypeattribute (proc_tty_drivers_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_active_time_28_0) true)
-+(expandtypeattribute (proc_uid_concurrent_policy_time_28_0) true)
-+(expandtypeattribute (proc_uid_cpupower_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_removeuid_28_0) true)
-+(expandtypeattribute (proc_uid_cputime_showstat_28_0) true)
-+(expandtypeattribute (proc_uid_io_stats_28_0) true)
-+(expandtypeattribute (proc_uid_procstat_set_28_0) true)
-+(expandtypeattribute (proc_uid_time_in_state_28_0) true)
-+(expandtypeattribute (proc_uptime_28_0) true)
-+(expandtypeattribute (proc_version_28_0) true)
-+(expandtypeattribute (proc_vmallocinfo_28_0) true)
-+(expandtypeattribute (proc_vmstat_28_0) true)
-+(expandtypeattribute (proc_zoneinfo_28_0) true)
-+(expandtypeattribute (profman_28_0) true)
-+(expandtypeattribute (profman_dump_data_file_28_0) true)
-+(expandtypeattribute (profman_exec_28_0) true)
-+(expandtypeattribute (properties_device_28_0) true)
-+(expandtypeattribute (properties_serial_28_0) true)
-+(expandtypeattribute (property_contexts_file_28_0) true)
-+(expandtypeattribute (property_data_file_28_0) true)
-+(expandtypeattribute (property_info_28_0) true)
-+(expandtypeattribute (property_socket_28_0) true)
-+(expandtypeattribute (pstorefs_28_0) true)
-+(expandtypeattribute (ptmx_device_28_0) true)
-+(expandtypeattribute (qtaguid_device_28_0) true)
-+(expandtypeattribute (qtaguid_proc_28_0) true)
-+(expandtypeattribute (racoon_28_0) true)
-+(expandtypeattribute (racoon_exec_28_0) true)
-+(expandtypeattribute (racoon_socket_28_0) true)
-+(expandtypeattribute (radio_28_0) true)
-+(expandtypeattribute (radio_data_file_28_0) true)
-+(expandtypeattribute (radio_device_28_0) true)
-+(expandtypeattribute (radio_prop_28_0) true)
-+(expandtypeattribute (radio_service_28_0) true)
-+(expandtypeattribute (ram_device_28_0) true)
-+(expandtypeattribute (random_device_28_0) true)
-+(expandtypeattribute (recovery_28_0) true)
-+(expandtypeattribute (recovery_block_device_28_0) true)
-+(expandtypeattribute (recovery_data_file_28_0) true)
-+(expandtypeattribute (recovery_persist_28_0) true)
-+(expandtypeattribute (recovery_persist_exec_28_0) true)
-+(expandtypeattribute (recovery_refresh_28_0) true)
-+(expandtypeattribute (recovery_refresh_exec_28_0) true)
-+(expandtypeattribute (recovery_service_28_0) true)
-+(expandtypeattribute (registry_service_28_0) true)
-+(expandtypeattribute (resourcecache_data_file_28_0) true)
-+(expandtypeattribute (restorecon_prop_28_0) true)
-+(expandtypeattribute (restrictions_service_28_0) true)
-+(expandtypeattribute (rild_debug_socket_28_0) true)
-+(expandtypeattribute (rild_socket_28_0) true)
-+(expandtypeattribute (ringtone_file_28_0) true)
-+(expandtypeattribute (root_block_device_28_0) true)
-+(expandtypeattribute (rootfs_28_0) true)
-+(expandtypeattribute (rpmsg_device_28_0) true)
-+(expandtypeattribute (rtc_device_28_0) true)
-+(expandtypeattribute (rttmanager_service_28_0) true)
-+(expandtypeattribute (runas_28_0) true)
-+(expandtypeattribute (runas_exec_28_0) true)
-+(expandtypeattribute (runtime_event_log_tags_file_28_0) true)
-+(expandtypeattribute (safemode_prop_28_0) true)
-+(expandtypeattribute (same_process_hal_file_28_0) true)
-+(expandtypeattribute (samplingprofiler_service_28_0) true)
-+(expandtypeattribute (scheduling_policy_service_28_0) true)
-+(expandtypeattribute (sdcardd_28_0) true)
-+(expandtypeattribute (sdcardd_exec_28_0) true)
-+(expandtypeattribute (sdcardfs_28_0) true)
-+(expandtypeattribute (seapp_contexts_file_28_0) true)
-+(expandtypeattribute (search_service_28_0) true)
-+(expandtypeattribute (sec_key_att_app_id_provider_service_28_0) true)
-+(expandtypeattribute (secure_element_28_0) true)
-+(expandtypeattribute (secure_element_device_28_0) true)
-+(expandtypeattribute (secure_element_service_28_0) true)
-+(expandtypeattribute (selinuxfs_28_0) true)
-+(expandtypeattribute (sensors_device_28_0) true)
-+(expandtypeattribute (sensorservice_service_28_0) true)
-+(expandtypeattribute (sepolicy_file_28_0) true)
-+(expandtypeattribute (serial_device_28_0) true)
-+(expandtypeattribute (serialno_prop_28_0) true)
-+(expandtypeattribute (serial_service_28_0) true)
-+(expandtypeattribute (service_contexts_file_28_0) true)
-+(expandtypeattribute (servicediscovery_service_28_0) true)
-+(expandtypeattribute (servicemanager_28_0) true)
-+(expandtypeattribute (servicemanager_exec_28_0) true)
-+(expandtypeattribute (settings_service_28_0) true)
-+(expandtypeattribute (sgdisk_28_0) true)
-+(expandtypeattribute (sgdisk_exec_28_0) true)
-+(expandtypeattribute (shared_relro_28_0) true)
-+(expandtypeattribute (shared_relro_file_28_0) true)
-+(expandtypeattribute (shell_28_0) true)
-+(expandtypeattribute (shell_data_file_28_0) true)
-+(expandtypeattribute (shell_exec_28_0) true)
-+(expandtypeattribute (shell_prop_28_0) true)
-+(expandtypeattribute (shm_28_0) true)
-+(expandtypeattribute (shortcut_manager_icons_28_0) true)
-+(expandtypeattribute (shortcut_service_28_0) true)
-+(expandtypeattribute (slice_service_28_0) true)
-+(expandtypeattribute (slideshow_28_0) true)
-+(expandtypeattribute (socket_device_28_0) true)
-+(expandtypeattribute (sockfs_28_0) true)
-+(expandtypeattribute (statusbar_service_28_0) true)
-+(expandtypeattribute (storaged_service_28_0) true)
-+(expandtypeattribute (storage_file_28_0) true)
-+(expandtypeattribute (storagestats_service_28_0) true)
-+(expandtypeattribute (storage_stub_file_28_0) true)
-+(expandtypeattribute (su_28_0) true)
-+(expandtypeattribute (su_exec_28_0) true)
-+(expandtypeattribute (surfaceflinger_28_0) true)
-+(expandtypeattribute (surfaceflinger_service_28_0) true)
-+(expandtypeattribute (swap_block_device_28_0) true)
-+(expandtypeattribute (sysfs_28_0) true)
-+(expandtypeattribute (sysfs_android_usb_28_0) true)
-+(expandtypeattribute (sysfs_batteryinfo_28_0) true)
-+(expandtypeattribute (sysfs_bluetooth_writable_28_0) true)
-+(expandtypeattribute (sysfs_devices_system_cpu_28_0) true)
-+(expandtypeattribute (sysfs_dm_28_0) true)
-+(expandtypeattribute (sysfs_dt_firmware_android_28_0) true)
-+(expandtypeattribute (sysfs_fs_ext4_features_28_0) true)
-+(expandtypeattribute (sysfs_hwrandom_28_0) true)
-+(expandtypeattribute (sysfs_ipv4_28_0) true)
-+(expandtypeattribute (sysfs_kernel_notes_28_0) true)
-+(expandtypeattribute (sysfs_leds_28_0) true)
-+(expandtypeattribute (sysfs_lowmemorykiller_28_0) true)
-+(expandtypeattribute (sysfs_mac_address_28_0) true)
-+(expandtypeattribute (sysfs_net_28_0) true)
-+(expandtypeattribute (sysfs_nfc_power_writable_28_0) true)
-+(expandtypeattribute (sysfs_power_28_0) true)
-+(expandtypeattribute (sysfs_rtc_28_0) true)
-+(expandtypeattribute (sysfs_switch_28_0) true)
-+(expandtypeattribute (sysfs_thermal_28_0) true)
-+(expandtypeattribute (sysfs_uio_28_0) true)
-+(expandtypeattribute (sysfs_usb_28_0) true)
-+(expandtypeattribute (sysfs_usermodehelper_28_0) true)
-+(expandtypeattribute (sysfs_vibrator_28_0) true)
-+(expandtypeattribute (sysfs_wake_lock_28_0) true)
-+(expandtypeattribute (sysfs_wakeup_reasons_28_0) true)
-+(expandtypeattribute (sysfs_wlan_fwpath_28_0) true)
-+(expandtypeattribute (sysfs_zram_28_0) true)
-+(expandtypeattribute (sysfs_zram_uevent_28_0) true)
-+(expandtypeattribute (system_app_28_0) true)
-+(expandtypeattribute (system_app_data_file_28_0) true)
-+(expandtypeattribute (system_app_service_28_0) true)
-+(expandtypeattribute (system_block_device_28_0) true)
-+(expandtypeattribute (system_boot_reason_prop_28_0) true)
-+(expandtypeattribute (system_data_file_28_0) true)
-+(expandtypeattribute (system_file_28_0) true)
-+(expandtypeattribute (systemkeys_data_file_28_0) true)
-+(expandtypeattribute (system_ndebug_socket_28_0) true)
-+(expandtypeattribute (system_net_netd_hwservice_28_0) true)
-+(expandtypeattribute (system_prop_28_0) true)
-+(expandtypeattribute (system_radio_prop_28_0) true)
-+(expandtypeattribute (system_server_28_0) true)
-+(expandtypeattribute (system_update_service_28_0) true)
-+(expandtypeattribute (system_wifi_keystore_hwservice_28_0) true)
-+(expandtypeattribute (system_wpa_socket_28_0) true)
-+(expandtypeattribute (task_service_28_0) true)
-+(expandtypeattribute (tee_28_0) true)
-+(expandtypeattribute (tee_data_file_28_0) true)
-+(expandtypeattribute (tee_device_28_0) true)
-+(expandtypeattribute (telecom_service_28_0) true)
-+(expandtypeattribute (test_boot_reason_prop_28_0) true)
-+(expandtypeattribute (textclassification_service_28_0) true)
-+(expandtypeattribute (textclassifier_data_file_28_0) true)
-+(expandtypeattribute (textservices_service_28_0) true)
-+(expandtypeattribute (thermalcallback_hwservice_28_0) true)
-+(expandtypeattribute (thermal_service_28_0) true)
-+(expandtypeattribute (timezone_service_28_0) true)
-+(expandtypeattribute (tmpfs_28_0) true)
-+(expandtypeattribute (tombstoned_28_0) true)
-+(expandtypeattribute (tombstone_data_file_28_0) true)
-+(expandtypeattribute (tombstoned_crash_socket_28_0) true)
-+(expandtypeattribute (tombstoned_exec_28_0) true)
-+(expandtypeattribute (tombstoned_intercept_socket_28_0) true)
-+(expandtypeattribute (tombstoned_java_trace_socket_28_0) true)
-+(expandtypeattribute (tombstone_wifi_data_file_28_0) true)
-+(expandtypeattribute (toolbox_28_0) true)
-+(expandtypeattribute (toolbox_exec_28_0) true)
-+(expandtypeattribute (trace_data_file_28_0) true)
-+(expandtypeattribute (traced_consumer_socket_28_0) true)
-+(expandtypeattribute (traced_enabled_prop_28_0) true)
-+(expandtypeattribute (traced_probes_28_0) true)
-+(expandtypeattribute (traced_producer_socket_28_0) true)
-+(expandtypeattribute (traceur_app_28_0) true)
-+(expandtypeattribute (trust_service_28_0) true)
-+(expandtypeattribute (tty_device_28_0) true)
-+(expandtypeattribute (tun_device_28_0) true)
-+(expandtypeattribute (tv_input_service_28_0) true)
-+(expandtypeattribute (tzdatacheck_28_0) true)
-+(expandtypeattribute (tzdatacheck_exec_28_0) true)
-+(expandtypeattribute (ueventd_28_0) true)
-+(expandtypeattribute (uhid_device_28_0) true)
-+(expandtypeattribute (uimode_service_28_0) true)
-+(expandtypeattribute (uio_device_28_0) true)
-+(expandtypeattribute (uncrypt_28_0) true)
-+(expandtypeattribute (uncrypt_exec_28_0) true)
-+(expandtypeattribute (uncrypt_socket_28_0) true)
-+(expandtypeattribute (unencrypted_data_file_28_0) true)
-+(expandtypeattribute (unlabeled_28_0) true)
-+(expandtypeattribute (untrusted_app_25_28_0) true)
-+(expandtypeattribute (untrusted_app_27_28_0) true)
-+(expandtypeattribute (untrusted_app_28_0) true)
-+(expandtypeattribute (untrusted_v2_app_28_0) true)
-+(expandtypeattribute (update_engine_28_0) true)
-+(expandtypeattribute (update_engine_data_file_28_0) true)
-+(expandtypeattribute (update_engine_exec_28_0) true)
-+(expandtypeattribute (update_engine_log_data_file_28_0) true)
-+(expandtypeattribute (update_engine_service_28_0) true)
-+(expandtypeattribute (updatelock_service_28_0) true)
-+(expandtypeattribute (update_verifier_28_0) true)
-+(expandtypeattribute (update_verifier_exec_28_0) true)
-+(expandtypeattribute (usagestats_service_28_0) true)
-+(expandtypeattribute (usbaccessory_device_28_0) true)
-+(expandtypeattribute (usbd_28_0) true)
-+(expandtypeattribute (usb_device_28_0) true)
-+(expandtypeattribute (usbd_exec_28_0) true)
-+(expandtypeattribute (usbfs_28_0) true)
-+(expandtypeattribute (usb_service_28_0) true)
-+(expandtypeattribute (userdata_block_device_28_0) true)
-+(expandtypeattribute (usermodehelper_28_0) true)
-+(expandtypeattribute (user_profile_data_file_28_0) true)
-+(expandtypeattribute (user_service_28_0) true)
-+(expandtypeattribute (vcs_device_28_0) true)
-+(expandtypeattribute (vdc_28_0) true)
-+(expandtypeattribute (vdc_exec_28_0) true)
-+(expandtypeattribute (vendor_app_file_28_0) true)
-+(expandtypeattribute (vendor_configs_file_28_0) true)
-+(expandtypeattribute (vendor_data_file_28_0) true)
-+(expandtypeattribute (vendor_default_prop_28_0) true)
-+(expandtypeattribute (vendor_file_28_0) true)
-+(expandtypeattribute (vendor_framework_file_28_0) true)
-+(expandtypeattribute (vendor_hal_file_28_0) true)
-+(expandtypeattribute (vendor_init_28_0) true)
-+(expandtypeattribute (vendor_overlay_file_28_0) true)
-+(expandtypeattribute (vendor_security_patch_level_prop_28_0) true)
-+(expandtypeattribute (vendor_shell_28_0) true)
-+(expandtypeattribute (vendor_shell_exec_28_0) true)
-+(expandtypeattribute (vendor_toolbox_exec_28_0) true)
-+(expandtypeattribute (vfat_28_0) true)
-+(expandtypeattribute (vibrator_service_28_0) true)
-+(expandtypeattribute (video_device_28_0) true)
-+(expandtypeattribute (virtual_touchpad_28_0) true)
-+(expandtypeattribute (virtual_touchpad_exec_28_0) true)
-+(expandtypeattribute (virtual_touchpad_service_28_0) true)
-+(expandtypeattribute (vndbinder_device_28_0) true)
-+(expandtypeattribute (vndk_sp_file_28_0) true)
-+(expandtypeattribute (vndservice_contexts_file_28_0) true)
-+(expandtypeattribute (vndservicemanager_28_0) true)
-+(expandtypeattribute (voiceinteraction_service_28_0) true)
-+(expandtypeattribute (vold_28_0) true)
-+(expandtypeattribute (vold_data_file_28_0) true)
-+(expandtypeattribute (vold_device_28_0) true)
-+(expandtypeattribute (vold_exec_28_0) true)
-+(expandtypeattribute (vold_metadata_file_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_28_0) true)
-+(expandtypeattribute (vold_prepare_subdirs_exec_28_0) true)
-+(expandtypeattribute (vold_prop_28_0) true)
-+(expandtypeattribute (vold_service_28_0) true)
-+(expandtypeattribute (vpn_data_file_28_0) true)
-+(expandtypeattribute (vr_hwc_28_0) true)
-+(expandtypeattribute (vr_hwc_exec_28_0) true)
-+(expandtypeattribute (vr_hwc_service_28_0) true)
-+(expandtypeattribute (vr_manager_service_28_0) true)
-+(expandtypeattribute (wallpaper_file_28_0) true)
-+(expandtypeattribute (wallpaper_service_28_0) true)
-+(expandtypeattribute (watchdogd_28_0) true)
-+(expandtypeattribute (watchdog_device_28_0) true)
-+(expandtypeattribute (webviewupdate_service_28_0) true)
-+(expandtypeattribute (webview_zygote_28_0) true)
-+(expandtypeattribute (webview_zygote_exec_28_0) true)
-+(expandtypeattribute (wifiaware_service_28_0) true)
-+(expandtypeattribute (wificond_28_0) true)
-+(expandtypeattribute (wificond_exec_28_0) true)
-+(expandtypeattribute (wificond_service_28_0) true)
-+(expandtypeattribute (wifi_data_file_28_0) true)
-+(expandtypeattribute (wifi_log_prop_28_0) true)
-+(expandtypeattribute (wifip2p_service_28_0) true)
-+(expandtypeattribute (wifi_prop_28_0) true)
-+(expandtypeattribute (wifiscanner_service_28_0) true)
-+(expandtypeattribute (wifi_service_28_0) true)
-+(expandtypeattribute (window_service_28_0) true)
-+(expandtypeattribute (wpantund_28_0) true)
-+(expandtypeattribute (wpantund_exec_28_0) true)
-+(expandtypeattribute (wpantund_service_28_0) true)
-+(expandtypeattribute (wpa_socket_28_0) true)
-+(expandtypeattribute (zero_device_28_0) true)
-+(expandtypeattribute (zoneinfo_data_file_28_0) true)
-+(expandtypeattribute (zygote_28_0) true)
-+(expandtypeattribute (zygote_exec_28_0) true)
-+(expandtypeattribute (zygote_socket_28_0) true)
-+(typeattributeset accessibility_service_28_0 (accessibility_service))
-+(typeattributeset account_service_28_0 (account_service))
-+(typeattributeset activity_service_28_0 (activity_service))
-+(typeattributeset adbd_28_0 (adbd))
-+(typeattributeset adb_data_file_28_0 (adb_data_file))
-+(typeattributeset adbd_exec_28_0 (adbd_exec))
-+(typeattributeset adbd_socket_28_0 (adbd_socket))
-+(typeattributeset adb_keys_file_28_0 (adb_keys_file))
-+(typeattributeset alarm_device_28_0 (alarm_device))
-+(typeattributeset alarm_service_28_0 (alarm_service))
-+(typeattributeset anr_data_file_28_0 (anr_data_file))
-+(typeattributeset apk_data_file_28_0 (apk_data_file))
-+(typeattributeset apk_private_data_file_28_0 (apk_private_data_file))
-+(typeattributeset apk_private_tmp_file_28_0 (apk_private_tmp_file))
-+(typeattributeset apk_tmp_file_28_0 (apk_tmp_file))
-+(typeattributeset app_data_file_28_0 (app_data_file privapp_data_file))
-+(typeattributeset app_fuse_file_28_0 (app_fuse_file))
-+(typeattributeset app_fusefs_28_0 (app_fusefs))
-+(typeattributeset appops_service_28_0 (appops_service))
-+(typeattributeset appwidget_service_28_0 (appwidget_service))
-+(typeattributeset asec_apk_file_28_0 (asec_apk_file))
-+(typeattributeset asec_image_file_28_0 (asec_image_file))
-+(typeattributeset asec_public_file_28_0 (asec_public_file))
-+(typeattributeset ashmem_device_28_0 (ashmem_device))
-+(typeattributeset assetatlas_service_28_0 (assetatlas_service))
-+(typeattributeset audio_data_file_28_0 (audio_data_file))
-+(typeattributeset audio_device_28_0 (audio_device))
-+(typeattributeset audiohal_data_file_28_0 (audiohal_data_file))
-+(typeattributeset audio_prop_28_0 (audio_prop))
-+(typeattributeset audio_seq_device_28_0 (audio_seq_device))
-+(typeattributeset audioserver_28_0 (audioserver))
-+(typeattributeset audioserver_data_file_28_0 (audioserver_data_file))
-+(typeattributeset audioserver_service_28_0 (audioserver_service))
-+(typeattributeset audio_service_28_0 (audio_service))
-+(typeattributeset audio_timer_device_28_0 (audio_timer_device))
-+(typeattributeset autofill_service_28_0 (autofill_service))
-+(typeattributeset backup_data_file_28_0 (backup_data_file))
-+(typeattributeset backup_service_28_0 (backup_service))
-+(typeattributeset batteryproperties_service_28_0 (batteryproperties_service))
-+(typeattributeset battery_service_28_0 (battery_service))
-+(typeattributeset batterystats_service_28_0 (batterystats_service))
-+(typeattributeset binder_calls_stats_service_28_0 (binder_calls_stats_service))
-+(typeattributeset binder_device_28_0 (binder_device))
-+(typeattributeset binfmt_miscfs_28_0 (binfmt_miscfs))
-+(typeattributeset blkid_28_0 (blkid))
-+(typeattributeset blkid_untrusted_28_0 (blkid_untrusted))
-+(typeattributeset block_device_28_0 (block_device))
-+(typeattributeset bluetooth_28_0 (bluetooth))
-+(typeattributeset bluetooth_a2dp_offload_prop_28_0 (bluetooth_a2dp_offload_prop))
-+(typeattributeset bluetooth_data_file_28_0 (bluetooth_data_file))
-+(typeattributeset bluetooth_efs_file_28_0 (bluetooth_efs_file))
-+(typeattributeset bluetooth_logs_data_file_28_0 (bluetooth_logs_data_file))
-+(typeattributeset bluetooth_manager_service_28_0 (bluetooth_manager_service))
-+(typeattributeset bluetooth_prop_28_0 (bluetooth_prop))
-+(typeattributeset bluetooth_service_28_0 (bluetooth_service))
-+(typeattributeset bluetooth_socket_28_0 (bluetooth_socket))
-+(typeattributeset bootanim_28_0 (bootanim))
-+(typeattributeset bootanim_exec_28_0 (bootanim_exec))
-+(typeattributeset boot_block_device_28_0 (boot_block_device))
-+(typeattributeset bootchart_data_file_28_0 (bootchart_data_file))
-+(typeattributeset bootloader_boot_reason_prop_28_0 (bootloader_boot_reason_prop))
-+(typeattributeset bootstat_28_0 (bootstat))
-+(typeattributeset bootstat_data_file_28_0 (bootstat_data_file))
-+(typeattributeset bootstat_exec_28_0 (bootstat_exec))
-+(typeattributeset boottime_prop_28_0 (boottime_prop))
-+(typeattributeset boottrace_data_file_28_0 (boottrace_data_file))
-+(typeattributeset broadcastradio_service_28_0 (broadcastradio_service))
-+(typeattributeset bufferhubd_28_0 (bufferhubd))
-+(typeattributeset bufferhubd_exec_28_0 (bufferhubd_exec))
-+(typeattributeset cache_backup_file_28_0 (cache_backup_file))
-+(typeattributeset cache_block_device_28_0 (cache_block_device))
-+(typeattributeset cache_file_28_0 (cache_file))
-+(typeattributeset cache_private_backup_file_28_0 (cache_private_backup_file))
-+(typeattributeset cache_recovery_file_28_0 (cache_recovery_file))
-+(typeattributeset camera_data_file_28_0 (camera_data_file))
-+(typeattributeset camera_device_28_0 (camera_device))
-+(typeattributeset cameraproxy_service_28_0 (cameraproxy_service))
-+(typeattributeset cameraserver_28_0 (cameraserver))
-+(typeattributeset cameraserver_exec_28_0 (cameraserver_exec))
-+(typeattributeset cameraserver_service_28_0 (cameraserver_service))
-+(typeattributeset cgroup_28_0 (cgroup))
-+(typeattributeset cgroup_bpf_28_0 (cgroup_bpf))
-+(typeattributeset charger_28_0 (charger))
-+(typeattributeset clatd_28_0 (clatd))
-+(typeattributeset clatd_exec_28_0 (clatd_exec))
-+(typeattributeset clipboard_service_28_0 (clipboard_service))
-+(typeattributeset commontime_management_service_28_0 (commontime_management_service))
-+(typeattributeset companion_device_service_28_0 (companion_device_service))
-+(typeattributeset configfs_28_0 (configfs))
-+(typeattributeset config_prop_28_0 (config_prop))
-+(typeattributeset connectivity_service_28_0 (connectivity_service))
-+(typeattributeset connmetrics_service_28_0 (connmetrics_service))
-+(typeattributeset console_device_28_0 (console_device))
-+(typeattributeset consumer_ir_service_28_0 (consumer_ir_service))
-+(typeattributeset content_service_28_0 (content_service))
-+(typeattributeset contexthub_service_28_0 (contexthub_service))
-+(typeattributeset coredump_file_28_0 (coredump_file))
-+(typeattributeset country_detector_service_28_0 (country_detector_service))
-+(typeattributeset coverage_service_28_0 (coverage_service))
-+(typeattributeset cppreopt_prop_28_0 (cppreopt_prop))
-+(typeattributeset cppreopts_28_0 (cppreopts))
-+(typeattributeset cppreopts_exec_28_0 (cppreopts_exec))
-+(typeattributeset cpuctl_device_28_0 (cpuctl_device))
-+(typeattributeset cpuinfo_service_28_0 (cpuinfo_service))
-+(typeattributeset crash_dump_28_0 (crash_dump))
-+(typeattributeset crash_dump_exec_28_0 (crash_dump_exec))
-+(typeattributeset crossprofileapps_service_28_0 (crossprofileapps_service))
-+(typeattributeset ctl_bootanim_prop_28_0 (ctl_bootanim_prop))
-+(typeattributeset ctl_bugreport_prop_28_0 (ctl_bugreport_prop))
-+(typeattributeset ctl_console_prop_28_0 (ctl_console_prop))
-+(typeattributeset ctl_default_prop_28_0
-+  ( ctl_adbd_prop
-+    ctl_default_prop))
-+(typeattributeset ctl_dumpstate_prop_28_0 (ctl_dumpstate_prop))
-+(typeattributeset ctl_fuse_prop_28_0 (ctl_fuse_prop))
-+(typeattributeset ctl_interface_restart_prop_28_0 (ctl_interface_restart_prop))
-+(typeattributeset ctl_interface_start_prop_28_0 (ctl_interface_start_prop))
-+(typeattributeset ctl_interface_stop_prop_28_0 (ctl_interface_stop_prop))
-+(typeattributeset ctl_mdnsd_prop_28_0 (ctl_mdnsd_prop))
-+(typeattributeset ctl_restart_prop_28_0 (ctl_restart_prop))
-+(typeattributeset ctl_rildaemon_prop_28_0 (ctl_rildaemon_prop))
-+(typeattributeset ctl_sigstop_prop_28_0 (ctl_sigstop_prop))
-+(typeattributeset ctl_start_prop_28_0 (ctl_start_prop))
-+(typeattributeset ctl_stop_prop_28_0 (ctl_stop_prop))
-+(typeattributeset dalvikcache_data_file_28_0 (dalvikcache_data_file))
-+(typeattributeset dalvik_prop_28_0 (dalvik_prop))
-+(typeattributeset dbinfo_service_28_0 (dbinfo_service))
-+(typeattributeset debugfs_28_0 (debugfs))
-+(typeattributeset debugfs_mmc_28_0 (debugfs_mmc))
-+(typeattributeset debugfs_trace_marker_28_0 (debugfs_trace_marker))
-+(typeattributeset debugfs_tracing_28_0 (debugfs_tracing))
-+(typeattributeset debugfs_tracing_debug_28_0 (debugfs_tracing_debug))
-+(typeattributeset debugfs_tracing_instances_28_0 (debugfs_tracing_instances))
-+(typeattributeset debugfs_wakeup_sources_28_0 (debugfs_wakeup_sources))
-+(typeattributeset debugfs_wifi_tracing_28_0 (debugfs_wifi_tracing))
-+(typeattributeset debuggerd_prop_28_0 (debuggerd_prop))
-+(typeattributeset debug_prop_28_0 (debug_prop))
-+(typeattributeset default_android_hwservice_28_0 (default_android_hwservice))
-+(typeattributeset default_android_service_28_0 (default_android_service))
-+(typeattributeset default_android_vndservice_28_0 (default_android_vndservice))
-+(typeattributeset default_prop_28_0 (default_prop))
-+(typeattributeset device_28_0 (device))
-+(typeattributeset device_identifiers_service_28_0 (device_identifiers_service))
-+(typeattributeset deviceidle_service_28_0 (deviceidle_service))
-+(typeattributeset device_logging_prop_28_0 (device_logging_prop))
-+(typeattributeset device_policy_service_28_0 (device_policy_service))
-+(typeattributeset devicestoragemonitor_service_28_0 (devicestoragemonitor_service))
-+(typeattributeset devpts_28_0 (devpts))
-+(typeattributeset dex2oat_28_0 (dex2oat))
-+(typeattributeset dex2oat_exec_28_0 (dex2oat_exec))
-+(typeattributeset dhcp_28_0 (dhcp))
-+(typeattributeset dhcp_data_file_28_0 (dhcp_data_file))
-+(typeattributeset dhcp_exec_28_0 (dhcp_exec))
-+(typeattributeset dhcp_prop_28_0 (dhcp_prop))
-+(typeattributeset diskstats_service_28_0 (diskstats_service))
-+(typeattributeset display_service_28_0 (display_service))
-+(typeattributeset dm_device_28_0 (dm_device))
-+(typeattributeset dnsmasq_28_0 (dnsmasq))
-+(typeattributeset dnsmasq_exec_28_0 (dnsmasq_exec))
-+(typeattributeset dnsproxyd_socket_28_0 (dnsproxyd_socket))
-+(typeattributeset DockObserver_service_28_0 (DockObserver_service))
-+(typeattributeset dreams_service_28_0 (dreams_service))
-+(typeattributeset drm_data_file_28_0 (drm_data_file))
-+(typeattributeset drmserver_28_0 (drmserver))
-+(typeattributeset drmserver_exec_28_0 (drmserver_exec))
-+(typeattributeset drmserver_service_28_0 (drmserver_service))
-+(typeattributeset drmserver_socket_28_0 (drmserver_socket))
-+(typeattributeset dropbox_service_28_0 (dropbox_service))
-+(typeattributeset dumpstate_28_0 (dumpstate))
-+(typeattributeset dumpstate_exec_28_0 (dumpstate_exec))
-+(typeattributeset dumpstate_options_prop_28_0 (dumpstate_options_prop))
-+(typeattributeset dumpstate_prop_28_0 (dumpstate_prop))
-+(typeattributeset dumpstate_service_28_0 (dumpstate_service))
-+(typeattributeset dumpstate_socket_28_0 (dumpstate_socket))
-+(typeattributeset e2fs_28_0 (e2fs))
-+(typeattributeset e2fs_exec_28_0 (e2fs_exec))
-+(typeattributeset efs_file_28_0 (efs_file))
-+(typeattributeset ephemeral_app_28_0 (ephemeral_app))
-+(typeattributeset ethernet_service_28_0 (ethernet_service))
-+(typeattributeset exfat_28_0 (exfat))
-+(typeattributeset exported2_config_prop_28_0 (exported2_config_prop))
-+(typeattributeset exported2_default_prop_28_0 (exported2_default_prop))
-+(typeattributeset exported2_radio_prop_28_0 (exported2_radio_prop))
-+(typeattributeset exported2_system_prop_28_0 (exported2_system_prop))
-+(typeattributeset exported2_vold_prop_28_0 (exported2_vold_prop))
-+(typeattributeset exported3_default_prop_28_0 (exported3_default_prop))
-+(typeattributeset exported3_radio_prop_28_0 (exported3_radio_prop))
-+(typeattributeset exported3_system_prop_28_0 (exported3_system_prop))
-+(typeattributeset exported_audio_prop_28_0 (exported_audio_prop))
-+(typeattributeset exported_bluetooth_prop_28_0 (exported_bluetooth_prop))
-+(typeattributeset exported_config_prop_28_0 (exported_config_prop))
-+(typeattributeset exported_dalvik_prop_28_0 (exported_dalvik_prop))
-+(typeattributeset exported_default_prop_28_0 (exported_default_prop))
-+(typeattributeset exported_dumpstate_prop_28_0 (exported_dumpstate_prop))
-+(typeattributeset exported_ffs_prop_28_0 (exported_ffs_prop))
-+(typeattributeset exported_fingerprint_prop_28_0 (exported_fingerprint_prop))
-+(typeattributeset exported_overlay_prop_28_0 (exported_overlay_prop))
-+(typeattributeset exported_pm_prop_28_0 (exported_pm_prop))
-+(typeattributeset exported_radio_prop_28_0 (exported_radio_prop))
-+(typeattributeset exported_secure_prop_28_0 (exported_secure_prop))
-+(typeattributeset exported_system_prop_28_0 (exported_system_prop))
-+(typeattributeset exported_system_radio_prop_28_0 (exported_system_radio_prop))
-+(typeattributeset exported_vold_prop_28_0 (exported_vold_prop))
-+(typeattributeset exported_wifi_prop_28_0 (exported_wifi_prop))
-+(typeattributeset ffs_prop_28_0 (ffs_prop))
-+(typeattributeset file_contexts_file_28_0 (file_contexts_file))
-+(typeattributeset fingerprintd_28_0 (fingerprintd))
-+(typeattributeset fingerprintd_data_file_28_0 (fingerprintd_data_file))
-+(typeattributeset fingerprintd_exec_28_0 (fingerprintd_exec))
-+(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
-+(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
-+(typeattributeset fingerprint_service_28_0 (fingerprint_service))
-+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
-+(typeattributeset firstboot_prop_28_0 (firstboot_prop))
-+(typeattributeset font_service_28_0 (font_service))
-+(typeattributeset frp_block_device_28_0 (frp_block_device))
-+(typeattributeset fs_bpf_28_0 (fs_bpf))
-+(typeattributeset fsck_28_0 (fsck))
-+(typeattributeset fsck_exec_28_0 (fsck_exec))
-+(typeattributeset fscklogs_28_0 (fscklogs))
-+(typeattributeset fsck_untrusted_28_0 (fsck_untrusted))
-+(typeattributeset full_device_28_0 (full_device))
-+(typeattributeset functionfs_28_0 (functionfs))
-+(typeattributeset fuse_28_0 (fuse))
-+(typeattributeset fuse_device_28_0 (fuse_device))
-+(typeattributeset fwk_display_hwservice_28_0 (fwk_display_hwservice))
-+(typeattributeset fwk_scheduler_hwservice_28_0 (fwk_scheduler_hwservice))
-+(typeattributeset fwk_sensor_hwservice_28_0 (fwk_sensor_hwservice))
-+(typeattributeset fwmarkd_socket_28_0 (fwmarkd_socket))
-+(typeattributeset gatekeeperd_28_0 (gatekeeperd))
-+(typeattributeset gatekeeper_data_file_28_0 (gatekeeper_data_file))
-+(typeattributeset gatekeeperd_exec_28_0 (gatekeeperd_exec))
-+(typeattributeset gatekeeper_service_28_0 (gatekeeper_service))
-+(typeattributeset gfxinfo_service_28_0 (gfxinfo_service))
-+(typeattributeset gps_control_28_0 (gps_control))
-+(typeattributeset gpu_device_28_0 (gpu_device))
-+(typeattributeset gpu_service_28_0 (gpu_service))
-+(typeattributeset graphics_device_28_0 (graphics_device))
-+(typeattributeset graphicsstats_service_28_0 (graphicsstats_service))
-+(typeattributeset hal_audiocontrol_hwservice_28_0 (hal_audiocontrol_hwservice))
-+(typeattributeset hal_audio_hwservice_28_0 (hal_audio_hwservice))
-+(typeattributeset hal_authsecret_hwservice_28_0 (hal_authsecret_hwservice))
-+(typeattributeset hal_bluetooth_hwservice_28_0 (hal_bluetooth_hwservice))
-+(typeattributeset hal_bootctl_hwservice_28_0 (hal_bootctl_hwservice))
-+(typeattributeset hal_broadcastradio_hwservice_28_0 (hal_broadcastradio_hwservice))
-+(typeattributeset hal_camera_hwservice_28_0 (hal_camera_hwservice))
-+(typeattributeset hal_cas_hwservice_28_0 (hal_cas_hwservice))
-+(typeattributeset hal_codec2_hwservice_28_0 (hal_codec2_hwservice))
-+(typeattributeset hal_configstore_ISurfaceFlingerConfigs_28_0 (hal_configstore_ISurfaceFlingerConfigs))
-+(typeattributeset hal_confirmationui_hwservice_28_0 (hal_confirmationui_hwservice))
-+(typeattributeset hal_contexthub_hwservice_28_0 (hal_contexthub_hwservice))
-+(typeattributeset hal_drm_hwservice_28_0 (hal_drm_hwservice))
-+(typeattributeset hal_dumpstate_hwservice_28_0 (hal_dumpstate_hwservice))
-+(typeattributeset hal_evs_hwservice_28_0 (hal_evs_hwservice))
-+(typeattributeset hal_fingerprint_hwservice_28_0 (hal_fingerprint_hwservice))
-+(typeattributeset hal_fingerprint_service_28_0 (hal_fingerprint_service))
-+(typeattributeset hal_gatekeeper_hwservice_28_0 (hal_gatekeeper_hwservice))
-+(typeattributeset hal_gnss_hwservice_28_0 (hal_gnss_hwservice))
-+(typeattributeset hal_graphics_allocator_hwservice_28_0 (hal_graphics_allocator_hwservice))
-+(typeattributeset hal_graphics_composer_hwservice_28_0 (hal_graphics_composer_hwservice))
-+(typeattributeset hal_graphics_mapper_hwservice_28_0 (hal_graphics_mapper_hwservice))
-+(typeattributeset hal_health_hwservice_28_0 (hal_health_hwservice))
-+(typeattributeset hal_ir_hwservice_28_0 (hal_ir_hwservice))
-+(typeattributeset hal_keymaster_hwservice_28_0 (hal_keymaster_hwservice))
-+(typeattributeset hal_light_hwservice_28_0 (hal_light_hwservice))
-+(typeattributeset hal_lowpan_hwservice_28_0 (hal_lowpan_hwservice))
-+(typeattributeset hal_memtrack_hwservice_28_0 (hal_memtrack_hwservice))
-+(typeattributeset hal_neuralnetworks_hwservice_28_0 (hal_neuralnetworks_hwservice))
-+(typeattributeset hal_nfc_hwservice_28_0 (hal_nfc_hwservice))
-+(typeattributeset hal_oemlock_hwservice_28_0 (hal_oemlock_hwservice))
-+(typeattributeset hal_omx_hwservice_28_0 (hal_omx_hwservice))
-+(typeattributeset hal_power_hwservice_28_0 (hal_power_hwservice))
-+(typeattributeset hal_renderscript_hwservice_28_0 (hal_renderscript_hwservice))
-+(typeattributeset hal_secure_element_hwservice_28_0 (hal_secure_element_hwservice))
-+(typeattributeset hal_sensors_hwservice_28_0 (hal_sensors_hwservice))
-+(typeattributeset hal_telephony_hwservice_28_0 (hal_telephony_hwservice))
-+(typeattributeset hal_tetheroffload_hwservice_28_0 (hal_tetheroffload_hwservice))
-+(typeattributeset hal_thermal_hwservice_28_0 (hal_thermal_hwservice))
-+(typeattributeset hal_tv_cec_hwservice_28_0 (hal_tv_cec_hwservice))
-+(typeattributeset hal_tv_input_hwservice_28_0 (hal_tv_input_hwservice))
-+(typeattributeset hal_usb_gadget_hwservice_28_0 (hal_usb_gadget_hwservice))
-+(typeattributeset hal_usb_hwservice_28_0 (hal_usb_hwservice))
-+(typeattributeset hal_vehicle_hwservice_28_0 (hal_vehicle_hwservice))
-+(typeattributeset hal_vibrator_hwservice_28_0 (hal_vibrator_hwservice))
-+(typeattributeset hal_vr_hwservice_28_0 (hal_vr_hwservice))
-+(typeattributeset hal_weaver_hwservice_28_0 (hal_weaver_hwservice))
-+(typeattributeset hal_wifi_hostapd_hwservice_28_0 (hal_wifi_hostapd_hwservice))
-+(typeattributeset hal_wifi_hwservice_28_0 (hal_wifi_hwservice))
-+(typeattributeset hal_wifi_offload_hwservice_28_0 (hal_wifi_offload_hwservice))
-+(typeattributeset hal_wifi_supplicant_hwservice_28_0 (hal_wifi_supplicant_hwservice))
-+(typeattributeset hardware_properties_service_28_0 (hardware_properties_service))
-+(typeattributeset hardware_service_28_0 (hardware_service))
-+(typeattributeset hci_attach_dev_28_0 (hci_attach_dev))
-+(typeattributeset hdmi_control_service_28_0 (hdmi_control_service))
-+(typeattributeset healthd_28_0 (healthd))
-+(typeattributeset healthd_exec_28_0 (healthd_exec))
-+(typeattributeset heapdump_data_file_28_0 (heapdump_data_file))
-+(typeattributeset hidl_allocator_hwservice_28_0 (hidl_allocator_hwservice))
-+(typeattributeset hidl_base_hwservice_28_0 (hidl_base_hwservice))
-+(typeattributeset hidl_manager_hwservice_28_0 (hidl_manager_hwservice))
-+(typeattributeset hidl_memory_hwservice_28_0 (hidl_memory_hwservice))
-+(typeattributeset hidl_token_hwservice_28_0 (hidl_token_hwservice))
-+(typeattributeset hwbinder_device_28_0 (hwbinder_device))
-+(typeattributeset hw_random_device_28_0 (hw_random_device))
-+(typeattributeset hwservice_contexts_file_28_0 (hwservice_contexts_file))
-+(typeattributeset hwservicemanager_28_0 (hwservicemanager))
-+(typeattributeset hwservicemanager_exec_28_0 (hwservicemanager_exec))
-+(typeattributeset hwservicemanager_prop_28_0 (hwservicemanager_prop))
-+(typeattributeset i2c_device_28_0 (i2c_device))
-+(typeattributeset icon_file_28_0 (icon_file))
-+(typeattributeset idmap_28_0 (idmap))
-+(typeattributeset idmap_exec_28_0 (idmap_exec))
-+(typeattributeset iio_device_28_0 (iio_device))
-+(typeattributeset imms_service_28_0 (imms_service))
-+(typeattributeset incident_28_0 (incident))
-+(typeattributeset incidentd_28_0 (incidentd))
-+(typeattributeset incident_data_file_28_0 (incident_data_file))
-+(typeattributeset incident_helper_28_0 (incident_helper))
-+(typeattributeset incident_service_28_0 (incident_service))
-+(typeattributeset init_28_0 (init))
-+(typeattributeset init_exec_28_0 (init_exec watchdogd_exec))
-+(typeattributeset inotify_28_0 (inotify))
-+(typeattributeset input_device_28_0 (input_device))
-+(typeattributeset inputflinger_28_0 (inputflinger))
-+(typeattributeset inputflinger_exec_28_0 (inputflinger_exec))
-+(typeattributeset inputflinger_service_28_0 (inputflinger_service))
-+(typeattributeset input_method_service_28_0 (input_method_service))
-+(typeattributeset input_service_28_0 (input_service))
-+(typeattributeset installd_28_0 (installd))
-+(typeattributeset install_data_file_28_0 (install_data_file))
-+(typeattributeset installd_exec_28_0 (installd_exec))
-+(typeattributeset installd_service_28_0 (installd_service))
-+(typeattributeset install_recovery_28_0 (install_recovery))
-+(typeattributeset install_recovery_exec_28_0 (install_recovery_exec))
-+(typeattributeset ion_device_28_0 (ion_device))
-+(typeattributeset IProxyService_service_28_0 (IProxyService_service))
-+(typeattributeset ipsec_service_28_0 (ipsec_service))
-+(typeattributeset isolated_app_28_0 (isolated_app))
-+(typeattributeset jobscheduler_service_28_0 (jobscheduler_service))
-+(typeattributeset kernel_28_0 (kernel))
-+(typeattributeset keychain_data_file_28_0 (keychain_data_file))
-+(typeattributeset keychord_device_28_0 (keychord_device))
-+(typeattributeset keystore_28_0 (keystore))
-+(typeattributeset keystore_data_file_28_0 (keystore_data_file))
-+(typeattributeset keystore_exec_28_0 (keystore_exec))
-+(typeattributeset keystore_service_28_0 (keystore_service))
-+(typeattributeset kmem_device_28_0 (kmem_device))
-+(typeattributeset kmsg_debug_device_28_0 (kmsg_debug_device))
-+(typeattributeset kmsg_device_28_0 (kmsg_device))
-+(typeattributeset labeledfs_28_0 (labeledfs))
-+(typeattributeset last_boot_reason_prop_28_0 (last_boot_reason_prop))
-+(typeattributeset launcherapps_service_28_0 (launcherapps_service))
-+(typeattributeset lmkd_28_0 (lmkd))
-+(typeattributeset lmkd_exec_28_0 (lmkd_exec))
-+(typeattributeset lmkd_socket_28_0 (lmkd_socket))
-+(typeattributeset location_service_28_0 (location_service))
-+(typeattributeset lock_settings_service_28_0 (lock_settings_service))
-+(typeattributeset logcat_exec_28_0 (logcat_exec))
-+(typeattributeset logd_28_0 (logd))
-+(typeattributeset logd_exec_28_0 (logd_exec))
-+(typeattributeset logd_prop_28_0 (logd_prop))
-+(typeattributeset logdr_socket_28_0 (logdr_socket))
-+(typeattributeset logd_socket_28_0 (logd_socket))
-+(typeattributeset logdw_socket_28_0 (logdw_socket))
-+(typeattributeset logpersist_28_0 (logpersist))
-+(typeattributeset logpersistd_logging_prop_28_0 (logpersistd_logging_prop))
-+(typeattributeset log_prop_28_0 (log_prop))
-+(typeattributeset log_tag_prop_28_0 (log_tag_prop))
-+(typeattributeset loop_control_device_28_0 (loop_control_device))
-+(typeattributeset loop_device_28_0 (loop_device))
-+(typeattributeset lowpan_device_28_0 (lowpan_device))
-+(typeattributeset lowpan_prop_28_0 (lowpan_prop))
-+(typeattributeset lowpan_service_28_0 (lowpan_service))
-+(typeattributeset mac_perms_file_28_0 (mac_perms_file))
-+(typeattributeset mdnsd_28_0 (mdnsd))
-+(typeattributeset mdnsd_socket_28_0 (mdnsd_socket))
-+(typeattributeset mdns_socket_28_0 (mdns_socket))
-+(typeattributeset hal_omx_server (mediacodec_28_0))
-+(typeattributeset mediacodec_28_0 (mediacodec))
-+(typeattributeset mediacodec_exec_28_0 (mediacodec_exec))
-+(typeattributeset mediacodec_service_28_0 (mediacodec_service))
-+(typeattributeset media_data_file_28_0 (media_data_file))
-+(typeattributeset mediadrmserver_28_0 (mediadrmserver))
-+(typeattributeset mediadrmserver_exec_28_0 (mediadrmserver_exec))
-+(typeattributeset mediadrmserver_service_28_0 (mediadrmserver_service))
-+(typeattributeset mediaextractor_28_0 (mediaextractor))
-+(typeattributeset mediaextractor_exec_28_0 (mediaextractor_exec))
-+(typeattributeset mediaextractor_service_28_0 (mediaextractor_service))
-+(typeattributeset mediaextractor_update_service_28_0 (mediaextractor_update_service))
-+(typeattributeset mediametrics_28_0 (mediametrics))
-+(typeattributeset mediametrics_exec_28_0 (mediametrics_exec))
-+(typeattributeset mediametrics_service_28_0 (mediametrics_service))
-+(typeattributeset media_projection_service_28_0 (media_projection_service))
-+(typeattributeset mediaprovider_28_0 (mediaprovider))
-+(typeattributeset media_router_service_28_0 (media_router_service))
-+(typeattributeset media_rw_data_file_28_0 (media_rw_data_file))
-+(typeattributeset mediaserver_28_0 (mediaserver))
-+(typeattributeset mediaserver_exec_28_0 (mediaserver_exec))
-+(typeattributeset mediaserver_service_28_0 (mediaserver_service))
-+(typeattributeset media_session_service_28_0 (media_session_service))
-+(typeattributeset meminfo_service_28_0 (meminfo_service))
-+(typeattributeset metadata_block_device_28_0 (metadata_block_device))
-+(typeattributeset metadata_file_28_0 (metadata_file))
-+(typeattributeset method_trace_data_file_28_0 (method_trace_data_file))
-+(typeattributeset midi_service_28_0 (midi_service))
-+(typeattributeset misc_block_device_28_0 (misc_block_device))
-+(typeattributeset misc_logd_file_28_0 (misc_logd_file))
-+(typeattributeset misc_user_data_file_28_0 (misc_user_data_file))
-+(typeattributeset mmc_prop_28_0 (mmc_prop))
-+(typeattributeset mnt_expand_file_28_0 (mnt_expand_file))
-+(typeattributeset mnt_media_rw_file_28_0 (mnt_media_rw_file))
-+(typeattributeset mnt_media_rw_stub_file_28_0 (mnt_media_rw_stub_file))
-+(typeattributeset mnt_user_file_28_0 (mnt_user_file))
-+(typeattributeset mnt_vendor_file_28_0 (mnt_vendor_file))
-+(typeattributeset modprobe_28_0 (modprobe))
-+(typeattributeset mount_service_28_0 (mount_service))
-+(typeattributeset mqueue_28_0 (mqueue))
-+(typeattributeset mtd_device_28_0 (mtd_device))
-+(typeattributeset mtp_28_0 (mtp))
-+(typeattributeset mtp_device_28_0 (mtp_device))
-+(typeattributeset mtpd_socket_28_0 (mtpd_socket))
-+(typeattributeset mtp_exec_28_0 (mtp_exec))
-+(typeattributeset nativetest_data_file_28_0 (nativetest_data_file))
-+(typeattributeset netd_28_0 (netd))
-+(typeattributeset net_data_file_28_0 (net_data_file))
-+(typeattributeset netd_exec_28_0 (netd_exec))
-+(typeattributeset netd_listener_service_28_0 (netd_listener_service))
-+(typeattributeset net_dns_prop_28_0 (net_dns_prop))
-+(typeattributeset netd_service_28_0 (netd_service))
-+(typeattributeset netd_socket_28_0 (netd_socket))
-+(typeattributeset netd_stable_secret_prop_28_0 (netd_stable_secret_prop))
-+(typeattributeset netif_28_0 (netif))
-+(typeattributeset netpolicy_service_28_0 (netpolicy_service))
-+(typeattributeset net_radio_prop_28_0 (net_radio_prop))
-+(typeattributeset netstats_service_28_0 (netstats_service))
-+(typeattributeset netutils_wrapper_28_0 (netutils_wrapper))
-+(typeattributeset netutils_wrapper_exec_28_0 (netutils_wrapper_exec))
-+(typeattributeset network_management_service_28_0 (network_management_service))
-+(typeattributeset network_score_service_28_0 (network_score_service))
-+(typeattributeset network_time_update_service_28_0 (network_time_update_service))
-+(typeattributeset network_watchlist_data_file_28_0 (network_watchlist_data_file))
-+(typeattributeset network_watchlist_service_28_0 (network_watchlist_service))
-+(typeattributeset nfc_28_0 (nfc))
-+(typeattributeset nfc_data_file_28_0 (nfc_data_file))
-+(typeattributeset nfc_device_28_0 (nfc_device))
-+(typeattributeset nfc_prop_28_0 (nfc_prop))
-+(typeattributeset nfc_service_28_0 (nfc_service))
-+(typeattributeset node_28_0 (node))
-+(typeattributeset nonplat_service_contexts_file_28_0 (nonplat_service_contexts_file))
-+(typeattributeset notification_service_28_0 (notification_service))
-+(typeattributeset null_device_28_0 (null_device))
-+(typeattributeset oemfs_28_0 (oemfs))
-+(typeattributeset oem_lock_service_28_0 (oem_lock_service))
-+(typeattributeset ota_data_file_28_0 (ota_data_file))
-+(typeattributeset otadexopt_service_28_0 (otadexopt_service))
-+(typeattributeset ota_package_file_28_0 (ota_package_file))
-+(typeattributeset otapreopt_chroot_28_0 (otapreopt_chroot))
-+(typeattributeset otapreopt_chroot_exec_28_0 (otapreopt_chroot_exec))
-+(typeattributeset otapreopt_slot_28_0 (otapreopt_slot))
-+(typeattributeset otapreopt_slot_exec_28_0 (otapreopt_slot_exec))
-+(typeattributeset overlay_prop_28_0 (overlay_prop))
-+(typeattributeset overlay_service_28_0 (overlay_service))
-+(typeattributeset owntty_device_28_0 (owntty_device))
-+(typeattributeset package_native_service_28_0 (package_native_service))
-+(typeattributeset package_service_28_0 (package_service))
-+(typeattributeset pan_result_prop_28_0 (pan_result_prop))
-+(typeattributeset pdx_bufferhub_client_channel_socket_28_0 (pdx_bufferhub_client_channel_socket))
-+(typeattributeset pdx_bufferhub_client_endpoint_socket_28_0 (pdx_bufferhub_client_endpoint_socket))
-+(typeattributeset pdx_bufferhub_dir_28_0 (pdx_bufferhub_dir))
-+(typeattributeset pdx_display_client_channel_socket_28_0 (pdx_display_client_channel_socket))
-+(typeattributeset pdx_display_client_endpoint_socket_28_0 (pdx_display_client_endpoint_socket))
-+(typeattributeset pdx_display_dir_28_0 (pdx_display_dir))
-+(typeattributeset pdx_display_manager_channel_socket_28_0 (pdx_display_manager_channel_socket))
-+(typeattributeset pdx_display_manager_endpoint_socket_28_0 (pdx_display_manager_endpoint_socket))
-+(typeattributeset pdx_display_screenshot_channel_socket_28_0 (pdx_display_screenshot_channel_socket))
-+(typeattributeset pdx_display_screenshot_endpoint_socket_28_0 (pdx_display_screenshot_endpoint_socket))
-+(typeattributeset pdx_display_vsync_channel_socket_28_0 (pdx_display_vsync_channel_socket))
-+(typeattributeset pdx_display_vsync_endpoint_socket_28_0 (pdx_display_vsync_endpoint_socket))
-+(typeattributeset pdx_performance_client_channel_socket_28_0 (pdx_performance_client_channel_socket))
-+(typeattributeset pdx_performance_client_endpoint_socket_28_0 (pdx_performance_client_endpoint_socket))
-+(typeattributeset pdx_performance_dir_28_0 (pdx_performance_dir))
-+(typeattributeset performanced_28_0 (performanced))
-+(typeattributeset performanced_exec_28_0 (performanced_exec))
-+(typeattributeset permission_service_28_0 (permission_service))
-+(typeattributeset persist_debug_prop_28_0 (persist_debug_prop))
-+(typeattributeset persistent_data_block_service_28_0 (persistent_data_block_service))
-+(typeattributeset persistent_properties_ready_prop_28_0 (persistent_properties_ready_prop))
-+(typeattributeset pinner_service_28_0 (pinner_service))
-+(typeattributeset pipefs_28_0 (pipefs))
-+(typeattributeset platform_app_28_0 (platform_app))
-+(typeattributeset pm_prop_28_0 (pm_prop))
-+(typeattributeset pmsg_device_28_0 (pmsg_device))
-+(typeattributeset port_28_0 (port))
-+(typeattributeset port_device_28_0 (port_device))
-+(typeattributeset postinstall_28_0 (postinstall))
-+(typeattributeset postinstall_dexopt_28_0 (postinstall_dexopt))
-+(typeattributeset postinstall_file_28_0 (postinstall_file))
-+(typeattributeset postinstall_mnt_dir_28_0 (postinstall_mnt_dir))
-+(typeattributeset powerctl_prop_28_0 (powerctl_prop))
-+(typeattributeset power_service_28_0 (power_service))
-+(typeattributeset ppp_28_0 (ppp))
-+(typeattributeset ppp_device_28_0 (ppp_device))
-+(typeattributeset ppp_exec_28_0 (ppp_exec))
-+(typeattributeset preloads_data_file_28_0 (preloads_data_file))
-+(typeattributeset preloads_media_file_28_0 (preloads_media_file))
-+(typeattributeset preopt2cachename_28_0 (preopt2cachename))
-+(typeattributeset preopt2cachename_exec_28_0 (preopt2cachename_exec))
-+(typeattributeset print_service_28_0 (print_service))
-+(typeattributeset priv_app_28_0 (priv_app))
-+(typeattributeset proc_28_0
-+  ( proc
-+    proc_fs_verity
-+    proc_keys
-+    proc_kpageflags
-+    proc_lowmemorykiller
-+    proc_pressure_cpu
-+    proc_pressure_io
-+    proc_pressure_mem
-+    proc_slabinfo))
-+(typeattributeset proc_abi_28_0 (proc_abi))
-+(typeattributeset proc_asound_28_0 (proc_asound))
-+(typeattributeset proc_bluetooth_writable_28_0 (proc_bluetooth_writable))
-+(typeattributeset proc_buddyinfo_28_0 (proc_buddyinfo))
-+(typeattributeset proc_cmdline_28_0 (proc_cmdline))
-+(typeattributeset proc_cpuinfo_28_0 (proc_cpuinfo))
-+(typeattributeset proc_dirty_28_0 (proc_dirty))
-+(typeattributeset proc_diskstats_28_0 (proc_diskstats))
-+(typeattributeset proc_drop_caches_28_0 (proc_drop_caches))
-+(typeattributeset processinfo_service_28_0 (processinfo_service))
-+(typeattributeset proc_extra_free_kbytes_28_0 (proc_extra_free_kbytes))
-+(typeattributeset proc_filesystems_28_0 (proc_filesystems))
-+(typeattributeset proc_hostname_28_0 (proc_hostname))
-+(typeattributeset proc_hung_task_28_0 (proc_hung_task))
-+(typeattributeset proc_interrupts_28_0 (proc_interrupts))
-+(typeattributeset proc_iomem_28_0 (proc_iomem))
-+(typeattributeset proc_kmsg_28_0 (proc_kmsg))
-+(typeattributeset proc_loadavg_28_0 (proc_loadavg))
-+(typeattributeset proc_max_map_count_28_0 (proc_max_map_count))
-+(typeattributeset proc_meminfo_28_0 (proc_meminfo))
-+(typeattributeset proc_min_free_order_shift_28_0 (proc_min_free_order_shift))
-+(typeattributeset proc_misc_28_0 (proc_misc))
-+(typeattributeset proc_modules_28_0 (proc_modules))
-+(typeattributeset proc_mounts_28_0 (proc_mounts))
-+(typeattributeset proc_net_28_0
-+  ( proc_net
-+    proc_net_tcp_udp))
-+(typeattributeset proc_overcommit_memory_28_0 (proc_overcommit_memory))
-+(typeattributeset proc_page_cluster_28_0 (proc_page_cluster))
-+(typeattributeset proc_pagetypeinfo_28_0 (proc_pagetypeinfo))
-+(typeattributeset proc_panic_28_0 (proc_panic))
-+(typeattributeset proc_perf_28_0 (proc_perf))
-+(typeattributeset proc_pid_max_28_0 (proc_pid_max))
-+(typeattributeset proc_pipe_conf_28_0 (proc_pipe_conf))
-+(typeattributeset proc_qtaguid_stat_28_0 (proc_qtaguid_stat))
-+(typeattributeset proc_random_28_0 (proc_random))
-+(typeattributeset proc_sched_28_0 (proc_sched))
-+(typeattributeset proc_security_28_0 (proc_security))
-+(typeattributeset proc_stat_28_0 (proc_stat))
-+(typeattributeset procstats_service_28_0 (procstats_service))
-+(typeattributeset proc_swaps_28_0 (proc_swaps))
-+(typeattributeset proc_sysrq_28_0 (proc_sysrq))
-+(typeattributeset proc_timer_28_0 (proc_timer))
-+(typeattributeset proc_tty_drivers_28_0 (proc_tty_drivers))
-+(typeattributeset proc_uid_concurrent_active_time_28_0 (proc_uid_concurrent_active_time))
-+(typeattributeset proc_uid_concurrent_policy_time_28_0 (proc_uid_concurrent_policy_time))
-+(typeattributeset proc_uid_cpupower_28_0 (proc_uid_cpupower))
-+(typeattributeset proc_uid_cputime_removeuid_28_0 (proc_uid_cputime_removeuid))
-+(typeattributeset proc_uid_cputime_showstat_28_0 (proc_uid_cputime_showstat))
-+(typeattributeset proc_uid_io_stats_28_0 (proc_uid_io_stats))
-+(typeattributeset proc_uid_procstat_set_28_0 (proc_uid_procstat_set))
-+(typeattributeset proc_uid_time_in_state_28_0 (proc_uid_time_in_state))
-+(typeattributeset proc_uptime_28_0 (proc_uptime))
-+(typeattributeset proc_version_28_0 (proc_version))
-+(typeattributeset proc_vmallocinfo_28_0 (proc_vmallocinfo))
-+(typeattributeset proc_vmstat_28_0 (proc_vmstat))
-+(typeattributeset proc_zoneinfo_28_0 (proc_zoneinfo))
-+(typeattributeset profman_28_0 (profman))
-+(typeattributeset profman_dump_data_file_28_0 (profman_dump_data_file))
-+(typeattributeset profman_exec_28_0 (profman_exec))
-+(typeattributeset properties_device_28_0 (properties_device))
-+(typeattributeset properties_serial_28_0 (properties_serial))
-+(typeattributeset property_contexts_file_28_0 (property_contexts_file))
-+(typeattributeset property_data_file_28_0 (property_data_file))
-+(typeattributeset property_info_28_0 (property_info))
-+(typeattributeset property_socket_28_0 (property_socket))
-+(typeattributeset pstorefs_28_0 (pstorefs))
-+(typeattributeset ptmx_device_28_0 (ptmx_device))
-+(typeattributeset qtaguid_device_28_0 (qtaguid_device))
-+(typeattributeset qtaguid_proc_28_0
-+  ( proc_qtaguid_ctrl
-+    qtaguid_proc))
-+(typeattributeset racoon_28_0 (racoon))
-+(typeattributeset racoon_exec_28_0 (racoon_exec))
-+(typeattributeset racoon_socket_28_0 (racoon_socket))
-+(typeattributeset radio_28_0 (radio))
-+(typeattributeset radio_data_file_28_0 (radio_data_file))
-+(typeattributeset radio_device_28_0 (radio_device))
-+(typeattributeset radio_prop_28_0 (radio_prop))
-+(typeattributeset radio_service_28_0 (radio_service))
-+(typeattributeset ram_device_28_0 (ram_device))
-+(typeattributeset random_device_28_0 (random_device))
-+(typeattributeset recovery_28_0 (recovery))
-+(typeattributeset recovery_block_device_28_0 (recovery_block_device))
-+(typeattributeset recovery_data_file_28_0 (recovery_data_file))
-+(typeattributeset recovery_persist_28_0 (recovery_persist))
-+(typeattributeset recovery_persist_exec_28_0 (recovery_persist_exec))
-+(typeattributeset recovery_refresh_28_0 (recovery_refresh))
-+(typeattributeset recovery_refresh_exec_28_0 (recovery_refresh_exec))
-+(typeattributeset recovery_service_28_0 (recovery_service))
-+(typeattributeset registry_service_28_0 (registry_service))
-+(typeattributeset resourcecache_data_file_28_0 (resourcecache_data_file))
-+(typeattributeset restorecon_prop_28_0 (restorecon_prop))
-+(typeattributeset restrictions_service_28_0 (restrictions_service))
-+(typeattributeset rild_debug_socket_28_0 (rild_debug_socket))
-+(typeattributeset rild_socket_28_0 (rild_socket))
-+(typeattributeset ringtone_file_28_0 (ringtone_file))
-+(typeattributeset root_block_device_28_0 (root_block_device))
-+(typeattributeset rootfs_28_0 (rootfs))
-+(typeattributeset rpmsg_device_28_0 (rpmsg_device))
-+(typeattributeset rtc_device_28_0 (rtc_device))
-+(typeattributeset rttmanager_service_28_0 (rttmanager_service))
-+(typeattributeset runas_28_0 (runas))
-+(typeattributeset runas_exec_28_0 (runas_exec))
-+(typeattributeset runtime_event_log_tags_file_28_0 (runtime_event_log_tags_file))
-+(typeattributeset safemode_prop_28_0 (safemode_prop))
-+(typeattributeset same_process_hal_file_28_0
-+  ( same_process_hal_file
-+    vendor_public_lib_file))
-+(typeattributeset samplingprofiler_service_28_0 (samplingprofiler_service))
-+(typeattributeset scheduling_policy_service_28_0 (scheduling_policy_service))
-+(typeattributeset sdcardd_28_0 (sdcardd))
-+(typeattributeset sdcardd_exec_28_0 (sdcardd_exec))
-+(typeattributeset sdcardfs_28_0 (sdcardfs))
-+(typeattributeset seapp_contexts_file_28_0 (seapp_contexts_file))
-+(typeattributeset search_service_28_0 (search_service))
-+(typeattributeset sec_key_att_app_id_provider_service_28_0 (sec_key_att_app_id_provider_service))
-+(typeattributeset secure_element_28_0 (secure_element))
-+(typeattributeset secure_element_device_28_0 (secure_element_device))
-+(typeattributeset secure_element_service_28_0 (secure_element_service))
-+(typeattributeset selinuxfs_28_0 (selinuxfs))
-+(typeattributeset sensors_device_28_0 (sensors_device))
-+(typeattributeset sensorservice_service_28_0 (sensorservice_service))
-+(typeattributeset sepolicy_file_28_0 (sepolicy_file))
-+(typeattributeset serial_device_28_0 (serial_device))
-+(typeattributeset serialno_prop_28_0 (serialno_prop))
-+(typeattributeset serial_service_28_0 (serial_service))
-+(typeattributeset service_contexts_file_28_0 (service_contexts_file))
-+(typeattributeset servicediscovery_service_28_0 (servicediscovery_service))
-+(typeattributeset servicemanager_28_0 (servicemanager))
-+(typeattributeset servicemanager_exec_28_0 (servicemanager_exec))
-+(typeattributeset settings_service_28_0 (settings_service))
-+(typeattributeset sgdisk_28_0 (sgdisk))
-+(typeattributeset sgdisk_exec_28_0 (sgdisk_exec))
-+(typeattributeset shared_relro_28_0 (shared_relro))
-+(typeattributeset shared_relro_file_28_0 (shared_relro_file))
-+(typeattributeset shell_28_0 (shell))
-+(typeattributeset shell_data_file_28_0 (shell_data_file))
-+(typeattributeset shell_exec_28_0 (shell_exec))
-+(typeattributeset shell_prop_28_0 (shell_prop))
-+(typeattributeset shm_28_0 (shm))
-+(typeattributeset shortcut_manager_icons_28_0 (shortcut_manager_icons))
-+(typeattributeset shortcut_service_28_0 (shortcut_service))
-+(typeattributeset slice_service_28_0 (slice_service))
-+(typeattributeset slideshow_28_0 (slideshow))
-+(typeattributeset socket_device_28_0 (socket_device))
-+(typeattributeset sockfs_28_0 (sockfs))
-+(typeattributeset statusbar_service_28_0 (statusbar_service))
-+(typeattributeset storaged_service_28_0 (storaged_service))
-+(typeattributeset storage_file_28_0 (storage_file))
-+(typeattributeset storagestats_service_28_0 (storagestats_service))
-+(typeattributeset storage_stub_file_28_0 (storage_stub_file))
-+(typeattributeset su_28_0 (su))
-+(typeattributeset su_exec_28_0 (su_exec))
-+(typeattributeset surfaceflinger_28_0 (surfaceflinger))
-+(typeattributeset surfaceflinger_service_28_0 (surfaceflinger_service))
-+(typeattributeset swap_block_device_28_0 (swap_block_device))
-+(typeattributeset sysfs_28_0
-+  ( sysfs
-+    sysfs_devices_block
-+    sysfs_extcon
-+    sysfs_loop
-+    sysfs_transparent_hugepage))
-+(typeattributeset sysfs_android_usb_28_0 (sysfs_android_usb))
-+(typeattributeset sysfs_batteryinfo_28_0 (sysfs_batteryinfo))
-+(typeattributeset sysfs_bluetooth_writable_28_0 (sysfs_bluetooth_writable))
-+(typeattributeset sysfs_devices_system_cpu_28_0 (sysfs_devices_system_cpu))
-+(typeattributeset sysfs_dm_28_0 (sysfs_dm))
-+(typeattributeset sysfs_dt_firmware_android_28_0 (sysfs_dt_firmware_android))
-+(typeattributeset sysfs_fs_ext4_features_28_0 (sysfs_fs_ext4_features))
-+(typeattributeset sysfs_hwrandom_28_0 (sysfs_hwrandom))
-+(typeattributeset sysfs_ipv4_28_0 (sysfs_ipv4))
-+(typeattributeset sysfs_kernel_notes_28_0 (sysfs_kernel_notes))
-+(typeattributeset sysfs_leds_28_0 (sysfs_leds))
-+(typeattributeset sysfs_lowmemorykiller_28_0 (sysfs_lowmemorykiller))
-+(typeattributeset sysfs_mac_address_28_0 (sysfs_mac_address))
-+(typeattributeset sysfs_net_28_0 (sysfs_net))
-+(typeattributeset sysfs_nfc_power_writable_28_0 (sysfs_nfc_power_writable))
-+(typeattributeset sysfs_power_28_0 (sysfs_power))
-+(typeattributeset sysfs_rtc_28_0 (sysfs_rtc))
-+(typeattributeset sysfs_switch_28_0 (sysfs_switch))
-+(typeattributeset sysfs_thermal_28_0 (sysfs_thermal))
-+(typeattributeset sysfs_uio_28_0 (sysfs_uio))
-+(typeattributeset sysfs_usb_28_0 (sysfs_usb))
-+(typeattributeset sysfs_usermodehelper_28_0 (sysfs_usermodehelper))
-+(typeattributeset sysfs_vibrator_28_0 (sysfs_vibrator))
-+(typeattributeset sysfs_wake_lock_28_0 (sysfs_wake_lock))
-+(typeattributeset sysfs_wakeup_reasons_28_0 (sysfs_wakeup_reasons))
-+(typeattributeset sysfs_wlan_fwpath_28_0 (sysfs_wlan_fwpath))
-+(typeattributeset sysfs_zram_28_0 (sysfs_zram))
-+(typeattributeset sysfs_zram_uevent_28_0 (sysfs_zram_uevent))
-+(typeattributeset system_app_28_0 (system_app))
-+(typeattributeset system_app_data_file_28_0 (system_app_data_file))
-+(typeattributeset system_app_service_28_0 (system_app_service))
-+(typeattributeset system_block_device_28_0 (system_block_device))
-+(typeattributeset system_boot_reason_prop_28_0 (system_boot_reason_prop))
-+(typeattributeset system_data_file_28_0
-+  ( dropbox_data_file
-+    system_data_file
-+    packages_list_file))
-+(typeattributeset system_file_28_0
-+  ( system_file
-+    system_asan_options_file
-+    system_lib_file
-+    system_linker_config_file
-+    system_linker_exec
-+    system_seccomp_policy_file
-+    system_security_cacerts_file
-+    tcpdump_exec
-+    system_zoneinfo_file
-+))
-+(typeattributeset systemkeys_data_file_28_0 (systemkeys_data_file))
-+(typeattributeset system_ndebug_socket_28_0 (system_ndebug_socket))
-+(typeattributeset system_net_netd_hwservice_28_0 (system_net_netd_hwservice))
-+(typeattributeset system_prop_28_0 (system_prop))
-+(typeattributeset system_radio_prop_28_0 (system_radio_prop))
-+(typeattributeset system_server_28_0 (system_server))
-+(typeattributeset system_update_service_28_0 (system_update_service))
-+(typeattributeset system_wifi_keystore_hwservice_28_0 (system_wifi_keystore_hwservice))
-+(typeattributeset system_wpa_socket_28_0 (system_wpa_socket))
-+(typeattributeset task_service_28_0 (task_service))
-+(typeattributeset tee_28_0 (tee))
-+(typeattributeset tee_data_file_28_0 (tee_data_file))
-+(typeattributeset tee_device_28_0 (tee_device))
-+(typeattributeset telecom_service_28_0 (telecom_service))
-+(typeattributeset test_boot_reason_prop_28_0 (test_boot_reason_prop))
-+(typeattributeset textclassification_service_28_0 (textclassification_service))
-+(typeattributeset textclassifier_data_file_28_0 (textclassifier_data_file))
-+(typeattributeset textservices_service_28_0 (textservices_service))
-+(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
-+(typeattributeset thermal_service_28_0 (thermal_service))
-+(typeattributeset timezone_service_28_0 (timezone_service))
-+(typeattributeset tmpfs_28_0
-+  ( mnt_sdcard_file
-+    tmpfs))
-+(typeattributeset tombstoned_28_0 (tombstoned))
-+(typeattributeset tombstone_data_file_28_0 (tombstone_data_file))
-+(typeattributeset tombstoned_crash_socket_28_0 (tombstoned_crash_socket))
-+(typeattributeset tombstoned_exec_28_0 (tombstoned_exec))
-+(typeattributeset tombstoned_intercept_socket_28_0 (tombstoned_intercept_socket))
-+(typeattributeset tombstoned_java_trace_socket_28_0 (tombstoned_java_trace_socket))
-+(typeattributeset tombstone_wifi_data_file_28_0 (tombstone_wifi_data_file))
-+(typeattributeset toolbox_28_0 (toolbox))
-+(typeattributeset toolbox_exec_28_0 (toolbox_exec))
-+(typeattributeset trace_data_file_28_0 (trace_data_file))
-+(typeattributeset traced_consumer_socket_28_0 (traced_consumer_socket))
-+(typeattributeset traced_enabled_prop_28_0 (traced_enabled_prop))
-+(typeattributeset traced_probes_28_0 (traced_probes))
-+(typeattributeset traced_producer_socket_28_0 (traced_producer_socket))
-+(typeattributeset traceur_app_28_0 (traceur_app))
-+(typeattributeset trust_service_28_0 (trust_service))
-+(typeattributeset tty_device_28_0 (tty_device))
-+(typeattributeset tun_device_28_0 (tun_device))
-+(typeattributeset tv_input_service_28_0 (tv_input_service))
-+(typeattributeset tzdatacheck_28_0 (tzdatacheck))
-+(typeattributeset tzdatacheck_exec_28_0 (tzdatacheck_exec))
-+(typeattributeset ueventd_28_0 (ueventd))
-+(typeattributeset uhid_device_28_0 (uhid_device))
-+(typeattributeset uimode_service_28_0 (uimode_service))
-+(typeattributeset uio_device_28_0 (uio_device))
-+(typeattributeset uncrypt_28_0 (uncrypt))
-+(typeattributeset uncrypt_exec_28_0 (uncrypt_exec))
-+(typeattributeset uncrypt_socket_28_0 (uncrypt_socket))
-+(typeattributeset unencrypted_data_file_28_0 (unencrypted_data_file))
-+(typeattributeset unlabeled_28_0 (unlabeled))
-+(typeattributeset untrusted_app_25_28_0 (untrusted_app_25))
-+(typeattributeset untrusted_app_27_28_0 (untrusted_app_27))
-+(typeattributeset untrusted_app_28_0 (untrusted_app))
-+(typeattributeset untrusted_v2_app_28_0 (untrusted_v2_app))
-+(typeattributeset update_engine_28_0 (update_engine))
-+(typeattributeset update_engine_data_file_28_0 (update_engine_data_file))
-+(typeattributeset update_engine_exec_28_0 (update_engine_exec))
-+(typeattributeset update_engine_log_data_file_28_0 (update_engine_log_data_file))
-+(typeattributeset update_engine_service_28_0 (update_engine_service))
-+(typeattributeset updatelock_service_28_0 (updatelock_service))
-+(typeattributeset update_verifier_28_0 (update_verifier))
-+(typeattributeset update_verifier_exec_28_0 (update_verifier_exec))
-+(typeattributeset usagestats_service_28_0 (usagestats_service))
-+(typeattributeset usbaccessory_device_28_0 (usbaccessory_device))
-+(typeattributeset usbd_28_0 (usbd))
-+(typeattributeset usb_device_28_0 (usb_device))
-+(typeattributeset usbd_exec_28_0 (usbd_exec))
-+(typeattributeset usbfs_28_0 (usbfs))
-+(typeattributeset usb_service_28_0 (usb_service))
-+(typeattributeset userdata_block_device_28_0 (userdata_block_device))
-+(typeattributeset usermodehelper_28_0 (usermodehelper))
-+(typeattributeset user_profile_data_file_28_0 (user_profile_data_file))
-+(typeattributeset user_service_28_0 (user_service))
-+(typeattributeset vcs_device_28_0 (vcs_device))
-+(typeattributeset vdc_28_0 (vdc))
-+(typeattributeset vdc_exec_28_0 (vdc_exec))
-+(typeattributeset vendor_app_file_28_0 (vendor_app_file))
-+(typeattributeset vendor_configs_file_28_0 (vendor_configs_file))
-+(typeattributeset vendor_data_file_28_0 (vendor_data_file))
-+(typeattributeset vendor_default_prop_28_0 (vendor_default_prop))
-+(typeattributeset vendor_file_28_0 (vendor_file))
-+(typeattributeset vendor_framework_file_28_0 (vendor_framework_file))
-+(typeattributeset vendor_hal_file_28_0 (vendor_hal_file))
-+(typeattributeset vendor_init_28_0 (vendor_init))
-+(typeattributeset vendor_overlay_file_28_0 (vendor_overlay_file))
-+(typeattributeset vendor_security_patch_level_prop_28_0 (vendor_security_patch_level_prop))
-+(typeattributeset vendor_shell_28_0 (vendor_shell))
-+(typeattributeset vendor_shell_exec_28_0 (vendor_shell_exec))
-+(typeattributeset vendor_toolbox_exec_28_0 (vendor_toolbox_exec))
-+(typeattributeset vfat_28_0 (vfat))
-+(typeattributeset vibrator_service_28_0 (vibrator_service))
-+(typeattributeset video_device_28_0 (video_device))
-+(typeattributeset virtual_touchpad_28_0 (virtual_touchpad))
-+(typeattributeset virtual_touchpad_exec_28_0 (virtual_touchpad_exec))
-+(typeattributeset virtual_touchpad_service_28_0 (virtual_touchpad_service))
-+(typeattributeset vndbinder_device_28_0 (vndbinder_device))
-+(typeattributeset vndk_sp_file_28_0 (vndk_sp_file))
-+(typeattributeset vndservice_contexts_file_28_0 (vndservice_contexts_file))
-+(typeattributeset vndservicemanager_28_0 (vndservicemanager))
-+(typeattributeset voiceinteraction_service_28_0 (voiceinteraction_service))
-+(typeattributeset vold_28_0 (vold))
-+(typeattributeset vold_data_file_28_0 (vold_data_file))
-+(typeattributeset vold_device_28_0 (vold_device))
-+(typeattributeset vold_exec_28_0 (vold_exec))
-+(typeattributeset vold_metadata_file_28_0 (vold_metadata_file))
-+(typeattributeset vold_prepare_subdirs_28_0 (vold_prepare_subdirs))
-+(typeattributeset vold_prepare_subdirs_exec_28_0 (vold_prepare_subdirs_exec))
-+(typeattributeset vold_prop_28_0 (vold_prop))
-+(typeattributeset vold_service_28_0 (vold_service))
-+(typeattributeset vpn_data_file_28_0 (vpn_data_file))
-+(typeattributeset vr_hwc_28_0 (vr_hwc))
-+(typeattributeset vr_hwc_exec_28_0 (vr_hwc_exec))
-+(typeattributeset vr_hwc_service_28_0 (vr_hwc_service))
-+(typeattributeset vr_manager_service_28_0 (vr_manager_service))
-+(typeattributeset wallpaper_file_28_0 (wallpaper_file))
-+(typeattributeset wallpaper_service_28_0 (wallpaper_service))
-+(typeattributeset watchdogd_28_0 (watchdogd))
-+(typeattributeset watchdog_device_28_0 (watchdog_device))
-+(typeattributeset webviewupdate_service_28_0 (webviewupdate_service))
-+(typeattributeset webview_zygote_28_0 (webview_zygote))
-+(typeattributeset webview_zygote_exec_28_0 (webview_zygote_exec))
-+(typeattributeset wifiaware_service_28_0 (wifiaware_service))
-+(typeattributeset wificond_28_0 (wificond))
-+(typeattributeset wificond_exec_28_0 (wificond_exec))
-+(typeattributeset wificond_service_28_0 (wificond_service))
-+(typeattributeset wifi_data_file_28_0 (wifi_data_file))
-+(typeattributeset wifi_log_prop_28_0 (wifi_log_prop))
-+(typeattributeset wifip2p_service_28_0 (wifip2p_service))
-+(typeattributeset wifi_prop_28_0 (wifi_prop))
-+(typeattributeset wifiscanner_service_28_0 (wifiscanner_service))
-+(typeattributeset wifi_service_28_0 (wifi_service))
-+(typeattributeset window_service_28_0 (window_service))
-+(typeattributeset wpantund_28_0 (wpantund))
-+(typeattributeset wpantund_exec_28_0 (wpantund_exec))
-+(typeattributeset wpantund_service_28_0 (wpantund_service))
-+(typeattributeset wpa_socket_28_0 (wpa_socket))
-+(typeattributeset zero_device_28_0 (zero_device))
-+(typeattributeset zoneinfo_data_file_28_0 (zoneinfo_data_file))
-+(typeattributeset zygote_28_0 (zygote))
-+(typeattributeset zygote_exec_28_0 (zygote_exec))
-+(typeattributeset zygote_socket_28_0 (zygote_socket))
-diff --git a/private/compat/28.0/28.0.compat.cil b/private/compat/28.0/28.0.compat.cil
-new file mode 100644
-index 000000000..783950ce5
---- /dev/null
-+++ b/private/compat/28.0/28.0.compat.cil
-@@ -0,0 +1,15 @@
-+;; complement CIL file for compatibility between ToT policy and 28.0 vendors.
-+;; will be compiled along with other normal policy files, on 28.0 vendors.
-+;;
-+
-+(typeattribute vendordomain)
-+(typeattributeset vendordomain ((and (domain) ((not (coredomain))))))
-+(allowx vendordomain dev_type (ioctl blk_file ((range 0x0000 0xffff))))
-+(allowx vendordomain file_type (ioctl file ((range 0x0000 0xffff))))
-+(allow vendordomain self (netlink_route_socket (nlmsg_readpriv)))
-+
-+(typeattributeset mlsvendorcompat (and appdomain vendordomain))
-+(allow mlsvendorcompat app_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat app_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-+(allow mlsvendorcompat privapp_data_file (dir (ioctl read write create getattr setattr lock rename open watch watch_reads add_name remove_name reparent search rmdir)))
-+(allow mlsvendorcompat privapp_data_file (file (ioctl read write create getattr setattr lock append map unlink rename open watch watch_reads)))
-diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
-new file mode 100644
-index 000000000..7213f9542
---- /dev/null
-+++ b/private/compat/28.0/28.0.ignore.cil
-@@ -0,0 +1,160 @@
-+;; new_objects - a collection of types that have been introduced with ToT policy
-+;;   that have no analogue in 28.0 policy.  Thus, we do not need to map
-+;;   these types to previous ones.  Add here to pass checkapi tests.
-+(type new_objects)
-+(typeattribute new_objects)
-+(typeattributeset new_objects
-+  ( new_objects
-+    activity_task_service
-+    adb_service
-+    apex_data_file
-+    apex_metadata_file
-+    apex_mnt_dir
-+    apex_service
-+    apexd
-+    apexd_exec
-+    apexd_prop
-+    apexd_tmpfs
-+    appdomain_tmpfs
-+    app_binding_service
-+    app_prediction_service
-+    app_zygote
-+    app_zygote_tmpfs
-+    ashmemd
-+    ashmem_device_service
-+    attention_service
-+    biometric_service
-+    bluetooth_audio_hal_prop
-+    bpf_progs_loaded_prop
-+    bugreport_service
-+    cgroup_desc_file
-+    cgroup_rc_file
-+    charger_exec
-+    content_capture_service
-+    content_suggestions_service
-+    cpu_variant_prop
-+    ctl_apexd_prop
-+    ctl_gsid_prop
-+    dev_cpu_variant
-+    device_config_activity_manager_native_boot_prop
-+    device_config_boot_count_prop
-+    device_config_input_native_boot_prop
-+    device_config_netd_native_prop
-+    device_config_reset_performed_prop
-+    device_config_runtime_native_boot_prop
-+    device_config_runtime_native_prop
-+    device_config_media_native_prop
-+    device_config_service
-+    device_config_sys_traced_prop
-+    dnsresolver_service
-+    dynamic_system_service
-+    dynamic_system_prop
-+    face_service
-+    face_vendor_data_file
-+    sota_prop
-+    fastbootd
-+    flags_health_check
-+    flags_health_check_exec
-+    fwk_bufferhub_hwservice
-+    fwk_camera_hwservice
-+    fwk_stats_hwservice
-+    gpuservice
-+    gsi_data_file
-+    gsi_metadata_file
-+    gsi_public_metadata_file
-+    gsi_service
-+    gsid
-+    gsid_exec
-+    gsid_prop
-+    color_display_service
-+    external_vibrator_service
-+    hal_atrace_hwservice
-+    hal_face_hwservice
-+    hal_graphics_composer_server_tmpfs
-+    hal_health_storage_hwservice
-+    hal_input_classifier_hwservice
-+    hal_power_stats_hwservice
-+    heapprofd
-+    heapprofd_enabled_prop
-+    heapprofd_exec
-+    heapprofd_prop
-+    heapprofd_socket
-+    idmap_service
-+    iris_service
-+    iris_vendor_data_file
-+    llkd
-+    llkd_exec
-+    llkd_prop
-+    llkd_tmpfs
-+    looper_stats_service
-+    lpdumpd
-+    lpdumpd_exec
-+    lpdumpd_prop
-+    lpdump_service
-+    iorapd
-+    iorapd_exec
-+    iorapd_data_file
-+    iorapd_service
-+    iorapd_tmpfs
-+    mediaswcodec
-+    mediaswcodec_exec
-+    mediaswcodec_tmpfs
-+    metadata_bootstat_file
-+    mnt_product_file
-+    network_stack
-+    network_stack_service
-+    network_stack_tmpfs
-+    nnapi_ext_deny_product_prop
-+    overlayfs_file
-+    password_slot_metadata_file
-+    permissionmgr_service
-+    postinstall_apex_mnt_dir
-+    recovery_socket
-+    role_service
-+    rollback_service
-+    rs
-+    rs_exec
-+    rss_hwm_reset
-+    rss_hwm_reset_exec
-+    runas_app
-+    runas_app_tmpfs
-+    art_apex_dir
-+    runtime_service
-+    sdcard_block_device
-+    sensor_privacy_service
-+    server_configurable_flags_data_file
-+    simpleperf_app_runner
-+    simpleperf_app_runner_exec
-+    socket_hook_prop
-+    su_tmpfs
-+    super_block_device
-+    sysfs_fs_f2fs
-+    system_bootstrap_lib_file
-+    system_event_log_tags_file
-+    system_lmk_prop
-+    system_suspend_hwservice
-+    system_suspend_control_service
-+    system_trace_prop
-+    staging_data_file
-+    task_profiles_file
-+    testharness_service
-+    test_harness_prop
-+    theme_prop
-+    time_prop
-+    timedetector_service
-+    timezonedetector_service
-+    traced_lazy_prop
-+    uri_grants_service
-+    use_memfd_prop
-+    vendor_apex_file
-+    vendor_cgroup_desc_file
-+    vendor_idc_file
-+    vendor_keychars_file
-+    vendor_keylayout_file
-+    vendor_misc_writer
-+    vendor_misc_writer_exec
-+    vendor_socket_hook_prop
-+    vendor_task_profiles_file
-+    vndk_prop
-+    vrflinger_vsync_service
-+    watchdogd_tmpfs))
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_sepolicy/0002-Fix-sepolicy-for-kernel-5.10-that-doesn-t-support-bp.patch b/patches/trebledroid/platform_system_sepolicy/0002-Fix-sepolicy-for-kernel-5.10-that-doesn-t-support-bp.patch
deleted file mode 100644
index ca40effc..00000000
--- a/patches/trebledroid/platform_system_sepolicy/0002-Fix-sepolicy-for-kernel-5.10-that-doesn-t-support-bp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5aee0e8138f55e3de9889f12b2c48b08da8ceb97 Mon Sep 17 00:00:00 2001
-From: danielzhang130 <37479705+danielzhang130@users.noreply.github.com>
-Date: Fri, 12 Apr 2024 13:01:08 -0400
-Subject: [PATCH 2/2] Fix sepolicy for kernel < 5.10 that doesn't support bpf
- file context (#1)
-
-Change-Id: I877bd90b1dc74c9d2f7713c70fd9aebd92331085
-
-Signed-off-by: Daniel Zhang <danielzhang130@gmail.com>
----
- private/network_stack.te | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/private/network_stack.te b/private/network_stack.te
-index 7587c1f46..9e6bd4b12 100644
---- a/private/network_stack.te
-+++ b/private/network_stack.te
-@@ -61,8 +61,8 @@ hal_client_domain(network_stack, hal_tetheroffload)
- allow network_stack self:netlink_netfilter_socket create_socket_perms_no_ioctl;
- allow network_stack network_stack_service:service_manager find;
- # allow Tethering(network_stack process) to run/update/read the eBPF maps to offload tethering traffic by eBPF.
--allow network_stack { fs_bpf_net_private fs_bpf_net_shared fs_bpf_netd_readonly fs_bpf_netd_shared fs_bpf_tethering }:dir search;
--allow network_stack { fs_bpf_net_private fs_bpf_net_shared fs_bpf_netd_readonly fs_bpf_netd_shared fs_bpf_tethering }:file { getattr read write };
-+allow network_stack { fs_bpf fs_bpf_net_private fs_bpf_net_shared fs_bpf_netd_readonly fs_bpf_netd_shared fs_bpf_tethering }:dir search;
-+allow network_stack { fs_bpf fs_bpf_net_private fs_bpf_net_shared fs_bpf_netd_readonly fs_bpf_netd_shared fs_bpf_tethering }:file { getattr read write };
- allow network_stack bpfloader:bpf { map_read map_write prog_run };
- # allow Tethering(network_stack process) to read flag value in tethering_u_or_later_native namespace
- get_prop(network_stack, device_config_tethering_u_or_later_native_prop)
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch b/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch
deleted file mode 100644
index 87895db9..00000000
--- a/patches/trebledroid/platform_system_vold/0001-Allow-deletion-of-symlink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 18f2b912ca1728a3542b86ce212771364e5f8646 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 17 Feb 2018 19:39:38 +0100
-Subject: [PATCH 1/5] Allow deletion of symlink
-
-Change-Id: I9731895f88729072297f753088583aabbe6990f4
----
- FsCrypt.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 51b35c51..2b0dbc6a 100644
---- a/FsCrypt.cpp
-+++ b/FsCrypt.cpp
-@@ -374,6 +374,7 @@ static bool prepare_dir_with_policy(const std::string& dir, mode_t mode, uid_t u
- static bool destroy_dir(const std::string& dir) {
-     LOG(DEBUG) << "Destroying: " << dir;
-     if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {
-+        if(unlink(dir.c_str()) == 0) return true;
-         PLOG(ERROR) << "Failed to destroy " << dir;
-         return false;
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch b/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
deleted file mode 100644
index dedce5b2..00000000
--- a/patches/trebledroid/platform_system_vold/0002-Failing-to-create-facedata-shouldn-t-be-fatal.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ba59b56a2eaa2bd53c8372a1b97147ebb5e72ad9 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 7 Mar 2020 14:49:09 +0100
-Subject: [PATCH 2/5] Failing to create facedata shouldn't be fatal
-
-Some Pie vendors create it on their own, so SELinux would deny that
-Also not all devices have face unlock anyway
-
-See https://github.com/phhusson/treble_experimentations/issues/1119
----
- vold_prepare_subdirs.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
-index e82a7c2d..de5583f4 100644
---- a/vold_prepare_subdirs.cpp
-+++ b/vold_prepare_subdirs.cpp
-@@ -208,7 +208,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
-             }
-             auto facedata_path = vendor_de_path + "/facedata";
-             if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, facedata_path)) {
--                return false;
-+                LOG(ERROR) << "Failed preparing folder for de facedata";
-             }
-         }
-     }
-@@ -257,7 +257,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
-             auto vendor_ce_path = android::vold::BuildDataVendorCePath(user_id);
-             auto facedata_path = vendor_ce_path + "/facedata";
-             if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, facedata_path)) {
--                return false;
-+                LOG(ERROR) << "Failed preparing folder for de facedata";
-             }
-         }
-     }
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch b/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
deleted file mode 100644
index d5e37cef..00000000
--- a/patches/trebledroid/platform_system_vold/0003-Don-t-unmount-rw-system.sh-binds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d97e098874895be4d5564d79c8f50595beaf0612 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Mon, 29 Nov 2021 17:49:13 -0500
-Subject: [PATCH 3/5] Don't unmount rw-system.sh binds
-
-Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
----
- VolumeManager.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/VolumeManager.cpp b/VolumeManager.cpp
-index c981f2d4..ce2a4510 100644
---- a/VolumeManager.cpp
-+++ b/VolumeManager.cpp
-@@ -1000,6 +1000,7 @@ int VolumeManager::unmountAll() {
-     while ((mentry = getmntent(fp)) != NULL) {
-         auto test = std::string(mentry->mnt_dir);
-         if ((StartsWith(test, "/mnt/") &&
-+             !StartsWith(test, "/mnt/phh") &&
- #ifdef __ANDROID_DEBUGGABLE__
-              !StartsWith(test, "/mnt/scratch") &&
- #endif
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_vold/0004-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch b/patches/trebledroid/platform_system_vold/0004-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch
deleted file mode 100644
index 0b29aa1c..00000000
--- a/patches/trebledroid/platform_system_vold/0004-Exfat-can-be-mounted-with-exfat-kernel-fs-driver-or-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 17c70144dcb71f000817c756f9af1e56e75da422 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 18 Oct 2022 16:08:09 -0400
-Subject: [PATCH 4/5] Exfat can be mounted with "exfat" kernel fs driver, or
- "sdfat" or "texfat" (Samsung and Sony variants)
-
----
- fs/Exfat.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
-index ed539216..a3694646 100644
---- a/fs/Exfat.cpp
-+++ b/fs/Exfat.cpp
-@@ -35,7 +35,9 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
- 
- bool IsSupported() {
-     return access(kMkfsPath, X_OK) == 0 && access(kFsckPath, X_OK) == 0 &&
--           IsFilesystemSupported("exfat");
-+           (IsFilesystemSupported("exfat") ||
-+            IsFilesystemSupported("texfat") ||
-+            IsFilesystemSupported("sdfat"));
- }
- 
- status_t Check(const std::string& source) {
-@@ -64,13 +66,16 @@ status_t Mount(const std::string& source, const std::string& target, int ownerUi
-     auto mountData = android::base::StringPrintf("uid=%d,gid=%d,fmask=%o,dmask=%o", ownerUid,
-                                                  ownerGid, permMask, permMask);
- 
--    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
-+    const char* fs = "exfat";
-+    if (IsFilesystemSupported("sdfat")) fs = "sdfat";
-+    if (IsFilesystemSupported("texfat")) fs = "texfat";
-+    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
-         return 0;
-     }
- 
-     PLOG(ERROR) << "Mount failed; attempting read-only";
-     mountFlags |= MS_RDONLY;
--    if (mount(source.c_str(), target.c_str(), "exfat", mountFlags, mountData.c_str()) == 0) {
-+    if (mount(source.c_str(), target.c_str(), fs, mountFlags, mountData.c_str()) == 0) {
-         return 0;
-     }
- 
--- 
-2.34.1
-
diff --git a/patches/trebledroid/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch b/patches/trebledroid/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch
deleted file mode 100644
index 5bf08c87..00000000
--- a/patches/trebledroid/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1cdec442e37f35dcb8fcadf103c63901fb94b58c Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 11 Mar 2020 14:02:35 +0100
-Subject: [PATCH 5/5] Every voldmanaged storage is adoptable
-
----
- main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main.cpp b/main.cpp
-index 078ee14b..475060dc 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -269,7 +269,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
-             std::string nickname(entry.label);
-             int flags = 0;
- 
--            if (entry.is_encryptable()) {
-+            if (entry.is_encryptable() || true) {
-                 flags |= android::vold::Disk::Flags::kAdoptable;
-                 configs->has_adoptable = true;
-             }
--- 
-2.34.1
-