From 6192bff1fc3044f6aef5f775f322e640a129ca54 Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Mon, 9 Jan 2017 10:55:53 -0800
Subject: [PATCH] Add bindServiceAsUser(..., Handler) to ContextWrapper.

This was added to Context/ContextImpl but is missing from
ContextWrapper, which causes it to fail unless you're using a
ContextImpl directly.

Bug: 33057511
Test: Build/manual test in associated change from same topic
Change-Id: I84913614dad2cc22a70a4191c2512a44b1dc8834
---
 core/java/android/content/ContextWrapper.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 4b6076b37fdf2..e437de0fb9baa 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -653,6 +653,13 @@ public class ContextWrapper extends Context {
         return mBase.bindServiceAsUser(service, conn, flags, user);
     }
 
+    /** @hide */
+    @Override
+    public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags,
+            Handler handler, UserHandle user) {
+        return mBase.bindServiceAsUser(service, conn, flags, handler, user);
+    }
+
     @Override
     public void unbindService(ServiceConnection conn) {
         mBase.unbindService(conn);