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

Commit b825d96f authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge changes I7465637b,I0ab84e46 into udc-dev am: 6a97c26e 

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



Change-Id: Ie9277cc7357f94cf99a61d6e3e4f325765b50e5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc36761b 6a97c26e

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

+41 −24
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
    private SparseIntArray mPendingUidStates = new SparseIntArray();

    private SparseIntArray mCapability = new SparseIntArray();

    private SparseIntArray mPendingCapability = new SparseIntArray();

    private SparseBooleanArray mVisibleAppWidget = new SparseBooleanArray();

    private SparseBooleanArray mPendingVisibleAppWidget = new SparseBooleanArray();

    private SparseBooleanArray mAppWidgetVisible = new SparseBooleanArray();

    private SparseBooleanArray mPendingAppWidgetVisible = new SparseBooleanArray();

    private SparseLongArray mPendingCommitTime = new SparseLongArray();

    private SparseBooleanArray mPendingGone = new SparseBooleanArray();
@@ -140,7 +140,7 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 


    private int evalModeInternal(int uid, int code, int uidState, int uidCapability) {



        if (getUidVisibleAppWidget(uid) || mActivityManagerInternal.isPendingTopUid(uid)

        if (getUidAppWidgetVisible(uid) || mActivityManagerInternal.isPendingTopUid(uid)

                || mActivityManagerInternal.isTempAllowlistedForFgsWhileInUse(uid)) {

            return MODE_ALLOWED;

        }
@@ -205,7 +205,7 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
        int numUids = uidPackageNames.size();

        for (int i = 0; i < numUids; i++) {

            int uid = uidPackageNames.keyAt(i);

            mPendingVisibleAppWidget.put(uid, visible);

            mPendingAppWidgetVisible.put(uid, visible);



            commitUidPendingState(uid);

        }
@@ -291,9 +291,9 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
            ActivityManager.printCapabilitiesFull(pw, pendingCapability);

            pw.println();

        }

        boolean appWidgetVisible = mVisibleAppWidget.get(uid, false);

        boolean appWidgetVisible = mAppWidgetVisible.get(uid, false);

        // if no pendingAppWidgetVisible set to appWidgetVisible to suppress output

        boolean pendingAppWidgetVisible = mPendingVisibleAppWidget.get(uid, appWidgetVisible);

        boolean pendingAppWidgetVisible = mPendingAppWidgetVisible.get(uid, appWidgetVisible);

        pw.print("    appWidgetVisible=");

        pw.println(appWidgetVisible);

        if (appWidgetVisible != pendingAppWidgetVisible) {
@@ -333,25 +333,25 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
                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));

        boolean pendingAppWidgetVisible = mPendingAppWidgetVisible.get(uid,

                mAppWidgetVisible.get(uid, false));



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

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

        boolean visibleAppWidget = mVisibleAppWidget.get(uid, false);

        boolean appWidgetVisible = mAppWidgetVisible.get(uid, false);



        if (uidState != pendingUidState

                || capability != pendingCapability

                || visibleAppWidget != pendingVisibleAppWidget) {

                || appWidgetVisible != pendingAppWidgetVisible) {

            boolean foregroundChange = uidState <= UID_STATE_MAX_LAST_NON_RESTRICTED

                    != pendingUidState <= UID_STATE_MAX_LAST_NON_RESTRICTED

                    || capability != pendingCapability

                    || visibleAppWidget != pendingVisibleAppWidget;

                    || appWidgetVisible != pendingAppWidgetVisible;



            if (foregroundChange) {

                // To save on memory usage, log only interesting changes.

                mEventLog.logCommitUidState(uid, pendingUidState, pendingCapability,

                        pendingVisibleAppWidget);

                        pendingAppWidgetVisible, appWidgetVisible != pendingAppWidgetVisible);

            }



            for (int i = 0; i < mUidStateChangedCallbacks.size(); i++) {
@@ -367,17 +367,17 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
        if (mPendingGone.get(uid, false)) {

            mUidStates.delete(uid);

            mCapability.delete(uid);

            mVisibleAppWidget.delete(uid);

            mAppWidgetVisible.delete(uid);

            mPendingGone.delete(uid);

        } else {

            mUidStates.put(uid, pendingUidState);

            mCapability.put(uid, pendingCapability);

            mVisibleAppWidget.put(uid, pendingVisibleAppWidget);

            mAppWidgetVisible.put(uid, pendingAppWidgetVisible);

        }



        mPendingUidStates.delete(uid);

        mPendingCapability.delete(uid);

        mPendingVisibleAppWidget.delete(uid);

        mPendingAppWidgetVisible.delete(uid);

        mPendingCommitTime.delete(uid);

    }
