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

am: ac3d9d8641

Change-Id: I71bc0a1411abc6433016554e073da5868df3b952
This commit is contained in:
Neil Fuller
2019-09-17 10:24:31 -07:00
committed by android-build-merger

View File

@@ -26,7 +26,6 @@ import android.net.NetworkPolicy;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Bundle; import android.os.Bundle;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.text.format.Time;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -50,6 +49,7 @@ import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.TimeZone;
@SearchIndexable @SearchIndexable
public class BillingCycleSettings extends DataUsageBaseFragment implements public class BillingCycleSettings extends DataUsageBaseFragment implements
@@ -403,7 +403,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
mCycleDayPicker.clearFocus(); mCycleDayPicker.clearFocus();
final int cycleDay = mCycleDayPicker.getValue(); final int cycleDay = mCycleDayPicker.getValue();
final String cycleTimezone = new Time().timezone; final String cycleTimezone = TimeZone.getDefault().getID();
editor.setPolicyCycleDay(template, cycleDay, cycleTimezone); editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);
target.updateDataUsage(); target.updateDataUsage();
} }