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

Merge "Fix style errors in NetworkStats" am: b84de74137

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138534

Change-Id: Ide39fea8d06b563bb3eb5e7ca3bc67c2b2caca7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Huang
2022-07-20 09:40:30 +00:00
committed by Automerger Merge Worker
parent be198dcc5c b84de74137
commit f49be5f320
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
framework-t/src/android/app/usage/NetworkStats.java
View File

@@ -1,17 +1,17 @@
/** /**
* Copyright (C) 2015 The Android Open Source Project * Copyright (C) 2015 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not * Licensed under the Apache License, Version 2.0 (the "License");
* use this file except in compliance with the License. You may obtain a copy * you may not use this file except in compliance with the License.
* of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * distributed under the License is distributed on an "AS IS" BASIS,
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* License for the specific language governing permissions and limitations * See the License for the specific language governing permissions and
* under the License. * limitations under the License.
*/ */
package android.app.usage; package android.app.usage;
@@ -36,11 +36,11 @@ import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
* Class providing enumeration over buckets of network usage statistics. {@link NetworkStats} objects * Class providing enumeration over buckets of network usage statistics. {@link NetworkStats}
* are returned as results to various queries in {@link NetworkStatsManager}. * objects are returned as results to various queries in {@link NetworkStatsManager}.
*/ */
public final class NetworkStats implements AutoCloseable { public final class NetworkStats implements AutoCloseable {
private final static String TAG = "NetworkStats"; private static final String TAG = "NetworkStats";
private final CloseGuard mCloseGuard = CloseGuard.get(); private final CloseGuard mCloseGuard = CloseGuard.get();
@@ -692,8 +692,8 @@ public final class NetworkStats implements AutoCloseable {
bucketOut.mMetered = Bucket.METERED_ALL; bucketOut.mMetered = Bucket.METERED_ALL;
bucketOut.mRoaming = Bucket.ROAMING_ALL; bucketOut.mRoaming = Bucket.ROAMING_ALL;
bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart; bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;
bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart + bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart
mRecycledHistoryEntry.bucketDuration; + mRecycledHistoryEntry.bucketDuration;
bucketOut.mRxBytes = mRecycledHistoryEntry.rxBytes; bucketOut.mRxBytes = mRecycledHistoryEntry.rxBytes;
bucketOut.mRxPackets = mRecycledHistoryEntry.rxPackets; bucketOut.mRxPackets = mRecycledHistoryEntry.rxPackets;
bucketOut.mTxBytes = mRecycledHistoryEntry.txBytes; bucketOut.mTxBytes = mRecycledHistoryEntry.txBytes;