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 
am: 47a9d4f

* commit '47a9d4f70c21cb8b19af5699fb9522668dc0fb6a':
  Correctly compose activity name of add-printer and print-settings activity
This commit is contained in:
Philip P. Moltmann
2016-03-18 14:32:43 +00:00
committed by android-build-merger
parent b8e660b62f 47a9d4f70c
commit f9f4429f80
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();
if (service.getSettingsActivityName() != null) {
Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
ComponentName.unflattenFromString(service.getSettingsActivityName()));
Intent settingsIntent = new Intent(Intent.ACTION_MAIN);
settingsIntent.setComponent(
new ComponentName(service.getComponentName().getPackageName(),
service.getSettingsActivityName()));
List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
settingsIntent, 0);
if (!resolvedActivities.isEmpty()) {
@@ -356,9 +360,12 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
}
if (service.getAddPrintersActivityName() != null) {
Intent addPrintersIntent = new Intent(Intent.ACTION_MAIN)
.setComponent(ComponentName.unflattenFromString(
Intent addPrintersIntent = new Intent(Intent.ACTION_MAIN);
addPrintersIntent.setComponent(
new ComponentName(service.getComponentName().getPackageName(),
service.getAddPrintersActivityName()));
List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
addPrintersIntent, 0);
if (!resolvedActivities.isEmpty()) {