diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-01-28 15:34:50 -0800 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2014-02-05 19:26:40 +0000 |
commit | 898c13df7b9b12ff10062f3542593e12fbe0c119 (patch) | |
tree | 323bc4d7da06b48af2079f44c5f8d346d265e956 /services/print | |
parent | df88d73092c62a1a3cd2b2056ca63ae2e70cc238 (diff) | |
download | frameworks_base-898c13df7b9b12ff10062f3542593e12fbe0c119.zip frameworks_base-898c13df7b9b12ff10062f3542593e12fbe0c119.tar.gz frameworks_base-898c13df7b9b12ff10062f3542593e12fbe0c119.tar.bz2 |
Check feature bits before loading optional services
At startup, we check with PackageManager whether a system service is
available before attempting to load it. A system service is available
if its associated feature (similar to hardware features) is present.
This does not remove unavailable services from the compiled jar.
Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7
Diffstat (limited to 'services/print')
-rw-r--r-- | services/print/Android.mk | 10 | ||||
-rw-r--r-- | services/print/java/com/android/server/print/PrintManagerService.java | 1 | ||||
-rw-r--r-- | services/print/java/service.mk | 11 |
3 files changed, 10 insertions, 12 deletions
diff --git a/services/print/Android.mk b/services/print/Android.mk new file mode 100644 index 0000000..33604b7 --- /dev/null +++ b/services/print/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := services.print + +LOCAL_SRC_FILES += \ + $(call all-java-files-under,java) + +include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java index 852736b..1e35678 100644 --- a/services/print/java/com/android/server/print/PrintManagerService.java +++ b/services/print/java/com/android/server/print/PrintManagerService.java @@ -52,7 +52,6 @@ import com.android.internal.R; import com.android.internal.content.PackageMonitor; import com.android.internal.os.BackgroundThread; import com.android.server.SystemService; -import com.android.server.devicepolicy.DevicePolicyManagerService; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/print/java/service.mk b/services/print/java/service.mk deleted file mode 100644 index cba3612..0000000 --- a/services/print/java/service.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Include only if the service is required -ifneq ($(findstring print,$(REQUIRED_SERVICES)),) - -SUB_DIR := print/java - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,$(SUB_DIR)) - -#DEFINED_SERVICES += com.android.server.print.PrintManagerService - -endif |