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

Commit aa58c0d5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Rename android.util.TimestampedValue to android.os" am: 641fa673 am: fee904a5 

Change-Id: Ib439759dbee692a624491267d07f72b0d754779d
parents 47173f44 fee904a5

core/java/android/app/timedetector/ManualTimeSuggestion.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.TimestampedValue;

import android.os.TimestampedValue;



import java.util.ArrayList;

import java.util.Arrays;

core/java/android/app/timedetector/NetworkTimeSuggestion.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.TimestampedValue;

import android.os.TimestampedValue;



import java.util.ArrayList;

import java.util.Arrays;

core/java/android/app/timedetector/PhoneTimeSuggestion.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.TimestampedValue;

import android.os.TimestampedValue;



import java.util.ArrayList;

import java.util.Collections;

core/java/android/app/timedetector/TimeDetector.java

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.ServiceManager.ServiceNotFoundException;

import android.os.SystemClock;

import android.os.TimestampedValue;

import android.util.Log;

import android.util.TimestampedValue;



/**

 * The interface through which system components can send signals to the TimeDetectorService.

core/java/android/util/TimestampedValue.java→core/java/android/os/TimestampedValue.java

+1 −4
Original line number Diff line number Diff line
@@ -14,13 +14,10 @@ 
 * limitations under the License.

 */



package android.util;

package android.os;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.SystemClock;



import java.util.Objects;