From 9d08a3ff2a07452ead5bbb7e97cfefda8e281c64 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Tue, 2 Nov 2021 06:52:46 +0000 Subject: [MS03] Remove ServiceNotFoundException hidden API usage Since ServiceNotFoundException is not a system API. Remove the unsupported interface which uses this exception. This is safe since the method annotated with maxTargetSdk = R and from dashboard it is not using by anybody. Test: TH Bug: 204830222 Change-Id: Ib8c0ce7b165732d24929851792d35371b90a5dfc --- core/java/android/app/SystemServiceRegistry.java | 7 ++++++- .../src/android/app/usage/NetworkStatsManager.java | 11 ----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index e2fd35940b52..aee7d0204c8c 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -129,6 +129,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; @@ -991,7 +992,11 @@ public final class SystemServiceRegistry { new CachedServiceFetcher() { @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, diff --git a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java index 8a6c85d54896..ca8330921620 100644 --- a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java +++ b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java @@ -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) { -- cgit v1.2.3-59-g8ed1b