Merge "Clear calling identity before doing any work" am: 31686e954a

am: 3eb2ad1096

Change-Id: I3a940e1fb84bc04b7b53cbe25111768deb3e6d0c
This commit is contained in:
Neil Fuller
2018-06-14 14:31:23 -07:00
committed by android-build-merger

View File

@@ -21,6 +21,7 @@ import android.annotation.Nullable;
import android.app.timedetector.ITimeDetectorService;
import android.app.timedetector.TimeSignal;
import android.content.Context;
import android.os.Binder;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.DumpUtils;
@@ -69,7 +70,13 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub {
@Override
public void suggestTime(@NonNull TimeSignal timeSignal) {
enforceSetTimePermission();
mTimeDetectorStrategy.suggestTime(timeSignal);
long callerIdToken = Binder.clearCallingIdentity();
try {
mTimeDetectorStrategy.suggestTime(timeSignal);
} finally {
Binder.restoreCallingIdentity(callerIdToken);
}
}
@Override