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

Commit 35cc2962 authored by Neil Fuller's avatar Neil Fuller
Browse files

Rename android.util.TimestampedValue to android.os 

Rename android.util.TimestampedValue to android.os to avoid dependency
from android.util onto android.os, which is disallowed by lint.

Bug: 147012511
Test: boot
Merged-In: I4b84db03c8ad24bbef63e45d6d15fb306a10364e
Change-Id: I4b84db03c8ad24bbef63e45d6d15fb306a10364e
(cherry picked from commit d159015e)
parent e716ff86

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;