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

Commit cd1f30b4 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Work on issue #78480444: Start tracking uid state in app ops 

We now push uid states down from activity manager in to app
ops, and it uses them to keep track of access/reject times for
each uid/package at the various states.

Bug: 78480444
Test: manual
Change-Id: Ia0bc9174b60b4bf0851834961cc48507a6a60951
parent 73f83613

core/java/android/app/AppOpsManager.java

+88 −11
Original line number Diff line number Diff line
@@ -109,6 +109,48 @@ public class AppOpsManager { 
     */

    public static final int MODE_DEFAULT = 3;



    /**

     * Metrics about an op when its uid is persistent.

     * @hide

     */

    public static final int UID_STATE_PERSISTENT = 0;



    /**

     * Metrics about an op when its uid is at the top.

     * @hide

     */

    public static final int UID_STATE_TOP = 1;



    /**

     * Metrics about an op when its uid is running a foreground service.

     * @hide

     */

    public static final int UID_STATE_FOREGROUND_SERVICE = 2;



    /**

     * Metrics about an op when its uid is in the foreground for any other reasons.

     * @hide

     */

    public static final int UID_STATE_FOREGROUND = 3;



    /**

     * Metrics about an op when its uid is in the background for any reason.

     * @hide

     */

    public static final int UID_STATE_BACKGROUND = 4;



    /**

     * Metrics about an op when its uid is cached.

     * @hide

     */

    public static final int UID_STATE_CACHED = 5;



    /**

     * Number of uid states we track.

     * @hide

     */

    public static final int _NUM_UID_STATE = 6;



    // when adding one of these:

    //  - increment _NUM_OP

    //  - define an OPSTR_* constant (marked as @SystemApi)
@@ -1471,8 +1513,8 @@ public class AppOpsManager { 
    public static class OpEntry implements Parcelable {

        private final int mOp;

        private final int mMode;

        private final long mTime;

        private final long mRejectTime;

        private final long[] mTimes;

        private final long[] mRejectTimes;

        private final int mDuration;

        private final int mProxyUid;

        private final String mProxyPackageName;
@@ -1481,8 +1523,23 @@ public class AppOpsManager { 
                int proxyUid, String proxyPackage) {

            mOp = op;

            mMode = mode;

            mTime = time;

            mRejectTime = rejectTime;

            mTimes = new long[_NUM_UID_STATE];

            mRejectTimes = new long[_NUM_UID_STATE];

            mTimes[0] = time;

            mRejectTimes[0] = rejectTime;

            mDuration = duration;

            mProxyUid = proxyUid;

            mProxyPackageName = proxyPackage;

        }



        public OpEntry(int op, int mode, long[] times, long[] rejectTimes, int duration,

                int proxyUid, String proxyPackage) {

            mOp = op;

            mMode = mode;

            mTimes = new long[_NUM_UID_STATE];

            mRejectTimes = new long[_NUM_UID_STATE];

            System.arraycopy(times, 0, mTimes, 0, _NUM_UID_STATE);

            System.arraycopy(rejectTimes, 0, mRejectTimes, 0, _NUM_UID_STATE);

            mDuration = duration;

            mProxyUid = proxyUid;

            mProxyPackageName = proxyPackage;
@@ -1497,11 +1554,31 @@ public class AppOpsManager { 
        }



        public long getTime() {

            return mTime;

            long time = 0;

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

                if (mTimes[i] > time) {

                    time = mTimes[i];

                }

            }

            return time;

        }



        public long getTimeFor(int uidState) {

            return mTimes[uidState];

        }



        public long getRejectTime() {

            return mRejectTime;

            long time = 0;

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

                if (mRejectTimes[i] > time) {

                    time = mTimes[i];

                }

            }

            return time;

        }



        public long getRejectTimeFor(int uidState) {

            return mRejectTimes[uidState];

        }



        public boolean isRunning() {
@@ -1509,7 +1586,7 @@ public class AppOpsManager { 
        }



        public int getDuration() {

            return mDuration == -1 ? (int)(System.currentTimeMillis()-mTime) : mDuration;

            return mDuration;

        }



        public int getProxyUid() {
@@ -1529,8 +1606,8 @@ public class AppOpsManager { 
        public void writeToParcel(Parcel dest, int flags) {

            dest.writeInt(mOp);

            dest.writeInt(mMode);

            dest.writeLong(mTime);

            dest.writeLong(mRejectTime);

            dest.writeLongArray(mTimes);

            dest.writeLongArray(mRejectTimes);

            dest.writeInt(mDuration);

            dest.writeInt(mProxyUid);

            dest.writeString(mProxyPackageName);
@@ -1539,8 +1616,8 @@ public class AppOpsManager { 
        OpEntry(Parcel source) {

            mOp = source.readInt();

            mMode = source.readInt();

            mTime = source.readLong();

            mRejectTime = source.readLong();

            mTimes = source.createLongArray();

            mRejectTimes = source.createLongArray();

            mDuration = source.readInt();

            mProxyUid = source.readInt();

            mProxyPackageName = source.readString();

services/core/java/com/android/server/AppOpsService.java

+332 −117

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -22948,6 +22948,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














    private void noteUidProcessState(final int uid, final int state) {















        mBatteryStatsService.noteUidProcessState(uid, state);













        mAppOpsService.updateUidProcState(uid, state);















        if (mTrackingAssociations) {















            for (int i1=0, N1=mAssociations.size(); i1<N1; i1++) {















                ArrayMap<ComponentName, SparseArray<ArrayMap<String, Association>>> targetComponents

























services/core/java/com/android/server/clipboard/ClipboardService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -613,7 +613,7 @@ public class ClipboardService extends SystemService {





























    private boolean clipboardAccessAllowed(int op, String callingPackage, int callingUid) {















        // Check the AppOp.













        if (mAppOps.checkOp(op, callingUid, callingPackage) != AppOpsManager.MODE_ALLOWED) {













        if (mAppOps.noteOp(op, callingUid, callingPackage) != AppOpsManager.MODE_ALLOWED) {















            return false;















        }















        try {