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

Commit 744b363a authored by Kurt Partridge's avatar Kurt Partridge
Browse files

[TestPrep8] Narrow try/catch scope

Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef
parent 78c1ad32
Loading
Loading
Loading
Loading
+9 −10
Original line number Diff line number Diff line
@@ -207,23 +207,22 @@ public class ResearchLog {
     * called.  The cached value is returned in future calls.
     */
    public JsonWriter getInitializedJsonWriterLocked() {
        if (mJsonWriter != NULL_JSON_WRITER || mFile == null) return mJsonWriter;
        try {
            if (mJsonWriter == NULL_JSON_WRITER && mFile != null) {
            final JsonWriter jsonWriter = createJsonWriter(mContext, mFile);
            if (jsonWriter != null) {
                jsonWriter.beginArray();
                mJsonWriter = jsonWriter;
                mHasWrittenData = true;
            }
            }
        } catch (IOException e) {
        } catch (final IOException e) {
            Log.w(TAG, "Error in JsonWriter; disabling logging", e);
            try {
                mJsonWriter.close();
            } catch (IllegalStateException e1) {
            } catch (final IllegalStateException e1) {
                // Assume that this is just the json not being terminated properly.
                // Ignore
            } catch (IOException e1) {
            } catch (final IOException e1) {
                Log.w(TAG, "Error in closing JsonWriter; disabling logging", e1);
            } finally {
                mJsonWriter = NULL_JSON_WRITER;