Snap for 5476456 from 8790a10d4fe5b1b00a29a1501931dbb450676632 to rvc-release

Change-Id: Ibbd3c1f728203527149d0930ad610407a09f13a8
This commit is contained in:
android-build-team Robot
2019-04-17 03:07:11 +00:00

View File

@@ -25,6 +25,7 @@ import android.app.backup.BackupManager;
import android.app.usage.NetworkStatsManager; import android.app.usage.NetworkStatsManager;
import android.content.Context; import android.content.Context;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.DataUnit; import android.util.DataUnit;
@@ -150,7 +151,7 @@ public class TrafficStats {
private static INetworkStatsService sStatsService; private static INetworkStatsService sStatsService;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
private synchronized static INetworkStatsService getStatsService() { private synchronized static INetworkStatsService getStatsService() {
if (sStatsService == null) { if (sStatsService == null) {
sStatsService = INetworkStatsService.Stub.asInterface( sStatsService = INetworkStatsService.Stub.asInterface(
@@ -960,7 +961,7 @@ public class TrafficStats {
* Interfaces are never removed from this list, so counters should always be * Interfaces are never removed from this list, so counters should always be
* monotonic. * monotonic.
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
private static String[] getMobileIfaces() { private static String[] getMobileIfaces() {
try { try {
return getStatsService().getMobileIfaces(); return getStatsService().getMobileIfaces();