OSDN Git Service

Unrestrict app if it been set as device admin app
authorLei Yu <jackqdyulei@google.com>
Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)
committerjackqdyulei <jackqdyulei@google.com>
Tue, 3 Jul 2018 00:36:27 +0000 (17:36 -0700)
commit154af9a75028ba8fd56f1866bd638e5bc70a04d6
tree5a3d0c4ff8ea450094bb2b0cf60cbec337725dde
parent636cc6caf974f1714e6493887ce8bb35fb6bd117
Unrestrict app if it been set as device admin app

Fix merge conlict in imports area

Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java