summaryrefslogtreecommitdiff
path: root/packages/CarrierDefaultApp/src
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2019-04-16 23:08:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-16 23:08:07 -0700
commit026b89e4f292ff1d1203ad6b6220d8bd3836a5bd (patch)
tree006c1d6d4f238b29fa07683c99061a9a2ea4a441 /packages/CarrierDefaultApp/src
parent7ae228c1891adbd5e2eb808e432e90817b456b55 (diff)
parent3444dd03d62ccec24816c30de140454d3ece50c0 (diff)
Merge "Move TrafficStats tags for the network stack constants"
am: 3444dd03d6 Change-Id: I13ba9e3077bb4ec28229a09f2d4747a43c281bcc
Diffstat (limited to 'packages/CarrierDefaultApp/src')
-rw-r--r--packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
index 55c9361ce6c4..81c5bcd47981 100644
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -52,6 +52,7 @@ import android.widget.TextView;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.TrafficStatsConstants;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -238,7 +239,8 @@ public class CaptivePortalLoginActivity extends Activity {
if (isFinishing() || isDestroyed()) return;
HttpURLConnection urlConnection = null;
int httpResponseCode = 500;
- int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);
+ int oldTag = TrafficStats.getAndSetThreadStatsTag(
+ TrafficStatsConstants.TAG_SYSTEM_PROBE);
try {
urlConnection = (HttpURLConnection) mNetwork.openConnection(
new URL(mCm.getCaptivePortalServerUrl()));