Merge "Avoid system app crashes for absent TEXT_SERVICES_MANAGER_SERVICE in Wear" into main (31eb3031) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -593,6 +593,11 @@ public final class SystemServiceRegistry {
		@Override
		public TextServicesManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		if (ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)
		&& ServiceManager.getService(Context.TEXT_SERVICES_MANAGER_SERVICE) == null
		&& android.server.Flags.removeTextService()) {
		return null;
		}
		return TextServicesManager.createInstance(ctx);
		}});

		@@ -1887,6 +1892,12 @@ public final class SystemServiceRegistry {
		return null;
		}
		break;
		case Context.TEXT_SERVICES_MANAGER_SERVICE:
		if (android.server.Flags.removeTextService()
		&& hasSystemFeatureOpportunistic(ctx, PackageManager.FEATURE_WATCH)) {
		return null;
		}
		break;
		}
		Slog.wtf(TAG, "Manager wrapper not available: " + name);
		return null;