summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-05-20 17:54:32 -0700
committerAdnan Begovic <adnan@cyngn.com>2016-05-23 10:45:30 -0700
commit6f68d2e4ffe3a56e631bc166740166608ef39dc9 (patch)
treef9c0b07206b4e4bdc388f5cebdfebc4203b7a9d6 /AndroidManifest.xml
parente0c4195281314478a0aee3e982a00c101bf86054 (diff)
downloadpackages_apps_Settings-6f68d2e4ffe3a56e631bc166740166608ef39dc9.zip
packages_apps_Settings-6f68d2e4ffe3a56e631bc166740166608ef39dc9.tar.gz
packages_apps_Settings-6f68d2e4ffe3a56e631bc166740166608ef39dc9.tar.bz2
Settings: Remove redundant definition of SoundSettingsActivity.
Causes CTS cross-profile intent verification failure. Change-Id: Id1c92c45cb1fb89e34598d54b9eb45497d629eac TICKET: FEIJ-104
Diffstat (limited to 'AndroidManifest.xml')
-rwxr-xr-xAndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 349bca7..26e03a7 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2487,7 +2487,7 @@
android:resource="@id/sound_settings" />
</activity>
- <activity android:name="Settings$SoundSettingsActivity"
+ <activity android:name="Settings$CMSoundSettingsActivity"
android:label="@string/notification_settings"
android:exported="true"
android:taskAffinity="">
@@ -2512,7 +2512,7 @@
<activity-alias android:name="Settings$SoundSettingsActivity"
android:label="@string/notification_settings"
android:taskAffinity=""
- android:targetActivity="Settings$SoundSettingsActivity">
+ android:targetActivity="Settings$CMSoundSettingsActivity">
<intent-filter android:priority="1">
<action android:name="com.android.settings.SOUND_SETTINGS" />
<action android:name="android.settings.SOUND_SETTINGS" />