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

Commit 9d5b28ad authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Move code from c.a.server.location.timezone" into sc-dev am: ebb573ba 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64e2d94520692ab8ca45979ef0932602e2f39d76
parents 2136c994 ebb573ba

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

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

 */



package com.android.server.location.timezone;



import static com.android.server.location.timezone.LocationTimeZoneManagerService.debugLog;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_DESTROYED;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_PERM_FAILED;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_CERTAIN;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_INITIALIZING;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_UNCERTAIN;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STOPPED;

package com.android.server.timezonedetector.location;



import static com.android.server.timezonedetector.location.LocationTimeZoneManagerService.debugLog;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_DESTROYED;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_PERM_FAILED;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_CERTAIN;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_INITIALIZING;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_UNCERTAIN;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STOPPED;



import android.annotation.NonNull;

import android.annotation.Nullable;

services/core/java/com/android/server/location/timezone/ControllerCallbackImpl.java→services/core/java/com/android/server/timezonedetector/location/ControllerCallbackImpl.java

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

 */



package com.android.server.location.timezone;

package com.android.server.timezonedetector.location;



import android.annotation.NonNull;

services/core/java/com/android/server/location/timezone/ControllerEnvironmentImpl.java→services/core/java/com/android/server/timezonedetector/location/ControllerEnvironmentImpl.java

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

 */



package com.android.server.location.timezone;

package com.android.server.timezonedetector.location;



import android.annotation.NonNull;

services/core/java/com/android/server/location/timezone/ControllerImpl.java→services/core/java/com/android/server/timezonedetector/location/ControllerImpl.java

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

 */



package com.android.server.location.timezone;



import static com.android.server.location.timezone.LocationTimeZoneManagerService.debugLog;

import static com.android.server.location.timezone.LocationTimeZoneManagerService.warnLog;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_DESTROYED;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_PERM_FAILED;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_CERTAIN;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_INITIALIZING;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_UNCERTAIN;

import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STOPPED;

import static com.android.server.location.timezone.TimeZoneProviderEvent.EVENT_TYPE_PERMANENT_FAILURE;

import static com.android.server.location.timezone.TimeZoneProviderEvent.EVENT_TYPE_SUGGESTION;

import static com.android.server.location.timezone.TimeZoneProviderEvent.EVENT_TYPE_UNCERTAIN;

package com.android.server.timezonedetector.location;



import static com.android.server.timezonedetector.location.LocationTimeZoneManagerService.debugLog;

import static com.android.server.timezonedetector.location.LocationTimeZoneManagerService.warnLog;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_DESTROYED;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_PERM_FAILED;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_CERTAIN;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_INITIALIZING;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STARTED_UNCERTAIN;

import static com.android.server.timezonedetector.location.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_STOPPED;

import static com.android.server.timezonedetector.location.TimeZoneProviderEvent.EVENT_TYPE_PERMANENT_FAILURE;

import static com.android.server.timezonedetector.location.TimeZoneProviderEvent.EVENT_TYPE_SUGGESTION;

import static com.android.server.timezonedetector.location.TimeZoneProviderEvent.EVENT_TYPE_UNCERTAIN;



import android.annotation.DurationMillisLong;

import android.annotation.NonNull;
@@ -36,9 +36,9 @@ import android.os.RemoteCallback; 
import android.util.IndentingPrintWriter;



import com.android.internal.annotations.GuardedBy;

import com.android.server.location.timezone.ThreadingDomain.SingleRunnableQueue;

import com.android.server.timezonedetector.ConfigurationInternal;

import com.android.server.timezonedetector.GeolocationTimeZoneSuggestion;

import com.android.server.timezonedetector.location.ThreadingDomain.SingleRunnableQueue;



import java.time.Duration;

import java.util.List;

services/core/java/com/android/server/location/timezone/HandlerThreadingDomain.java→services/core/java/com/android/server/timezonedetector/location/HandlerThreadingDomain.java

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

 */



package com.android.server.location.timezone;

package com.android.server.timezonedetector.location;



import android.annotation.DurationMillisLong;

import android.annotation.NonNull;