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

Commit e58efabd authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Revert "Temporarily whitelist platform test packages for hidden API""... 

Merge "Revert "Temporarily whitelist platform test packages for hidden API"" into pi-dev am: 8819dc86
am: c2dfd020

Change-Id: I9525fb1bbb6ca8a65c9c1b9732015fca3af1dcb3
parents eea33448 c2dfd020

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

+0 −54
Original line number Original line Diff line number Diff line
@@ -21835,54 +21835,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
    // INSTRUMENTATION

    // INSTRUMENTATION

    // =========================================================

    // =========================================================

















    private static String[] HIDDENAPI_EXEMPT_PACKAGES = {














        "com.android.bluetooth.tests",














        "com.android.managedprovisioning.tests",














        "com.android.frameworks.coretests",














        "com.android.frameworks.coretests.binderproxycountingtestapp",














        "com.android.frameworks.coretests.binderproxycountingtestservice",














        "com.android.frameworks.tests.net",














        "com.android.frameworks.tests.uiservices",














        "com.android.coretests.apps.bstatstestapp",














        "com.android.servicestests.apps.conntestapp",














        "com.android.frameworks.servicestests",














        "com.android.frameworks.utiltests",














        "com.android.mtp.tests",














        "android.mtp",














        "com.android.documentsui.tests",














        "com.android.shell.tests",














        "com.android.systemui.tests",














        "com.android.testables",














        "android.net.wifi.test",














        "com.android.server.wifi.test",














        "com.android.frameworks.telephonytests",














        "com.android.providers.contacts.tests",














        "com.android.providers.contacts.tests2",














        "com.android.settings.tests.unit",














        "com.android.server.telecom.tests",














        "com.android.vcard.tests",














        "com.android.providers.blockednumber.tests",














        "android.settings.functional",














        "com.android.notification.functional",














        "com.android.frameworks.dexloggertest",














        "com.android.server.usb",














        "com.android.providers.downloads.tests",














        "com.android.emergency.tests.unit",














        "com.android.providers.calendar.tests",














        "com.android.settingslib",














        "com.android.rs.test",














        "com.android.printspooler.outofprocess.tests",














        "com.android.cellbroadcastreceiver.tests.unit",














        "com.android.providers.telephony.tests",














        "com.android.carrierconfig.tests",














        "com.android.phone.tests",














        "com.android.service.ims.presence.tests",














        "com.android.providers.setting.test",














        "com.android.frameworks.locationtests",














        "com.android.frameworks.coretests.privacy",














        "com.android.settings.ui",














    };



























    public boolean startInstrumentation(ComponentName className,







    public boolean startInstrumentation(ComponentName className,











            String profileFile, int flags, Bundle arguments,







            String profileFile, int flags, Bundle arguments,











            IInstrumentationWatcher watcher, IUiAutomationConnection uiAutomationConnection,







            IInstrumentationWatcher watcher, IUiAutomationConnection uiAutomationConnection,










@@ -21970,12 +21922,6 @@ public class ActivityManagerService extends IActivityManager.Stub









                mUsageStatsService.reportEvent(ii.targetPackage, userId,







                mUsageStatsService.reportEvent(ii.targetPackage, userId,











                        UsageEvents.Event.SYSTEM_INTERACTION);







                        UsageEvents.Event.SYSTEM_INTERACTION);











            }







            }











            // TODO: Temporary whitelist of packages which need to be exempt from hidden API














            //       checks. Remove this as soon as the testing infrastructure allows to set














            //       the flag in AndroidTest.xml.














            if (Arrays.asList(HIDDENAPI_EXEMPT_PACKAGES).contains(ai.packageName)) {














                disableHiddenApiChecks = true;














            }






























            ProcessRecord app = addAppLocked(ai, defProcess, false, disableHiddenApiChecks,







            ProcessRecord app = addAppLocked(ai, defProcess, false, disableHiddenApiChecks,











                    abiOverride);







                    abiOverride);