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

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

Merge "Handle invalid data during job loading." into qt-dev am: ba8c9b4f 

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



Change-Id: I3cbb3042328108ba2847cffede3f56c73d34290d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b34c8422 ba8c9b4f

services/core/java/com/android/server/job/JobStore.java

+23 −3
Original line number Diff line number Diff line
@@ -459,6 +459,10 @@ public final class JobStore { 
                if (DEBUG) {

                    Slog.d(TAG, "Error persisting bundle.", 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 {

                mPersistInfo.countAllJobsSaved = numJobs;

                mPersistInfo.countSystemServerJobsSaved = numSystemJobs;
@@ -807,6 +811,15 @@ public final class JobStore { 
            } catch (NumberFormatException e) {

                Slog.d(TAG, "Error reading constraints, skipping.");

                return null;

            } catch (XmlPullParserException e) {

                Slog.d(TAG, "Error Parser Exception.", e);

                return null;

            } 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>
@@ -902,8 +915,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;
@@ -950,7 +969,8 @@ public final class JobStore { 
            return new JobInfo.Builder(jobId, cname);

        }



        private void buildConstraintsFromXml(JobInfo.Builder jobBuilder, XmlPullParser parser) {

        private void buildConstraintsFromXml(JobInfo.Builder jobBuilder, XmlPullParser parser)

                throws XmlPullParserException, IOException {

            String val;



            final String netCapabilities = parser.getAttributeValue(null, "net-capabilities");