Merge "Use disableForUser in StatusBarManager" am: 5392d799ab

am: 3f3aa3518f

Change-Id: Ieb7bf7cc8d9fc54b56ec5f8d5caa723357c8ec6e
This commit is contained in:
Evan Laird
2018-06-13 09:09:03 -07:00
committed by android-build-merger

View File

@@ -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();