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

Commit 16f50075 authored by Aaron Huang's avatar Aaron Huang Committed by Gerrit Code Review
Browse files

Merge changes from topic "pacproxy-service" 

* changes:
  Make PacProxyService be a system service
  Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
parents 4a6c12e6 5d31a15d

core/api/module-lib-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -58,6 +58,16 @@ package android.net { 
    method @Nullable public byte[] getWatchlistConfigHash();

  }



  public class PacProxyManager {

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void addPacProxyInstalledListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.PacProxyManager.PacProxyInstalledListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void removePacProxyInstalledListener(@NonNull android.net.PacProxyManager.PacProxyInstalledListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setCurrentProxyScriptUrl(@Nullable android.net.ProxyInfo);

  }



  public static interface PacProxyManager.PacProxyInstalledListener {

    method public void onPacProxyInstalled(@Nullable android.net.Network, @NonNull android.net.ProxyInfo);

  }



  public final class Proxy {

    method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);

  }

core/java/android/app/SystemServiceRegistry.java

+11 −0
Original line number Diff line number Diff line
@@ -117,11 +117,13 @@ import android.net.EthernetManager; 
import android.net.IEthernetManager;

import android.net.IIpSecService;

import android.net.INetworkPolicyManager;

import android.net.IPacProxyManager;

import android.net.IVpnManager;

import android.net.IpSecManager;

import android.net.NetworkPolicyManager;

import android.net.NetworkScoreManager;

import android.net.NetworkWatchlistManager;

import android.net.PacProxyManager;

import android.net.TetheringManager;

import android.net.VpnManager;

import android.net.lowpan.ILowpanManager;
@@ -346,6 +348,15 @@ public final class SystemServiceRegistry { 
        // (which extends it).

        SYSTEM_SERVICE_NAMES.put(android.text.ClipboardManager.class, Context.CLIPBOARD_SERVICE);



        registerService(Context.PAC_PROXY_SERVICE, PacProxyManager.class,

                new CachedServiceFetcher<PacProxyManager>() {

            @Override

            public PacProxyManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                IBinder b = ServiceManager.getServiceOrThrow(Context.PAC_PROXY_SERVICE);

                IPacProxyManager service = IPacProxyManager.Stub.asInterface(b);

                return new PacProxyManager(ctx.getOuterContext(), service);

            }});



        registerService(Context.NETD_SERVICE, IBinder.class, new StaticServiceFetcher<IBinder>() {

            @Override

            public IBinder createService() throws ServiceNotFoundException {

core/java/android/content/Context.java

+12 −0
Original line number Diff line number Diff line
@@ -3451,6 +3451,7 @@ public abstract class Context { 
            VIBRATOR_SERVICE,

            //@hide: STATUS_BAR_SERVICE,

            CONNECTIVITY_SERVICE,

            PAC_PROXY_SERVICE,

            VCN_MANAGEMENT_SERVICE,

            //@hide: IP_MEMORY_STORE_SERVICE,

            IPSEC_SERVICE,
@@ -4016,6 +4017,17 @@ public abstract class Context { 
     */

    public static final String CONNECTIVITY_SERVICE = "connectivity";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a {@link

     * android.net.PacProxyManager} for handling management of

     * pac proxy information.

     *

     * @see #getSystemService(String)

     * @see android.net.PacProxyManager

     * @hide

     */

    public static final String PAC_PROXY_SERVICE = "pac_proxy";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a {@link android.net.vcn.VcnManager}

     * for managing Virtual Carrier Networks

core/java/android/net/IPacProxyInstalledListener.aidl

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * 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 android.net;



import android.net.Network;

import android.net.ProxyInfo;



/** {@hide} */

oneway interface IPacProxyInstalledListener {

    void onPacProxyInstalled(in Network network, in ProxyInfo proxy);

}

core/java/android/net/IPacProxyManager.aidl

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/**

 * 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 perNmissions and

 * limitations under the License.

 */



package android.net;



import android.net.IPacProxyInstalledListener;

import android.net.ProxyInfo;



/** {@hide} */

interface IPacProxyManager

{

    void addListener(IPacProxyInstalledListener listener);

    void removeListener(IPacProxyInstalledListener listener);

    void setCurrentProxyScriptUrl(in ProxyInfo proxyInfo);

}