Merge "Use disableForUser in StatusBarManager"

1 files changed, 4 insertions, 2 deletions

diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index 4a092140ed78..3d1b73bebb79 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -121,9 +121,10 @@ public class StatusBarManager {
      */
     public void disable(int what) {
         try {
+            final int userId = Binder.getCallingUserHandle().getIdentifier();
             final IStatusBarService svc = getService();
             if (svc != null) {
-                svc.disable(what, mToken, mContext.getPackageName());
+                svc.disableForUser(what, mToken, mContext.getPackageName(), userId);
             }
         } catch (RemoteException ex) {
             throw ex.rethrowFromSystemServer();
@@ -138,9 +139,10 @@ public class StatusBarManager {
      */
     public void disable2(@Disable2Flags int what) {
         try {
+            final int userId = Binder.getCallingUserHandle().getIdentifier();
             final IStatusBarService svc = getService();
             if (svc != null) {
-                svc.disable2(what, mToken, mContext.getPackageName());
+                svc.disable2ForUser(what, mToken, mContext.getPackageName(), userId);
             }
         } catch (RemoteException ex) {
             throw ex.rethrowFromSystemServer();