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

Merge "Catch SecurityException thrown from job binding" into qt-dev

Browse Source 
am: b15ce5ac96

Change-Id: I373c3f71ad72720bd27993779e7ccb3b94af9032
This commit is contained in:
Christopher Tate
2019-06-12 10:42:00 -07:00
committed by android-build-merger
parent d0f8cfca88 b15ce5ac96
commit bb8962e90e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/job/JobServiceContext.java
View File

@@ -247,10 +247,20 @@ public final class JobServiceContext implements ServiceConnection {
mVerb = VERB_BINDING; mVerb = VERB_BINDING;
scheduleOpTimeOutLocked(); scheduleOpTimeOutLocked();
final Intent intent = new Intent().setComponent(job.getServiceComponent()); final Intent intent = new Intent().setComponent(job.getServiceComponent());
boolean binding = mContext.bindServiceAsUser(intent, this, boolean binding = false;
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND try {
| Context.BIND_NOT_VISIBLE | Context.BIND_ADJUST_BELOW_PERCEPTIBLE, binding = mContext.bindServiceAsUser(intent, this,
new UserHandle(job.getUserId())); Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND
| Context.BIND_NOT_VISIBLE | Context.BIND_ADJUST_BELOW_PERCEPTIBLE,
new UserHandle(job.getUserId()));
} catch (SecurityException e) {
// Some permission policy, for example INTERACT_ACROSS_USERS and
// android:singleUser, can result in a SecurityException being thrown from
// bindServiceAsUser(). If this happens, catch it and fail gracefully.
Slog.w(TAG, "Job service " + job.getServiceComponent().getShortClassName()
+ " cannot be executed: " + e.getMessage());
binding = false;
}
if (!binding) { if (!binding) {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, job.getServiceComponent().getShortClassName() + " unavailable."); Slog.d(TAG, job.getServiceComponent().getShortClassName() + " unavailable.");