Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47c137a7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Track rename android.util.TimestampedValue" am: e8172f85 am: b7721352 

Change-Id: I9914446284e21281c86fc18cca1ad9a5242571b0
parents df51f1fd b7721352

src/java/com/android/internal/telephony/NitzStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.TimestampedValue;

import android.provider.Settings;

import android.util.TimestampedValue;



import com.android.internal.util.IndentingPrintWriter;

src/java/com/android/internal/telephony/NitzStateMachineImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.internal.telephony; 
import android.app.timedetector.PhoneTimeSuggestion;

import android.content.Context;

import android.os.PowerManager;

import android.os.TimestampedValue;

import android.telephony.Rlog;

import android.text.TextUtils;

import android.util.LocalLog;

import android.util.TimestampedValue;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.TimeZoneLookupHelper.CountryResult;

src/java/com/android/internal/telephony/ServiceStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.os.Registrant; 
import android.os.RegistrantList;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.TimestampedValue;

import android.os.UserHandle;

import android.os.WorkSource;

import android.preference.PreferenceManager;
@@ -87,7 +88,6 @@ import android.util.Pair; 
import android.util.SparseArray;

import android.util.SparseBooleanArray;

import android.util.StatsLog;

import android.util.TimestampedValue;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

src/java/com/android/internal/telephony/nitz/NewNitzStateMachineImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import android.annotation.Nullable; 
import android.app.timedetector.PhoneTimeSuggestion;

import android.app.timezonedetector.PhoneTimeZoneSuggestion;

import android.content.Context;

import android.os.TimestampedValue;

import android.telephony.Rlog;

import android.util.TimestampedValue;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.NitzData;

src/java/com/android/internal/telephony/nitz/NewTimeServiceHelperImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.app.timedetector.TimeDetector; 
import android.app.timezonedetector.PhoneTimeZoneSuggestion;

import android.app.timezonedetector.TimeZoneDetector;

import android.content.Context;

import android.os.TimestampedValue;

import android.util.LocalLog;

import android.util.TimestampedValue;



import com.android.internal.telephony.Phone;

import com.android.internal.telephony.metrics.TelephonyMetrics;