Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle provider initialization failure"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-06 12:28:28 +00:00
committed by Android (Google) Code Review
parent bb7aeb012e 627920cbcb
commit 974f4c3149
6 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/location/timezone/BinderLocationTimeZoneProvider.java
View File

@@ -161,11 +161,6 @@ class BinderLocationTimeZoneProvider extends LocationTimeZoneProvider {
mProxy.setRequest(request);
}
@Override
void logWarn(String msg) {
Slog.w(TAG, msg);
}
@Override
public void dump(@NonNull IndentingPrintWriter ipw, @Nullable String[] args) {
synchronized (mSharedLock) {

6
services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java
View File

@@ -285,8 +285,12 @@ public class LocationTimeZoneManagerService extends Binder {
}
static void warnLog(String msg) {
warnLog(msg, null);
}
static void warnLog(String msg, @Nullable Throwable t) {
if (Log.isLoggable(TAG, Log.WARN)) {
Slog.w(TAG, msg);
Slog.w(TAG, msg, t);
}
}
}

29
services/core/java/com/android/server/location/timezone/LocationTimeZoneProvider.java
View File

@@ -17,6 +17,7 @@
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.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;
@@ -345,12 +346,21 @@ abstract class LocationTimeZoneProvider implements Dumpable {
}
mProviderListener = Objects.requireNonNull(providerListener);
ProviderState currentState = ProviderState.createStartingState(this);
ProviderState newState = currentState.newState(
currentState = currentState.newState(
PROVIDER_STATE_STOPPED, null, null,
"initialize() called");
setCurrentState(newState, false);
setCurrentState(currentState, false);
onInitialize();
// Guard against uncaught exceptions due to initialization problems.
try {
onInitialize();
} catch (RuntimeException e) {
warnLog("Unable to initialize the provider", e);
currentState = currentState
.newState(PROVIDER_STATE_PERM_FAILED, null, null,
"Provider failed to initialize");
setCurrentState(currentState, true);
}
}
}
@@ -498,7 +508,7 @@ abstract class LocationTimeZoneProvider implements Dumpable {
case PROVIDER_STATE_PERM_FAILED: {
// After entering perm failed, there is nothing to do. The remote peer is
// supposed to stop sending events after it has reported perm failure.
logWarn("handleTimeZoneProviderEvent: Event=" + timeZoneProviderEvent
warnLog("handleTimeZoneProviderEvent: Event=" + timeZoneProviderEvent
+ " received for provider=" + this + " when in failed state");
return;
}
@@ -509,7 +519,7 @@ abstract class LocationTimeZoneProvider implements Dumpable {
+ " Failure event=" + timeZoneProviderEvent
+ " received for stopped provider=" + this
+ ", entering permanently failed state";
logWarn(msg);
warnLog(msg);
ProviderState newState = currentState.newState(
PROVIDER_STATE_PERM_FAILED, null, null, msg);
setCurrentState(newState, true);
@@ -522,7 +532,7 @@ abstract class LocationTimeZoneProvider implements Dumpable {
case EVENT_TYPE_UNCERTAIN: {
// Any geolocation-related events received for a stopped provider are
// ignored: they should not happen.
logWarn("handleTimeZoneProviderEvent:"
warnLog("handleTimeZoneProviderEvent:"
+ " event=" + timeZoneProviderEvent
+ " received for stopped provider=" + this
+ ", ignoring");
@@ -544,7 +554,7 @@ abstract class LocationTimeZoneProvider implements Dumpable {
+ " Failure event=" + timeZoneProviderEvent
+ " received for provider=" + this
+ ", entering permanently failed state";
logWarn(msg);
warnLog(msg);
ProviderState newState = currentState.newState(
PROVIDER_STATE_PERM_FAILED, null, null, msg);
setCurrentState(newState, true);
@@ -584,11 +594,6 @@ abstract class LocationTimeZoneProvider implements Dumpable {
}
}
/**
* Implemented by subclasses.
*/
abstract void logWarn(String msg);
@GuardedBy("mSharedLock")
private void assertIsStarted() {
ProviderState currentState = mCurrentState.get();

2
services/core/java/com/android/server/location/timezone/LocationTimeZoneProviderProxy.java
View File

@@ -79,8 +79,8 @@ abstract class LocationTimeZoneProviderProxy implements Dumpable {
throw new IllegalStateException("listener already set");
}
this.mListener = listener;
onInitialize();
}
onInitialize();
}
/**

6
services/core/java/com/android/server/location/timezone/NullLocationTimeZoneProvider.java
View File

@@ -21,7 +21,6 @@ import static com.android.server.location.timezone.LocationTimeZoneProvider.Prov
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.util.IndentingPrintWriter;
import android.util.Slog;
import java.time.Duration;
@@ -73,11 +72,6 @@ class NullLocationTimeZoneProvider extends LocationTimeZoneProvider {
// Ignored - this implementation is always permanently failed.
}
@Override
void logWarn(String msg) {
Slog.w(TAG, msg);
}
@Override
public void dump(@NonNull IndentingPrintWriter ipw, @Nullable String[] args) {
synchronized (mSharedLock) {

5
services/tests/servicestests/src/com/android/server/location/timezone/ControllerImplTest.java
View File

@@ -1052,11 +1052,6 @@ public class ControllerImplTest {
// Nothing needed for tests.
}
@Override
void logWarn(String msg) {
System.out.println(msg);
}
@Override
public void dump(IndentingPrintWriter pw, String[] args) {
// Nothing needed for tests.