From 4461754bd55d4f5f1e2d01877acf6a5cfb2b7bf9 Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Fri, 3 Jan 2020 13:37:24 +0000 Subject: [PATCH] Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull Bug: 126528330 Test: Treehugger Change-Id: I978d5d0959f7800e859bfb384458ba52adc0c2b0 --- .../server/net/NetworkStatsRecorder.java | 23 ++++++----- .../server/net/NetworkStatsService.java | 39 ++++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/services/core/java/com/android/server/net/NetworkStatsRecorder.java b/services/core/java/com/android/server/net/NetworkStatsRecorder.java index 06ec341d9e..a94a2f79ab 100644 --- a/services/core/java/com/android/server/net/NetworkStatsRecorder.java +++ b/services/core/java/com/android/server/net/NetworkStatsRecorder.java @@ -21,8 +21,6 @@ import static android.net.TrafficStats.KB_IN_BYTES; import static android.net.TrafficStats.MB_IN_BYTES; import static android.text.format.DateUtils.YEAR_IN_MILLIS; -import static com.android.internal.util.Preconditions.checkNotNull; - import android.net.NetworkStats; import android.net.NetworkStats.NonMonotonicObserver; import android.net.NetworkStatsHistory; @@ -54,6 +52,7 @@ import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.HashSet; import java.util.Map; +import java.util.Objects; /** * Logic to record deltas between periodic {@link NetworkStats} snapshots into @@ -116,9 +115,9 @@ public class NetworkStatsRecorder { */ public NetworkStatsRecorder(FileRotator rotator, NonMonotonicObserver observer, DropBoxManager dropBox, String cookie, long bucketDuration, boolean onlyTags) { - mRotator = checkNotNull(rotator, "missing FileRotator"); - mObserver = checkNotNull(observer, "missing NonMonotonicObserver"); - mDropBox = checkNotNull(dropBox, "missing DropBoxManager"); + mRotator = Objects.requireNonNull(rotator, "missing FileRotator"); + mObserver = Objects.requireNonNull(observer, "missing NonMonotonicObserver"); + mDropBox = Objects.requireNonNull(dropBox, "missing DropBoxManager"); mCookie = cookie; mBucketDuration = bucketDuration; @@ -165,7 +164,7 @@ public class NetworkStatsRecorder { * as reference is valid. */ public NetworkStatsCollection getOrLoadCompleteLocked() { - checkNotNull(mRotator, "missing FileRotator"); + Objects.requireNonNull(mRotator, "missing FileRotator"); NetworkStatsCollection res = mComplete != null ? mComplete.get() : null; if (res == null) { res = loadLocked(Long.MIN_VALUE, Long.MAX_VALUE); @@ -175,7 +174,7 @@ public class NetworkStatsRecorder { } public NetworkStatsCollection getOrLoadPartialLocked(long start, long end) { - checkNotNull(mRotator, "missing FileRotator"); + Objects.requireNonNull(mRotator, "missing FileRotator"); NetworkStatsCollection res = mComplete != null ? mComplete.get() : null; if (res == null) { res = loadLocked(start, end); @@ -280,7 +279,7 @@ public class NetworkStatsRecorder { * {@link #mPersistThresholdBytes}. */ public void maybePersistLocked(long currentTimeMillis) { - checkNotNull(mRotator, "missing FileRotator"); + Objects.requireNonNull(mRotator, "missing FileRotator"); final long pendingBytes = mPending.getTotalBytes(); if (pendingBytes >= mPersistThresholdBytes) { forcePersistLocked(currentTimeMillis); @@ -293,7 +292,7 @@ public class NetworkStatsRecorder { * Force persisting any pending deltas. */ public void forcePersistLocked(long currentTimeMillis) { - checkNotNull(mRotator, "missing FileRotator"); + Objects.requireNonNull(mRotator, "missing FileRotator"); if (mPending.isDirty()) { if (LOGD) Slog.d(TAG, "forcePersistLocked() writing for " + mCookie); try { @@ -356,7 +355,7 @@ public class NetworkStatsRecorder { private final NetworkStatsCollection mCollection; public CombiningRewriter(NetworkStatsCollection collection) { - mCollection = checkNotNull(collection, "missing NetworkStatsCollection"); + mCollection = Objects.requireNonNull(collection, "missing NetworkStatsCollection"); } @Override @@ -418,7 +417,7 @@ public class NetworkStatsRecorder { } public void importLegacyNetworkLocked(File file) throws IOException { - checkNotNull(mRotator, "missing FileRotator"); + Objects.requireNonNull(mRotator, "missing FileRotator"); // legacy file still exists; start empty to avoid double importing mRotator.deleteAll(); @@ -438,7 +437,7 @@ public class NetworkStatsRecorder { } public void importLegacyUidLocked(File file) throws IOException { - checkNotNull(mRotator, "missing FileRotator"); + Objects.requireNonNull(mRotator, "missing FileRotator"); // legacy file still exists; start empty to avoid double importing mRotator.deleteAll(); diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java index a943e77284..a41fb7d327 100644 --- a/services/core/java/com/android/server/net/NetworkStatsService.java +++ b/services/core/java/com/android/server/net/NetworkStatsService.java @@ -65,7 +65,6 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS; import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.SECOND_IN_MILLIS; -import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.server.NetworkManagementService.LIMIT_GLOBAL_ALERT; import static com.android.server.NetworkManagementSocketTagger.resetKernelUidStats; import static com.android.server.NetworkManagementSocketTagger.setKernelCounterSet; @@ -148,6 +147,7 @@ import java.time.ZoneOffset; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Objects; /** * Collect and persist detailed network statistics, and provide this data to @@ -357,17 +357,18 @@ public class NetworkStatsService extends INetworkStatsService.Stub { TelephonyManager teleManager, NetworkStatsSettings settings, NetworkStatsFactory factory, NetworkStatsObservers statsObservers, File systemDir, File baseDir) { - mContext = checkNotNull(context, "missing Context"); - mNetworkManager = checkNotNull(networkManager, "missing INetworkManagementService"); - mAlarmManager = checkNotNull(alarmManager, "missing AlarmManager"); - mClock = checkNotNull(clock, "missing Clock"); - mSettings = checkNotNull(settings, "missing NetworkStatsSettings"); - mTeleManager = checkNotNull(teleManager, "missing TelephonyManager"); - mWakeLock = checkNotNull(wakeLock, "missing WakeLock"); - mStatsFactory = checkNotNull(factory, "missing factory"); - mStatsObservers = checkNotNull(statsObservers, "missing NetworkStatsObservers"); - mSystemDir = checkNotNull(systemDir, "missing systemDir"); - mBaseDir = checkNotNull(baseDir, "missing baseDir"); + mContext = Objects.requireNonNull(context, "missing Context"); + mNetworkManager = Objects.requireNonNull(networkManager, + "missing INetworkManagementService"); + mAlarmManager = Objects.requireNonNull(alarmManager, "missing AlarmManager"); + mClock = Objects.requireNonNull(clock, "missing Clock"); + mSettings = Objects.requireNonNull(settings, "missing NetworkStatsSettings"); + mTeleManager = Objects.requireNonNull(teleManager, "missing TelephonyManager"); + mWakeLock = Objects.requireNonNull(wakeLock, "missing WakeLock"); + mStatsFactory = Objects.requireNonNull(factory, "missing factory"); + mStatsObservers = Objects.requireNonNull(statsObservers, "missing NetworkStatsObservers"); + mSystemDir = Objects.requireNonNull(systemDir, "missing systemDir"); + mBaseDir = Objects.requireNonNull(baseDir, "missing baseDir"); mUseBpfTrafficStats = new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists(); } @@ -896,11 +897,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub { @Override public DataUsageRequest registerUsageCallback(String callingPackage, DataUsageRequest request, Messenger messenger, IBinder binder) { - checkNotNull(callingPackage, "calling package is null"); - checkNotNull(request, "DataUsageRequest is null"); - checkNotNull(request.template, "NetworkTemplate is null"); - checkNotNull(messenger, "messenger is null"); - checkNotNull(binder, "binder is null"); + Objects.requireNonNull(callingPackage, "calling package is null"); + Objects.requireNonNull(request, "DataUsageRequest is null"); + Objects.requireNonNull(request.template, "NetworkTemplate is null"); + Objects.requireNonNull(messenger, "messenger is null"); + Objects.requireNonNull(binder, "binder is null"); int callingUid = Binder.getCallingUid(); @NetworkStatsAccess.Level int accessLevel = checkAccessLevel(callingPackage); @@ -921,7 +922,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { @Override public void unregisterUsageRequest(DataUsageRequest request) { - checkNotNull(request, "DataUsageRequest is null"); + Objects.requireNonNull(request, "DataUsageRequest is null"); int callingUid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); @@ -1795,7 +1796,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { private final ContentResolver mResolver; public DefaultNetworkStatsSettings(Context context) { - mResolver = checkNotNull(context.getContentResolver()); + mResolver = Objects.requireNonNull(context.getContentResolver()); // TODO: adjust these timings for production builds }