LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 2ee360b058 am: 5727033c3a

Browse Source 
Change-Id: I77d243d82c34a976637f6bdb8f652e9886c3b491
This commit is contained in:
Automerger Merge Worker
2020-01-03 16:22:21 +00:00
parent 661741804d 2ee360b058
commit af83fe4801
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/net/NetworkStatsRecorder.java
View File

@@ -21,8 +21,6 @@ import static android.net.TrafficStats.KB_IN_BYTES;
import static android.net.TrafficStats.MB_IN_BYTES; import static android.net.TrafficStats.MB_IN_BYTES;
import static android.text.format.DateUtils.YEAR_IN_MILLIS; 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;
import android.net.NetworkStats.NonMonotonicObserver; import android.net.NetworkStats.NonMonotonicObserver;
import android.net.NetworkStatsHistory; import android.net.NetworkStatsHistory;
@@ -54,6 +52,7 @@ import java.lang.ref.WeakReference;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Objects;
/** /**
* Logic to record deltas between periodic {@link NetworkStats} snapshots into * Logic to record deltas between periodic {@link NetworkStats} snapshots into
@@ -116,9 +115,9 @@ public class NetworkStatsRecorder {
*/ */
public NetworkStatsRecorder(FileRotator rotator, NonMonotonicObserver<String> observer, public NetworkStatsRecorder(FileRotator rotator, NonMonotonicObserver<String> observer,
DropBoxManager dropBox, String cookie, long bucketDuration, boolean onlyTags) { DropBoxManager dropBox, String cookie, long bucketDuration, boolean onlyTags) {
mRotator = checkNotNull(rotator, "missing FileRotator"); mRotator = Objects.requireNonNull(rotator, "missing FileRotator");
mObserver = checkNotNull(observer, "missing NonMonotonicObserver"); mObserver = Objects.requireNonNull(observer, "missing NonMonotonicObserver");
mDropBox = checkNotNull(dropBox, "missing DropBoxManager"); mDropBox = Objects.requireNonNull(dropBox, "missing DropBoxManager");
mCookie = cookie; mCookie = cookie;
mBucketDuration = bucketDuration; mBucketDuration = bucketDuration;
@@ -165,7 +164,7 @@ public class NetworkStatsRecorder {
* as reference is valid. * as reference is valid.
*/ */
public NetworkStatsCollection getOrLoadCompleteLocked() { public NetworkStatsCollection getOrLoadCompleteLocked() {
checkNotNull(mRotator, "missing FileRotator"); Objects.requireNonNull(mRotator, "missing FileRotator");
NetworkStatsCollection res = mComplete != null ? mComplete.get() : null; NetworkStatsCollection res = mComplete != null ? mComplete.get() : null;
if (res == null) { if (res == null) {
res = loadLocked(Long.MIN_VALUE, Long.MAX_VALUE); res = loadLocked(Long.MIN_VALUE, Long.MAX_VALUE);
@@ -175,7 +174,7 @@ public class NetworkStatsRecorder {
} }
public NetworkStatsCollection getOrLoadPartialLocked(long start, long end) { public NetworkStatsCollection getOrLoadPartialLocked(long start, long end) {
checkNotNull(mRotator, "missing FileRotator"); Objects.requireNonNull(mRotator, "missing FileRotator");
NetworkStatsCollection res = mComplete != null ? mComplete.get() : null; NetworkStatsCollection res = mComplete != null ? mComplete.get() : null;
if (res == null) { if (res == null) {
res = loadLocked(start, end); res = loadLocked(start, end);
@@ -280,7 +279,7 @@ public class NetworkStatsRecorder {
* {@link #mPersistThresholdBytes}. * {@link #mPersistThresholdBytes}.
*/ */
public void maybePersistLocked(long currentTimeMillis) { public void maybePersistLocked(long currentTimeMillis) {
checkNotNull(mRotator, "missing FileRotator"); Objects.requireNonNull(mRotator, "missing FileRotator");
final long pendingBytes = mPending.getTotalBytes(); final long pendingBytes = mPending.getTotalBytes();
if (pendingBytes >= mPersistThresholdBytes) { if (pendingBytes >= mPersistThresholdBytes) {
forcePersistLocked(currentTimeMillis); forcePersistLocked(currentTimeMillis);
@@ -293,7 +292,7 @@ public class NetworkStatsRecorder {
* Force persisting any pending deltas. * Force persisting any pending deltas.
*/ */
public void forcePersistLocked(long currentTimeMillis) { public void forcePersistLocked(long currentTimeMillis) {
checkNotNull(mRotator, "missing FileRotator"); Objects.requireNonNull(mRotator, "missing FileRotator");
if (mPending.isDirty()) { if (mPending.isDirty()) {
if (LOGD) Slog.d(TAG, "forcePersistLocked() writing for " + mCookie); if (LOGD) Slog.d(TAG, "forcePersistLocked() writing for " + mCookie);
try { try {
@@ -356,7 +355,7 @@ public class NetworkStatsRecorder {
private final NetworkStatsCollection mCollection; private final NetworkStatsCollection mCollection;
public CombiningRewriter(NetworkStatsCollection collection) { public CombiningRewriter(NetworkStatsCollection collection) {
mCollection = checkNotNull(collection, "missing NetworkStatsCollection"); mCollection = Objects.requireNonNull(collection, "missing NetworkStatsCollection");
} }
@Override @Override
@@ -418,7 +417,7 @@ public class NetworkStatsRecorder {
} }
public void importLegacyNetworkLocked(File file) throws IOException { 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 // legacy file still exists; start empty to avoid double importing
mRotator.deleteAll(); mRotator.deleteAll();
@@ -438,7 +437,7 @@ public class NetworkStatsRecorder {
} }
public void importLegacyUidLocked(File file) throws IOException { 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 // legacy file still exists; start empty to avoid double importing
mRotator.deleteAll(); mRotator.deleteAll();

39
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -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.MINUTE_IN_MILLIS;
import static android.text.format.DateUtils.SECOND_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.NetworkManagementService.LIMIT_GLOBAL_ALERT;
import static com.android.server.NetworkManagementSocketTagger.resetKernelUidStats; import static com.android.server.NetworkManagementSocketTagger.resetKernelUidStats;
import static com.android.server.NetworkManagementSocketTagger.setKernelCounterSet; import static com.android.server.NetworkManagementSocketTagger.setKernelCounterSet;
@@ -148,6 +147,7 @@ import java.time.ZoneOffset;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* Collect and persist detailed network statistics, and provide this data to * 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, TelephonyManager teleManager, NetworkStatsSettings settings,
NetworkStatsFactory factory, NetworkStatsObservers statsObservers, File systemDir, NetworkStatsFactory factory, NetworkStatsObservers statsObservers, File systemDir,
File baseDir) { File baseDir) {
mContext = checkNotNull(context, "missing Context"); mContext = Objects.requireNonNull(context, "missing Context");
mNetworkManager = checkNotNull(networkManager, "missing INetworkManagementService"); mNetworkManager = Objects.requireNonNull(networkManager,
mAlarmManager = checkNotNull(alarmManager, "missing AlarmManager"); "missing INetworkManagementService");
mClock = checkNotNull(clock, "missing Clock"); mAlarmManager = Objects.requireNonNull(alarmManager, "missing AlarmManager");
mSettings = checkNotNull(settings, "missing NetworkStatsSettings"); mClock = Objects.requireNonNull(clock, "missing Clock");
mTeleManager = checkNotNull(teleManager, "missing TelephonyManager"); mSettings = Objects.requireNonNull(settings, "missing NetworkStatsSettings");
mWakeLock = checkNotNull(wakeLock, "missing WakeLock"); mTeleManager = Objects.requireNonNull(teleManager, "missing TelephonyManager");
mStatsFactory = checkNotNull(factory, "missing factory"); mWakeLock = Objects.requireNonNull(wakeLock, "missing WakeLock");
mStatsObservers = checkNotNull(statsObservers, "missing NetworkStatsObservers"); mStatsFactory = Objects.requireNonNull(factory, "missing factory");
mSystemDir = checkNotNull(systemDir, "missing systemDir"); mStatsObservers = Objects.requireNonNull(statsObservers, "missing NetworkStatsObservers");
mBaseDir = checkNotNull(baseDir, "missing baseDir"); 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(); mUseBpfTrafficStats = new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists();
} }
@@ -896,11 +897,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public DataUsageRequest registerUsageCallback(String callingPackage, public DataUsageRequest registerUsageCallback(String callingPackage,
DataUsageRequest request, Messenger messenger, IBinder binder) { DataUsageRequest request, Messenger messenger, IBinder binder) {
checkNotNull(callingPackage, "calling package is null"); Objects.requireNonNull(callingPackage, "calling package is null");
checkNotNull(request, "DataUsageRequest is null"); Objects.requireNonNull(request, "DataUsageRequest is null");
checkNotNull(request.template, "NetworkTemplate is null"); Objects.requireNonNull(request.template, "NetworkTemplate is null");
checkNotNull(messenger, "messenger is null"); Objects.requireNonNull(messenger, "messenger is null");
checkNotNull(binder, "binder is null"); Objects.requireNonNull(binder, "binder is null");
int callingUid = Binder.getCallingUid(); int callingUid = Binder.getCallingUid();
@NetworkStatsAccess.Level int accessLevel = checkAccessLevel(callingPackage); @NetworkStatsAccess.Level int accessLevel = checkAccessLevel(callingPackage);
@@ -921,7 +922,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public void unregisterUsageRequest(DataUsageRequest request) { public void unregisterUsageRequest(DataUsageRequest request) {
checkNotNull(request, "DataUsageRequest is null"); Objects.requireNonNull(request, "DataUsageRequest is null");
int callingUid = Binder.getCallingUid(); int callingUid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
@@ -1795,7 +1796,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private final ContentResolver mResolver; private final ContentResolver mResolver;
public DefaultNetworkStatsSettings(Context context) { public DefaultNetworkStatsSettings(Context context) {
mResolver = checkNotNull(context.getContentResolver()); mResolver = Objects.requireNonNull(context.getContentResolver());
// TODO: adjust these timings for production builds // TODO: adjust these timings for production builds
} }