Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6371853 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Use disableForUser in StatusBarManager" am: 5392d799 

am: 3f3aa351

Change-Id: Ieb7bf7cc8d9fc54b56ec5f8d5caa723357c8ec6e
parents 1ecf4ac2 3f3aa351

core/java/android/app/StatusBarManager.java

+4 −2
Original line number Diff line number Diff line
@@ -132,9 +132,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();
@@ -149,9 +150,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();