Removed stub implementation of ADD_DEVICE_ADMIN.
CarSettings now implements it.
Test: adb shell pm query-activities --brief --user cur -a android.app.action.ADD_DEVICE_ADMIN
Test: adb shell am start --ecn android.app.extra.DEVICE_ADMIN com.afwsamples.testdpc/.DeviceAdminReceiver -a android.app.action.ADD_DEVICE_ADMIN
Bug: 186788948
Bug: 188585303
Change-Id: I35d8217a4f8d94a49755a7b65743daf95b796085
diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index 44a114b..885c9d7 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -90,10 +90,6 @@
android:excludeFromRecents="true"
android:exported="true">
<intent-filter android:priority="-1">
- <action android:name="android.app.action.ADD_DEVICE_ADMIN"/>
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter>
- <intent-filter android:priority="-1">
<action android:name="android.settings.ACCESSIBILITY_SETTINGS"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/admin/DevicePolicyFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/admin/DevicePolicyFragment.java
index d15ec55..f71e57f 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/admin/DevicePolicyFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/admin/DevicePolicyFragment.java
@@ -330,12 +330,7 @@
}
Log.v(TAG, "setAdminApp(): index=" + index + ",size=" + mDeviceAdminApps.size() + ",app="
+ app);
- // TODO(188585303): use ACTION_ADD_DEVICE_ADMIN
-// Intent intent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
-// .putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, app.admin);
- Intent intent = new Intent()
- .setComponent(new ComponentName("com.android.car.settings",
- "com.android.car.settings.enterprise.DeviceAdminAddActivity"))
+ Intent intent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, app.admin);
Log.i(TAG, "launching intent " + intent + " for " + app);
getActivity().startActivity(intent);