commit 5392d799ab9e9a392df24780d3727a9c55664517
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 13 14:19:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 13 14:19:32 2018 +0000
tree fc9b9cf6fb7d7aec8db7a67ecde6d757d1d7d8d7
parent 16eef1aad8619ce4f146b6051cb4297082bead25
parent 172708b5399343615a2d456ee14fc02542c17f7a

Merge "Use disableForUser in StatusBarManager"

core/java/android/app/StatusBarManager.java

diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index 4a09214..3d1b73b 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -121,9 +121,10 @@
      */
     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 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();