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

Commit ecadc419 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Move LocationTimeZoneEvent to com.android"

parents f4f4e6d1 bd141410

location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl

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


package com.android.internal.location.timezone;



import android.location.timezone.LocationTimeZoneEvent;

import com.android.internal.location.timezone.LocationTimeZoneEvent;



/**

 * Binder interface for the manager of location time zone provider implementations.

location/java/android/location/timezone/LocationTimeZoneEvent.aidl→location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.aidl

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

 */



package android.location.timezone;

package com.android.internal.location.timezone;



parcelable LocationTimeZoneEvent;

location/java/android/location/timezone/LocationTimeZoneEvent.java→location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.java

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

 */



package android.location.timezone;

package com.android.internal.location.timezone;



import android.annotation.IntDef;

import android.annotation.NonNull;

location/lib/java/com/android/location/timezone/provider/LocationTimeZoneEventUnbundled.java

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.location.timezone.provider; 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.location.timezone.LocationTimeZoneEvent;

import android.os.SystemClock;



import com.android.internal.location.timezone.LocationTimeZoneEvent;



import java.util.Collections;

import java.util.List;

import java.util.Objects;

services/core/java/com/android/server/location/timezone/BinderLocationTimeZoneProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import static com.android.server.location.timezone.LocationTimeZoneProvider.Prov 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.location.timezone.LocationTimeZoneEvent;

import android.util.IndentingPrintWriter;

import android.util.Slog;



import com.android.internal.location.timezone.LocationTimeZoneEvent;

import com.android.internal.location.timezone.LocationTimeZoneProviderRequest;



import java.time.Duration;