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

Commit c87c14e0 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 8f7cf638 0d7e68d8

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+3 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
    @VisibleForTesting

    final class RestartAction extends SinglePressAction implements LongPressAction {

        private RestartAction() {

            super(R.drawable.ic_restart, R.string.global_action_restart);

            super(R.drawable.ic_restart, shouldShowRestartSubmenu()

                    ? com.android.systemui.R.string.global_action_restart_more

                    : R.string.global_action_restart);

        }



        @Override

services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java

+26 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.net; 


import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND;

import static android.net.NetworkPolicyManager.POLICY_NONE;

import static android.net.NetworkPolicyManager.POLICY_REJECT_ALL;

import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.NetworkPolicyManager.POLICY_REJECT_WIFI;

import static android.net.NetworkPolicyManager.POLICY_REJECT_CELLULAR;
@@ -86,6 +87,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
        pw.println("    Adds a UID to the whitelist for restrict background usage.");

        pw.println("  add restrict-background-blacklist UID");

        pw.println("    Adds a UID to the blacklist for restrict background usage.");

        pw.println("  add restrict-network-usage-blacklist UID");

        pw.println("    Adds a UID to the blacklist for restrict network usage.");

        pw.println("  add restrict-wifi-data-blacklist UID");

        pw.println("    Adds a UID to the blacklist for restrict Wi-Fi data usage.");

        pw.println("  add restrict-mobile-data-blacklist UID");
@@ -104,6 +107,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
        pw.println("    Lists UIDs that are whitelisted for restrict background usage.");

        pw.println("  list restrict-background-blacklist");

        pw.println("    Lists UIDs that are blacklisted for restrict background usage.");

        pw.println("  list restrict-network-usage-blacklist");

        pw.println("    Lists UIDs that are blacklisted for restrict network usage.");

        pw.println("  list restrict-wifi-data-blacklist");

        pw.println("    Lists UIDs that are blacklisted for restrict Wi-Fi data usage.");

        pw.println("  list restrict-mobile-data-blacklist");
@@ -114,6 +119,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
        pw.println("    Removes a UID from the whitelist for restrict background usage.");

        pw.println("  remove restrict-background-blacklist UID");

        pw.println("    Removes a UID from the blacklist for restrict background usage.");

        pw.println("  remove restrict-network-usage-blacklist UID");

        pw.println("    Removes a UID from the blacklist for restrict network usage.");

        pw.println("  remove restrict-wifi-data-blacklist UID");

        pw.println("    Removes a UID from the blacklist for restrict Wi-Fi data usage.");

        pw.println("  remove restrict-mobile-data-blacklist UID");
@@ -180,6 +187,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
                return listRestrictBackgroundWhitelist();

            case "restrict-background-blacklist":

                return listRestrictBackgroundBlacklist();

            case "restrict-network-usage-blacklist":

                return listRestrictNetworkUsageBlacklist();

            case "restrict-wifi-data-blacklist":

                return listRestrictWiFiDataBlacklist();

            case "restrict-mobile-data-blacklist":
@@ -203,6 +212,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
                return addRestrictBackgroundWhitelist();

            case "restrict-background-blacklist":

                return addRestrictBackgroundBlacklist();

            case "restrict-network-usage-blacklist":

                return addRestrictNetworkUsageBlacklist();

            case "restrict-wifi-data-blacklist":

                return addRestrictWiFiDataBlacklist();

            case "restrict-mobile-data-blacklist":
@@ -228,6 +239,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
                return removeRestrictBackgroundWhitelist();

            case "restrict-background-blacklist":

                return removeRestrictBackgroundBlacklist();

            case "restrict-network-usage-blacklist":

                return removeRestrictNetworkUsageBlacklist();

            case "restrict-wifi-data-blacklist":

                return removeRestrictWiFiDataBlacklist();

            case "restrict-mobile-data-blacklist":
@@ -288,6 +301,11 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
                POLICY_REJECT_METERED_BACKGROUND);

    }



    private int listRestrictNetworkUsageBlacklist() throws RemoteException {

        return listUidPolicies("Restrict network usage blacklisted UIDs",

                POLICY_REJECT_ALL);

    }



    private int listRestrictWiFiDataBlacklist() throws RemoteException {

        return listUidPolicies("Restrict Wi-Fi data blacklisted UIDs",

                POLICY_REJECT_WIFI);
@@ -368,6 +386,10 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
        return setUidPolicy(POLICY_REJECT_METERED_BACKGROUND);

    }



    private int addRestrictNetworkUsageBlacklist() throws RemoteException {

        return setUidPolicy(POLICY_REJECT_ALL);

    }



    private int addRestrictWiFiDataBlacklist() throws RemoteException {

        return setUidPolicy(POLICY_REJECT_WIFI);

    }
@@ -384,6 +406,10 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { 
        return resetUidPolicy("not blacklisted", POLICY_REJECT_METERED_BACKGROUND);

    }



    private int removeRestrictNetworkUsageBlacklist() throws RemoteException {

        return resetUidPolicy("not blacklisted", POLICY_REJECT_ALL);

    }



    private int removeRestrictWiFiDataBlacklist() throws RemoteException {

        return resetUidPolicy("not blacklisted", POLICY_REJECT_WIFI);

    }