diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-11 03:01:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-11 03:01:50 +0000 |
| commit | caaa768476bd7d731da952c88d699e2eeba64558 (patch) | |
| tree | a8eadb67b2ec3adae018896f71328399c65e9036 /AndroidManifest.xml | |
| parent | a267cbec530e9fea2ff17b14baee0c85441d292e (diff) | |
| parent | 00b3239fbfd93ee8f41625d819a9d02798092c1c (diff) | |
| download | android_packages_apps_PackageInstaller-caaa768476bd7d731da952c88d699e2eeba64558.tar.gz android_packages_apps_PackageInstaller-caaa768476bd7d731da952c88d699e2eeba64558.tar.bz2 android_packages_apps_PackageInstaller-caaa768476bd7d731da952c88d699e2eeba64558.zip | |
Merge changes from topics "role-dialer-dialog", "role-sms-dialog" into qt-dev
* changes:
Replace ChangeDefaultDialerDialog with RequestRoleActivity.
Replace SmsDefaultDialog with RequestRoleActivity.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 15f81b7e..c2e44217 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -179,11 +179,14 @@ <action android:name="android.app.role.action.REQUEST_ROLE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - <!-- TODO: STOPSHIP: give this a priority greater than 1 to override Settings. --> - <intent-filter android:priority="0"> + <intent-filter android:priority="2"> <action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <intent-filter android:priority="1001"> + <action android:name="android.telecom.action.CHANGE_DEFAULT_DIALER" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> <activity android:name="com.android.packageinstaller.role.ui.DefaultAppListActivity" |