Merge "Re-enable app_functions on Wear." into main (169ed456) · Commits · e / os / android_frameworks_base

core/java/android/app/appfunctions/AppFunctionManagerConfiguration.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.app.appfunctions.flags.Flags.enableAppFunctionManager;

		import android.annotation.NonNull;
		import android.content.Context;
		import android.content.pm.PackageManager;

		/**
		* Represents the system configuration of support for the {@code AppFunctionManager} and associated
		@@ -29,15 +28,13 @@ import android.content.pm.PackageManager;
		* @hide
		*/
		public class AppFunctionManagerConfiguration {
		private final Context mContext;

		/**
		* Constructs a new instance of {@code AppFunctionManagerConfiguration}.
		*
		* @param context context
		*/
		public AppFunctionManagerConfiguration(@NonNull final Context context) {
		mContext = context;
		// Context can be used to access system features, etc.
		}

		/**
		@@ -46,7 +43,7 @@ public class AppFunctionManagerConfiguration {
		* @return {@code true} if supported; otherwise {@code false}
		*/
		public boolean isSupported() {
		return enableAppFunctionManager() && !isWatch();
		return enableAppFunctionManager();
		}

		/**
		@@ -58,8 +55,4 @@ public class AppFunctionManagerConfiguration {
		public static boolean isSupported(@NonNull final Context context) {
		return new AppFunctionManagerConfiguration(context).isSupported();
		}

		private boolean isWatch() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
		}
		}