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

Merge "Fix permission issues for network update service" am: 1aed0289c9 am: f240a52f52

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2253795

Change-Id: I305e3521f6431df4f65e557b5f2c779f346ceee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Neil Fuller
2022-10-13 13:20:17 +00:00
committed by Automerger Merge Worker
parent 9251e4c553 f240a52f52
commit 0dd68fdb90
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/NetworkTimeUpdateService.java
View File

@@ -165,9 +165,14 @@ public class NetworkTimeUpdateService extends Binder {
mContext.enforceCallingPermission( mContext.enforceCallingPermission(
android.Manifest.permission.SET_TIME, "clear latest network time"); android.Manifest.permission.SET_TIME, "clear latest network time");
mTime.clearCachedTimeResult(); final long token = Binder.clearCallingIdentity();
try {
mTime.clearCachedTimeResult();
mLocalLog.log("clearTimeForTests"); mLocalLog.log("clearTimeForTests");
} finally {
Binder.restoreCallingIdentity(token);
}
} }
/** /**
@@ -181,15 +186,19 @@ public class NetworkTimeUpdateService extends Binder {
mContext.enforceCallingPermission( mContext.enforceCallingPermission(
android.Manifest.permission.SET_TIME, "force network time refresh"); android.Manifest.permission.SET_TIME, "force network time refresh");
boolean success = mTime.forceRefresh(); final long token = Binder.clearCallingIdentity();
mLocalLog.log("forceRefreshForTests: success=" + success); try {
boolean success = mTime.forceRefresh();
mLocalLog.log("forceRefreshForTests: success=" + success);
if (success) { if (success) {
makeNetworkTimeSuggestion(mTime.getCachedTimeResult(), makeNetworkTimeSuggestion(mTime.getCachedTimeResult(),
"Origin: NetworkTimeUpdateService: forceRefreshForTests"); "Origin: NetworkTimeUpdateService: forceRefreshForTests");
}
return success;
} finally {
Binder.restoreCallingIdentity(token);
} }
return success;
} }
/** /**
@@ -201,10 +210,15 @@ public class NetworkTimeUpdateService extends Binder {
mContext.enforceCallingPermission( mContext.enforceCallingPermission(
android.Manifest.permission.SET_TIME, "set NTP server config for tests"); android.Manifest.permission.SET_TIME, "set NTP server config for tests");
mLocalLog.log("Setting server config for tests: hostname=" + hostname final long token = Binder.clearCallingIdentity();
+ ", port=" + port try {
+ ", timeout=" + timeout); mLocalLog.log("Setting server config for tests: hostname=" + hostname
mTime.setServerConfigForTests(hostname, port, timeout); + ", port=" + port
+ ", timeout=" + timeout);
mTime.setServerConfigForTests(hostname, port, timeout);
} finally {
Binder.restoreCallingIdentity(token);
}
} }
private void onPollNetworkTime(int event) { private void onPollNetworkTime(int event) {