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

Commit 7028a035 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fix IOException handling when writing MonotonicClock 

As uncovered by some tests, AtomicFile.write() can throw an exception.

Bug: 311006993
Bug: 308227129
Test: atest PowerStatsTests
Change-Id: I8ffad9e5d91060c585beea0112642ae34839ddf2
parent 157a6899

core/java/com/android/internal/os/MonotonicClock.java

+6 −8
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import org.xmlpull.v1.XmlPullParserException; 


import java.io.ByteArrayInputStream;

import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStream;
@@ -98,14 +99,11 @@ public class MonotonicClock { 
            return;

        }



        mFile.write(out -> {

            try {

        try (FileOutputStream out = mFile.startWrite()) {

            writeXml(out, Xml.newBinarySerializer());

                out.close();

        } catch (IOException e) {

            Log.e(TAG, "Cannot write monotonic clock to " + mFile.getBaseFile(), e);

        }

        });

    }



    /**