diff options
| author | Chen Xu <fionaxu@google.com> | 2019-09-26 22:23:16 -0700 |
|---|---|---|
| committer | Chen Xu <fionaxu@google.com> | 2019-09-27 10:58:41 -0700 |
| commit | 9f5eeef5f577c4ae5de3102d9d539cd5bb3f4f16 (patch) | |
| tree | d933649dd01b7ba9d3f7c14280c98dcfb88735f5 | |
| parent | b6b18ba110233448ee62a3483282c8f63cb45a84 (diff) | |
new telephony annotation class
This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotation to a separate class and having
other module statically link to it.
Bug: 140908357
Test: Build
Change-Id: I8f4374bbe2f81b9a688c5c3699bafe4942859a1b
| -rw-r--r-- | service/java/com/android/server/wifi/CellularLinkLayerStats.java | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/CellularLinkLayerStatsCollectorTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/CellularLinkLayerStats.java b/service/java/com/android/server/wifi/CellularLinkLayerStats.java index 25f2949a7..09923e625 100644 --- a/service/java/com/android/server/wifi/CellularLinkLayerStats.java +++ b/service/java/com/android/server/wifi/CellularLinkLayerStats.java @@ -16,9 +16,9 @@ package com.android.server.wifi; +import android.telephony.Annotation.NetworkType; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; -import android.telephony.TelephonyManager.NetworkType; /** * A class representing the link layer statistics of the primary registered cell diff --git a/tests/wifitests/src/com/android/server/wifi/CellularLinkLayerStatsCollectorTest.java b/tests/wifitests/src/com/android/server/wifi/CellularLinkLayerStatsCollectorTest.java index 66e659b4f..e6d459319 100644 --- a/tests/wifitests/src/com/android/server/wifi/CellularLinkLayerStatsCollectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/CellularLinkLayerStatsCollectorTest.java @@ -33,6 +33,7 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.validateMockitoUsage; import android.content.Context; +import android.telephony.Annotation.NetworkType; import android.telephony.CellInfo; import android.telephony.CellInfoCdma; import android.telephony.CellInfoGsm; @@ -48,7 +49,6 @@ import android.telephony.CellSignalStrengthWcdma; import android.telephony.SignalStrength; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.telephony.TelephonyManager.NetworkType; import androidx.test.filters.SmallTest; |