Merge "DynamicIndexableContentMonito should respect lacking software features."

This commit is contained in:
Svetoslav
2014-05-09 14:29:03 +00:00
committed by Android (Google) Code Review

View File

@@ -74,10 +74,15 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
} }
}; };
private final ContentObserver mContentObserver = new MyContentObserver(mHandler); private final ContentObserver mUserDictionaryContentObserver =
new UserDictionaryContentObserver(mHandler);
private Context mContext; private Context mContext;
private boolean mHasFeturePrinting;
private boolean mHasFetureIme;
private static Intent getAccessibilityServiceIntent(String packageName) { private static Intent getAccessibilityServiceIntent(String packageName) {
final Intent intent = new Intent(AccessibilityService.SERVICE_INTERFACE); final Intent intent = new Intent(AccessibilityService.SERVICE_INTERFACE);
intent.setPackage(packageName); intent.setPackage(packageName);
@@ -99,6 +104,11 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
public void register(Context context) { public void register(Context context) {
mContext = context; mContext = context;
mHasFeturePrinting = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_PRINTING);
mHasFetureIme = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_INPUT_METHODS);
// Cache accessibility service packages to know when they go away. // Cache accessibility service packages to know when they go away.
AccessibilityManager accessibilityManager = (AccessibilityManager) AccessibilityManager accessibilityManager = (AccessibilityManager)
mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
@@ -114,35 +124,39 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
mAccessibilityServices.add(resolveInfo.serviceInfo.packageName); mAccessibilityServices.add(resolveInfo.serviceInfo.packageName);
} }
// Cache print service packages to know when they go away. if (mHasFeturePrinting) {
PrintManager printManager = (PrintManager) // Cache print service packages to know when they go away.
mContext.getSystemService(Context.PRINT_SERVICE); PrintManager printManager = (PrintManager)
List<PrintServiceInfo> printServices = printManager.getInstalledPrintServices(); mContext.getSystemService(Context.PRINT_SERVICE);
final int serviceCount = printServices.size(); List<PrintServiceInfo> printServices = printManager.getInstalledPrintServices();
for (int i = 0; i < serviceCount; i++) { final int serviceCount = printServices.size();
PrintServiceInfo printService = printServices.get(i); for (int i = 0; i < serviceCount; i++) {
ResolveInfo resolveInfo = printService.getResolveInfo(); PrintServiceInfo printService = printServices.get(i);
if (resolveInfo == null || resolveInfo.serviceInfo == null) { ResolveInfo resolveInfo = printService.getResolveInfo();
continue; if (resolveInfo == null || resolveInfo.serviceInfo == null) {
continue;
}
mPrintServices.add(resolveInfo.serviceInfo.packageName);
} }
mPrintServices.add(resolveInfo.serviceInfo.packageName);
} }
// Cache IME service packages to know when they go away. // Cache IME service packages to know when they go away.
InputMethodManager imeManager = (InputMethodManager) if (mHasFetureIme) {
mContext.getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imeManager = (InputMethodManager)
List<InputMethodInfo> inputMethods = imeManager.getInputMethodList(); mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
final int inputMethodCount = inputMethods.size(); List<InputMethodInfo> inputMethods = imeManager.getInputMethodList();
for (int i = 0; i < inputMethodCount; i++) { final int inputMethodCount = inputMethods.size();
InputMethodInfo inputMethod = inputMethods.get(i); for (int i = 0; i < inputMethodCount; i++) {
ServiceInfo serviceInfo = inputMethod.getServiceInfo(); InputMethodInfo inputMethod = inputMethods.get(i);
if (serviceInfo == null) continue; ServiceInfo serviceInfo = inputMethod.getServiceInfo();
mImeServices.add(serviceInfo.packageName); if (serviceInfo == null) continue;
} mImeServices.add(serviceInfo.packageName);
}
// Watch for related content URIs. // Watch for related content URIs.
mContext.getContentResolver().registerContentObserver( mContext.getContentResolver().registerContentObserver(
UserDictionary.Words.CONTENT_URI, true, mContentObserver); UserDictionary.Words.CONTENT_URI, true, mUserDictionaryContentObserver);
}
// Watch for input device changes. // Watch for input device changes.
InputManager inputManager = (InputManager) context.getSystemService( InputManager inputManager = (InputManager) context.getSystemService(
@@ -160,7 +174,10 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
Context.INPUT_SERVICE); Context.INPUT_SERVICE);
inputManager.unregisterInputDeviceListener(this); inputManager.unregisterInputDeviceListener(this);
mContext.getContentResolver().unregisterContentObserver(mContentObserver); if (mHasFetureIme) {
mContext.getContentResolver().unregisterContentObserver(
mUserDictionaryContentObserver);
}
mAccessibilityServices.clear(); mAccessibilityServices.clear();
mPrintServices.clear(); mPrintServices.clear();
@@ -225,21 +242,25 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
} }
} }
if (!mPrintServices.contains(packageName)) { if (mHasFeturePrinting) {
final Intent intent = getPrintServiceIntent(packageName); if (!mPrintServices.contains(packageName)) {
if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { final Intent intent = getPrintServiceIntent(packageName);
mPrintServices.add(packageName); if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
Index.getInstance(mContext).updateFromClassNameResource( mPrintServices.add(packageName);
PrintSettingsFragment.class.getName(), false, true); Index.getInstance(mContext).updateFromClassNameResource(
PrintSettingsFragment.class.getName(), false, true);
}
} }
} }
if (!mImeServices.contains(packageName)) { if (mHasFetureIme) {
Intent intent = getIMEServiceIntent(packageName); if (!mImeServices.contains(packageName)) {
if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { Intent intent = getIMEServiceIntent(packageName);
mImeServices.add(packageName); if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
Index.getInstance(mContext).updateFromClassNameResource( mImeServices.add(packageName);
InputMethodAndLanguageSettings.class.getName(), false, true); Index.getInstance(mContext).updateFromClassNameResource(
InputMethodAndLanguageSettings.class.getName(), false, true);
}
} }
} }
} }
@@ -252,24 +273,28 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
AccessibilitySettings.class.getName(), true, true); AccessibilitySettings.class.getName(), true, true);
} }
final int printIndex = mPrintServices.indexOf(packageName); if (mHasFeturePrinting) {
if (printIndex >= 0) { final int printIndex = mPrintServices.indexOf(packageName);
mPrintServices.remove(printIndex); if (printIndex >= 0) {
Index.getInstance(mContext).updateFromClassNameResource( mPrintServices.remove(printIndex);
PrintSettingsFragment.class.getName(), true, true); Index.getInstance(mContext).updateFromClassNameResource(
PrintSettingsFragment.class.getName(), true, true);
}
} }
final int imeIndex = mImeServices.indexOf(packageName); if (mHasFetureIme) {
if (imeIndex >= 0) { final int imeIndex = mImeServices.indexOf(packageName);
mImeServices.remove(imeIndex); if (imeIndex >= 0) {
Index.getInstance(mContext).updateFromClassNameResource( mImeServices.remove(imeIndex);
InputMethodAndLanguageSettings.class.getName(), true, true); Index.getInstance(mContext).updateFromClassNameResource(
InputMethodAndLanguageSettings.class.getName(), true, true);
}
} }
} }
private final class MyContentObserver extends ContentObserver { private final class UserDictionaryContentObserver extends ContentObserver {
public MyContentObserver(Handler handler) { public UserDictionaryContentObserver(Handler handler) {
super(handler); super(handler);
} }