Merge "Add ConnectivityAnnotations class" into sc-dev am: 3610ac6ad1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186142

Change-Id: Ib74156e9f29e62e861d19f5b58a12ab106478b4c
This commit is contained in:
Aaron Huang
2021-05-17 14:26:25 +00:00
committed by Automerger Merge Worker
6 changed files with 72 additions and 22 deletions

View File

@@ -105,12 +105,12 @@ import android.database.ContentObserver;
import android.net.CaptivePortal;
import android.net.CaptivePortalData;
import android.net.ConnectionInfo;
import android.net.ConnectivityAnnotations.RestrictBackgroundStatus;
import android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import android.net.ConnectivityDiagnosticsManager.DataStallReport;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.BlockedReason;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.ConnectivityManager.RestrictBackgroundStatus;
import android.net.ConnectivityResources;
import android.net.ConnectivitySettingsManager;
import android.net.DataStallReportParcelable;