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

Merge "Fix minor code nits"

Browse Source
This commit is contained in:
Neil Fuller
2020-10-30 10:34:33 +00:00
committed by Android (Google) Code Review
parent 0858987626 5066e850ee
commit 2b775b57f8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/time/TimeManager.java
View File

@@ -110,7 +110,7 @@ public final class TimeManager {
@RequiresPermission(android.Manifest.permission.MANAGE_TIME_AND_ZONE_DETECTION)
public boolean updateTimeZoneConfiguration(@NonNull TimeZoneConfiguration configuration) {
if (DEBUG) {
Log.d(TAG, "updateConfiguration called: " + configuration);
Log.d(TAG, "updateTimeZoneConfiguration called: " + configuration);
}
try {
return mITimeZoneDetectorService.updateConfiguration(configuration);

3
core/java/android/app/time/TimeZoneCapabilities.java
View File

@@ -180,8 +180,7 @@ public final class TimeZoneCapabilities implements Parcelable {
public TimeZoneConfiguration tryApplyConfigChanges(
@NonNull TimeZoneConfiguration config,
@NonNull TimeZoneConfiguration requestedChanges) {
TimeZoneConfiguration.Builder newConfigBuilder =
new TimeZoneConfiguration.Builder(config);
TimeZoneConfiguration.Builder newConfigBuilder = new TimeZoneConfiguration.Builder(config);
if (requestedChanges.hasIsAutoDetectionEnabled()) {
if (this.getConfigureAutoDetectionEnabledCapability() < CAPABILITY_NOT_APPLICABLE) {
return null;