@@ -385,8 +385,8 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
        return mCapability.get(uid, ActivityManager.PROCESS_CAPABILITY_NONE);

    }



    private boolean getUidVisibleAppWidget(int uid) {

        return mVisibleAppWidget.get(uid, false);

    private boolean getUidAppWidgetVisible(int uid) {

        return mAppWidgetVisible.get(uid, false);

    }



    private static class EventLog {
@@ -398,6 +398,9 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
        // Memory usage: 24 * size bytes

        private static final int EVAL_FOREGROUND_MODE_MAX_SIZE = 200;



        private static final int APP_WIDGET_VISIBLE = 1 << 0;

        private static final int APP_WIDGET_VISIBLE_CHANGED = 1 << 1;



        private final DelayableExecutor mExecutor;

        private final Thread mExecutorThread;
@@ -446,16 +449,18 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
            mUpdateUidProcStateLogTimestamps[idx] = timestamp;

        }



        void logCommitUidState(int uid, int uidState, int capability, boolean visible) {

        void logCommitUidState(int uid, int uidState, int capability, boolean appWidgetVisible,

                boolean appWidgetVisibleChanged) {

            if (COMMIT_UID_STATE_LOG_MAX_SIZE == 0) {

                return;

            }

            mExecutor.execute(PooledLambda.obtainRunnable(EventLog::logCommitUidStateAsync,

                    this, System.currentTimeMillis(), uid, uidState, capability, visible));

                    this, System.currentTimeMillis(), uid, uidState, capability, appWidgetVisible,

                    appWidgetVisibleChanged));

        }



        void logCommitUidStateAsync(long timestamp, int uid, int uidState, int capability,

                boolean visible) {

                boolean appWidgetVisible, boolean appWidgetVisibleChanged) {

            int idx = (mCommitUidStateLogHead + mCommitUidStateLogSize)

                    % COMMIT_UID_STATE_LOG_MAX_SIZE;

            if (mCommitUidStateLogSize == COMMIT_UID_STATE_LOG_MAX_SIZE) {
@@ -468,7 +473,13 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
            mCommitUidStateLog[idx][0] = uid;

            mCommitUidStateLog[idx][1] = uidState;

            mCommitUidStateLog[idx][2] = capability;

            mCommitUidStateLog[idx][3] = visible ? 1 : 0;

            mCommitUidStateLog[idx][3] = 0;

            if (appWidgetVisible) {

                mCommitUidStateLog[idx][3] += APP_WIDGET_VISIBLE;

            }

            if (appWidgetVisibleChanged) {

                mCommitUidStateLog[idx][3] += APP_WIDGET_VISIBLE_CHANGED;

            }

            mCommitUidStateLogTimestamps[idx] = timestamp;

        }
@@ -570,7 +581,9 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
            int uid = mCommitUidStateLog[idx][0];

            int uidState = mCommitUidStateLog[idx][1];

            int capability = mCommitUidStateLog[idx][2];

            boolean visibleAppWidget = mCommitUidStateLog[idx][3] != 0;

            boolean appWidgetVisible = (mCommitUidStateLog[idx][3] & APP_WIDGET_VISIBLE) != 0;

            boolean appWidgetVisibleChanged =

                    (mCommitUidStateLog[idx][3] & APP_WIDGET_VISIBLE_CHANGED) != 0;



            TimeUtils.dumpTime(pw, timestamp);
@@ -585,8 +598,12 @@ class AppOpsUidStateTrackerImpl implements AppOpsUidStateTracker { 
            pw.print(" capability=");

            pw.print(ActivityManager.getCapabilitiesSummary(capability) + " ");



            pw.print(" visibleAppWidget=");

            pw.print(visibleAppWidget);

            pw.print(" appWidgetVisible=");

            pw.print(appWidgetVisible);



            if (appWidgetVisibleChanged) {

                pw.print(" (changed)");

            }



            pw.println();

        }

services/tests/mockingservicestests/src/com/android/server/appop/AppOpsUidStateTrackerTest.java

+28 −0
Original line number Diff line number Diff line
@@ -782,6 +782,34 @@ public class AppOpsUidStateTrackerTest { 
        assertTrue(mIntf.isUidInForeground(UID));

    }



    @Test

    public void testAppWidgetVisibleDoesntChangeUidState() {

        procStateBuilder(UID)

                .topState()

                .update();



        SparseArray<String> updatedAppWidgetVisibilities = new SparseArray<>();

        updatedAppWidgetVisibilities.put(UID, "");



        mIntf.updateAppWidgetVisibility(updatedAppWidgetVisibilities, true);



        assertEquals(UID_STATE_TOP, mIntf.getUidState(UID));

    }



    @Test

    public void testAppWidgetNotVisibleDoesntChangeUidState() {

        SparseArray<String> updatedAppWidgetVisibilities = new SparseArray<>();

        updatedAppWidgetVisibilities.put(UID, "");

        mIntf.updateAppWidgetVisibility(updatedAppWidgetVisibilities, true);

        procStateBuilder(UID)

                .topState()

                .update();



        mIntf.updateAppWidgetVisibility(updatedAppWidgetVisibilities, false);



        assertEquals(UID_STATE_TOP, mIntf.getUidState(UID));

    }



    public void testUidStateChangedCallback(int initialState, int finalState) {

        int initialUidState = processStateToUidState(initialState);

        int finalUidState = processStateToUidState(finalState);