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

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

Change-Id: Ibea3e869d720daa5a19bf32d3d04558695ebba06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2023-03-03 02:01:18 +00:00
committed by Automerger Merge Worker

View File

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