Merge "Restrict access to dangerous methods to <= P" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-22 07:14:10 +00:00
committed by Android (Google) Code Review

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;
@@ -169,7 +170,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(
@@ -979,7 +980,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();