diff options
| author | Chen Xu <fionaxu@google.com> | 2019-09-26 22:23:16 -0700 |
|---|---|---|
| committer | Chen Xu <fionaxu@google.com> | 2019-10-21 18:27:21 -0700 |
| commit | 29a0a736152adf3158d28257eb91fd74cd947901 (patch) | |
| tree | 9c2cc250235438301089de317871931ead3af9b2 | |
| parent | 6544a639e96700036add6e56347a8b4a08f0fb06 (diff) | |
| download | wifi-29a0a736152adf3158d28257eb91fd74cd947901.tar.gz | |
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
(cherry picked from commit 9f5eeef5f577c4ae5de3102d9d539cd5bb3f4f16)
Merged-in: 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 8b1647fcb..126e34ce3 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; |