commit ac3d9d86411718795bf78894a15e8f6731c34237
author Neil Fuller <nfuller@google.com> Tue Sep 17 10:17:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 17 10:17:41 2019 -0700
tree 62cb8ccf1ae8d5c0b2427f438c903c0926575d25
parent 82c74accb0b026f7cfaf57cb7443dde39aae6f5b
parent 42b55bc6f666938654e3683f8032512295505903

Merge "Remove use of deprecated Time class" am: b3f8696c4d am: b83ddefb5c
am: 42b55bc6f6

Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603

src/com/android/settings/datausage/BillingCycleSettings.java

diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 87b8198..3160e3c 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -26,7 +26,6 @@
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
-import android.text.format.Time;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,6 +49,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 
 @SearchIndexable
 public class BillingCycleSettings extends DataUsageBaseFragment implements
@@ -405,7 +405,7 @@
             mCycleDayPicker.clearFocus();
 
             final int cycleDay = mCycleDayPicker.getValue();
-            final String cycleTimezone = new Time().timezone;
+            final String cycleTimezone = TimeZone.getDefault().getID();
             editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);
             target.updateDataUsage();
         }