summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-18 23:07:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-18 23:07:32 +0000
commit7fdbe22475f00a2f69c63e0647c342f49681d07d (patch)
tree5322e82ec9dc4108bef61971017751b516c6be76 /core/java/android
parented12eb24a2910b526d0ada3a5d9cb40ba76a0399 (diff)
parent06f0519a01b2c43fcd599168e5d112a3afcecf05 (diff)
Merge "Make RemoteService propagate Context#bindService failure to PendingRequests" into qt-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/role/RoleControllerManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/role/RoleControllerManager.java b/core/java/android/app/role/RoleControllerManager.java
index 394a0d64b3e4..9186b3d5e15a 100644
--- a/core/java/android/app/role/RoleControllerManager.java
+++ b/core/java/android/app/role/RoleControllerManager.java
@@ -275,6 +275,11 @@ public class RoleControllerManager {
Log.e(LOG_TAG, "Error calling grantDefaultRoles()", e);
}
}
+
+ @Override
+ protected void onFailed() {
+ mRemoteCallback.sendResult(null);
+ }
}
/**