Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aebdaa43 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into a14

parents 73d98bbd cf4daf15
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@
    <string name="quick_settings_ambient_display_label">Активен дисплей</string>
    <string name="accessibility_quick_settings_ambient_display_off">Активен дисплей е изключен.</string>
    <string name="accessibility_quick_settings_ambient_display_on">Активен дисплей е включен.</string>
    <string name="quick_settings_aod_label">Винаги на дисплея</string>
    <string name="quick_settings_aod_off_powersave_label">AOD изкл.\nИкономия на батерията</string>
    <string name="quick_settings_caffeine_label">Кофеин</string>
    <string name="accessibility_quick_settings_caffeine_off">Кофеин изключен.</string>
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@
    <string name="accessibility_quick_settings_caffeine_on">Cafeína ligada.</string>
    <string name="quick_settings_heads_up_label">Notificações pop-up</string>
    <string name="accessibility_quick_settings_heads_up_off">Notificações pop-up desativadas.</string>
    <string name="accessibility_quick_settings_heads_up_on">Notificações pop-up desativadas.</string>
    <string name="accessibility_quick_settings_heads_up_on">Notificações pop-up ativadas.</string>
    <string name="quick_settings_powershare_label">Wireless PowerShare</string>
    <string name="quick_settings_powershare_off_powersave_label">Wireless PowerShare desativado\nEconomia de bateria</string>
    <string name="quick_settings_powershare_off_low_battery_label">Wireless PowerShare desativado\nBateria fraca</string>
+7 −0
Original line number Diff line number Diff line
@@ -3120,6 +3120,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
                allowNetworkAccessForPackages(packageNames);
            }
        }

        // There is nothing to migrate if coming from pre-12, from nothing, or from a restore.
        final boolean isMigratingFromAtLeastAndroid12 = version >= VERSION_SUPPORTED_CARRIER_USAGE;
        if (!forRestore && lineageVersion < LINEAGE_VERSION_REINSTATED_POLICY_REJECT_ALL
                && isMigratingFromAtLeastAndroid12) {
            migrateToPolicyRejectAll();
                }
    }

    /**