Clean up TODOs pending Phone Settings removal.
Bug: 73470808
Test: build and deploy, launch from launcher, RunCarSettingsRoboTests
Change-Id: Iee061bda2223a39c27961d11c7d588fae83bd8da
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 60838ed..e61aaf2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -231,12 +231,11 @@
</activity>
<!-- Alias for launcher activity only, as this belongs to each profile. -->
- <!-- TODO: once phone setting is removed from car system image, set priority to 1 -->
<activity-alias android:name="Settings"
android:label="@string/settings_label"
android:launchMode="singleTask"
android:targetActivity=".common.CarSettingActivity">
- <intent-filter android:priority="10">
+ <intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/src/com/android/car/settings/applications/ApplicationDetailsFragment.java b/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
index 275968c..e997948 100644
--- a/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
+++ b/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
@@ -266,14 +266,6 @@
}
private boolean shouldDisableUninstallButton() {
- // TODO: Remove this condition when phone settings is removed from automotive builds.
- // This is a temporary measure to allow enabling the phone settings package.
- // It is not an expected case long-term to have packages in the disabled state that
- // normally cannot be disabled by a user.
- if (mPackageName.equals("com.android.settings")) {
- return false;
- }
-
if (shouldDisableUninstallForHomeApp()) {
LOG.d("Uninstall disabled for home app");
return true;