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

Commit ba073ec3 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] fix timestamp format in dump" into tm-dev am: 043ff055 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17299912

Change-Id: Ida95f35365c2b800a544fbfd6587ed5d89336f53
parents dff8e6ca 043ff055

packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ final class SettingsState { 
            return;

        }

        HistoricalOperation operation = new HistoricalOperation(

                SystemClock.elapsedRealtime(), type,

                System.currentTimeMillis(), type,

                setting != null ? new Setting(setting) : null);

        if (mNextHistoricalOpIdx >= mHistoricalOperations.size()) {

            mHistoricalOperations.add(operation);