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

Commit 8de5971a authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Avoid caller NPE if callback null in AppOpsService 

bug:25863432

Change-Id: Ib0386ed4c1637ff8b084f32592ba316b65498005
parent caceb021

services/core/java/com/android/server/AppOpsService.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -788,6 +788,9 @@ public class AppOpsService extends IAppOpsService.Stub { 




    @Override

    @Override

    public void startWatchingMode(int op, String packageName, IAppOpsCallback callback) {

    public void startWatchingMode(int op, String packageName, IAppOpsCallback callback) {

        if (callback == null) {

            return;

        }

        synchronized (this) {

        synchronized (this) {

            op = (op != AppOpsManager.OP_NONE) ? AppOpsManager.opToSwitch(op) : op;

            op = (op != AppOpsManager.OP_NONE) ? AppOpsManager.opToSwitch(op) : op;

            Callback cb = mModeWatchers.get(callback.asBinder());

            Callback cb = mModeWatchers.get(callback.asBinder());
@@ -816,6 +819,9 @@ public class AppOpsService extends IAppOpsService.Stub { 




    @Override

    @Override

    public void stopWatchingMode(IAppOpsCallback callback) {

    public void stopWatchingMode(IAppOpsCallback callback) {

        if (callback == null) {

            return;

        }

        synchronized (this) {

        synchronized (this) {

            Callback cb = mModeWatchers.remove(callback.asBinder());

            Callback cb = mModeWatchers.remove(callback.asBinder());

            if (cb != null) {

            if (cb != null) {