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

Commit 1bff9b7b authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Use existing uid state/capability/widget visibility as default" into... 

Merge "Use existing uid state/capability/widget visibility as default" into udc-dev am: d22cb8f2 am: 28c6e9be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21689145



Change-Id: Ibea3e869d720daa5a19bf32d3d04558695ebba06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0fe344c 28c6e9be

services/core/java/com/android/server/appop/AppOpsUidStateTrackerImpl.java

+6 −3
Original line number Diff line number Diff line
@@ -327,9 +327,12 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
    }



    private void commitUidPendingState(int uid) {

        int pendingUidState = mPendingUidStates.get(uid, MIN_PRIORITY_UID_STATE);

        int pendingCapability = mPendingCapability.get(uid, PROCESS_CAPABILITY_NONE);

        boolean pendingVisibleAppWidget = mPendingVisibleAppWidget.get(uid, false);

        int pendingUidState = mPendingUidStates.get(uid,

                mUidStates.get(uid, MIN_PRIORITY_UID_STATE));

        int pendingCapability = mPendingCapability.get(uid,

                mCapability.get(uid, PROCESS_CAPABILITY_NONE));

        boolean pendingVisibleAppWidget = mPendingVisibleAppWidget.get(uid,

                mVisibleAppWidget.get(uid, false));



        int uidState = mUidStates.get(uid, MIN_PRIORITY_UID_STATE);

        int capability = mCapability.get(uid, PROCESS_CAPABILITY_NONE);