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

Commit 97f46f69 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move ExternalTimeSuggestion to android.app.time" into sc-dev am: e90010e4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13471265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If603044928a6c62ff6ba22ddfd957c43081b0f80
parents dac9a9e7 e90010e4

core/java/android/app/timedetector/ExternalTimeSuggestion.aidl→core/java/android/app/time/ExternalTimeSuggestion.aidl

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

 */



package android.app.timedetector;

package android.app.time;



parcelable ExternalTimeSuggestion;

core/java/android/app/timedetector/ExternalTimeSuggestion.java→core/java/android/app/time/ExternalTimeSuggestion.java

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

 */



package android.app.timedetector;

package android.app.time;



import android.annotation.NonNull;

import android.annotation.Nullable;

core/java/android/app/timedetector/ITimeDetectorService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.app.timedetector;



import android.app.timedetector.ExternalTimeSuggestion;

import android.app.time.ExternalTimeSuggestion;

import android.app.timedetector.GnssTimeSuggestion;

import android.app.timedetector.ManualTimeSuggestion;

import android.app.timedetector.NetworkTimeSuggestion;

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app.timedetector; 
import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemService;

import android.app.time.ExternalTimeSuggestion;

import android.content.Context;

import android.os.SystemClock;

import android.os.TimestampedValue;

core/java/android/app/timedetector/TimeDetectorImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app.timedetector;



import android.annotation.NonNull;

import android.app.time.ExternalTimeSuggestion;

import android.content.Context;

import android.os.RemoteException;

import android.os.ServiceManager;