Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle invalid data during job loading.

Browse Source 
Catch exceptions that may be thrown if invalid data ended up in the
persisted job file.

Bug: 246541702
Bug: 246542132
Bug: 246542285
Bug: 246542330
Test: install test app with invalid job config, start app to schedule job, then reboot device
Change-Id: Id0ceba345942baf21177f687b8dd85ef001c0a9e
(cherry picked from commit c98fb42b48)
Merged-In: Id0ceba345942baf21177f687b8dd85ef001c0a9e
This commit is contained in:
Kweku Adams
2022-09-21 22:13:01 +00:00
parent 415d288b12
commit df1ba00dd9
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apex/jobscheduler/service/java/com/android/server/job/JobStore.java
View File

@@ -687,6 +687,10 @@ public final class JobStore {
} }
} catch (XmlPullParserException | IOException e) { } catch (XmlPullParserException | IOException e) {
Slog.wtf(TAG, "Error jobstore xml.", 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 { } finally {
if (mPersistInfo.countAllJobsLoaded < 0) { // Only set them once. if (mPersistInfo.countAllJobsLoaded < 0) { // Only set them once.
mPersistInfo.countAllJobsLoaded = numJobs; mPersistInfo.countAllJobsLoaded = numJobs;
@@ -817,6 +821,15 @@ public final class JobStore {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Slog.d(TAG, "Error reading constraints, skipping."); Slog.d(TAG, "Error reading constraints, skipping.");
return null; 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> parser.next(); // Consume </constraints>
@@ -912,8 +925,14 @@ public final class JobStore {
return null; return null;
} }
PersistableBundle extras = PersistableBundle.restoreFromXml(parser); final PersistableBundle extras;
jobBuilder.setExtras(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> parser.nextTag(); // Consume </extras>
final JobInfo builtJob; final JobInfo builtJob;
@@ -959,7 +978,8 @@ public final class JobStore {
return new JobInfo.Builder(jobId, cname); 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; String val;
final String netCapabilities = parser.getAttributeValue(null, "net-capabilities"); final String netCapabilities = parser.getAttributeValue(null, "net-capabilities");