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

Commit c9a04258 authored by Varun Shah's avatar Varun Shah
Browse files

Catch exceptions when reading SyncStatusInfo. 

The system server can potentially crash if there is corrupted sync
status info on disk. It's safe to ignore this corrupted data since it's
only informative.

Fixes: 133247002
Test: system builds and boots
Change-Id: Ibaec3a8280e36c14d7e0da4cdd852ec98a2ef733
parent e93875e1

services/core/java/com/android/server/content/SyncStorageEngine.java

+10 −6
Original line number Diff line number Diff line
@@ -2032,6 +2032,7 @@ public class SyncStorageEngine { 
            int token;

            while ((token=in.readInt()) != STATUS_FILE_END) {

                if (token == STATUS_FILE_ITEM) {

                    try {

                        SyncStatusInfo status = new SyncStatusInfo(in);

                        if (mAuthorities.indexOfKey(status.authorityId) >= 0) {

                            status.pending = false;
@@ -2040,6 +2041,9 @@ public class SyncStorageEngine { 
                            }

                            mSyncStatus.put(status.authorityId, status);

                        }

                    } catch (Exception e) {

                        Slog.e(TAG, "Unable to parse some sync status.", e);

                    }

                } else {

                    // Ooops.

                    Slog.w(TAG, "Unknown status token: " + token);