commit 38f1b6dbc97435f1227f15b4b7dca6c9bd3cc343
author Chris Tate <ctate@android.com> Thu Feb 16 00:50:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 16 00:51:01 2017 +0000
tree 80f55a66f77d4ccc6c63d09c2a43c2b520a08f72
parent 83b072c48c0008312db5666f43b9062c43416455
parent a8e8e4a34f8f5e07cbccf4e20a485e1d0b88fe0d

Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev

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

diff --git a/services/core/java/com/android/server/job/JobServiceContext.java b/services/core/java/com/android/server/job/JobServiceContext.java
index 5e495fa..fb54d3b 100644
--- a/services/core/java/com/android/server/job/JobServiceContext.java
+++ b/services/core/java/com/android/server/job/JobServiceContext.java
@@ -445,7 +445,10 @@
                 mVerb = VERB_STARTING;
                 scheduleOpTimeOut();
                 service.startJob(mParams);
-            } catch (RemoteException e) {
+            } catch (Exception e) {
+                // We catch 'Exception' because client-app malice or bugs might induce a wide
+                // range of possible exception-throw outcomes from startJob() and its handling
+                // of the client's ParcelableBundle extras.
                 Slog.e(TAG, "Error sending onStart message to '" +
                         mRunningJob.getServiceComponent().getShortClassName() + "' ", e);
             }