Merge "Clean up TODOs pending Phone Settings removal." into pi-car-dev
am: 4b123b4cce
Change-Id: I93d5f6fe0ef6c7ccd0a5f910cef6de4507012807
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 21fd638..35b0de3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -224,12 +224,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 fce2604..5042208 100644
--- a/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
+++ b/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
@@ -265,14 +265,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;