Lei Yu 154af9a750 Unrestrict app if it been set as device admin app ...

Fix merge conlict in imports area

Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf

2018-07-02 17:36:27 -07:00

..

appinfo

Merge "Reorder and clean up imports."

2018-06-19 00:06:24 +00:00

assist

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

defaultapps

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

manageapplications

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

managedomainurls

Stop using AppState for app icon in DomainAppPreference.

2018-05-30 12:33:26 -07:00

specialaccess

Unrestrict app if it been set as device admin app

2018-07-02 17:36:27 -07:00

AppAndNotificationDashboardFragmentTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

AppInfoWithHeaderTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

ApplicationFeatureProviderImplTest.java

Use settingslib shadows in Settings robotest

2018-05-30 14:36:26 -07:00

AppPermissionsPreferenceControllerTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

AppStateAppOpsBridgeTest.java

Remove wrapper for ConnectionManager/IPackageManager

2018-04-02 17:09:10 -07:00

AppStateInstallAppsBridgeTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

AppStateNotificationBridgeTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

AppStorageSettingsTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

AppStorageSizesControllerTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

AppWithAdminGrantedPermissionsCounterTest.java

Replace PackageManagerWrapper with PackageManager

2018-04-24 15:12:31 +08:00

AppWithAdminGrantedPermissionsListerTest.java

Replace PackageManagerWrapper with PackageManager

2018-04-24 15:12:31 +08:00

DefaultAppSettingsTest.java

Use ListFormatter to join strings

2018-05-02 11:15:32 +08:00

EnterpriseDefaultAppsTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

FetchPackageStorageAsyncLoaderTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

InstalledAppCounterTest.java

Replace PackageManagerWrapper with PackageManager

2018-04-24 15:12:31 +08:00

InstalledAppListerTest.java

Replace PackageManagerWrapper with PackageManager

2018-04-24 15:12:31 +08:00

LayoutPreferenceTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

PremiumSmsAccessTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

RecentAppsPreferenceControllerTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

SpecialAppAccessPreferenceControllerTest.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

UsageAccessDetailsTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00

VrListenerSettingsTest.java

Use external/robolectric-shadows/run_robotests.mk

2018-03-04 03:50:08 -08:00