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

Merge "Handle invalid data during job loading." into sc-dev

Browse Source
This commit is contained in:
Kweku Adams
2023-03-28 17:30:13 +00:00
committed by Android (Google) Code Review
parent 6b7c751554 7bdc1e8a3a
commit 1a150853cd
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,6 +733,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;
@@ -869,6 +873,9 @@ public final class JobStore {
} catch (IOException e) { } catch (IOException e) {
Slog.d(TAG, "Error I/O Exception.", e); Slog.d(TAG, "Error I/O Exception.", e);
return null; return null;
} catch (IllegalArgumentException e) {
Slog.e(TAG, "Constraints contained invalid data", e);
return null;
} }
parser.next(); // Consume </constraints> parser.next(); // Consume </constraints>
@@ -965,8 +972,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;