diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-02-06 20:25:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 20:25:51 +0000 |
| commit | 9f97de13359662c2709eed227b3fab2ce7d5dabc (patch) | |
| tree | 7eb16083cd5fd9d30999dfdead280311084c3e5a /services/print/java | |
| parent | 2b1252ddd2650cb38918cb85d2a3711b2cfa8db5 (diff) | |
| parent | a5a93f559d337ad5b79716b05ea43707eb779dc8 (diff) | |
| download | frameworks_base-9f97de13359662c2709eed227b3fab2ce7d5dabc.zip frameworks_base-9f97de13359662c2709eed227b3fab2ce7d5dabc.tar.gz frameworks_base-9f97de13359662c2709eed227b3fab2ce7d5dabc.tar.bz2 | |
am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
Check feature bits before loading optional services
Diffstat (limited to 'services/print/java')
| -rw-r--r-- | services/print/java/com/android/server/print/PrintManagerService.java | 1 | ||||
| -rw-r--r-- | services/print/java/service.mk | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java index 7f146a7..7438297 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 |