Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MS03] Remove ServiceNotFoundException hidden API usage" am: 7fee9dd710 am: c270bbf232

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878043

Change-Id: I8d973c5e74e72621b4083b7389c5c5ca6f37de60
This commit is contained in:
Junyu Lai
2021-12-16 11:17:15 +00:00
committed by Automerger Merge Worker
parent ecd5de9078 c270bbf232
commit a562604531
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/SystemServiceRegistry.java
View File

@@ -130,6 +130,7 @@ import android.net.EthernetManager;
import android.net.IEthernetManager; import android.net.IEthernetManager;
import android.net.IIpSecService; import android.net.IIpSecService;
import android.net.INetworkPolicyManager; import android.net.INetworkPolicyManager;
import android.net.INetworkStatsService;
import android.net.IPacProxyManager; import android.net.IPacProxyManager;
import android.net.IVpnManager; import android.net.IVpnManager;
import android.net.IpSecManager; import android.net.IpSecManager;
@@ -981,7 +982,11 @@ public final class SystemServiceRegistry {
new CachedServiceFetcher<NetworkStatsManager>() { new CachedServiceFetcher<NetworkStatsManager>() {
@Override @Override
public NetworkStatsManager createService(ContextImpl ctx) throws ServiceNotFoundException { 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, registerService(Context.PERSISTENT_DATA_BLOCK_SERVICE, PersistentDataBlockManager.class,

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

@@ -45,8 +45,6 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceManager.ServiceNotFoundException;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.DataUnit; import android.util.DataUnit;
@@ -135,15 +133,6 @@ public class NetworkStatsManager {
private int mFlags; 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 */ /** @hide */
@VisibleForTesting @VisibleForTesting
public NetworkStatsManager(Context context, INetworkStatsService service) { public NetworkStatsManager(Context context, INetworkStatsService service) {