PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-03-18 14:26:25 +00:00
committed by Android (Google) Code Review
parent 3bd4771ccb 3e4c0d8789
commit 47a9d4f70c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/print/PrintServiceSettingsFragment.java
View File

@@ -341,8 +341,12 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
mServiceEnabled = service.isEnabled(); mServiceEnabled = service.isEnabled();
if (service.getSettingsActivityName() != null) { if (service.getSettingsActivityName() != null) {
Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent( Intent settingsIntent = new Intent(Intent.ACTION_MAIN);
ComponentName.unflattenFromString(service.getSettingsActivityName()));
settingsIntent.setComponent(
new ComponentName(service.getComponentName().getPackageName(),
service.getSettingsActivityName()));
List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities( List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
settingsIntent, 0); settingsIntent, 0);
if (!resolvedActivities.isEmpty()) { if (!resolvedActivities.isEmpty()) {
@@ -356,9 +360,12 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
} }
if (service.getAddPrintersActivityName() != null) { if (service.getAddPrintersActivityName() != null) {
Intent addPrintersIntent = new Intent(Intent.ACTION_MAIN) Intent addPrintersIntent = new Intent(Intent.ACTION_MAIN);
.setComponent(ComponentName.unflattenFromString(
addPrintersIntent.setComponent(
new ComponentName(service.getComponentName().getPackageName(),
service.getAddPrintersActivityName())); service.getAddPrintersActivityName()));
List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities( List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
addPrintersIntent, 0); addPrintersIntent, 0);
if (!resolvedActivities.isEmpty()) { if (!resolvedActivities.isEmpty()) {