diff --git a/CleanSpec.mk b/CleanSpec.mk index 2fa195c20619d..1e49fcbb3ec7e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -185,7 +185,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/effects/) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/framework-res_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrintClient.*) - +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 324ba77bde34b..a711f48c8c149 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -213,7 +213,8 @@ public final class AccessibilityManager { userId = UserHandle.myUserId(); } IBinder iBinder = ServiceManager.getService(Context.ACCESSIBILITY_SERVICE); - IAccessibilityManager service = IAccessibilityManager.Stub.asInterface(iBinder); + IAccessibilityManager service = iBinder == null + ? null : IAccessibilityManager.Stub.asInterface(iBinder); sInstance = new AccessibilityManager(context, service, userId); } } @@ -233,10 +234,14 @@ public final class AccessibilityManager { mHandler = new MyHandler(context.getMainLooper()); mService = service; mUserId = userId; - + if (mService == null) { + mIsEnabled = false; + } try { - final int stateFlags = mService.addClient(mClient, userId); - setState(stateFlags); + if (mService != null) { + final int stateFlags = mService.addClient(mClient, userId); + setState(stateFlags); + } } catch (RemoteException re) { Log.e(LOG_TAG, "AccessibilityManagerService is dead", re); } @@ -358,14 +363,16 @@ public final class AccessibilityManager { public List getInstalledAccessibilityServiceList() { List services = null; try { - services = mService.getInstalledAccessibilityServiceList(mUserId); - if (DEBUG) { - Log.i(LOG_TAG, "Installed AccessibilityServices " + services); + if (mService != null) { + services = mService.getInstalledAccessibilityServiceList(mUserId); + if (DEBUG) { + Log.i(LOG_TAG, "Installed AccessibilityServices " + services); + } } } catch (RemoteException re) { Log.e(LOG_TAG, "Error while obtaining the installed AccessibilityServices. ", re); } - return Collections.unmodifiableList(services); + return services != null ? Collections.unmodifiableList(services) : Collections.EMPTY_LIST; } /** @@ -385,14 +392,16 @@ public final class AccessibilityManager { int feedbackTypeFlags) { List services = null; try { - services = mService.getEnabledAccessibilityServiceList(feedbackTypeFlags, mUserId); - if (DEBUG) { - Log.i(LOG_TAG, "Installed AccessibilityServices " + services); + if (mService != null) { + services = mService.getEnabledAccessibilityServiceList(feedbackTypeFlags, mUserId); + if (DEBUG) { + Log.i(LOG_TAG, "Installed AccessibilityServices " + services); + } } } catch (RemoteException re) { Log.e(LOG_TAG, "Error while obtaining the installed AccessibilityServices. ", re); } - return Collections.unmodifiableList(services); + return services != null ? Collections.unmodifiableList(services) : Collections.EMPTY_LIST; } /** @@ -502,6 +511,9 @@ public final class AccessibilityManager { */ public int addAccessibilityInteractionConnection(IWindow windowToken, IAccessibilityInteractionConnection connection) { + if (mService == null) { + return View.NO_ID; + } try { return mService.addAccessibilityInteractionConnection(windowToken, connection, mUserId); } catch (RemoteException re) { @@ -518,7 +530,9 @@ public final class AccessibilityManager { */ public void removeAccessibilityInteractionConnection(IWindow windowToken) { try { - mService.removeAccessibilityInteractionConnection(windowToken); + if (mService != null) { + mService.removeAccessibilityInteractionConnection(windowToken); + } } catch (RemoteException re) { Log.e(LOG_TAG, "Error while removing an accessibility interaction connection. ", re); } diff --git a/services/common_time/Android.mk b/libs/common_time/Android.mk similarity index 100% rename from services/common_time/Android.mk rename to libs/common_time/Android.mk diff --git a/services/common_time/clock_recovery.cpp b/libs/common_time/clock_recovery.cpp similarity index 100% rename from services/common_time/clock_recovery.cpp rename to libs/common_time/clock_recovery.cpp diff --git a/services/common_time/clock_recovery.h b/libs/common_time/clock_recovery.h similarity index 100% rename from services/common_time/clock_recovery.h rename to libs/common_time/clock_recovery.h diff --git a/services/common_time/common_clock.cpp b/libs/common_time/common_clock.cpp similarity index 100% rename from services/common_time/common_clock.cpp rename to libs/common_time/common_clock.cpp diff --git a/services/common_time/common_clock.h b/libs/common_time/common_clock.h similarity index 100% rename from services/common_time/common_clock.h rename to libs/common_time/common_clock.h diff --git a/services/common_time/common_clock_service.cpp b/libs/common_time/common_clock_service.cpp similarity index 100% rename from services/common_time/common_clock_service.cpp rename to libs/common_time/common_clock_service.cpp diff --git a/services/common_time/common_clock_service.h b/libs/common_time/common_clock_service.h similarity index 100% rename from services/common_time/common_clock_service.h rename to libs/common_time/common_clock_service.h diff --git a/services/common_time/common_time_config_service.cpp b/libs/common_time/common_time_config_service.cpp similarity index 100% rename from services/common_time/common_time_config_service.cpp rename to libs/common_time/common_time_config_service.cpp diff --git a/services/common_time/common_time_config_service.h b/libs/common_time/common_time_config_service.h similarity index 100% rename from services/common_time/common_time_config_service.h rename to libs/common_time/common_time_config_service.h diff --git a/services/common_time/common_time_server.cpp b/libs/common_time/common_time_server.cpp similarity index 100% rename from services/common_time/common_time_server.cpp rename to libs/common_time/common_time_server.cpp diff --git a/services/common_time/common_time_server.h b/libs/common_time/common_time_server.h similarity index 100% rename from services/common_time/common_time_server.h rename to libs/common_time/common_time_server.h diff --git a/services/common_time/common_time_server_api.cpp b/libs/common_time/common_time_server_api.cpp similarity index 100% rename from services/common_time/common_time_server_api.cpp rename to libs/common_time/common_time_server_api.cpp diff --git a/services/common_time/common_time_server_packets.cpp b/libs/common_time/common_time_server_packets.cpp similarity index 100% rename from services/common_time/common_time_server_packets.cpp rename to libs/common_time/common_time_server_packets.cpp diff --git a/services/common_time/common_time_server_packets.h b/libs/common_time/common_time_server_packets.h similarity index 100% rename from services/common_time/common_time_server_packets.h rename to libs/common_time/common_time_server_packets.h diff --git a/services/common_time/diag_thread.cpp b/libs/common_time/diag_thread.cpp similarity index 100% rename from services/common_time/diag_thread.cpp rename to libs/common_time/diag_thread.cpp diff --git a/services/common_time/diag_thread.h b/libs/common_time/diag_thread.h similarity index 100% rename from services/common_time/diag_thread.h rename to libs/common_time/diag_thread.h diff --git a/services/common_time/main.cpp b/libs/common_time/main.cpp similarity index 100% rename from services/common_time/main.cpp rename to libs/common_time/main.cpp diff --git a/services/common_time/utils.cpp b/libs/common_time/utils.cpp similarity index 100% rename from services/common_time/utils.cpp rename to libs/common_time/utils.cpp diff --git a/services/common_time/utils.h b/libs/common_time/utils.h similarity index 100% rename from services/common_time/utils.h rename to libs/common_time/utils.h diff --git a/services/input/Android.mk b/libs/input/Android.mk similarity index 100% rename from services/input/Android.mk rename to libs/input/Android.mk diff --git a/services/input/EventHub.cpp b/libs/input/EventHub.cpp similarity index 100% rename from services/input/EventHub.cpp rename to libs/input/EventHub.cpp diff --git a/services/input/EventHub.h b/libs/input/EventHub.h similarity index 100% rename from services/input/EventHub.h rename to libs/input/EventHub.h diff --git a/services/input/InputApplication.cpp b/libs/input/InputApplication.cpp similarity index 100% rename from services/input/InputApplication.cpp rename to libs/input/InputApplication.cpp diff --git a/services/input/InputApplication.h b/libs/input/InputApplication.h similarity index 100% rename from services/input/InputApplication.h rename to libs/input/InputApplication.h diff --git a/services/input/InputDispatcher.cpp b/libs/input/InputDispatcher.cpp similarity index 100% rename from services/input/InputDispatcher.cpp rename to libs/input/InputDispatcher.cpp diff --git a/services/input/InputDispatcher.h b/libs/input/InputDispatcher.h similarity index 100% rename from services/input/InputDispatcher.h rename to libs/input/InputDispatcher.h diff --git a/services/input/InputListener.cpp b/libs/input/InputListener.cpp similarity index 100% rename from services/input/InputListener.cpp rename to libs/input/InputListener.cpp diff --git a/services/input/InputListener.h b/libs/input/InputListener.h similarity index 100% rename from services/input/InputListener.h rename to libs/input/InputListener.h diff --git a/services/input/InputManager.cpp b/libs/input/InputManager.cpp similarity index 100% rename from services/input/InputManager.cpp rename to libs/input/InputManager.cpp diff --git a/services/input/InputManager.h b/libs/input/InputManager.h similarity index 100% rename from services/input/InputManager.h rename to libs/input/InputManager.h diff --git a/services/input/InputReader.cpp b/libs/input/InputReader.cpp similarity index 100% rename from services/input/InputReader.cpp rename to libs/input/InputReader.cpp diff --git a/services/input/InputReader.h b/libs/input/InputReader.h similarity index 100% rename from services/input/InputReader.h rename to libs/input/InputReader.h diff --git a/services/input/InputWindow.cpp b/libs/input/InputWindow.cpp similarity index 100% rename from services/input/InputWindow.cpp rename to libs/input/InputWindow.cpp diff --git a/services/input/InputWindow.h b/libs/input/InputWindow.h similarity index 100% rename from services/input/InputWindow.h rename to libs/input/InputWindow.h diff --git a/services/input/PointerController.cpp b/libs/input/PointerController.cpp similarity index 100% rename from services/input/PointerController.cpp rename to libs/input/PointerController.cpp diff --git a/services/input/PointerController.h b/libs/input/PointerController.h similarity index 100% rename from services/input/PointerController.h rename to libs/input/PointerController.h diff --git a/services/input/SpriteController.cpp b/libs/input/SpriteController.cpp similarity index 100% rename from services/input/SpriteController.cpp rename to libs/input/SpriteController.cpp diff --git a/services/input/SpriteController.h b/libs/input/SpriteController.h similarity index 100% rename from services/input/SpriteController.h rename to libs/input/SpriteController.h diff --git a/services/input/tests/Android.mk b/libs/input/tests/Android.mk similarity index 100% rename from services/input/tests/Android.mk rename to libs/input/tests/Android.mk diff --git a/services/input/tests/InputDispatcher_test.cpp b/libs/input/tests/InputDispatcher_test.cpp similarity index 100% rename from services/input/tests/InputDispatcher_test.cpp rename to libs/input/tests/InputDispatcher_test.cpp diff --git a/services/input/tests/InputReader_test.cpp b/libs/input/tests/InputReader_test.cpp similarity index 100% rename from services/input/tests/InputReader_test.cpp rename to libs/input/tests/InputReader_test.cpp diff --git a/services/Android.mk b/services/Android.mk new file mode 100644 index 0000000000000..6ee7fca01128e --- /dev/null +++ b/services/Android.mk @@ -0,0 +1,45 @@ +LOCAL_PATH:= $(call my-dir) + +# the java library +# ============================================================ +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := + +# TODO: Move this to the product makefiles +REQUIRED_SERVICES := core appwidget backup devicepolicy accessibility print + +include $(patsubst %,$(LOCAL_PATH)/%/java/service.mk,$(REQUIRED_SERVICES)) + +LOCAL_MODULE:= services + +LOCAL_JAVA_LIBRARIES := android.policy conscrypt telephony-common + +#LOCAL_PROGUARD_ENABLED := full +#LOCAL_PROGUARD_FLAG_FILES := proguard.flags + +include $(BUILD_JAVA_LIBRARY) + +include $(BUILD_DROIDDOC) + +# native library +# ============================================================= + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := +LOCAL_SHARED_LIBRARIES := + +# include all the jni subdirs to collect their sources +include $(wildcard $(LOCAL_PATH)/*/jni/Android.mk) + +LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES + +ifeq ($(WITH_MALLOC_LEAK_CHECK),true) + LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK +endif + +LOCAL_MODULE:= libandroid_servers + +include $(BUILD_SHARED_LIBRARY) + diff --git a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java similarity index 100% rename from services/java/com/android/server/accessibility/AccessibilityInputFilter.java rename to services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java similarity index 100% rename from services/java/com/android/server/accessibility/AccessibilityManagerService.java rename to services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java diff --git a/services/java/com/android/server/accessibility/EventStreamTransformation.java b/services/accessibility/java/com/android/server/accessibility/EventStreamTransformation.java similarity index 100% rename from services/java/com/android/server/accessibility/EventStreamTransformation.java rename to services/accessibility/java/com/android/server/accessibility/EventStreamTransformation.java diff --git a/services/java/com/android/server/accessibility/GestureUtils.java b/services/accessibility/java/com/android/server/accessibility/GestureUtils.java similarity index 100% rename from services/java/com/android/server/accessibility/GestureUtils.java rename to services/accessibility/java/com/android/server/accessibility/GestureUtils.java diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/accessibility/java/com/android/server/accessibility/ScreenMagnifier.java similarity index 100% rename from services/java/com/android/server/accessibility/ScreenMagnifier.java rename to services/accessibility/java/com/android/server/accessibility/ScreenMagnifier.java diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java similarity index 100% rename from services/java/com/android/server/accessibility/TouchExplorer.java rename to services/accessibility/java/com/android/server/accessibility/TouchExplorer.java diff --git a/services/accessibility/java/service.mk b/services/accessibility/java/service.mk new file mode 100644 index 0000000000000..5e8f37578a954 --- /dev/null +++ b/services/accessibility/java/service.mk @@ -0,0 +1,11 @@ +# Include only if the service is required +ifneq ($(findstring accessibility,$(REQUIRED_SERVICES)),) + +SUB_DIR := accessibility/java + +LOCAL_SRC_FILES += \ + $(call all-java-files-under,$(SUB_DIR)) + +#DEFINED_SERVICES += com.android.server.accessibility.AccessibilityManagerService + +endif diff --git a/services/java/com/android/server/appwidget/AppWidgetService.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java similarity index 100% rename from services/java/com/android/server/appwidget/AppWidgetService.java rename to services/appwidget/java/com/android/server/appwidget/AppWidgetService.java diff --git a/services/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java similarity index 100% rename from services/java/com/android/server/appwidget/AppWidgetServiceImpl.java rename to services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java diff --git a/services/appwidget/java/service.mk b/services/appwidget/java/service.mk new file mode 100644 index 0000000000000..0e3344682c7f5 --- /dev/null +++ b/services/appwidget/java/service.mk @@ -0,0 +1,11 @@ +# Include only if the service is required +ifneq ($(findstring appwidget,$(REQUIRED_SERVICES)),) + +SUB_DIR := appwidget/java + +LOCAL_SRC_FILES += \ + $(call all-java-files-under,$(SUB_DIR)) + +#DEFINED_SERVICES += com.android.server.appwidget.AppWidgetService + +endif diff --git a/services/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java similarity index 100% rename from services/java/com/android/server/backup/BackupManagerService.java rename to services/backup/java/com/android/server/backup/BackupManagerService.java diff --git a/services/java/com/android/server/backup/PackageManagerBackupAgent.java b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java similarity index 100% rename from services/java/com/android/server/backup/PackageManagerBackupAgent.java rename to services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java diff --git a/services/java/com/android/server/backup/SystemBackupAgent.java b/services/backup/java/com/android/server/backup/SystemBackupAgent.java similarity index 100% rename from services/java/com/android/server/backup/SystemBackupAgent.java rename to services/backup/java/com/android/server/backup/SystemBackupAgent.java diff --git a/services/backup/java/service.mk b/services/backup/java/service.mk new file mode 100644 index 0000000000000..bd22b95a06102 --- /dev/null +++ b/services/backup/java/service.mk @@ -0,0 +1,11 @@ +# Include only if the service is required +ifneq ($(findstring backup,$(REQUIRED_SERVICES)),) + +SUB_DIR := backup/java + +LOCAL_SRC_FILES += \ + $(call all-java-files-under,$(SUB_DIR)) + +#DEFINED_SERVICES += com.android.server.backup.BackupManagerService + +endif diff --git a/services/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java similarity index 100% rename from services/java/com/android/server/AlarmManagerService.java rename to services/core/java/com/android/server/AlarmManagerService.java diff --git a/services/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java similarity index 100% rename from services/java/com/android/server/AppOpsService.java rename to services/core/java/com/android/server/AppOpsService.java diff --git a/services/java/com/android/server/AssetAtlasService.java b/services/core/java/com/android/server/AssetAtlasService.java similarity index 100% rename from services/java/com/android/server/AssetAtlasService.java rename to services/core/java/com/android/server/AssetAtlasService.java diff --git a/services/java/com/android/server/AttributeCache.java b/services/core/java/com/android/server/AttributeCache.java similarity index 100% rename from services/java/com/android/server/AttributeCache.java rename to services/core/java/com/android/server/AttributeCache.java diff --git a/services/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java similarity index 100% rename from services/java/com/android/server/BatteryService.java rename to services/core/java/com/android/server/BatteryService.java diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java similarity index 100% rename from services/java/com/android/server/BluetoothManagerService.java rename to services/core/java/com/android/server/BluetoothManagerService.java diff --git a/services/java/com/android/server/BootReceiver.java b/services/core/java/com/android/server/BootReceiver.java similarity index 100% rename from services/java/com/android/server/BootReceiver.java rename to services/core/java/com/android/server/BootReceiver.java diff --git a/services/java/com/android/server/BrickReceiver.java b/services/core/java/com/android/server/BrickReceiver.java similarity index 100% rename from services/java/com/android/server/BrickReceiver.java rename to services/core/java/com/android/server/BrickReceiver.java diff --git a/services/java/com/android/server/CertBlacklister.java b/services/core/java/com/android/server/CertBlacklister.java similarity index 100% rename from services/java/com/android/server/CertBlacklister.java rename to services/core/java/com/android/server/CertBlacklister.java diff --git a/services/java/com/android/server/CommonTimeManagementService.java b/services/core/java/com/android/server/CommonTimeManagementService.java similarity index 100% rename from services/java/com/android/server/CommonTimeManagementService.java rename to services/core/java/com/android/server/CommonTimeManagementService.java diff --git a/services/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java similarity index 100% rename from services/java/com/android/server/ConnectivityService.java rename to services/core/java/com/android/server/ConnectivityService.java diff --git a/services/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java similarity index 100% rename from services/java/com/android/server/ConsumerIrService.java rename to services/core/java/com/android/server/ConsumerIrService.java diff --git a/services/java/com/android/server/CountryDetectorService.java b/services/core/java/com/android/server/CountryDetectorService.java similarity index 100% rename from services/java/com/android/server/CountryDetectorService.java rename to services/core/java/com/android/server/CountryDetectorService.java diff --git a/services/java/com/android/server/DiskStatsService.java b/services/core/java/com/android/server/DiskStatsService.java similarity index 100% rename from services/java/com/android/server/DiskStatsService.java rename to services/core/java/com/android/server/DiskStatsService.java diff --git a/services/java/com/android/server/DockObserver.java b/services/core/java/com/android/server/DockObserver.java similarity index 100% rename from services/java/com/android/server/DockObserver.java rename to services/core/java/com/android/server/DockObserver.java diff --git a/services/java/com/android/server/DropBoxManagerService.java b/services/core/java/com/android/server/DropBoxManagerService.java similarity index 100% rename from services/java/com/android/server/DropBoxManagerService.java rename to services/core/java/com/android/server/DropBoxManagerService.java diff --git a/services/java/com/android/server/EntropyMixer.java b/services/core/java/com/android/server/EntropyMixer.java similarity index 100% rename from services/java/com/android/server/EntropyMixer.java rename to services/core/java/com/android/server/EntropyMixer.java diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags similarity index 100% rename from services/java/com/android/server/EventLogTags.logtags rename to services/core/java/com/android/server/EventLogTags.logtags diff --git a/services/java/com/android/server/FgThread.java b/services/core/java/com/android/server/FgThread.java similarity index 100% rename from services/java/com/android/server/FgThread.java rename to services/core/java/com/android/server/FgThread.java diff --git a/services/java/com/android/server/INativeDaemonConnectorCallbacks.java b/services/core/java/com/android/server/INativeDaemonConnectorCallbacks.java similarity index 100% rename from services/java/com/android/server/INativeDaemonConnectorCallbacks.java rename to services/core/java/com/android/server/INativeDaemonConnectorCallbacks.java diff --git a/services/java/com/android/server/IdleMaintenanceService.java b/services/core/java/com/android/server/IdleMaintenanceService.java similarity index 100% rename from services/java/com/android/server/IdleMaintenanceService.java rename to services/core/java/com/android/server/IdleMaintenanceService.java diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java similarity index 100% rename from services/java/com/android/server/InputMethodManagerService.java rename to services/core/java/com/android/server/InputMethodManagerService.java diff --git a/services/java/com/android/server/IntentResolver.java b/services/core/java/com/android/server/IntentResolver.java similarity index 100% rename from services/java/com/android/server/IntentResolver.java rename to services/core/java/com/android/server/IntentResolver.java diff --git a/services/java/com/android/server/IoThread.java b/services/core/java/com/android/server/IoThread.java similarity index 100% rename from services/java/com/android/server/IoThread.java rename to services/core/java/com/android/server/IoThread.java diff --git a/services/java/com/android/server/LocalServices.java b/services/core/java/com/android/server/LocalServices.java similarity index 100% rename from services/java/com/android/server/LocalServices.java rename to services/core/java/com/android/server/LocalServices.java diff --git a/services/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java similarity index 100% rename from services/java/com/android/server/LocationManagerService.java rename to services/core/java/com/android/server/LocationManagerService.java diff --git a/services/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java similarity index 100% rename from services/java/com/android/server/LockSettingsService.java rename to services/core/java/com/android/server/LockSettingsService.java diff --git a/services/java/com/android/server/MasterClearReceiver.java b/services/core/java/com/android/server/MasterClearReceiver.java similarity index 100% rename from services/java/com/android/server/MasterClearReceiver.java rename to services/core/java/com/android/server/MasterClearReceiver.java diff --git a/services/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java similarity index 100% rename from services/java/com/android/server/MountService.java rename to services/core/java/com/android/server/MountService.java diff --git a/services/java/com/android/server/NativeDaemonConnector.java b/services/core/java/com/android/server/NativeDaemonConnector.java similarity index 100% rename from services/java/com/android/server/NativeDaemonConnector.java rename to services/core/java/com/android/server/NativeDaemonConnector.java diff --git a/services/java/com/android/server/NativeDaemonConnectorException.java b/services/core/java/com/android/server/NativeDaemonConnectorException.java similarity index 100% rename from services/java/com/android/server/NativeDaemonConnectorException.java rename to services/core/java/com/android/server/NativeDaemonConnectorException.java diff --git a/services/java/com/android/server/NativeDaemonEvent.java b/services/core/java/com/android/server/NativeDaemonEvent.java similarity index 100% rename from services/java/com/android/server/NativeDaemonEvent.java rename to services/core/java/com/android/server/NativeDaemonEvent.java diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java similarity index 100% rename from services/java/com/android/server/NetworkManagementService.java rename to services/core/java/com/android/server/NetworkManagementService.java diff --git a/services/java/com/android/server/NetworkTimeUpdateService.java b/services/core/java/com/android/server/NetworkTimeUpdateService.java similarity index 100% rename from services/java/com/android/server/NetworkTimeUpdateService.java rename to services/core/java/com/android/server/NetworkTimeUpdateService.java diff --git a/services/java/com/android/server/NsdService.java b/services/core/java/com/android/server/NsdService.java similarity index 100% rename from services/java/com/android/server/NsdService.java rename to services/core/java/com/android/server/NsdService.java diff --git a/services/java/com/android/server/RandomBlock.java b/services/core/java/com/android/server/RandomBlock.java similarity index 100% rename from services/java/com/android/server/RandomBlock.java rename to services/core/java/com/android/server/RandomBlock.java diff --git a/services/java/com/android/server/RecognitionManagerService.java b/services/core/java/com/android/server/RecognitionManagerService.java similarity index 100% rename from services/java/com/android/server/RecognitionManagerService.java rename to services/core/java/com/android/server/RecognitionManagerService.java diff --git a/services/java/com/android/server/SamplingProfilerService.java b/services/core/java/com/android/server/SamplingProfilerService.java similarity index 100% rename from services/java/com/android/server/SamplingProfilerService.java rename to services/core/java/com/android/server/SamplingProfilerService.java diff --git a/services/java/com/android/server/SerialService.java b/services/core/java/com/android/server/SerialService.java similarity index 100% rename from services/java/com/android/server/SerialService.java rename to services/core/java/com/android/server/SerialService.java diff --git a/services/java/com/android/server/ServiceWatcher.java b/services/core/java/com/android/server/ServiceWatcher.java similarity index 100% rename from services/java/com/android/server/ServiceWatcher.java rename to services/core/java/com/android/server/ServiceWatcher.java diff --git a/services/java/com/android/server/ShutdownActivity.java b/services/core/java/com/android/server/ShutdownActivity.java similarity index 100% rename from services/java/com/android/server/ShutdownActivity.java rename to services/core/java/com/android/server/ShutdownActivity.java diff --git a/services/java/com/android/server/SystemServer.java b/services/core/java/com/android/server/SystemServer.java similarity index 100% rename from services/java/com/android/server/SystemServer.java rename to services/core/java/com/android/server/SystemServer.java diff --git a/services/java/com/android/server/SystemService.java b/services/core/java/com/android/server/SystemService.java similarity index 97% rename from services/java/com/android/server/SystemService.java rename to services/core/java/com/android/server/SystemService.java index 37afb4f875418..b9d30cede1d31 100644 --- a/services/java/com/android/server/SystemService.java +++ b/services/core/java/com/android/server/SystemService.java @@ -27,6 +27,7 @@ public abstract class SystemService { /* * Boot Phases */ + public static final int PHASE_LOCK_SETTINGS_READY = 480; public static final int PHASE_SYSTEM_SERVICES_READY = 500; public static final int PHASE_THIRD_PARTY_APPS_CAN_START = 600; public static final int PHASE_BOOT_COMPLETE = 1000; @@ -40,6 +41,10 @@ public abstract class SystemService { onCreate(context); } + public final boolean isSafeMode() { + return mManager.isSafeMode(); + } + /** * Services are not yet available. This is a good place to do setup work that does * not require other services. diff --git a/services/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java similarity index 89% rename from services/java/com/android/server/SystemServiceManager.java rename to services/core/java/com/android/server/SystemServiceManager.java index 648975a9b7cab..59f7e920e7c4f 100644 --- a/services/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -29,6 +29,7 @@ public class SystemServiceManager { private static final String TAG = "SystemServiceManager"; private final Context mContext; + private boolean mSafeMode; // Services that should receive lifecycle events. private final ArrayList mServices = new ArrayList(); @@ -39,6 +40,14 @@ public class SystemServiceManager { mContext = context; } + public void startService(String className) { + try { + startService(Class.forName(className)); + } catch (ClassNotFoundException cnfe) { + Slog.i(TAG, className + " not available, ignoring."); + } + } + /** * Creates and starts a system service. The class must be a subclass of * {@link com.android.server.SystemService}. @@ -91,6 +100,19 @@ public class SystemServiceManager { } } + /** Sets the safe mode flag for services to query. */ + public void setSafeMode(boolean safeMode) { + mSafeMode = safeMode; + } + + /** + * Returns whether we are booting into safe mode. + * @return safe mode flag + */ + public boolean isSafeMode() { + return mSafeMode; + } + /** * Outputs the state of this manager to the System log. */ diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java similarity index 100% rename from services/java/com/android/server/TelephonyRegistry.java rename to services/core/java/com/android/server/TelephonyRegistry.java diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java similarity index 100% rename from services/java/com/android/server/TextServicesManagerService.java rename to services/core/java/com/android/server/TextServicesManagerService.java diff --git a/services/java/com/android/server/TwilightCalculator.java b/services/core/java/com/android/server/TwilightCalculator.java similarity index 100% rename from services/java/com/android/server/TwilightCalculator.java rename to services/core/java/com/android/server/TwilightCalculator.java diff --git a/services/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java similarity index 100% rename from services/java/com/android/server/UiModeManagerService.java rename to services/core/java/com/android/server/UiModeManagerService.java diff --git a/services/java/com/android/server/UiThread.java b/services/core/java/com/android/server/UiThread.java similarity index 100% rename from services/java/com/android/server/UiThread.java rename to services/core/java/com/android/server/UiThread.java diff --git a/services/java/com/android/server/UpdateLockService.java b/services/core/java/com/android/server/UpdateLockService.java similarity index 100% rename from services/java/com/android/server/UpdateLockService.java rename to services/core/java/com/android/server/UpdateLockService.java diff --git a/services/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java similarity index 100% rename from services/java/com/android/server/VibratorService.java rename to services/core/java/com/android/server/VibratorService.java diff --git a/services/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java similarity index 100% rename from services/java/com/android/server/Watchdog.java rename to services/core/java/com/android/server/Watchdog.java diff --git a/services/java/com/android/server/WiredAccessoryManager.java b/services/core/java/com/android/server/WiredAccessoryManager.java similarity index 100% rename from services/java/com/android/server/WiredAccessoryManager.java rename to services/core/java/com/android/server/WiredAccessoryManager.java diff --git a/services/java/com/android/server/accounts/AccountAuthenticatorCache.java b/services/core/java/com/android/server/accounts/AccountAuthenticatorCache.java similarity index 100% rename from services/java/com/android/server/accounts/AccountAuthenticatorCache.java rename to services/core/java/com/android/server/accounts/AccountAuthenticatorCache.java diff --git a/services/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java similarity index 100% rename from services/java/com/android/server/accounts/AccountManagerService.java rename to services/core/java/com/android/server/accounts/AccountManagerService.java diff --git a/services/java/com/android/server/accounts/IAccountAuthenticatorCache.java b/services/core/java/com/android/server/accounts/IAccountAuthenticatorCache.java similarity index 100% rename from services/java/com/android/server/accounts/IAccountAuthenticatorCache.java rename to services/core/java/com/android/server/accounts/IAccountAuthenticatorCache.java diff --git a/services/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java similarity index 100% rename from services/java/com/android/server/am/ActiveServices.java rename to services/core/java/com/android/server/am/ActiveServices.java diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java similarity index 100% rename from services/java/com/android/server/am/ActivityManagerService.java rename to services/core/java/com/android/server/am/ActivityManagerService.java diff --git a/services/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java similarity index 100% rename from services/java/com/android/server/am/ActivityRecord.java rename to services/core/java/com/android/server/am/ActivityRecord.java diff --git a/services/java/com/android/server/am/ActivityResult.java b/services/core/java/com/android/server/am/ActivityResult.java similarity index 100% rename from services/java/com/android/server/am/ActivityResult.java rename to services/core/java/com/android/server/am/ActivityResult.java diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java similarity index 100% rename from services/java/com/android/server/am/ActivityStack.java rename to services/core/java/com/android/server/am/ActivityStack.java diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java similarity index 100% rename from services/java/com/android/server/am/ActivityStackSupervisor.java rename to services/core/java/com/android/server/am/ActivityStackSupervisor.java diff --git a/services/java/com/android/server/am/AppBindRecord.java b/services/core/java/com/android/server/am/AppBindRecord.java similarity index 100% rename from services/java/com/android/server/am/AppBindRecord.java rename to services/core/java/com/android/server/am/AppBindRecord.java diff --git a/services/java/com/android/server/am/AppErrorDialog.java b/services/core/java/com/android/server/am/AppErrorDialog.java similarity index 100% rename from services/java/com/android/server/am/AppErrorDialog.java rename to services/core/java/com/android/server/am/AppErrorDialog.java diff --git a/services/java/com/android/server/am/AppErrorResult.java b/services/core/java/com/android/server/am/AppErrorResult.java similarity index 100% rename from services/java/com/android/server/am/AppErrorResult.java rename to services/core/java/com/android/server/am/AppErrorResult.java diff --git a/services/java/com/android/server/am/AppNotRespondingDialog.java b/services/core/java/com/android/server/am/AppNotRespondingDialog.java similarity index 100% rename from services/java/com/android/server/am/AppNotRespondingDialog.java rename to services/core/java/com/android/server/am/AppNotRespondingDialog.java diff --git a/services/java/com/android/server/am/AppWaitingForDebuggerDialog.java b/services/core/java/com/android/server/am/AppWaitingForDebuggerDialog.java similarity index 100% rename from services/java/com/android/server/am/AppWaitingForDebuggerDialog.java rename to services/core/java/com/android/server/am/AppWaitingForDebuggerDialog.java diff --git a/services/java/com/android/server/am/BackupRecord.java b/services/core/java/com/android/server/am/BackupRecord.java similarity index 100% rename from services/java/com/android/server/am/BackupRecord.java rename to services/core/java/com/android/server/am/BackupRecord.java diff --git a/services/java/com/android/server/am/BaseErrorDialog.java b/services/core/java/com/android/server/am/BaseErrorDialog.java similarity index 100% rename from services/java/com/android/server/am/BaseErrorDialog.java rename to services/core/java/com/android/server/am/BaseErrorDialog.java diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java similarity index 100% rename from services/java/com/android/server/am/BatteryStatsService.java rename to services/core/java/com/android/server/am/BatteryStatsService.java diff --git a/services/java/com/android/server/am/BroadcastFilter.java b/services/core/java/com/android/server/am/BroadcastFilter.java similarity index 100% rename from services/java/com/android/server/am/BroadcastFilter.java rename to services/core/java/com/android/server/am/BroadcastFilter.java diff --git a/services/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java similarity index 100% rename from services/java/com/android/server/am/BroadcastQueue.java rename to services/core/java/com/android/server/am/BroadcastQueue.java diff --git a/services/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java similarity index 100% rename from services/java/com/android/server/am/BroadcastRecord.java rename to services/core/java/com/android/server/am/BroadcastRecord.java diff --git a/services/java/com/android/server/am/CompatModeDialog.java b/services/core/java/com/android/server/am/CompatModeDialog.java similarity index 100% rename from services/java/com/android/server/am/CompatModeDialog.java rename to services/core/java/com/android/server/am/CompatModeDialog.java diff --git a/services/java/com/android/server/am/CompatModePackages.java b/services/core/java/com/android/server/am/CompatModePackages.java similarity index 100% rename from services/java/com/android/server/am/CompatModePackages.java rename to services/core/java/com/android/server/am/CompatModePackages.java diff --git a/services/java/com/android/server/am/ConnectionRecord.java b/services/core/java/com/android/server/am/ConnectionRecord.java similarity index 100% rename from services/java/com/android/server/am/ConnectionRecord.java rename to services/core/java/com/android/server/am/ConnectionRecord.java diff --git a/services/java/com/android/server/am/ContentProviderConnection.java b/services/core/java/com/android/server/am/ContentProviderConnection.java similarity index 100% rename from services/java/com/android/server/am/ContentProviderConnection.java rename to services/core/java/com/android/server/am/ContentProviderConnection.java diff --git a/services/java/com/android/server/am/ContentProviderRecord.java b/services/core/java/com/android/server/am/ContentProviderRecord.java similarity index 100% rename from services/java/com/android/server/am/ContentProviderRecord.java rename to services/core/java/com/android/server/am/ContentProviderRecord.java diff --git a/services/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java similarity index 100% rename from services/java/com/android/server/am/CoreSettingsObserver.java rename to services/core/java/com/android/server/am/CoreSettingsObserver.java diff --git a/services/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags similarity index 100% rename from services/java/com/android/server/am/EventLogTags.logtags rename to services/core/java/com/android/server/am/EventLogTags.logtags diff --git a/services/java/com/android/server/am/FactoryErrorDialog.java b/services/core/java/com/android/server/am/FactoryErrorDialog.java similarity index 100% rename from services/java/com/android/server/am/FactoryErrorDialog.java rename to services/core/java/com/android/server/am/FactoryErrorDialog.java diff --git a/services/java/com/android/server/am/IntentBindRecord.java b/services/core/java/com/android/server/am/IntentBindRecord.java similarity index 100% rename from services/java/com/android/server/am/IntentBindRecord.java rename to services/core/java/com/android/server/am/IntentBindRecord.java diff --git a/services/java/com/android/server/am/LaunchWarningWindow.java b/services/core/java/com/android/server/am/LaunchWarningWindow.java similarity index 100% rename from services/java/com/android/server/am/LaunchWarningWindow.java rename to services/core/java/com/android/server/am/LaunchWarningWindow.java diff --git a/services/java/com/android/server/am/NativeCrashListener.java b/services/core/java/com/android/server/am/NativeCrashListener.java similarity index 100% rename from services/java/com/android/server/am/NativeCrashListener.java rename to services/core/java/com/android/server/am/NativeCrashListener.java diff --git a/services/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java similarity index 100% rename from services/java/com/android/server/am/PendingIntentRecord.java rename to services/core/java/com/android/server/am/PendingIntentRecord.java diff --git a/services/java/com/android/server/am/PendingThumbnailsRecord.java b/services/core/java/com/android/server/am/PendingThumbnailsRecord.java similarity index 100% rename from services/java/com/android/server/am/PendingThumbnailsRecord.java rename to services/core/java/com/android/server/am/PendingThumbnailsRecord.java diff --git a/services/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java similarity index 100% rename from services/java/com/android/server/am/ProcessList.java rename to services/core/java/com/android/server/am/ProcessList.java diff --git a/services/java/com/android/server/am/ProcessMemInfo.java b/services/core/java/com/android/server/am/ProcessMemInfo.java similarity index 100% rename from services/java/com/android/server/am/ProcessMemInfo.java rename to services/core/java/com/android/server/am/ProcessMemInfo.java diff --git a/services/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java similarity index 100% rename from services/java/com/android/server/am/ProcessRecord.java rename to services/core/java/com/android/server/am/ProcessRecord.java diff --git a/services/java/com/android/server/am/ProcessStatsService.java b/services/core/java/com/android/server/am/ProcessStatsService.java similarity index 100% rename from services/java/com/android/server/am/ProcessStatsService.java rename to services/core/java/com/android/server/am/ProcessStatsService.java diff --git a/services/java/com/android/server/am/ProviderMap.java b/services/core/java/com/android/server/am/ProviderMap.java similarity index 100% rename from services/java/com/android/server/am/ProviderMap.java rename to services/core/java/com/android/server/am/ProviderMap.java diff --git a/services/java/com/android/server/am/ReceiverList.java b/services/core/java/com/android/server/am/ReceiverList.java similarity index 100% rename from services/java/com/android/server/am/ReceiverList.java rename to services/core/java/com/android/server/am/ReceiverList.java diff --git a/services/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java similarity index 100% rename from services/java/com/android/server/am/ServiceRecord.java rename to services/core/java/com/android/server/am/ServiceRecord.java diff --git a/services/java/com/android/server/am/StrictModeViolationDialog.java b/services/core/java/com/android/server/am/StrictModeViolationDialog.java similarity index 100% rename from services/java/com/android/server/am/StrictModeViolationDialog.java rename to services/core/java/com/android/server/am/StrictModeViolationDialog.java diff --git a/services/java/com/android/server/am/TaskAccessInfo.java b/services/core/java/com/android/server/am/TaskAccessInfo.java similarity index 100% rename from services/java/com/android/server/am/TaskAccessInfo.java rename to services/core/java/com/android/server/am/TaskAccessInfo.java diff --git a/services/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java similarity index 100% rename from services/java/com/android/server/am/TaskRecord.java rename to services/core/java/com/android/server/am/TaskRecord.java diff --git a/services/java/com/android/server/am/ThumbnailHolder.java b/services/core/java/com/android/server/am/ThumbnailHolder.java similarity index 100% rename from services/java/com/android/server/am/ThumbnailHolder.java rename to services/core/java/com/android/server/am/ThumbnailHolder.java diff --git a/services/java/com/android/server/am/UriPermission.java b/services/core/java/com/android/server/am/UriPermission.java similarity index 100% rename from services/java/com/android/server/am/UriPermission.java rename to services/core/java/com/android/server/am/UriPermission.java diff --git a/services/java/com/android/server/am/UriPermissionOwner.java b/services/core/java/com/android/server/am/UriPermissionOwner.java similarity index 100% rename from services/java/com/android/server/am/UriPermissionOwner.java rename to services/core/java/com/android/server/am/UriPermissionOwner.java diff --git a/services/java/com/android/server/am/UsageStatsService.java b/services/core/java/com/android/server/am/UsageStatsService.java similarity index 100% rename from services/java/com/android/server/am/UsageStatsService.java rename to services/core/java/com/android/server/am/UsageStatsService.java diff --git a/services/java/com/android/server/am/UserStartedState.java b/services/core/java/com/android/server/am/UserStartedState.java similarity index 100% rename from services/java/com/android/server/am/UserStartedState.java rename to services/core/java/com/android/server/am/UserStartedState.java diff --git a/services/java/com/android/server/am/package.html b/services/core/java/com/android/server/am/package.html similarity index 100% rename from services/java/com/android/server/am/package.html rename to services/core/java/com/android/server/am/package.html diff --git a/services/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java similarity index 100% rename from services/java/com/android/server/clipboard/ClipboardService.java rename to services/core/java/com/android/server/clipboard/ClipboardService.java diff --git a/services/java/com/android/server/connectivity/DataConnectionStats.java b/services/core/java/com/android/server/connectivity/DataConnectionStats.java similarity index 100% rename from services/java/com/android/server/connectivity/DataConnectionStats.java rename to services/core/java/com/android/server/connectivity/DataConnectionStats.java diff --git a/services/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java similarity index 100% rename from services/java/com/android/server/connectivity/Nat464Xlat.java rename to services/core/java/com/android/server/connectivity/Nat464Xlat.java diff --git a/services/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java similarity index 100% rename from services/java/com/android/server/connectivity/PacManager.java rename to services/core/java/com/android/server/connectivity/PacManager.java diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java similarity index 100% rename from services/java/com/android/server/connectivity/Tethering.java rename to services/core/java/com/android/server/connectivity/Tethering.java diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java similarity index 100% rename from services/java/com/android/server/connectivity/Vpn.java rename to services/core/java/com/android/server/connectivity/Vpn.java diff --git a/services/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java similarity index 100% rename from services/java/com/android/server/content/ContentService.java rename to services/core/java/com/android/server/content/ContentService.java diff --git a/services/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java similarity index 100% rename from services/java/com/android/server/content/SyncManager.java rename to services/core/java/com/android/server/content/SyncManager.java diff --git a/services/java/com/android/server/content/SyncOperation.java b/services/core/java/com/android/server/content/SyncOperation.java similarity index 100% rename from services/java/com/android/server/content/SyncOperation.java rename to services/core/java/com/android/server/content/SyncOperation.java diff --git a/services/java/com/android/server/content/SyncQueue.java b/services/core/java/com/android/server/content/SyncQueue.java similarity index 100% rename from services/java/com/android/server/content/SyncQueue.java rename to services/core/java/com/android/server/content/SyncQueue.java diff --git a/services/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java similarity index 100% rename from services/java/com/android/server/content/SyncStorageEngine.java rename to services/core/java/com/android/server/content/SyncStorageEngine.java diff --git a/services/java/com/android/server/display/DisplayAdapter.java b/services/core/java/com/android/server/display/DisplayAdapter.java similarity index 100% rename from services/java/com/android/server/display/DisplayAdapter.java rename to services/core/java/com/android/server/display/DisplayAdapter.java diff --git a/services/java/com/android/server/display/DisplayDevice.java b/services/core/java/com/android/server/display/DisplayDevice.java similarity index 100% rename from services/java/com/android/server/display/DisplayDevice.java rename to services/core/java/com/android/server/display/DisplayDevice.java diff --git a/services/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java similarity index 100% rename from services/java/com/android/server/display/DisplayDeviceInfo.java rename to services/core/java/com/android/server/display/DisplayDeviceInfo.java diff --git a/services/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java similarity index 100% rename from services/java/com/android/server/display/DisplayManagerService.java rename to services/core/java/com/android/server/display/DisplayManagerService.java diff --git a/services/java/com/android/server/display/DisplayTransactionListener.java b/services/core/java/com/android/server/display/DisplayTransactionListener.java similarity index 100% rename from services/java/com/android/server/display/DisplayTransactionListener.java rename to services/core/java/com/android/server/display/DisplayTransactionListener.java diff --git a/services/java/com/android/server/display/DisplayViewport.java b/services/core/java/com/android/server/display/DisplayViewport.java similarity index 100% rename from services/java/com/android/server/display/DisplayViewport.java rename to services/core/java/com/android/server/display/DisplayViewport.java diff --git a/services/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java similarity index 100% rename from services/java/com/android/server/display/LocalDisplayAdapter.java rename to services/core/java/com/android/server/display/LocalDisplayAdapter.java diff --git a/services/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java similarity index 100% rename from services/java/com/android/server/display/LogicalDisplay.java rename to services/core/java/com/android/server/display/LogicalDisplay.java diff --git a/services/java/com/android/server/display/OverlayDisplayAdapter.java b/services/core/java/com/android/server/display/OverlayDisplayAdapter.java similarity index 100% rename from services/java/com/android/server/display/OverlayDisplayAdapter.java rename to services/core/java/com/android/server/display/OverlayDisplayAdapter.java diff --git a/services/java/com/android/server/display/OverlayDisplayWindow.java b/services/core/java/com/android/server/display/OverlayDisplayWindow.java similarity index 100% rename from services/java/com/android/server/display/OverlayDisplayWindow.java rename to services/core/java/com/android/server/display/OverlayDisplayWindow.java diff --git a/services/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java similarity index 100% rename from services/java/com/android/server/display/PersistentDataStore.java rename to services/core/java/com/android/server/display/PersistentDataStore.java diff --git a/services/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java similarity index 100% rename from services/java/com/android/server/display/VirtualDisplayAdapter.java rename to services/core/java/com/android/server/display/VirtualDisplayAdapter.java diff --git a/services/java/com/android/server/display/WifiDisplayAdapter.java b/services/core/java/com/android/server/display/WifiDisplayAdapter.java similarity index 100% rename from services/java/com/android/server/display/WifiDisplayAdapter.java rename to services/core/java/com/android/server/display/WifiDisplayAdapter.java diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/core/java/com/android/server/display/WifiDisplayController.java similarity index 100% rename from services/java/com/android/server/display/WifiDisplayController.java rename to services/core/java/com/android/server/display/WifiDisplayController.java diff --git a/services/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java similarity index 100% rename from services/java/com/android/server/dreams/DreamController.java rename to services/core/java/com/android/server/dreams/DreamController.java diff --git a/services/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java similarity index 100% rename from services/java/com/android/server/dreams/DreamManagerService.java rename to services/core/java/com/android/server/dreams/DreamManagerService.java diff --git a/services/java/com/android/server/firewall/AndFilter.java b/services/core/java/com/android/server/firewall/AndFilter.java similarity index 100% rename from services/java/com/android/server/firewall/AndFilter.java rename to services/core/java/com/android/server/firewall/AndFilter.java diff --git a/services/java/com/android/server/firewall/CategoryFilter.java b/services/core/java/com/android/server/firewall/CategoryFilter.java similarity index 100% rename from services/java/com/android/server/firewall/CategoryFilter.java rename to services/core/java/com/android/server/firewall/CategoryFilter.java diff --git a/services/java/com/android/server/firewall/Filter.java b/services/core/java/com/android/server/firewall/Filter.java similarity index 100% rename from services/java/com/android/server/firewall/Filter.java rename to services/core/java/com/android/server/firewall/Filter.java diff --git a/services/java/com/android/server/firewall/FilterFactory.java b/services/core/java/com/android/server/firewall/FilterFactory.java similarity index 100% rename from services/java/com/android/server/firewall/FilterFactory.java rename to services/core/java/com/android/server/firewall/FilterFactory.java diff --git a/services/java/com/android/server/firewall/FilterList.java b/services/core/java/com/android/server/firewall/FilterList.java similarity index 100% rename from services/java/com/android/server/firewall/FilterList.java rename to services/core/java/com/android/server/firewall/FilterList.java diff --git a/services/java/com/android/server/firewall/IntentFirewall.java b/services/core/java/com/android/server/firewall/IntentFirewall.java similarity index 100% rename from services/java/com/android/server/firewall/IntentFirewall.java rename to services/core/java/com/android/server/firewall/IntentFirewall.java diff --git a/services/java/com/android/server/firewall/NotFilter.java b/services/core/java/com/android/server/firewall/NotFilter.java similarity index 100% rename from services/java/com/android/server/firewall/NotFilter.java rename to services/core/java/com/android/server/firewall/NotFilter.java diff --git a/services/java/com/android/server/firewall/OrFilter.java b/services/core/java/com/android/server/firewall/OrFilter.java similarity index 100% rename from services/java/com/android/server/firewall/OrFilter.java rename to services/core/java/com/android/server/firewall/OrFilter.java diff --git a/services/java/com/android/server/firewall/PortFilter.java b/services/core/java/com/android/server/firewall/PortFilter.java similarity index 100% rename from services/java/com/android/server/firewall/PortFilter.java rename to services/core/java/com/android/server/firewall/PortFilter.java diff --git a/services/java/com/android/server/firewall/SenderFilter.java b/services/core/java/com/android/server/firewall/SenderFilter.java similarity index 100% rename from services/java/com/android/server/firewall/SenderFilter.java rename to services/core/java/com/android/server/firewall/SenderFilter.java diff --git a/services/java/com/android/server/firewall/SenderPermissionFilter.java b/services/core/java/com/android/server/firewall/SenderPermissionFilter.java similarity index 100% rename from services/java/com/android/server/firewall/SenderPermissionFilter.java rename to services/core/java/com/android/server/firewall/SenderPermissionFilter.java diff --git a/services/java/com/android/server/firewall/StringFilter.java b/services/core/java/com/android/server/firewall/StringFilter.java similarity index 100% rename from services/java/com/android/server/firewall/StringFilter.java rename to services/core/java/com/android/server/firewall/StringFilter.java diff --git a/services/java/com/android/server/input/InputApplicationHandle.java b/services/core/java/com/android/server/input/InputApplicationHandle.java similarity index 100% rename from services/java/com/android/server/input/InputApplicationHandle.java rename to services/core/java/com/android/server/input/InputApplicationHandle.java diff --git a/services/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java similarity index 100% rename from services/java/com/android/server/input/InputManagerService.java rename to services/core/java/com/android/server/input/InputManagerService.java diff --git a/services/java/com/android/server/input/InputWindowHandle.java b/services/core/java/com/android/server/input/InputWindowHandle.java similarity index 100% rename from services/java/com/android/server/input/InputWindowHandle.java rename to services/core/java/com/android/server/input/InputWindowHandle.java diff --git a/services/java/com/android/server/input/PersistentDataStore.java b/services/core/java/com/android/server/input/PersistentDataStore.java similarity index 100% rename from services/java/com/android/server/input/PersistentDataStore.java rename to services/core/java/com/android/server/input/PersistentDataStore.java diff --git a/services/java/com/android/server/lights/Light.java b/services/core/java/com/android/server/lights/Light.java similarity index 100% rename from services/java/com/android/server/lights/Light.java rename to services/core/java/com/android/server/lights/Light.java diff --git a/services/java/com/android/server/lights/LightsManager.java b/services/core/java/com/android/server/lights/LightsManager.java similarity index 100% rename from services/java/com/android/server/lights/LightsManager.java rename to services/core/java/com/android/server/lights/LightsManager.java diff --git a/services/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java similarity index 100% rename from services/java/com/android/server/lights/LightsService.java rename to services/core/java/com/android/server/lights/LightsService.java diff --git a/services/java/com/android/server/location/ComprehensiveCountryDetector.java b/services/core/java/com/android/server/location/ComprehensiveCountryDetector.java similarity index 100% rename from services/java/com/android/server/location/ComprehensiveCountryDetector.java rename to services/core/java/com/android/server/location/ComprehensiveCountryDetector.java diff --git a/services/java/com/android/server/location/CountryDetectorBase.java b/services/core/java/com/android/server/location/CountryDetectorBase.java similarity index 100% rename from services/java/com/android/server/location/CountryDetectorBase.java rename to services/core/java/com/android/server/location/CountryDetectorBase.java diff --git a/services/java/com/android/server/location/FlpHardwareProvider.java b/services/core/java/com/android/server/location/FlpHardwareProvider.java similarity index 100% rename from services/java/com/android/server/location/FlpHardwareProvider.java rename to services/core/java/com/android/server/location/FlpHardwareProvider.java diff --git a/services/java/com/android/server/location/FusedLocationHardwareSecure.java b/services/core/java/com/android/server/location/FusedLocationHardwareSecure.java similarity index 100% rename from services/java/com/android/server/location/FusedLocationHardwareSecure.java rename to services/core/java/com/android/server/location/FusedLocationHardwareSecure.java diff --git a/services/java/com/android/server/location/FusedProxy.java b/services/core/java/com/android/server/location/FusedProxy.java similarity index 100% rename from services/java/com/android/server/location/FusedProxy.java rename to services/core/java/com/android/server/location/FusedProxy.java diff --git a/services/java/com/android/server/location/GeocoderProxy.java b/services/core/java/com/android/server/location/GeocoderProxy.java similarity index 100% rename from services/java/com/android/server/location/GeocoderProxy.java rename to services/core/java/com/android/server/location/GeocoderProxy.java diff --git a/services/java/com/android/server/location/GeofenceManager.java b/services/core/java/com/android/server/location/GeofenceManager.java similarity index 100% rename from services/java/com/android/server/location/GeofenceManager.java rename to services/core/java/com/android/server/location/GeofenceManager.java diff --git a/services/java/com/android/server/location/GeofenceProxy.java b/services/core/java/com/android/server/location/GeofenceProxy.java similarity index 100% rename from services/java/com/android/server/location/GeofenceProxy.java rename to services/core/java/com/android/server/location/GeofenceProxy.java diff --git a/services/java/com/android/server/location/GeofenceState.java b/services/core/java/com/android/server/location/GeofenceState.java similarity index 100% rename from services/java/com/android/server/location/GeofenceState.java rename to services/core/java/com/android/server/location/GeofenceState.java diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java similarity index 100% rename from services/java/com/android/server/location/GpsLocationProvider.java rename to services/core/java/com/android/server/location/GpsLocationProvider.java diff --git a/services/java/com/android/server/location/GpsXtraDownloader.java b/services/core/java/com/android/server/location/GpsXtraDownloader.java similarity index 100% rename from services/java/com/android/server/location/GpsXtraDownloader.java rename to services/core/java/com/android/server/location/GpsXtraDownloader.java diff --git a/services/java/com/android/server/location/LocationBasedCountryDetector.java b/services/core/java/com/android/server/location/LocationBasedCountryDetector.java similarity index 100% rename from services/java/com/android/server/location/LocationBasedCountryDetector.java rename to services/core/java/com/android/server/location/LocationBasedCountryDetector.java diff --git a/services/java/com/android/server/location/LocationBlacklist.java b/services/core/java/com/android/server/location/LocationBlacklist.java similarity index 100% rename from services/java/com/android/server/location/LocationBlacklist.java rename to services/core/java/com/android/server/location/LocationBlacklist.java diff --git a/services/java/com/android/server/location/LocationFudger.java b/services/core/java/com/android/server/location/LocationFudger.java similarity index 100% rename from services/java/com/android/server/location/LocationFudger.java rename to services/core/java/com/android/server/location/LocationFudger.java diff --git a/services/java/com/android/server/location/LocationProviderInterface.java b/services/core/java/com/android/server/location/LocationProviderInterface.java similarity index 100% rename from services/java/com/android/server/location/LocationProviderInterface.java rename to services/core/java/com/android/server/location/LocationProviderInterface.java diff --git a/services/java/com/android/server/location/LocationProviderProxy.java b/services/core/java/com/android/server/location/LocationProviderProxy.java similarity index 100% rename from services/java/com/android/server/location/LocationProviderProxy.java rename to services/core/java/com/android/server/location/LocationProviderProxy.java diff --git a/services/java/com/android/server/location/MockProvider.java b/services/core/java/com/android/server/location/MockProvider.java similarity index 100% rename from services/java/com/android/server/location/MockProvider.java rename to services/core/java/com/android/server/location/MockProvider.java diff --git a/services/java/com/android/server/location/PassiveProvider.java b/services/core/java/com/android/server/location/PassiveProvider.java similarity index 100% rename from services/java/com/android/server/location/PassiveProvider.java rename to services/core/java/com/android/server/location/PassiveProvider.java diff --git a/services/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java similarity index 100% rename from services/java/com/android/server/media/MediaRouterService.java rename to services/core/java/com/android/server/media/MediaRouterService.java diff --git a/services/java/com/android/server/media/RemoteDisplayProviderProxy.java b/services/core/java/com/android/server/media/RemoteDisplayProviderProxy.java similarity index 100% rename from services/java/com/android/server/media/RemoteDisplayProviderProxy.java rename to services/core/java/com/android/server/media/RemoteDisplayProviderProxy.java diff --git a/services/java/com/android/server/media/RemoteDisplayProviderWatcher.java b/services/core/java/com/android/server/media/RemoteDisplayProviderWatcher.java similarity index 100% rename from services/java/com/android/server/media/RemoteDisplayProviderWatcher.java rename to services/core/java/com/android/server/media/RemoteDisplayProviderWatcher.java diff --git a/services/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java similarity index 100% rename from services/java/com/android/server/net/LockdownVpnTracker.java rename to services/core/java/com/android/server/net/LockdownVpnTracker.java diff --git a/services/java/com/android/server/net/NetworkIdentitySet.java b/services/core/java/com/android/server/net/NetworkIdentitySet.java similarity index 100% rename from services/java/com/android/server/net/NetworkIdentitySet.java rename to services/core/java/com/android/server/net/NetworkIdentitySet.java diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java similarity index 100% rename from services/java/com/android/server/net/NetworkPolicyManagerService.java rename to services/core/java/com/android/server/net/NetworkPolicyManagerService.java diff --git a/services/java/com/android/server/net/NetworkStatsCollection.java b/services/core/java/com/android/server/net/NetworkStatsCollection.java similarity index 100% rename from services/java/com/android/server/net/NetworkStatsCollection.java rename to services/core/java/com/android/server/net/NetworkStatsCollection.java diff --git a/services/java/com/android/server/net/NetworkStatsRecorder.java b/services/core/java/com/android/server/net/NetworkStatsRecorder.java similarity index 100% rename from services/java/com/android/server/net/NetworkStatsRecorder.java rename to services/core/java/com/android/server/net/NetworkStatsRecorder.java diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java similarity index 100% rename from services/java/com/android/server/net/NetworkStatsService.java rename to services/core/java/com/android/server/net/NetworkStatsService.java diff --git a/services/java/com/android/server/notification/NotificationDelegate.java b/services/core/java/com/android/server/notification/NotificationDelegate.java similarity index 100% rename from services/java/com/android/server/notification/NotificationDelegate.java rename to services/core/java/com/android/server/notification/NotificationDelegate.java diff --git a/services/java/com/android/server/notification/NotificationManagerInternal.java b/services/core/java/com/android/server/notification/NotificationManagerInternal.java similarity index 100% rename from services/java/com/android/server/notification/NotificationManagerInternal.java rename to services/core/java/com/android/server/notification/NotificationManagerInternal.java diff --git a/services/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java similarity index 100% rename from services/java/com/android/server/notification/NotificationManagerService.java rename to services/core/java/com/android/server/notification/NotificationManagerService.java diff --git a/services/java/com/android/server/os/SchedulingPolicyService.java b/services/core/java/com/android/server/os/SchedulingPolicyService.java similarity index 100% rename from services/java/com/android/server/os/SchedulingPolicyService.java rename to services/core/java/com/android/server/os/SchedulingPolicyService.java diff --git a/services/java/com/android/server/pm/BasePermission.java b/services/core/java/com/android/server/pm/BasePermission.java similarity index 100% rename from services/java/com/android/server/pm/BasePermission.java rename to services/core/java/com/android/server/pm/BasePermission.java diff --git a/services/java/com/android/server/pm/GrantedPermissions.java b/services/core/java/com/android/server/pm/GrantedPermissions.java similarity index 100% rename from services/java/com/android/server/pm/GrantedPermissions.java rename to services/core/java/com/android/server/pm/GrantedPermissions.java diff --git a/services/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java similarity index 100% rename from services/java/com/android/server/pm/Installer.java rename to services/core/java/com/android/server/pm/Installer.java diff --git a/services/java/com/android/server/pm/KeySetManager.java b/services/core/java/com/android/server/pm/KeySetManager.java similarity index 100% rename from services/java/com/android/server/pm/KeySetManager.java rename to services/core/java/com/android/server/pm/KeySetManager.java diff --git a/services/java/com/android/server/pm/PackageKeySetData.java b/services/core/java/com/android/server/pm/PackageKeySetData.java similarity index 100% rename from services/java/com/android/server/pm/PackageKeySetData.java rename to services/core/java/com/android/server/pm/PackageKeySetData.java diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java similarity index 100% rename from services/java/com/android/server/pm/PackageManagerService.java rename to services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java similarity index 100% rename from services/java/com/android/server/pm/PackageSetting.java rename to services/core/java/com/android/server/pm/PackageSetting.java diff --git a/services/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java similarity index 100% rename from services/java/com/android/server/pm/PackageSettingBase.java rename to services/core/java/com/android/server/pm/PackageSettingBase.java diff --git a/services/java/com/android/server/pm/PackageSignatures.java b/services/core/java/com/android/server/pm/PackageSignatures.java similarity index 100% rename from services/java/com/android/server/pm/PackageSignatures.java rename to services/core/java/com/android/server/pm/PackageSignatures.java diff --git a/services/java/com/android/server/pm/PackageVerificationResponse.java b/services/core/java/com/android/server/pm/PackageVerificationResponse.java similarity index 100% rename from services/java/com/android/server/pm/PackageVerificationResponse.java rename to services/core/java/com/android/server/pm/PackageVerificationResponse.java diff --git a/services/java/com/android/server/pm/PackageVerificationState.java b/services/core/java/com/android/server/pm/PackageVerificationState.java similarity index 100% rename from services/java/com/android/server/pm/PackageVerificationState.java rename to services/core/java/com/android/server/pm/PackageVerificationState.java diff --git a/services/java/com/android/server/pm/PendingPackage.java b/services/core/java/com/android/server/pm/PendingPackage.java similarity index 100% rename from services/java/com/android/server/pm/PendingPackage.java rename to services/core/java/com/android/server/pm/PendingPackage.java diff --git a/services/java/com/android/server/pm/PreferredActivity.java b/services/core/java/com/android/server/pm/PreferredActivity.java similarity index 100% rename from services/java/com/android/server/pm/PreferredActivity.java rename to services/core/java/com/android/server/pm/PreferredActivity.java diff --git a/services/java/com/android/server/pm/PreferredComponent.java b/services/core/java/com/android/server/pm/PreferredComponent.java similarity index 100% rename from services/java/com/android/server/pm/PreferredComponent.java rename to services/core/java/com/android/server/pm/PreferredComponent.java diff --git a/services/java/com/android/server/pm/PreferredIntentResolver.java b/services/core/java/com/android/server/pm/PreferredIntentResolver.java similarity index 100% rename from services/java/com/android/server/pm/PreferredIntentResolver.java rename to services/core/java/com/android/server/pm/PreferredIntentResolver.java diff --git a/services/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java similarity index 100% rename from services/java/com/android/server/pm/SELinuxMMAC.java rename to services/core/java/com/android/server/pm/SELinuxMMAC.java diff --git a/services/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java similarity index 100% rename from services/java/com/android/server/pm/Settings.java rename to services/core/java/com/android/server/pm/Settings.java diff --git a/services/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java similarity index 100% rename from services/java/com/android/server/pm/SharedUserSetting.java rename to services/core/java/com/android/server/pm/SharedUserSetting.java diff --git a/services/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java similarity index 100% rename from services/java/com/android/server/pm/UserManagerService.java rename to services/core/java/com/android/server/pm/UserManagerService.java diff --git a/services/java/com/android/server/power/DisplayBlanker.java b/services/core/java/com/android/server/power/DisplayBlanker.java similarity index 100% rename from services/java/com/android/server/power/DisplayBlanker.java rename to services/core/java/com/android/server/power/DisplayBlanker.java diff --git a/services/java/com/android/server/power/DisplayPowerController.java b/services/core/java/com/android/server/power/DisplayPowerController.java similarity index 100% rename from services/java/com/android/server/power/DisplayPowerController.java rename to services/core/java/com/android/server/power/DisplayPowerController.java diff --git a/services/java/com/android/server/power/DisplayPowerRequest.java b/services/core/java/com/android/server/power/DisplayPowerRequest.java similarity index 100% rename from services/java/com/android/server/power/DisplayPowerRequest.java rename to services/core/java/com/android/server/power/DisplayPowerRequest.java diff --git a/services/java/com/android/server/power/DisplayPowerState.java b/services/core/java/com/android/server/power/DisplayPowerState.java similarity index 100% rename from services/java/com/android/server/power/DisplayPowerState.java rename to services/core/java/com/android/server/power/DisplayPowerState.java diff --git a/services/java/com/android/server/power/ElectronBeam.java b/services/core/java/com/android/server/power/ElectronBeam.java similarity index 100% rename from services/java/com/android/server/power/ElectronBeam.java rename to services/core/java/com/android/server/power/ElectronBeam.java diff --git a/services/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java similarity index 100% rename from services/java/com/android/server/power/Notifier.java rename to services/core/java/com/android/server/power/Notifier.java diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java similarity index 100% rename from services/java/com/android/server/power/PowerManagerService.java rename to services/core/java/com/android/server/power/PowerManagerService.java diff --git a/services/java/com/android/server/power/RampAnimator.java b/services/core/java/com/android/server/power/RampAnimator.java similarity index 100% rename from services/java/com/android/server/power/RampAnimator.java rename to services/core/java/com/android/server/power/RampAnimator.java diff --git a/services/java/com/android/server/power/ScreenOnBlocker.java b/services/core/java/com/android/server/power/ScreenOnBlocker.java similarity index 100% rename from services/java/com/android/server/power/ScreenOnBlocker.java rename to services/core/java/com/android/server/power/ScreenOnBlocker.java diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java similarity index 100% rename from services/java/com/android/server/power/ShutdownThread.java rename to services/core/java/com/android/server/power/ShutdownThread.java diff --git a/services/java/com/android/server/power/SuspendBlocker.java b/services/core/java/com/android/server/power/SuspendBlocker.java similarity index 100% rename from services/java/com/android/server/power/SuspendBlocker.java rename to services/core/java/com/android/server/power/SuspendBlocker.java diff --git a/services/java/com/android/server/power/WirelessChargerDetector.java b/services/core/java/com/android/server/power/WirelessChargerDetector.java similarity index 100% rename from services/java/com/android/server/power/WirelessChargerDetector.java rename to services/core/java/com/android/server/power/WirelessChargerDetector.java diff --git a/services/java/com/android/server/search/SearchManagerService.java b/services/core/java/com/android/server/search/SearchManagerService.java similarity index 100% rename from services/java/com/android/server/search/SearchManagerService.java rename to services/core/java/com/android/server/search/SearchManagerService.java diff --git a/services/java/com/android/server/search/Searchables.java b/services/core/java/com/android/server/search/Searchables.java similarity index 100% rename from services/java/com/android/server/search/Searchables.java rename to services/core/java/com/android/server/search/Searchables.java diff --git a/services/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java similarity index 100% rename from services/java/com/android/server/statusbar/StatusBarManagerInternal.java rename to services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java diff --git a/services/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java similarity index 100% rename from services/java/com/android/server/statusbar/StatusBarManagerService.java rename to services/core/java/com/android/server/statusbar/StatusBarManagerService.java diff --git a/services/java/com/android/server/storage/DeviceStorageMonitorInternal.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorInternal.java similarity index 100% rename from services/java/com/android/server/storage/DeviceStorageMonitorInternal.java rename to services/core/java/com/android/server/storage/DeviceStorageMonitorInternal.java diff --git a/services/java/com/android/server/storage/DeviceStorageMonitorService.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java similarity index 100% rename from services/java/com/android/server/storage/DeviceStorageMonitorService.java rename to services/core/java/com/android/server/storage/DeviceStorageMonitorService.java diff --git a/services/java/com/android/server/twilight/TwilightListener.java b/services/core/java/com/android/server/twilight/TwilightListener.java similarity index 100% rename from services/java/com/android/server/twilight/TwilightListener.java rename to services/core/java/com/android/server/twilight/TwilightListener.java diff --git a/services/java/com/android/server/twilight/TwilightManager.java b/services/core/java/com/android/server/twilight/TwilightManager.java similarity index 100% rename from services/java/com/android/server/twilight/TwilightManager.java rename to services/core/java/com/android/server/twilight/TwilightManager.java diff --git a/services/java/com/android/server/twilight/TwilightService.java b/services/core/java/com/android/server/twilight/TwilightService.java similarity index 100% rename from services/java/com/android/server/twilight/TwilightService.java rename to services/core/java/com/android/server/twilight/TwilightService.java diff --git a/services/java/com/android/server/twilight/TwilightState.java b/services/core/java/com/android/server/twilight/TwilightState.java similarity index 100% rename from services/java/com/android/server/twilight/TwilightState.java rename to services/core/java/com/android/server/twilight/TwilightState.java diff --git a/services/java/com/android/server/updates/CarrierProvisioningUrlsInstallReceiver.java b/services/core/java/com/android/server/updates/CarrierProvisioningUrlsInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/CarrierProvisioningUrlsInstallReceiver.java rename to services/core/java/com/android/server/updates/CarrierProvisioningUrlsInstallReceiver.java diff --git a/services/java/com/android/server/updates/CertPinInstallReceiver.java b/services/core/java/com/android/server/updates/CertPinInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/CertPinInstallReceiver.java rename to services/core/java/com/android/server/updates/CertPinInstallReceiver.java diff --git a/services/java/com/android/server/updates/ConfigUpdateInstallReceiver.java b/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/ConfigUpdateInstallReceiver.java rename to services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java diff --git a/services/java/com/android/server/updates/IntentFirewallInstallReceiver.java b/services/core/java/com/android/server/updates/IntentFirewallInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/IntentFirewallInstallReceiver.java rename to services/core/java/com/android/server/updates/IntentFirewallInstallReceiver.java diff --git a/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java b/services/core/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java rename to services/core/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java diff --git a/services/java/com/android/server/updates/SmsShortCodesInstallReceiver.java b/services/core/java/com/android/server/updates/SmsShortCodesInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/SmsShortCodesInstallReceiver.java rename to services/core/java/com/android/server/updates/SmsShortCodesInstallReceiver.java diff --git a/services/java/com/android/server/updates/TZInfoInstallReceiver.java b/services/core/java/com/android/server/updates/TZInfoInstallReceiver.java similarity index 100% rename from services/java/com/android/server/updates/TZInfoInstallReceiver.java rename to services/core/java/com/android/server/updates/TZInfoInstallReceiver.java diff --git a/services/java/com/android/server/usb/UsbDebuggingManager.java b/services/core/java/com/android/server/usb/UsbDebuggingManager.java similarity index 100% rename from services/java/com/android/server/usb/UsbDebuggingManager.java rename to services/core/java/com/android/server/usb/UsbDebuggingManager.java diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/core/java/com/android/server/usb/UsbDeviceManager.java similarity index 100% rename from services/java/com/android/server/usb/UsbDeviceManager.java rename to services/core/java/com/android/server/usb/UsbDeviceManager.java diff --git a/services/java/com/android/server/usb/UsbHostManager.java b/services/core/java/com/android/server/usb/UsbHostManager.java similarity index 100% rename from services/java/com/android/server/usb/UsbHostManager.java rename to services/core/java/com/android/server/usb/UsbHostManager.java diff --git a/services/java/com/android/server/usb/UsbService.java b/services/core/java/com/android/server/usb/UsbService.java similarity index 100% rename from services/java/com/android/server/usb/UsbService.java rename to services/core/java/com/android/server/usb/UsbService.java diff --git a/services/java/com/android/server/usb/UsbSettingsManager.java b/services/core/java/com/android/server/usb/UsbSettingsManager.java similarity index 100% rename from services/java/com/android/server/usb/UsbSettingsManager.java rename to services/core/java/com/android/server/usb/UsbSettingsManager.java diff --git a/services/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java similarity index 100% rename from services/java/com/android/server/wallpaper/WallpaperManagerService.java rename to services/core/java/com/android/server/wallpaper/WallpaperManagerService.java diff --git a/services/java/com/android/server/wifi/README.txt b/services/core/java/com/android/server/wifi/README.txt similarity index 100% rename from services/java/com/android/server/wifi/README.txt rename to services/core/java/com/android/server/wifi/README.txt diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/core/java/com/android/server/wifi/WifiController.java similarity index 100% rename from services/java/com/android/server/wifi/WifiController.java rename to services/core/java/com/android/server/wifi/WifiController.java diff --git a/services/java/com/android/server/wifi/WifiNotificationController.java b/services/core/java/com/android/server/wifi/WifiNotificationController.java similarity index 100% rename from services/java/com/android/server/wifi/WifiNotificationController.java rename to services/core/java/com/android/server/wifi/WifiNotificationController.java diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/core/java/com/android/server/wifi/WifiService.java similarity index 100% rename from services/java/com/android/server/wifi/WifiService.java rename to services/core/java/com/android/server/wifi/WifiService.java diff --git a/services/java/com/android/server/wifi/WifiSettingsStore.java b/services/core/java/com/android/server/wifi/WifiSettingsStore.java similarity index 100% rename from services/java/com/android/server/wifi/WifiSettingsStore.java rename to services/core/java/com/android/server/wifi/WifiSettingsStore.java diff --git a/services/java/com/android/server/wifi/WifiTrafficPoller.java b/services/core/java/com/android/server/wifi/WifiTrafficPoller.java similarity index 100% rename from services/java/com/android/server/wifi/WifiTrafficPoller.java rename to services/core/java/com/android/server/wifi/WifiTrafficPoller.java diff --git a/services/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java similarity index 100% rename from services/java/com/android/server/wm/AppTransition.java rename to services/core/java/com/android/server/wm/AppTransition.java diff --git a/services/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java similarity index 100% rename from services/java/com/android/server/wm/AppWindowAnimator.java rename to services/core/java/com/android/server/wm/AppWindowAnimator.java diff --git a/services/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java similarity index 100% rename from services/java/com/android/server/wm/AppWindowToken.java rename to services/core/java/com/android/server/wm/AppWindowToken.java diff --git a/services/java/com/android/server/wm/BlackFrame.java b/services/core/java/com/android/server/wm/BlackFrame.java similarity index 100% rename from services/java/com/android/server/wm/BlackFrame.java rename to services/core/java/com/android/server/wm/BlackFrame.java diff --git a/services/java/com/android/server/wm/DimLayer.java b/services/core/java/com/android/server/wm/DimLayer.java similarity index 100% rename from services/java/com/android/server/wm/DimLayer.java rename to services/core/java/com/android/server/wm/DimLayer.java diff --git a/services/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java similarity index 100% rename from services/java/com/android/server/wm/DisplayContent.java rename to services/core/java/com/android/server/wm/DisplayContent.java diff --git a/services/java/com/android/server/wm/DisplayMagnifier.java b/services/core/java/com/android/server/wm/DisplayMagnifier.java similarity index 100% rename from services/java/com/android/server/wm/DisplayMagnifier.java rename to services/core/java/com/android/server/wm/DisplayMagnifier.java diff --git a/services/java/com/android/server/wm/DisplaySettings.java b/services/core/java/com/android/server/wm/DisplaySettings.java similarity index 100% rename from services/java/com/android/server/wm/DisplaySettings.java rename to services/core/java/com/android/server/wm/DisplaySettings.java diff --git a/services/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java similarity index 100% rename from services/java/com/android/server/wm/DragState.java rename to services/core/java/com/android/server/wm/DragState.java diff --git a/services/java/com/android/server/wm/FakeWindowImpl.java b/services/core/java/com/android/server/wm/FakeWindowImpl.java similarity index 100% rename from services/java/com/android/server/wm/FakeWindowImpl.java rename to services/core/java/com/android/server/wm/FakeWindowImpl.java diff --git a/services/java/com/android/server/wm/FocusedStackFrame.java b/services/core/java/com/android/server/wm/FocusedStackFrame.java similarity index 100% rename from services/java/com/android/server/wm/FocusedStackFrame.java rename to services/core/java/com/android/server/wm/FocusedStackFrame.java diff --git a/services/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java similarity index 100% rename from services/java/com/android/server/wm/InputMonitor.java rename to services/core/java/com/android/server/wm/InputMonitor.java diff --git a/services/java/com/android/server/wm/KeyguardDisableHandler.java b/services/core/java/com/android/server/wm/KeyguardDisableHandler.java similarity index 100% rename from services/java/com/android/server/wm/KeyguardDisableHandler.java rename to services/core/java/com/android/server/wm/KeyguardDisableHandler.java diff --git a/services/java/com/android/server/wm/PointerEventDispatcher.java b/services/core/java/com/android/server/wm/PointerEventDispatcher.java similarity index 100% rename from services/java/com/android/server/wm/PointerEventDispatcher.java rename to services/core/java/com/android/server/wm/PointerEventDispatcher.java diff --git a/services/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java similarity index 100% rename from services/java/com/android/server/wm/ScreenRotationAnimation.java rename to services/core/java/com/android/server/wm/ScreenRotationAnimation.java diff --git a/services/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java similarity index 100% rename from services/java/com/android/server/wm/Session.java rename to services/core/java/com/android/server/wm/Session.java diff --git a/services/java/com/android/server/wm/StackTapPointerEventListener.java b/services/core/java/com/android/server/wm/StackTapPointerEventListener.java similarity index 100% rename from services/java/com/android/server/wm/StackTapPointerEventListener.java rename to services/core/java/com/android/server/wm/StackTapPointerEventListener.java diff --git a/services/java/com/android/server/wm/StartingData.java b/services/core/java/com/android/server/wm/StartingData.java similarity index 100% rename from services/java/com/android/server/wm/StartingData.java rename to services/core/java/com/android/server/wm/StartingData.java diff --git a/services/java/com/android/server/wm/StrictModeFlash.java b/services/core/java/com/android/server/wm/StrictModeFlash.java similarity index 100% rename from services/java/com/android/server/wm/StrictModeFlash.java rename to services/core/java/com/android/server/wm/StrictModeFlash.java diff --git a/services/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java similarity index 100% rename from services/java/com/android/server/wm/Task.java rename to services/core/java/com/android/server/wm/Task.java diff --git a/services/java/com/android/server/wm/TaskGroup.java b/services/core/java/com/android/server/wm/TaskGroup.java similarity index 100% rename from services/java/com/android/server/wm/TaskGroup.java rename to services/core/java/com/android/server/wm/TaskGroup.java diff --git a/services/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java similarity index 100% rename from services/java/com/android/server/wm/TaskStack.java rename to services/core/java/com/android/server/wm/TaskStack.java diff --git a/services/java/com/android/server/wm/ViewServer.java b/services/core/java/com/android/server/wm/ViewServer.java similarity index 100% rename from services/java/com/android/server/wm/ViewServer.java rename to services/core/java/com/android/server/wm/ViewServer.java diff --git a/services/java/com/android/server/wm/Watermark.java b/services/core/java/com/android/server/wm/Watermark.java similarity index 100% rename from services/java/com/android/server/wm/Watermark.java rename to services/core/java/com/android/server/wm/Watermark.java diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java similarity index 100% rename from services/java/com/android/server/wm/WindowAnimator.java rename to services/core/java/com/android/server/wm/WindowAnimator.java diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java similarity index 100% rename from services/java/com/android/server/wm/WindowManagerService.java rename to services/core/java/com/android/server/wm/WindowManagerService.java diff --git a/services/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java similarity index 100% rename from services/java/com/android/server/wm/WindowState.java rename to services/core/java/com/android/server/wm/WindowState.java diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java similarity index 100% rename from services/java/com/android/server/wm/WindowStateAnimator.java rename to services/core/java/com/android/server/wm/WindowStateAnimator.java diff --git a/services/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java similarity index 100% rename from services/java/com/android/server/wm/WindowToken.java rename to services/core/java/com/android/server/wm/WindowToken.java diff --git a/services/core/java/service.mk b/services/core/java/service.mk new file mode 100644 index 0000000000000..4cb411bc4d25c --- /dev/null +++ b/services/core/java/service.mk @@ -0,0 +1,6 @@ +SUB_DIR := core/java + +LOCAL_SRC_FILES += \ + $(call all-java-files-under,$(SUB_DIR)) \ + $(SUB_DIR)/com/android/server/EventLogTags.logtags \ + $(SUB_DIR)/com/android/server/am/EventLogTags.logtags diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk new file mode 100644 index 0000000000000..1a3ce639c015d --- /dev/null +++ b/services/core/jni/Android.mk @@ -0,0 +1,56 @@ +# This file is included by the top level services directory to collect source +# files +LOCAL_REL_DIR := core/jni + +LOCAL_SRC_FILES += \ + $(LOCAL_REL_DIR)/com_android_server_AlarmManagerService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_AssetAtlasService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_ConsumerIrService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_input_InputApplicationHandle.cpp \ + $(LOCAL_REL_DIR)/com_android_server_input_InputManagerService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_input_InputWindowHandle.cpp \ + $(LOCAL_REL_DIR)/com_android_server_lights_LightsService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_power_PowerManagerService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_SerialService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_SystemServer.cpp \ + $(LOCAL_REL_DIR)/com_android_server_UsbDeviceManager.cpp \ + $(LOCAL_REL_DIR)/com_android_server_UsbHostManager.cpp \ + $(LOCAL_REL_DIR)/com_android_server_VibratorService.cpp \ + $(LOCAL_REL_DIR)/com_android_server_location_GpsLocationProvider.cpp \ + $(LOCAL_REL_DIR)/com_android_server_location_FlpHardwareProvider.cpp \ + $(LOCAL_REL_DIR)/com_android_server_connectivity_Vpn.cpp \ + $(LOCAL_REL_DIR)/onload.cpp + +LOCAL_C_INCLUDES += \ + $(JNI_H_INCLUDE) \ + frameworks/base/services \ + frameworks/base/libs \ + frameworks/base/core/jni \ + frameworks/native/services \ + external/skia/include/core \ + libcore/include \ + libcore/include/libsuspend \ + $(call include-path-for, libhardware)/hardware \ + $(call include-path-for, libhardware_legacy)/hardware_legacy \ + +LOCAL_SHARED_LIBRARIES += \ + libandroid_runtime \ + libandroidfw \ + libbinder \ + libcutils \ + liblog \ + libhardware \ + libhardware_legacy \ + libnativehelper \ + libutils \ + libui \ + libinput \ + libinputservice \ + libsensorservice \ + libskia \ + libgui \ + libusbhost \ + libsuspend \ + libEGL \ + libGLESv2 + diff --git a/services/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp similarity index 100% rename from services/jni/com_android_server_AlarmManagerService.cpp rename to services/core/jni/com_android_server_AlarmManagerService.cpp diff --git a/services/jni/com_android_server_AssetAtlasService.cpp b/services/core/jni/com_android_server_AssetAtlasService.cpp similarity index 100% rename from services/jni/com_android_server_AssetAtlasService.cpp rename to services/core/jni/com_android_server_AssetAtlasService.cpp diff --git a/services/jni/com_android_server_ConsumerIrService.cpp b/services/core/jni/com_android_server_ConsumerIrService.cpp similarity index 100% rename from services/jni/com_android_server_ConsumerIrService.cpp rename to services/core/jni/com_android_server_ConsumerIrService.cpp diff --git a/services/jni/com_android_server_SerialService.cpp b/services/core/jni/com_android_server_SerialService.cpp similarity index 100% rename from services/jni/com_android_server_SerialService.cpp rename to services/core/jni/com_android_server_SerialService.cpp diff --git a/services/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp similarity index 100% rename from services/jni/com_android_server_SystemServer.cpp rename to services/core/jni/com_android_server_SystemServer.cpp diff --git a/services/jni/com_android_server_UsbDeviceManager.cpp b/services/core/jni/com_android_server_UsbDeviceManager.cpp similarity index 100% rename from services/jni/com_android_server_UsbDeviceManager.cpp rename to services/core/jni/com_android_server_UsbDeviceManager.cpp diff --git a/services/jni/com_android_server_UsbHostManager.cpp b/services/core/jni/com_android_server_UsbHostManager.cpp similarity index 100% rename from services/jni/com_android_server_UsbHostManager.cpp rename to services/core/jni/com_android_server_UsbHostManager.cpp diff --git a/services/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp similarity index 100% rename from services/jni/com_android_server_VibratorService.cpp rename to services/core/jni/com_android_server_VibratorService.cpp diff --git a/services/jni/com_android_server_connectivity_Vpn.cpp b/services/core/jni/com_android_server_connectivity_Vpn.cpp similarity index 100% rename from services/jni/com_android_server_connectivity_Vpn.cpp rename to services/core/jni/com_android_server_connectivity_Vpn.cpp diff --git a/services/jni/com_android_server_input_InputApplicationHandle.cpp b/services/core/jni/com_android_server_input_InputApplicationHandle.cpp similarity index 100% rename from services/jni/com_android_server_input_InputApplicationHandle.cpp rename to services/core/jni/com_android_server_input_InputApplicationHandle.cpp diff --git a/services/jni/com_android_server_input_InputApplicationHandle.h b/services/core/jni/com_android_server_input_InputApplicationHandle.h similarity index 100% rename from services/jni/com_android_server_input_InputApplicationHandle.h rename to services/core/jni/com_android_server_input_InputApplicationHandle.h diff --git a/services/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp similarity index 100% rename from services/jni/com_android_server_input_InputManagerService.cpp rename to services/core/jni/com_android_server_input_InputManagerService.cpp diff --git a/services/jni/com_android_server_input_InputWindowHandle.cpp b/services/core/jni/com_android_server_input_InputWindowHandle.cpp similarity index 100% rename from services/jni/com_android_server_input_InputWindowHandle.cpp rename to services/core/jni/com_android_server_input_InputWindowHandle.cpp diff --git a/services/jni/com_android_server_input_InputWindowHandle.h b/services/core/jni/com_android_server_input_InputWindowHandle.h similarity index 100% rename from services/jni/com_android_server_input_InputWindowHandle.h rename to services/core/jni/com_android_server_input_InputWindowHandle.h diff --git a/services/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp similarity index 100% rename from services/jni/com_android_server_lights_LightsService.cpp rename to services/core/jni/com_android_server_lights_LightsService.cpp diff --git a/services/jni/com_android_server_location_FlpHardwareProvider.cpp b/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp similarity index 100% rename from services/jni/com_android_server_location_FlpHardwareProvider.cpp rename to services/core/jni/com_android_server_location_FlpHardwareProvider.cpp diff --git a/services/jni/com_android_server_location_GpsLocationProvider.cpp b/services/core/jni/com_android_server_location_GpsLocationProvider.cpp similarity index 100% rename from services/jni/com_android_server_location_GpsLocationProvider.cpp rename to services/core/jni/com_android_server_location_GpsLocationProvider.cpp diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp similarity index 100% rename from services/jni/com_android_server_power_PowerManagerService.cpp rename to services/core/jni/com_android_server_power_PowerManagerService.cpp diff --git a/services/jni/com_android_server_power_PowerManagerService.h b/services/core/jni/com_android_server_power_PowerManagerService.h similarity index 100% rename from services/jni/com_android_server_power_PowerManagerService.h rename to services/core/jni/com_android_server_power_PowerManagerService.h diff --git a/services/jni/onload.cpp b/services/core/jni/onload.cpp similarity index 100% rename from services/jni/onload.cpp rename to services/core/jni/onload.cpp diff --git a/services/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java similarity index 100% rename from services/java/com/android/server/devicepolicy/DevicePolicyManagerService.java rename to services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java diff --git a/services/devicepolicy/java/service.mk b/services/devicepolicy/java/service.mk new file mode 100644 index 0000000000000..e64cc96dedf8e --- /dev/null +++ b/services/devicepolicy/java/service.mk @@ -0,0 +1,11 @@ +# Include only if the service is required +ifneq ($(findstring devicepolicy,$(REQUIRED_SERVICES)),) + +SUB_DIR := devicepolicy/java + +LOCAL_SRC_FILES += \ + $(call all-java-files-under,$(SUB_DIR)) + +#DEFINED_SERVICES += com.android.server.devicepolicy.DevicePolicyManagerService + +endif diff --git a/services/java/Android.mk b/services/java/Android.mk deleted file mode 100644 index 9651239f6db2e..0000000000000 --- a/services/java/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# Build services.jar -# ============================================================ -include $(CLEAR_VARS) - -LOCAL_MODULE:= services -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -LOCAL_SRC_FILES := \ - $(call all-subdir-java-files) \ - com/android/server/EventLogTags.logtags \ - com/android/server/am/EventLogTags.logtags - -LOCAL_JAVA_LIBRARIES := android.policy conscrypt telephony-common - -include $(BUILD_JAVA_LIBRARY) -include $(BUILD_DROIDDOC) diff --git a/services/jni/Android.mk b/services/jni/Android.mk deleted file mode 100644 index a98b1c3b95aeb..0000000000000 --- a/services/jni/Android.mk +++ /dev/null @@ -1,63 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - com_android_server_AlarmManagerService.cpp \ - com_android_server_AssetAtlasService.cpp \ - com_android_server_ConsumerIrService.cpp \ - com_android_server_input_InputApplicationHandle.cpp \ - com_android_server_input_InputManagerService.cpp \ - com_android_server_input_InputWindowHandle.cpp \ - com_android_server_lights_LightsService.cpp \ - com_android_server_power_PowerManagerService.cpp \ - com_android_server_SerialService.cpp \ - com_android_server_SystemServer.cpp \ - com_android_server_UsbDeviceManager.cpp \ - com_android_server_UsbHostManager.cpp \ - com_android_server_VibratorService.cpp \ - com_android_server_location_GpsLocationProvider.cpp \ - com_android_server_location_FlpHardwareProvider.cpp \ - com_android_server_connectivity_Vpn.cpp \ - onload.cpp - -LOCAL_C_INCLUDES += \ - $(JNI_H_INCLUDE) \ - frameworks/base/services \ - frameworks/base/core/jni \ - frameworks/native/services \ - external/skia/include/core \ - libcore/include \ - libcore/include/libsuspend \ - $(call include-path-for, libhardware)/hardware \ - $(call include-path-for, libhardware_legacy)/hardware_legacy \ - -LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime \ - libandroidfw \ - libbinder \ - libcutils \ - liblog \ - libhardware \ - libhardware_legacy \ - libnativehelper \ - libutils \ - libui \ - libinput \ - libinputservice \ - libsensorservice \ - libskia \ - libgui \ - libusbhost \ - libsuspend \ - libEGL \ - libGLESv2 - -LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES - -ifeq ($(WITH_MALLOC_LEAK_CHECK),true) - LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK -endif - -LOCAL_MODULE:= libandroid_servers - -include $(BUILD_SHARED_LIBRARY) diff --git a/services/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java similarity index 100% rename from services/java/com/android/server/print/PrintManagerService.java rename to services/print/java/com/android/server/print/PrintManagerService.java diff --git a/services/java/com/android/server/print/RemotePrintService.java b/services/print/java/com/android/server/print/RemotePrintService.java similarity index 100% rename from services/java/com/android/server/print/RemotePrintService.java rename to services/print/java/com/android/server/print/RemotePrintService.java diff --git a/services/java/com/android/server/print/RemotePrintSpooler.java b/services/print/java/com/android/server/print/RemotePrintSpooler.java similarity index 100% rename from services/java/com/android/server/print/RemotePrintSpooler.java rename to services/print/java/com/android/server/print/RemotePrintSpooler.java diff --git a/services/java/com/android/server/print/UserState.java b/services/print/java/com/android/server/print/UserState.java similarity index 100% rename from services/java/com/android/server/print/UserState.java rename to services/print/java/com/android/server/print/UserState.java diff --git a/services/print/java/service.mk b/services/print/java/service.mk new file mode 100644 index 0000000000000..cba3612e901a5 --- /dev/null +++ b/services/print/java/service.mk @@ -0,0 +1,11 @@ +# 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