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

Commit 11bb8228 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Adding a way to communicate user space for AppOp changes." into...

Merge "Merge "Adding a way to communicate user space for AppOp changes." into udc-dev am: a08ca180 am: b6fbd338 am: 4adfe277 am: 39d9602d"
parents a29751b4 64ddc749
Loading
Loading
Loading
Loading
+23 −1
Original line number Diff line number Diff line
@@ -7089,6 +7089,26 @@ public class AppOpsManager {
     */
    public interface OnOpChangedListener {
        public void onOpChanged(String op, String packageName);

        /**
         * Implementations can override this method to add handling logic for AppOp changes.
         *
         * Normally, listeners to AppOp changes work in the same User Space as the App whose Op
         * has changed. However, in some case listeners can have a single instance responsible for
         * multiple users. (For ex single Media Provider instance in user 0 is responsible for both
         * cloned and user 0 spaces). For handling such cases correctly, listeners need to be
         * passed userId in addition to PackageName and Op.

         * The default impl is to fallback onto {@link #onOpChanged(String, String)
         *
         * @param op The Op that changed.
         * @param packageName Package of the app whose Op changed.
         * @param userId User Space of the app whose Op changed.
         * @hide
         */
        default void onOpChanged(@NonNull String op, @NonNull String packageName,  int userId) {
            onOpChanged(op, packageName);
        }
    }

    /**
@@ -7785,7 +7805,9 @@ public class AppOpsManager {
                            ((OnOpChangedInternalListener)callback).onOpChanged(op, packageName);
                        }
                        if (sAppOpInfos[op].name != null) {
                            callback.onOpChanged(sAppOpInfos[op].name, packageName);

                            callback.onOpChanged(sAppOpInfos[op].name, packageName,
                                    UserHandle.getUserId(uid));
                        }
                    }
                };