diff options
23 files changed, 55 insertions, 46 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 7809961..b32a729 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -89,7 +89,7 @@ import android.view.WindowManagerPolicy; * This class is created by the initialization routine of the {@link WindowManagerPolicy}, * and runs on its thread. The keyguard UI is created from that thread in the * constructor of this class. The apis may be called from other threads, including the - * {@link com.android.server.InputManager}'s and {@link android.view.WindowManager}'s. + * {@link com.android.server.wm.InputManager}'s and {@link android.view.WindowManager}'s. * Therefore, methods on this class are synchronized, and any action that is pointed * directly to the keyguard UI is posted to a {@link Handler} to ensure it is taken on the UI * thread of the keyguard. diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 51e9b00..44b8590 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -26,7 +26,7 @@ import com.android.internal.view.IInputMethodManager; import com.android.internal.view.IInputMethodSession; import com.android.internal.view.InputBindResult; -import com.android.server.StatusBarManagerService; +import com.android.server.EventLogTags; import org.xmlpull.v1.XmlPullParserException; diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index caf6376..d80a2cd 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -40,7 +40,6 @@ import android.hardware.SensorManager; import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Binder; -import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -50,7 +49,6 @@ import android.os.Power; import android.os.PowerManager; import android.os.Process; import android.os.RemoteException; -import android.os.ServiceManager; import android.os.SystemClock; import android.os.WorkSource; import android.provider.Settings.SettingNotFoundException; @@ -69,14 +67,13 @@ import static android.provider.Settings.System.WINDOW_ANIMATION_SCALE; import static android.provider.Settings.System.TRANSITION_ANIMATION_SCALE; import java.io.FileDescriptor; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.Observable; import java.util.Observer; -class PowerManagerService extends IPowerManager.Stub +public class PowerManagerService extends IPowerManager.Stub implements LocalPowerManager, Watchdog.Monitor { private static final String TAG = "PowerManagerService"; @@ -2689,7 +2686,7 @@ class PowerManagerService extends IPowerManager.Stub } } - void setPolicy(WindowManagerPolicy p) { + public void setPolicy(WindowManagerPolicy p) { synchronized (mLocks) { mPolicy = p; mLocks.notifyAll(); diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java index 5ada77b..8df8177 100644 --- a/services/java/com/android/server/StatusBarManagerService.java +++ b/services/java/com/android/server/StatusBarManagerService.java @@ -39,6 +39,7 @@ import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarIconList; import com.android.internal.statusbar.StatusBarNotification; +import com.android.server.wm.WindowManagerService; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/java/com/android/server/SystemBackupAgent.java b/services/java/com/android/server/SystemBackupAgent.java index a1f43b4..80b0174 100644 --- a/services/java/com/android/server/SystemBackupAgent.java +++ b/services/java/com/android/server/SystemBackupAgent.java @@ -16,6 +16,7 @@ package com.android.server; + import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; import android.app.backup.BackupAgentHelper; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6a6cc2a..52c47e1 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -17,6 +17,7 @@ package com.android.server; import com.android.server.am.ActivityManagerService; +import com.android.server.wm.WindowManagerService; import com.android.internal.app.ShutdownThread; import com.android.internal.os.BinderInternal; import com.android.internal.os.SamplingProfilerIntegration; diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 997e750..b1a6a9a 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -70,8 +70,6 @@ import com.android.internal.content.PackageMonitor; import com.android.internal.service.wallpaper.ImageWallpaper; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.JournaledFile; -import com.android.server.DevicePolicyManagerService.ActiveAdmin; -import com.android.server.DevicePolicyManagerService.MyPackageMonitor; class WallpaperManagerService extends IWallpaperManager.Stub { static final String TAG = "WallpaperService"; diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index f3ccd38..399c19a 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -24,8 +24,8 @@ import com.android.server.ProcessMap; import com.android.server.ProcessStats; import com.android.server.SystemServer; import com.android.server.Watchdog; -import com.android.server.WindowManagerService; import com.android.server.am.ActivityStack.ActivityState; +import com.android.server.wm.WindowManagerService; import dalvik.system.Zygote; diff --git a/services/java/com/android/server/InputApplication.java b/services/java/com/android/server/wm/InputApplication.java index ae09484..e04fd31 100644 --- a/services/java/com/android/server/InputApplication.java +++ b/services/java/com/android/server/wm/InputApplication.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; + /** * Describes input-related application properties for use by the input dispatcher. diff --git a/services/java/com/android/server/InputApplicationHandle.java b/services/java/com/android/server/wm/InputApplicationHandle.java index d396d11..c95e525 100644 --- a/services/java/com/android/server/InputApplicationHandle.java +++ b/services/java/com/android/server/wm/InputApplicationHandle.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; + /** * Functions as a handle for an application that can receive input. diff --git a/services/java/com/android/server/InputManager.java b/services/java/com/android/server/wm/InputManager.java index 8d249ff..80a2a96 100644 --- a/services/java/com/android/server/InputManager.java +++ b/services/java/com/android/server/wm/InputManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; import com.android.internal.util.XmlUtils; diff --git a/services/java/com/android/server/InputWindow.java b/services/java/com/android/server/wm/InputWindow.java index 2c2cdfe..e3eb473 100644 --- a/services/java/com/android/server/InputWindow.java +++ b/services/java/com/android/server/wm/InputWindow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; import android.graphics.Region; import android.view.InputChannel; diff --git a/services/java/com/android/server/InputWindowHandle.java b/services/java/com/android/server/wm/InputWindowHandle.java index 4b92939..cc508c6 100644 --- a/services/java/com/android/server/InputWindowHandle.java +++ b/services/java/com/android/server/wm/InputWindowHandle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; import android.view.WindowManagerPolicy; diff --git a/services/java/com/android/server/InputWindowList.java b/services/java/com/android/server/wm/InputWindowList.java index 1cbb2cc..6077337 100644 --- a/services/java/com/android/server/InputWindowList.java +++ b/services/java/com/android/server/wm/InputWindowList.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; /** diff --git a/services/java/com/android/server/ScreenRotationAnimation.java b/services/java/com/android/server/wm/ScreenRotationAnimation.java index ef00b08..fc9f10e 100644 --- a/services/java/com/android/server/ScreenRotationAnimation.java +++ b/services/java/com/android/server/wm/ScreenRotationAnimation.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package com.android.server; // TODO: use com.android.server.wm, once things move there +package com.android.server.wm; // TODO: use com.android.server.wm, once things move there + import android.content.Context; import android.graphics.Bitmap; diff --git a/services/java/com/android/server/StrictModeFlash.java b/services/java/com/android/server/wm/StrictModeFlash.java index 0a6c625..2aa45ac 100644 --- a/services/java/com/android/server/StrictModeFlash.java +++ b/services/java/com/android/server/wm/StrictModeFlash.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package com.android.server; // TODO: use com.android.server.wm, once things move there +package com.android.server.wm; // TODO: use com.android.server.wm, once things move there + import android.graphics.Canvas; import android.graphics.Color; diff --git a/services/java/com/android/server/ViewServer.java b/services/java/com/android/server/wm/ViewServer.java index 7b5d18a..cebd5e7 100644 --- a/services/java/com/android/server/ViewServer.java +++ b/services/java/com/android/server/wm/ViewServer.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; + import android.util.Slog; @@ -33,7 +34,7 @@ import java.io.OutputStreamWriter; /** * The ViewServer is local socket server that can be used to communicate with the * views of the opened windows. Communication with the views is ensured by the - * {@link com.android.server.WindowManagerService} and is a cross-process operation. + * {@link com.android.server.wm.WindowManagerService} and is a cross-process operation. * * {@hide} */ diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index b662c55..3183643 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.wm; import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; @@ -42,6 +42,12 @@ import com.android.internal.view.IInputContext; import com.android.internal.view.IInputMethodClient; import com.android.internal.view.IInputMethodManager; import com.android.internal.view.WindowManagerPolicyThread; +import com.android.server.AttributeCache; +import com.android.server.EventLogTags; +import com.android.server.PowerManagerService; +import com.android.server.Watchdog; +import com.android.server.AttributeCache.Entry; +import com.android.server.Watchdog.Monitor; import com.android.server.am.BatteryStatsService; import android.Manifest; @@ -5347,8 +5353,8 @@ public class WindowManagerService extends IWindowManager.Stub * * @return True if the server was successfully started, false otherwise. * - * @see com.android.server.ViewServer - * @see com.android.server.ViewServer#VIEW_SERVER_DEFAULT_PORT + * @see com.android.server.wm.ViewServer + * @see com.android.server.wm.ViewServer#VIEW_SERVER_DEFAULT_PORT */ public boolean startViewServer(int port) { if (isSystemSecure()) { @@ -5394,7 +5400,7 @@ public class WindowManagerService extends IWindowManager.Stub * @return True if the server stopped, false if it wasn't started or * couldn't be stopped. * - * @see com.android.server.ViewServer + * @see com.android.server.wm.ViewServer */ public boolean stopViewServer() { if (isSystemSecure()) { @@ -5416,7 +5422,7 @@ public class WindowManagerService extends IWindowManager.Stub * * @return True if the server is running, false otherwise. * - * @see com.android.server.ViewServer + * @see com.android.server.wm.ViewServer */ public boolean isViewServerRunning() { if (isSystemSecure()) { diff --git a/services/jni/com_android_server_InputApplication.cpp b/services/jni/com_android_server_InputApplication.cpp index a46a162..e64ec4e 100644 --- a/services/jni/com_android_server_InputApplication.cpp +++ b/services/jni/com_android_server_InputApplication.cpp @@ -77,11 +77,11 @@ void android_server_InputApplication_toNative( LOG_FATAL_IF(! var, "Unable to find field " fieldName); int register_android_server_InputApplication(JNIEnv* env) { - FIND_CLASS(gInputApplicationClassInfo.clazz, "com/android/server/InputApplication"); + FIND_CLASS(gInputApplicationClassInfo.clazz, "com/android/server/wm/InputApplication"); GET_FIELD_ID(gInputApplicationClassInfo.inputApplicationHandle, gInputApplicationClassInfo.clazz, - "inputApplicationHandle", "Lcom/android/server/InputApplicationHandle;"); + "inputApplicationHandle", "Lcom/android/server/wm/InputApplicationHandle;"); GET_FIELD_ID(gInputApplicationClassInfo.name, gInputApplicationClassInfo.clazz, "name", "Ljava/lang/String;"); diff --git a/services/jni/com_android_server_InputApplicationHandle.cpp b/services/jni/com_android_server_InputApplicationHandle.cpp index ab82635..3a1214f 100644 --- a/services/jni/com_android_server_InputApplicationHandle.cpp +++ b/services/jni/com_android_server_InputApplicationHandle.cpp @@ -106,11 +106,11 @@ static JNINativeMethod gInputApplicationHandleMethods[] = { LOG_FATAL_IF(! var, "Unable to find field " fieldName); int register_android_server_InputApplicationHandle(JNIEnv* env) { - int res = jniRegisterNativeMethods(env, "com/android/server/InputApplicationHandle", + int res = jniRegisterNativeMethods(env, "com/android/server/wm/InputApplicationHandle", gInputApplicationHandleMethods, NELEM(gInputApplicationHandleMethods)); LOG_FATAL_IF(res < 0, "Unable to register native methods."); - FIND_CLASS(gInputApplicationHandleClassInfo.clazz, "com/android/server/InputApplicationHandle"); + FIND_CLASS(gInputApplicationHandleClassInfo.clazz, "com/android/server/wm/InputApplicationHandle"); GET_FIELD_ID(gInputApplicationHandleClassInfo.ptr, gInputApplicationHandleClassInfo.clazz, "ptr", "I"); diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp index 427af23..0a50ff8 100644 --- a/services/jni/com_android_server_InputManager.cpp +++ b/services/jni/com_android_server_InputManager.cpp @@ -1079,7 +1079,7 @@ static jstring android_server_InputManager_nativeDump(JNIEnv* env, jclass clazz) static JNINativeMethod gInputManagerMethods[] = { /* name, signature, funcPtr */ - { "nativeInit", "(Lcom/android/server/InputManager$Callbacks;)V", + { "nativeInit", "(Lcom/android/server/wm/InputManager$Callbacks;)V", (void*) android_server_InputManager_nativeInit }, { "nativeStart", "()V", (void*) android_server_InputManager_nativeStart }, @@ -1096,15 +1096,15 @@ static JNINativeMethod gInputManagerMethods[] = { { "nativeHasKeys", "(II[I[Z)Z", (void*) android_server_InputManager_nativeHasKeys }, { "nativeRegisterInputChannel", - "(Landroid/view/InputChannel;Lcom/android/server/InputWindowHandle;Z)V", + "(Landroid/view/InputChannel;Lcom/android/server/wm/InputWindowHandle;Z)V", (void*) android_server_InputManager_nativeRegisterInputChannel }, { "nativeUnregisterInputChannel", "(Landroid/view/InputChannel;)V", (void*) android_server_InputManager_nativeUnregisterInputChannel }, { "nativeInjectInputEvent", "(Landroid/view/InputEvent;IIII)I", (void*) android_server_InputManager_nativeInjectInputEvent }, - { "nativeSetInputWindows", "([Lcom/android/server/InputWindow;)V", + { "nativeSetInputWindows", "([Lcom/android/server/wm/InputWindow;)V", (void*) android_server_InputManager_nativeSetInputWindows }, - { "nativeSetFocusedApplication", "(Lcom/android/server/InputApplication;)V", + { "nativeSetFocusedApplication", "(Lcom/android/server/wm/InputApplication;)V", (void*) android_server_InputManager_nativeSetFocusedApplication }, { "nativeSetInputDispatchMode", "(ZZ)V", (void*) android_server_InputManager_nativeSetInputDispatchMode }, @@ -1134,13 +1134,13 @@ static JNINativeMethod gInputManagerMethods[] = { LOG_FATAL_IF(! var, "Unable to find field " fieldName); int register_android_server_InputManager(JNIEnv* env) { - int res = jniRegisterNativeMethods(env, "com/android/server/InputManager", + int res = jniRegisterNativeMethods(env, "com/android/server/wm/InputManager", gInputManagerMethods, NELEM(gInputManagerMethods)); LOG_FATAL_IF(res < 0, "Unable to register native methods."); // Callbacks - FIND_CLASS(gCallbacksClassInfo.clazz, "com/android/server/InputManager$Callbacks"); + FIND_CLASS(gCallbacksClassInfo.clazz, "com/android/server/wm/InputManager$Callbacks"); GET_METHOD_ID(gCallbacksClassInfo.notifyConfigurationChanged, gCallbacksClassInfo.clazz, "notifyConfigurationChanged", "(J)V"); @@ -1149,22 +1149,22 @@ int register_android_server_InputManager(JNIEnv* env) { "notifyLidSwitchChanged", "(JZ)V"); GET_METHOD_ID(gCallbacksClassInfo.notifyInputChannelBroken, gCallbacksClassInfo.clazz, - "notifyInputChannelBroken", "(Lcom/android/server/InputWindowHandle;)V"); + "notifyInputChannelBroken", "(Lcom/android/server/wm/InputWindowHandle;)V"); GET_METHOD_ID(gCallbacksClassInfo.notifyANR, gCallbacksClassInfo.clazz, "notifyANR", - "(Lcom/android/server/InputApplicationHandle;Lcom/android/server/InputWindowHandle;)J"); + "(Lcom/android/server/wm/InputApplicationHandle;Lcom/android/server/wm/InputWindowHandle;)J"); GET_METHOD_ID(gCallbacksClassInfo.interceptKeyBeforeQueueing, gCallbacksClassInfo.clazz, "interceptKeyBeforeQueueing", "(Landroid/view/KeyEvent;IZ)I"); GET_METHOD_ID(gCallbacksClassInfo.interceptKeyBeforeDispatching, gCallbacksClassInfo.clazz, "interceptKeyBeforeDispatching", - "(Lcom/android/server/InputWindowHandle;Landroid/view/KeyEvent;I)Z"); + "(Lcom/android/server/wm/InputWindowHandle;Landroid/view/KeyEvent;I)Z"); GET_METHOD_ID(gCallbacksClassInfo.dispatchUnhandledKey, gCallbacksClassInfo.clazz, "dispatchUnhandledKey", - "(Lcom/android/server/InputWindowHandle;Landroid/view/KeyEvent;I)Landroid/view/KeyEvent;"); + "(Lcom/android/server/wm/InputWindowHandle;Landroid/view/KeyEvent;I)Landroid/view/KeyEvent;"); GET_METHOD_ID(gCallbacksClassInfo.checkInjectEventsPermission, gCallbacksClassInfo.clazz, "checkInjectEventsPermission", "(II)Z"); @@ -1188,7 +1188,7 @@ int register_android_server_InputManager(JNIEnv* env) { "getPointerLayer", "()I"); GET_METHOD_ID(gCallbacksClassInfo.getPointerIcon, gCallbacksClassInfo.clazz, - "getPointerIcon", "()Lcom/android/server/InputManager$PointerIcon;"); + "getPointerIcon", "()Lcom/android/server/wm/InputManager$PointerIcon;"); // KeyEvent @@ -1235,7 +1235,7 @@ int register_android_server_InputManager(JNIEnv* env) { // PointerIcon - FIND_CLASS(gPointerIconClassInfo.clazz, "com/android/server/InputManager$PointerIcon"); + FIND_CLASS(gPointerIconClassInfo.clazz, "com/android/server/wm/InputManager$PointerIcon"); GET_FIELD_ID(gPointerIconClassInfo.bitmap, gPointerIconClassInfo.clazz, "bitmap", "Landroid/graphics/Bitmap;"); diff --git a/services/jni/com_android_server_InputWindow.cpp b/services/jni/com_android_server_InputWindow.cpp index 7515456..8548b47 100644 --- a/services/jni/com_android_server_InputWindow.cpp +++ b/services/jni/com_android_server_InputWindow.cpp @@ -144,10 +144,10 @@ void android_server_InputWindow_toNative( LOG_FATAL_IF(! var, "Unable to find field " fieldName); int register_android_server_InputWindow(JNIEnv* env) { - FIND_CLASS(gInputWindowClassInfo.clazz, "com/android/server/InputWindow"); + FIND_CLASS(gInputWindowClassInfo.clazz, "com/android/server/wm/InputWindow"); GET_FIELD_ID(gInputWindowClassInfo.inputWindowHandle, gInputWindowClassInfo.clazz, - "inputWindowHandle", "Lcom/android/server/InputWindowHandle;"); + "inputWindowHandle", "Lcom/android/server/wm/InputWindowHandle;"); GET_FIELD_ID(gInputWindowClassInfo.inputChannel, gInputWindowClassInfo.clazz, "inputChannel", "Landroid/view/InputChannel;"); diff --git a/services/jni/com_android_server_InputWindowHandle.cpp b/services/jni/com_android_server_InputWindowHandle.cpp index 4d66212..5b74e43 100644 --- a/services/jni/com_android_server_InputWindowHandle.cpp +++ b/services/jni/com_android_server_InputWindowHandle.cpp @@ -116,18 +116,18 @@ static JNINativeMethod gInputWindowHandleMethods[] = { LOG_FATAL_IF(! var, "Unable to find field " fieldName); int register_android_server_InputWindowHandle(JNIEnv* env) { - int res = jniRegisterNativeMethods(env, "com/android/server/InputWindowHandle", + int res = jniRegisterNativeMethods(env, "com/android/server/wm/InputWindowHandle", gInputWindowHandleMethods, NELEM(gInputWindowHandleMethods)); LOG_FATAL_IF(res < 0, "Unable to register native methods."); - FIND_CLASS(gInputWindowHandleClassInfo.clazz, "com/android/server/InputWindowHandle"); + FIND_CLASS(gInputWindowHandleClassInfo.clazz, "com/android/server/wm/InputWindowHandle"); GET_FIELD_ID(gInputWindowHandleClassInfo.ptr, gInputWindowHandleClassInfo.clazz, "ptr", "I"); GET_FIELD_ID(gInputWindowHandleClassInfo.inputApplicationHandle, gInputWindowHandleClassInfo.clazz, - "inputApplicationHandle", "Lcom/android/server/InputApplicationHandle;"); + "inputApplicationHandle", "Lcom/android/server/wm/InputApplicationHandle;"); return 0; } |