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

Commit 7fee9dd7 authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge "[MS03] Remove ServiceNotFoundException hidden API usage"

parents 00d81639 9d08a3ff

core/java/android/app/SystemServiceRegistry.java

+6 −1
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ import android.net.EthernetManager; 
import android.net.IEthernetManager;

import android.net.IIpSecService;

import android.net.INetworkPolicyManager;

import android.net.INetworkStatsService;

import android.net.IPacProxyManager;

import android.net.IVpnManager;

import android.net.IpSecManager;
@@ -981,7 +982,11 @@ public final class SystemServiceRegistry { 
                new CachedServiceFetcher<NetworkStatsManager>() {

            @Override

            public NetworkStatsManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                return new NetworkStatsManager(ctx.getOuterContext());

                // TODO: Replace with an initializer in the module, see

                //  {@code ConnectivityFrameworkInitializer}.

                final INetworkStatsService service = INetworkStatsService.Stub.asInterface(

                        ServiceManager.getServiceOrThrow(Context.NETWORK_STATS_SERVICE));

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

            }});



        registerService(Context.PERSISTENT_DATA_BLOCK_SERVICE, PersistentDataBlockManager.class,

packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java

+0 −11
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ import android.os.Looper; 
import android.os.Message;

import android.os.Messenger;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager.ServiceNotFoundException;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.DataUnit;
@@ -135,15 +133,6 @@ public class NetworkStatsManager { 


    private int mFlags;



    /**

     * {@hide}

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public NetworkStatsManager(Context context) throws ServiceNotFoundException {

        this(context, INetworkStatsService.Stub.asInterface(

                ServiceManager.getServiceOrThrow(Context.NETWORK_STATS_SERVICE)));

    }



    /** @hide */

    @VisibleForTesting

    public NetworkStatsManager(Context context, INetworkStatsService service) {