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

Commit ac65c0ee authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AppOps: fix "contact" delete ops check failed"

parents 9775b162 5bd43936

core/java/android/content/ContentProvider.java

+6 −1
Original line number Diff line number Diff line
@@ -248,7 +248,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
                    }

                }



                if (operation.isWriteOperation()) {

                if (operation.isDeleteOperation()) {

                    if (enforceDeletePermission(callingPkg, operation.getUri())

                            != AppOpsManager.MODE_ALLOWED) {

                        throw new OperationApplicationException("App op not allowed", 0);

                    }

                } else if (operation.isWriteOperation()) {

                    if (enforceWritePermission(callingPkg, operation.getUri())

                            != AppOpsManager.MODE_ALLOWED) {

                        throw new OperationApplicationException("App op not allowed", 0);

core/java/android/content/ContentProviderOperation.java

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ public class ContentProviderOperation implements Parcelable { 
        return mType;

    }



    /** @hide */

    public boolean isDeleteOperation() {

        return mType == TYPE_DELETE;

    }



    public boolean isWriteOperation() {

        return mType == TYPE_DELETE || mType == TYPE_INSERT || mType == TYPE_UPDATE;

    }