Merge changes from topic "notch-city" into q10
* changes:
vendor: notch-city: Reduce QS header offset on immersive & hide mode [2a/2]
vendor: notch-city: update 3 mode display cutout handler
diff --git a/config/permissions/backup.xml b/config/permissions/backup.xml
index c335b29..c569a5b 100644
--- a/config/permissions/backup.xml
+++ b/config/permissions/backup.xml
@@ -17,8 +17,6 @@
<!-- Whitelist of what components are permitted as backup data transports. The
'service' attribute here is a flattened ComponentName string. -->
<backup-transport-whitelisted-service
- service="android/com.android.internal.backup.LocalTransportService" />
- <backup-transport-whitelisted-service
service="com.google.android.gms/.backup.BackupTransportService" />
<backup-transport-whitelisted-service
service="com.google.android.gms/.backup.component.D2dTransportService" />
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index ade1e63..98e605f 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -41,10 +41,12 @@
<!-- Disable stock OTA components if installed -->
<string-array name="config_globallyDisabledComponents" translatable="false">
+ <item>com.android.vending/com.google.android.finsky.systemupdate.SystemUpdateSettingsContentProvider</item>
+ <item>com.android.vending/com.google.android.finsky.systemupdateactivity.SettingsSecurityEntryPoint</item>
+ <item>com.android.vending/com.google.android.finsky.systemupdateactivity.SystemUpdateActivity</item>
<item>com.google.android.gms/com.google.android.gms.update.SystemUpdateActivity</item>
- <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
<item>com.google.android.gms/com.google.android.gms.update.SystemUpdateGcmTaskService</item>
- <item>com.google.android.setupwizard/com.google.android.setupwizard.time.DateTimeCheck</item>
+ <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
</string-array>
<string name="config_mms_user_agent">LineageOS</string>