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

Commit 2448c5a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle invalid data during job loading." into sc-v2-dev am: 5fdd4173 

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



Change-Id: I3e6ac58e54b8eb98bb2569429325749f00f9c200
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8f6c822 5fdd4173

apex/jobscheduler/service/java/com/android/server/job/JobStore.java

+15 −2
Original line number Diff line number Diff line
@@ -742,6 +742,10 @@ public final class JobStore { 
                }

            } catch (XmlPullParserException | IOException e) {

                Slog.wtf(TAG, "Error jobstore xml.", e);

            } catch (Exception e) {

                // Crashing at this point would result in a boot loop, so live with a general

                // Exception for system stability's sake.

                Slog.wtf(TAG, "Unexpected exception", e);

            } finally {

                if (mPersistInfo.countAllJobsLoaded < 0) { // Only set them once.

                    mPersistInfo.countAllJobsLoaded = numJobs;
@@ -890,6 +894,9 @@ public final class JobStore { 
            } catch (IOException e) {

                Slog.d(TAG, "Error I/O Exception.", e);

                return null;

            } catch (IllegalArgumentException e) {

                Slog.e(TAG, "Constraints contained invalid data", e);

                return null;

            }



            parser.next(); // Consume </constraints>
@@ -986,8 +993,14 @@ public final class JobStore { 
                return null;

            }



            PersistableBundle extras = PersistableBundle.restoreFromXml(parser);

            final PersistableBundle extras;

            try {

                extras = PersistableBundle.restoreFromXml(parser);

                jobBuilder.setExtras(extras);

            } catch (IllegalArgumentException e) {

                Slog.e(TAG, "Persisted extras contained invalid data", e);

                return null;

            }

            parser.nextTag(); // Consume </extras>



            final JobInfo builtJob;