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

Commit d09973bc authored by Shreyas Basarge's avatar Shreyas Basarge
Browse files

Fixes NPE bug in JobScheduler.getAllPendingJobs() 

The extras persistable bundle in JobInfo is
parcelled/unparcelled from different threads
simultaneously for IPC and persisting jobInfo.
The extras bundle in now copied before writing
it to disk.

Bug: 25344172
Change-Id: Ia190181c869d3e5d216dccee9637d3d3a4fb5cb3
parent ea9b1dae

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

+20 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import java.nio.charset.StandardCharsets; 
import java.util.ArrayList;

import java.util.Iterator;

import java.util.List;

import java.util.Set;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -348,9 +349,27 @@ public class JobStore { 
        private void writeBundleToXml(PersistableBundle extras, XmlSerializer out)

                throws IOException, XmlPullParserException {

            out.startTag(null, XML_TAG_EXTRAS);

            extras.saveToXml(out);

            PersistableBundle extrasCopy = deepCopyBundle(extras, 10);

            extrasCopy.saveToXml(out);

            out.endTag(null, XML_TAG_EXTRAS);

        }



        private PersistableBundle deepCopyBundle(PersistableBundle bundle, int maxDepth) {

            if (maxDepth <= 0) {

                return null;

            }

            PersistableBundle copy = (PersistableBundle) bundle.clone();

            Set<String> keySet = bundle.keySet();

            for (String key: keySet) {

                PersistableBundle b = copy.getPersistableBundle(key);

                if (b != null) {

                    PersistableBundle bCopy = deepCopyBundle(b, maxDepth-1);

                    copy.putPersistableBundle(key, bCopy);

                }

            }

            return copy;

        }



        /**

         * Write out a tag with data identifying this job's constraints. If the constraint isn't here

         * it doesn't apply.