Merge "Re-enable app_functions on Wear." into main
diff --git a/core/java/android/app/appfunctions/AppFunctionManagerConfiguration.java b/core/java/android/app/appfunctions/AppFunctionManagerConfiguration.java
index fa77e79..cb21d1f 100644
--- a/core/java/android/app/appfunctions/AppFunctionManagerConfiguration.java
+++ b/core/java/android/app/appfunctions/AppFunctionManagerConfiguration.java
@@ -20,7 +20,6 @@
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 @@
* @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 @@
* @return {@code true} if supported; otherwise {@code false}
*/
public boolean isSupported() {
- return enableAppFunctionManager() && !isWatch();
+ return enableAppFunctionManager();
}
/**
@@ -58,8 +55,4 @@
public static boolean isSupported(@NonNull final Context context) {
return new AppFunctionManagerConfiguration(context).isSupported();
}
-
- private boolean isWatch() {
- return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
- }
}