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

Commit 8c8c6256 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6145145 from 1591d079 to qt-qpr3-release 

Change-Id: I66f94944e81ddbe8d71b50a43b35d06178911ca7
parents 2ba8f2a7 1591d079

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

+1 −3
Original line number Diff line number Diff line
@@ -422,9 +422,7 @@ public final class ProcessList { 


        @GuardedBy("ProcessList.this.mService")

        void freeIsolatedUidLocked(int uid) {

            // Strip out userId

            final int appId = UserHandle.getAppId(uid);

            mUidUsed.delete(appId);

            mUidUsed.delete(uid);

        }

    };

services/core/java/com/android/server/appop/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ 
                    "include-filter": "com.android.server.appop"

                }

            ]

        },

        {

            "name": "FrameworksMockingServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.appop"

                }

            ]

        }

    ]

}

services/tests/mockingservicestests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />

    <uses-permission android:name="android.permission.HARDWARE_TEST"/>

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />



    <application android:testOnly="true"

                 android:debuggable="true">

services/tests/servicestests/src/com/android/server/appop/AppOpsServiceTest.java→services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java

+105 −62

File changed and moved.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+12 −1
Original line number Diff line number Diff line
@@ -346,10 +346,21 @@ public class ActivityManagerServiceTest { 
        verifyUidRangesNoOverlap(range, range2);

        verifyIsolatedUidAllocator(range2);



        // Free both, then try to allocate the maximum number of UID ranges

        // Free both

        allocator.freeUidRangeLocked(appInfo);

        allocator.freeUidRangeLocked(appInfo2);



        // Verify for a secondary user

        ApplicationInfo appInfo3 = new ApplicationInfo();

        appInfo3.processName = "com.android.test.app";

        appInfo3.uid = 1010000;

        final IsolatedUidRange range3 = allocator.getOrCreateIsolatedUidRangeLocked(

                appInfo3.processName, appInfo3.uid);

        validateAppZygoteIsolatedUidRange(range3);

        verifyIsolatedUidAllocator(range3);



        allocator.freeUidRangeLocked(appInfo3);

        // Try to allocate the maximum number of UID ranges

        int maxNumUidRanges = (Process.LAST_APP_ZYGOTE_ISOLATED_UID

                - Process.FIRST_APP_ZYGOTE_ISOLATED_UID + 1) / Process.NUM_UIDS_PER_APP_ZYGOTE;

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