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

Merge "Clear calling identity before doing any work"

Browse Source 
am: 31686e954a

Change-Id: I144fd2b5f46ce7d7a06195a2dd5207d44cd951f0
This commit is contained in:
Neil Fuller
2018-06-14 14:15:04 -07:00
committed by android-build-merger
parent 494665870f 31686e954a
commit 3eb2ad1096
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/timedetector/TimeDetectorService.java
View File

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