Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b775b57 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Fix minor code nits"

parents 08589876 5066e850

core/java/android/app/time/TimeManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/time/TimeZoneCapabilities.java

+1 −2
Original line number Diff line number Diff line
@@ -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;